Skip to content

Commit

Permalink
Format source
Browse files Browse the repository at this point in the history
  • Loading branch information
hansemannn committed Aug 15, 2017
1 parent cf03f0d commit 1748a65
Show file tree
Hide file tree
Showing 583 changed files with 73,332 additions and 77,189 deletions.
3 changes: 1 addition & 2 deletions iphone/Classes/APIModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
#import "TiModule.h"

@interface APIModule : TiModule {

}

-(void)logMessage:(NSArray*)messages severity:(NSString*)severity; // Used by TiConsole
- (void)logMessage:(NSArray *)messages severity:(NSString *)severity; // Used by TiConsole

@end
150 changes: 72 additions & 78 deletions iphone/Classes/APIModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,136 +5,130 @@
* Please see the LICENSE included with this distribution for details.
*/
#import "APIModule.h"
#import "TiUtils.h"
#import "TiBase.h"
#import "TiApp.h"
#import "TiBase.h"
#import "TiExceptionHandler.h"
#import "TiUtils.h"

#ifndef USE_JSCORE_FRAMEWORK
#import "TiDebugger.h"
#endif

extern NSString * const TI_APPLICATION_DEPLOYTYPE;
extern NSString *const TI_APPLICATION_DEPLOYTYPE;

@implementation APIModule

-(NSString*)apiName
- (NSString *)apiName
{
return @"Ti.API";
return @"Ti.API";
}

