code review

GMPhobos/Classes/Phobos.m

@@ -39,6 +39,8 @@ static NSString *sdkVersion = @"1.3.1";
 
 static dispatch_semaphore_t _immediatelySemaphore;
 static dispatch_semaphore_t _normalSemaphore;
+static dispatch_queue_t _immediatelyQueue;
+static dispatch_queue_t _normalQueue;
 
 + (Phobos *)clientWithAppName:(NSString *)appName channelId:(NSString *)channelId{
     Phobos.sharedClient.appName = appName;
@@ -51,6 +53,8 @@ static dispatch_semaphore_t _normalSemaphore;
     dispatch_once(&onceToken, ^{
         _immediatelySemaphore = dispatch_semaphore_create(1);
         _normalSemaphore = dispatch_semaphore_create(1);
+        _immediatelyQueue = dispatch_queue_create("immdiately", DISPATCH_QUEUE_CONCURRENT);
+        _normalQueue = dispatch_queue_create("normal", DISPATCH_QUEUE_CONCURRENT);
     });
 }
 
@@ -438,7 +442,7 @@ static dispatch_semaphore_t _normalSemaphore;
 }
 
 + (void)track:(NSString *)eventName{
-    [self track:eventName attributes:@{} sendNow:NO currentAPI:_sharedClient.serverAPI];
+    [self track:eventName attributes:nil sendNow:NO currentAPI:_sharedClient.serverAPI];
 }
 
 + (void)track:(NSString *)eventName attributes:(NSDictionary *)attributes{
@@ -450,7 +454,7 @@ static dispatch_semaphore_t _normalSemaphore;
 }
 
 + (void)track:(NSString *)eventName currentAPI:(NSString *)currentAPI {
-    [self track:eventName attributes:@{} sendNow:NO currentAPI:currentAPI];
+    [self track:eventName attributes:nil sendNow:NO currentAPI:currentAPI];
 }
 
 + (void)track:(NSString *)eventName attributes:(NSDictionary *)attributes currentAPI:(NSString *)currentAPI {
@@ -489,6 +493,7 @@ static dispatch_semaphore_t _normalSemaphore;
 }
 
 - (void)trackPhobosWithURL:(NSString *)url data:(NSDictionary *)data immediate:(BOOL)immediate {
+    dispatch_async(_normalQueue, ^{
         dispatch_semaphore_wait(_normalSemaphore, DISPATCH_TIME_FOREVER);
         NSMutableDictionary *dataDict = [[GMCache fetchObjectAtDocumentPathWithkey:PhobosNormalCacheKey] mutableCopy];
         _normalCount++;
@@ -505,6 +510,7 @@ static dispatch_semaphore_t _normalSemaphore;
             [Phobos  removeAllNormalPhobosData];
         }
         dispatch_semaphore_signal(_normalSemaphore);
+    });
 }
 
 /**
@@ -513,6 +519,7 @@ static dispatch_semaphore_t _normalSemaphore;
  * @param data : 使用id类型是因为直接调用实时埋点传过来的是Dict,而普通埋点过来的则是Array类型
  */
 - (void)sendImmediatelyPhobosWithURL:(NSString *)url data:(id)data {
+    dispatch_async(_immediatelyQueue, ^{
         dispatch_semaphore_wait(_immediatelySemaphore, DISPATCH_TIME_FOREVER);
         __block NSMutableDictionary *dataDict = [[GMCache fetchObjectAtDocumentPathWithkey:PhobosImmediatelyCacheKey] mutableCopy];
         dataDict = [self dataDict:dataDict setObject:data forKey:url];
@@ -536,6 +543,7 @@ static dispatch_semaphore_t _normalSemaphore;
                 phobosLog(@"✈ ---------- ✈ data arrived Mars");
             }];
         }];
+    });
 }
 
 /**
@@ -555,7 +563,13 @@ static dispatch_semaphore_t _normalSemaphore;
 //    [self verifyPVPhobos:dataArray data:object];
 //#endif
     [dataArray addObjectsFromArray:data];
+    // 进行数据校验
+    @try {
+        NSData *json = [PhobosUtil encodeJSON:dataArray];
         [dataDict setValue:dataArray forKey:key];
+    } @catch (NSException *exception) {
+        NSAssert(NO, @"哎呀呀,VALUE只不能为NSObject ");
+    }
     return dataDict;
 }