Merge branch 'zx/gmPhobos' into 'master'

Zx/gm phobos

See merge request !25

GMPhobos/Classes/Phobos.m

@@ -28,6 +28,10 @@ static NSString *sdkVersion = @"110";
 @property (strong, nonatomic) NSString *sessionId;
 /* 每一条埋点数据的物理ID，自增，生命周期和sessionId相同。特别注意：在sessionOver的时候，要把他置为0 */
 @property (assign, nonatomic) NSInteger serialId;
+
+// 用来记录除serverAPI以外的API
+@property (strong, nonatomic) NSMutableArray *APIArray;
+
 @end
 
 @implementation Phobos
@@ -56,6 +60,7 @@ static NSString *sdkVersion = @"110";
         _serverAPI = @"";
         _userType = [[NSMutableDictionary alloc] initWithCapacity:0];
         _appVersion = [PhobosUtil getAppVersion];
+        _APIArray = [NSMutableArray array];
         [self setupNotification];
         [self handleSessionStart];
         [self synchronizePhobosKey];
@@ -276,7 +281,7 @@ static NSString *sdkVersion = @"110";
 
 + (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes currentAPI:(NSString *)currentAPI {
     [self track:eventId attributes:attributes sendNow:NO currentAPI:currentAPI];
-    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:[PhobosUtil MD5String:currentAPI]];
     //超过一定数量的话，统一发送一次
     if (array.count > PhobosShardCount) {
         [sharedClient sendArray:array currentAPI:currentAPI cleanCacheRightNow:YES];
@@ -284,13 +289,14 @@ static NSString *sdkVersion = @"110";
 }
 
 + (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow currentAPI:(NSString *)currentAPI {
+    [sharedClient addNewApi:currentAPI]; // 记录新的API
     NSDictionary *dict = [sharedClient prepareDictionaryForEvent:eventId attributes:attributes];
     if (sendNow) {
         NSArray *array = @[dict];
         // 实时发送的埋点，不能立即清楚缓存
         [sharedClient sendArray:array currentAPI:currentAPI cleanCacheRightNow:NO];
     }else{
-        [sharedClient save:dict];
+        [sharedClient save:dict currentAPI:currentAPI];
     }
 }
 
@@ -441,6 +447,26 @@ static NSString *sdkVersion = @"110";
     [GMCache storeObjectAtDocumentPathWithkey:PhobosCacheKey object:dataArray];
 }
 
+/**
+ *  @brief 保存数据到缓存层
+ *
+ *  @param data 数据
+ *
+ */
+- (void)save:(NSDictionary *)data currentAPI:(NSString *)currentAPI
+{
+    if (_logEnabled) {
+        phobosLog([NSString stringWithFormat:@"save dictionary: %@",data]);
+    }
+    
+    NSMutableArray *dataArray = [GMCache fetchObjectAtDocumentPathWithkey:[PhobosUtil MD5String:currentAPI]];
+    if (dataArray) {
+        [dataArray addObject:data];
+    }else{
+        dataArray = [NSMutableArray arrayWithObject:data];
+    }
+    [GMCache storeObjectAtDocumentPathWithkey:[PhobosUtil MD5String:currentAPI] object:dataArray];
+}
 /**
  *  @brief 从缓存中获取数据，并发送
  *
@@ -451,6 +477,13 @@ static NSString *sdkVersion = @"110";
     if (paramsArray.count>0) {
         [self sendArray:paramsArray cleanCacheRightNow:YES];
     }
+    // 其他接口的埋点
+    for (NSString *newApi in self.APIArray) {
+        NSArray *paramsArray = [GMCache fetchObjectAtDocumentPathWithkey:[PhobosUtil MD5String:newApi]];
+        if (paramsArray.count>0) {
+            [self sendArray:paramsArray currentAPI:newApi cleanCacheRightNow:YES];
+        }
+    }
 }
 
 /*
@@ -482,7 +515,8 @@ static NSString *sdkVersion = @"110";
  从缓存区获取数据，发给服务器，请求成功的时候，把缓存区的数据删除掉
  */
 - (void)sendArrayWithCurrentAPI:(NSString *)currentAPI {
-    NSMutableArray *dataArray = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+    NSString *PhobosTempCacheKeyStr = [PhobosUtil MD5String:[PhobosUtil MD5String:currentAPI]]; // 两次加密作为key值，和缓存的key值作区分
+    NSMutableArray *dataArray = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKeyStr];
     if (_logEnabled) {
         NSData *data = [NSJSONSerialization dataWithJSONObject:dataArray options:NSJSONWritingPrettyPrinted error:nil];
         NSString *jsonString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
@@ -494,7 +528,7 @@ static NSString *sdkVersion = @"110";
         if (compressedData) {
             [PhobosUtil sendData:compressedData currentAPI:currentAPI success:^(NSInteger code) {
                 phobosLog(@"✈ ---------- ✈ data arrived Mars");
-                [GMCache removeObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+                [GMCache removeObjectAtDocumentPathWithkey:PhobosTempCacheKeyStr];
             }];
         }
     }
@@ -536,18 +570,18 @@ static NSString *sdkVersion = @"110";
 - (void)sendArray:(NSArray *)array currentAPI:(NSString *)currentAPI cleanCacheRightNow:(BOOL)clean {
     @try {
         //1.获取缓存区的数据，把新数据追加进去
-        
-        NSMutableArray *dataArray = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+        NSString *PhobosTempCacheKeyStr = [PhobosUtil MD5String:[PhobosUtil MD5String:currentAPI]]; // 两次加密作为key值，和缓存的key值作区分
+        NSMutableArray *dataArray = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKeyStr];
         if (dataArray) {
             [dataArray addObjectsFromArray:array];
         }else{
             dataArray = [NSMutableArray arrayWithArray:array];
         }
-        [GMCache storeObjectAtDocumentPathWithkey:PhobosTempCacheKey object:dataArray];
+        [GMCache storeObjectAtDocumentPathWithkey:PhobosTempCacheKeyStr object:dataArray];
         //2.把缓存区的数据发送给服务器
         [self sendArrayWithCurrentAPI:currentAPI];
         //3.把原有的数据删除
-        [GMCache removeObjectAtDocumentPathWithkey:PhobosCacheKey];
+        [GMCache removeObjectAtDocumentPathWithkey:[PhobosUtil MD5String:currentAPI]];
     }
     @catch (NSException *exception) {
         phobosLog(exception);
@@ -571,4 +605,13 @@ static NSString *sdkVersion = @"110";
     });
 }
 