-(void)logMessage:(NSArray*)args severity:(NSString*)severity
- (void)logMessage:(NSArray *)args severity:(NSString *)severity
{
NSString* lcSeverity = [severity lowercaseString];

NSString *lcSeverity = [severity lowercaseString];
#ifndef USE_JSCORE_FRAMEWORK
DebuggerLogLevel level = OUT;
if ([lcSeverity isEqualToString:@"warn"]) {
level = WARN;
}
else if ([lcSeverity isEqualToString:@"error"] ||
[lcSeverity isEqualToString:@"critical"] ||
[lcSeverity isEqualToString:@"fatal"]) {
level = ERR;
}
else if ([lcSeverity isEqualToString:@"trace"]) {
level = TRACE;
}
else if ([lcSeverity isEqualToString:@"debug"]) {
level = LOG_DEBUG;
}

if ([[TiApp app] debugMode]) {
NSMutableArray* messages = [NSMutableArray arrayWithArray:args];

if (![lcSeverity isEqualToString:@"info"]) { // Custom severity, or just a badly-formed log; either way, debugger treats it as info
[messages insertObject:[NSString stringWithFormat:@"[%@]", severity] atIndex:0];
}

TiDebuggerLogMessage(level, [messages componentsJoinedByString:@" "]);
DebuggerLogLevel level = OUT;
if ([lcSeverity isEqualToString:@"warn"]) {
level = WARN;
} else if ([lcSeverity isEqualToString:@"error"] ||
[lcSeverity isEqualToString:@"critical"] ||
[lcSeverity isEqualToString:@"fatal"]) {
level = ERR;
} else if ([lcSeverity isEqualToString:@"trace"]) {
level = TRACE;
} else if ([lcSeverity isEqualToString:@"debug"]) {
level = LOG_DEBUG;
}

if ([[TiApp app] debugMode]) {
NSMutableArray *messages = [NSMutableArray arrayWithArray:args];

if (![lcSeverity isEqualToString:@"info"]) { // Custom severity, or just a badly-formed log; either way, debugger treats it as info
[messages insertObject:[NSString stringWithFormat:@"[%@]", severity] atIndex:0];
}
else

TiDebuggerLogMessage(level, [messages componentsJoinedByString:@" "]);
} else
#endif
{
{
#ifndef USE_JSCORE_FRAMEWORK
if ([TI_APPLICATION_DEPLOYTYPE isEqualToString:@"production"]) {
if (level != ERR) {
return;
}
}
#endif
NSLog(@"[%@] %@", [severity uppercaseString], [args componentsJoinedByString:@" "]);
if ([TI_APPLICATION_DEPLOYTYPE isEqualToString:@"production"]) {
if (level != ERR) {
return;
}
}
#endif
NSLog(@"[%@] %@", [severity uppercaseString], [args componentsJoinedByString:@" "]);
}
}

-(id)transform:(id)arg
- (id)transform:(id)arg
{
if ([arg isKindOfClass:[NSDictionary class]]) {
return [[[[TiScriptError alloc] initWithDictionary:arg] autorelease] description];
}
return arg;
if ([arg isKindOfClass:[NSDictionary class]]) {
return [[[[TiScriptError alloc] initWithDictionary:arg] autorelease] description];
}
return arg;
}

-(void)debug:(NSArray*)args
- (void)debug:(NSArray *)args
{
[self logMessage:args severity:@"debug"];
[self logMessage:args severity:@"debug"];
}

-(void)info:(NSArray*)args
- (void)info:(NSArray *)args
{
[self logMessage:args severity:@"info"];
[self logMessage:args severity:@"info"];
}

-(void)warn:(NSArray*)args
- (void)warn:(NSArray *)args
{
[self logMessage:args severity:@"warn"];
[self logMessage:args severity:@"warn"];
}

-(void)error:(NSArray*)args
- (void)error:(NSArray *)args
{
[self logMessage:args severity:@"error"];
[self logMessage:args severity:@"error"];
}

-(void)trace:(NSArray*)args
- (void)trace:(NSArray *)args
{
[self logMessage:args severity:@"trace"];
[self logMessage:args severity:@"trace"];
}

-(void)timestamp:(NSArray*)args
- (void)timestamp:(NSArray *)args
{
NSLog(@"[TIMESTAMP] %f %@", [NSDate timeIntervalSinceReferenceDate], [self transform:[args objectAtIndex:0]]);
fflush(stderr);
NSLog(@"[TIMESTAMP] %f %@", [NSDate timeIntervalSinceReferenceDate], [self transform:[args objectAtIndex:0]]);
fflush(stderr);
}

-(void)notice:(NSArray*)args
- (void)notice:(NSArray *)args
{
[self logMessage:args severity:@"info"];
[self logMessage:args severity:@"info"];
}

-(void)critical:(NSArray*)args
- (void)critical:(NSArray *)args
{
[self logMessage:args severity:@"error"];
[self logMessage:args severity:@"error"];
}

-(void)log:(NSArray*)args
- (void)log:(NSArray *)args
{
if ([args count] > 1) {
[self logMessage:[args subarrayWithRange:NSMakeRange(1, [args count]-1)] severity:[args objectAtIndex:0]];
}
else {
[self logMessage:args severity:@"info"];
}
if ([args count] > 1) {
[self logMessage:[args subarrayWithRange:NSMakeRange(1, [args count] - 1)] severity:[args objectAtIndex:0]];
} else {
[self logMessage:args severity:@"info"];
}
}

-(void)reportUnhandledException:(NSArray*)args
- (void)reportUnhandledException:(NSArray *)args
{
id lineNumber = [args objectAtIndex:0];
id source = [args objectAtIndex:1];
id message = [args objectAtIndex:2];

NSLog(@"[ERROR] %@:%@ %@",source,lineNumber,message);
fflush(stderr);
}
id lineNumber = [args objectAtIndex:0];
id source = [args objectAtIndex:1];
id message = [args objectAtIndex:2];

NSLog(@"[ERROR] %@:%@ %@", source, lineNumber, message);
fflush(stderr);
}

@end
10 changes: 5 additions & 5 deletions iphone/Classes/AccelerometerModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifdef USE_TI_ACCELEROMETER
#import <CoreMotion/CoreMotion.h>

@interface AccelerometerModule : TiModule<UIAccelerometerDelegate> {
@private
CMMotionManager* _motionManager;
NSOperationQueue* _motionQueue;
CFAbsoluteTime oldTime;
@interface AccelerometerModule : TiModule <UIAccelerometerDelegate> {
@private
CMMotionManager *_motionManager;
NSOperationQueue *_motionQueue;
CFAbsoluteTime oldTime;
}

@end
Expand Down
92 changes: 45 additions & 47 deletions iphone/Classes/AccelerometerModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,72 +8,70 @@

#import "AccelerometerModule.h"


@implementation AccelerometerModule

-(void)dealloc
- (void)dealloc
{
[self stopGeneratingEvents];
[super dealloc];
[self stopGeneratingEvents];
[super dealloc];
}

-(NSString*)apiName
- (NSString *)apiName
{
return @"Ti.Accelerometer";
return @"Ti.Accelerometer";
}


-(void)startGeneratingEvents
- (void)startGeneratingEvents
{
if (_motionManager == nil) {
_motionManager = [[CMMotionManager alloc] init];
if (_motionManager.isAccelerometerAvailable) {
_motionQueue = [[NSOperationQueue alloc] init];
_motionManager.accelerometerUpdateInterval = 1.0/10.0;
oldTime = CFAbsoluteTimeGetCurrent();
[_motionManager startAccelerometerUpdatesToQueue:_motionQueue withHandler:^(CMAccelerometerData *accelerometerData, NSError *error){
if (error == nil) {
NSDictionary *event = [NSDictionary dictionaryWithObjectsAndKeys:
NUMDOUBLE(accelerometerData.acceleration.x), @"x",
NUMDOUBLE(accelerometerData.acceleration.y), @"y",
NUMDOUBLE(accelerometerData.acceleration.z), @"z",
NUMLONGLONG((CFAbsoluteTimeGetCurrent() - oldTime)*1000),@"timestamp",
nil];
[self fireEvent:@"update" withObject:event];
} else {
DebugLog(@"Error in event - %@",[TiUtils messageFromError:error]);
}
}];

} else {
DebugLog(@"Accelerometer is Unavailable on this device");
RELEASE_TO_NIL(_motionManager);
}
if (_motionManager == nil) {
_motionManager = [[CMMotionManager alloc] init];
if (_motionManager.isAccelerometerAvailable) {
_motionQueue = [[NSOperationQueue alloc] init];
_motionManager.accelerometerUpdateInterval = 1.0 / 10.0;
oldTime = CFAbsoluteTimeGetCurrent();
[_motionManager startAccelerometerUpdatesToQueue:_motionQueue
withHandler:^(CMAccelerometerData *accelerometerData, NSError *error) {
if (error == nil) {
NSDictionary *event = [NSDictionary dictionaryWithObjectsAndKeys:
NUMDOUBLE(accelerometerData.acceleration.x), @"x",
NUMDOUBLE(accelerometerData.acceleration.y), @"y",
NUMDOUBLE(accelerometerData.acceleration.z), @"z",
NUMLONGLONG((CFAbsoluteTimeGetCurrent() - oldTime) * 1000), @"timestamp",
nil];
[self fireEvent:@"update" withObject:event];
} else {
DebugLog(@"Error in event - %@", [TiUtils messageFromError:error]);
}
}];

} else {
DebugLog(@"Accelerometer is Unavailable on this device");
RELEASE_TO_NIL(_motionManager);
}
}
}

-(void)stopGeneratingEvents
- (void)stopGeneratingEvents
{
if (_motionManager != nil) {
[_motionManager stopAccelerometerUpdates];
RELEASE_TO_NIL_AUTORELEASE(_motionQueue);
RELEASE_TO_NIL_AUTORELEASE(_motionManager);
}
if (_motionManager != nil) {
[_motionManager stopAccelerometerUpdates];
RELEASE_TO_NIL_AUTORELEASE(_motionQueue);
RELEASE_TO_NIL_AUTORELEASE(_motionManager);
}
}

-(void)_listenerAdded:(NSString *)type count:(int)count
- (void)_listenerAdded:(NSString *)type count:(int)count
{
if ( (count == 1) && [type isEqualToString:@"update"] ) {
[self startGeneratingEvents];
}

if ((count == 1) && [type isEqualToString:@"update"]) {
[self startGeneratingEvents];
}
}

-(void)_listenerRemoved:(NSString *)type count:(int)count
- (void)_listenerRemoved:(NSString *)type count:(int)count
{
if ( (count == 0) && [type isEqualToString:@"update"] ) {
[self stopGeneratingEvents];
}
if ((count == 0) && [type isEqualToString:@"update"]) {
[self stopGeneratingEvents];
}
}

@end
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/AnalyticsModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

@interface AnalyticsModule : TiModule

+ (BOOL)isEventFiltered:(NSString*)eventName;
+ (BOOL)isEventFiltered:(NSString *)eventName;

@end

0 comments on commit 1748a65

Please sign in to comment.