+
+- (void)addNewApi:(NSString *)api {
+    for (NSString *item in self.APIArray) {
+        if ([api isEqualToString:item]) {
+            break;
+        }
+        [self.APIArray addObject:api];
+    }
+}
 @end

GMPhobos/Classes/PhobosConfig.h

@@ -20,6 +20,7 @@
 #define PhobosEndTime         @"PhobosEndTime"            //记录APP退出|退到后台时的时间戳
 #define PhobosCacheKey        @"PhobosCacheKey"           //存放持久化埋点数据的key
 #define PhobosTempCacheKey    @"PhobosTempCacheKey"       //临时存放待发送埋点数据的key
+
 #define PhobosShardCount      50                          //收集数据分段发送的个数
 
 #endif /* PhobosConfig_h */

GMPhobos/Classes/PhobosUtil.h

@@ -80,7 +80,10 @@ typedef void (^SendDataSuccessBlock)(NSInteger code);
 + (NSString *)deviceRunTime;
 
 
-
+/**
+ * MD5加密
+ */
++ (NSString *)MD5String:(NSString *)str;
 
 
 @end

GMPhobos/Classes/PhobosUtil.m

@@ -21,6 +21,8 @@
 #import <mach/machine.h>
 #import "sys/utsname.h"
 #import "Phobos.h"
+#import <CommonCrypto/CommonCryptor.h>
+#import <CommonCrypto/CommonDigest.h>
 
 #define IOS_CELLULAR    @"pdp_ip0"
 #define IOS_WIFI        @"en0"
@@ -427,4 +429,21 @@
     return [NSString stringWithFormat:@"%ld", uptime];
 }
 
++ (NSString *)MD5String:(NSString *)str
+{
+    if(str == nil || [str length] == 0)
+        return nil;
+    
+    const char *value = [str UTF8String];
+    
+    unsigned char outputBuffer[CC_MD5_DIGEST_LENGTH];
+    CC_MD5(value, (uint32_t)strlen(value), outputBuffer);
+    
+    NSMutableString *outputString = [[NSMutableString alloc] initWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
+    for(NSInteger count = 0; count < CC_MD5_DIGEST_LENGTH; count++){
+        [outputString appendFormat:@"%02x",outputBuffer[count]];
+    }
+    
+    return outputString;
+}
 @end