增加网加加统计APP使用时长 ,渠道from统计

张旭
1 parent 855cbe63
Showing 10 changed files with 125 additions and 12 deletions
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserManager.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserManager.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemTools.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveVerificationCode.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveVerificationCode.m
CNLiveUserSystemSDK.xcodeproj/project.pbxproj
Products/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemCenter.h
@@ -15,6 +15,7 @@
 @property (nonatomic, strong) NSString *appKey;
 @property (nonatomic, strong) NSString *appSecret;
 @property (nonatomic ,assign) BOOL isTestEnvironment;
+@property (nonatomic, copy) NSString *userId;
 + (CNLiveUserManager *)manager;
@@ -10,7 +10,6 @@
 #import "CNLiveUserSystemTools.h"
 #import "Common.h"
-#define testStatUrl @"http://testappsta.cnlive.com/app.js"
 #define formalStatUrl @"http://app.sta.cnlive.com/app.js"
 @interface CNLiveUserManager ()
@@ -48,11 +47,11 @@
         NSString *stamp = realTime;
         stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
-        NSString *baseUrl = self.isTestEnvironment ? formalStatUrl : testStatUrl;
-        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=&spid=&appid=%@&version=1005_%@&eventid=1300&uri=&sid=&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion, StatAppVersion];
+        NSString *baseUrl = formalStatUrl;
+        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=iphone&spid=&appid=%@&version=1005_%@&eventid=1300&uri=&sid=&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion, StatAppVersion];
         [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
-
+        
     }];
 }
@@ -65,9 +64,39 @@
         NSString *endDate = [NSString stringWithFormat:@"%.3f",[netDate timeIntervalSinceDate:_startDate]];
         endDate = [endDate stringByReplacingOccurrencesOfString:@"." withString:@""];
-        NSString *baseUrl = self.isTestEnvironment ? formalStatUrl : testStatUrl;
-        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=&spid=&appid=%@&version=1005_%@&eventid=1311&uri=%@&sid=&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion,endDate,StatAppVersion];
+        NSString *baseUrl = formalStatUrl;
+        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=iphone&spid=&appid=%@&version=1005_%@&eventid=1311&uri=%@&sid=&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion,endDate,StatAppVersion];
+        
+        [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
+    }];
+}
+
+- (void)wjjStartUserStat
+{
+    [CNLiveUserSystemTools getRealTimeString:^(NSString * _Nullable realTime, NSDate * _Nullable netDate) {
+        
+        _startDate = netDate;
+        
+        NSString *stamp = realTime;
+        stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
+        NSString *baseUrl = formalStatUrl;
+        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=iphone&spid=&appid=%@&version=1005_%@&eventid=1320&uri=&sid=%@&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion, [CNLiveUserManager manager].userId,StatAppVersion];
+        [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
+        
+    }];
+}
+
+- (void)wjjEndUserStat
+{
+    [CNLiveUserSystemTools getRealTimeString:^(NSString * _Nullable realTime, NSDate * _Nullable netDate) {
+        NSString *stamp = realTime;
+        stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
+        
+        NSString *endDate = [NSString stringWithFormat:@"%.3f",[netDate timeIntervalSinceDate:_startDate]];
+        endDate = [endDate stringByReplacingOccurrencesOfString:@"." withString:@""];
+        NSString *baseUrl = formalStatUrl;
+        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=iphone&spid=&appid=%@&version=1005_%@&eventid=1321&uri=%@&sid=%@&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion,endDate,[CNLiveUserManager manager].userId,StatAppVersion];
         [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
     }];
 }
@@ -75,10 +104,20 @@
 - (void)applicationBecomeActive
 {
     [self startUserStat];
+    
+    if ([CNLiveUserManager manager].userId)
+    {
+        [self wjjStartUserStat];
+    }
 }
 - (void)applicationEnterBackground
 {
     [self endUserStat];
+    
+    if ([CNLiveUserManager manager].userId)
+    {
+        [self wjjEndUserStat];
+    }
 }
 @end
@@ -24,6 +24,13 @@
  + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret isTestEnvironment:(BOOL)isTestEnvironment;
 /**
+ 用户ID
+
+ @param userId 用户ID
+ */
++ (void)setUserId:(NSString *)userId;
+
+/**
  @abstract      初始化
  @param         appId                   注册成功获得应用ID
  @param         appKey                  注册成功获得应用key
@@ -96,7 +103,7 @@
 /**
- @abstract      发送验证码
+ @abstract      发送验证码(旧)
  @param         mobile                  手机号
  @param         type                    发送验证码类型（详见VerificationCodeType）
  @param         success                 成功回调
@@ -104,6 +111,16 @@
  */
 + (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+/**
+ @abstract      发送验证码(新)
+ @param         type                    发送验证码类型（详见VerificationCodeType）
+ @param         mobile                  手机号
+ @param         countryCode             手机号国家码
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      更新用户附加信息
@@ -50,6 +50,11 @@
     [[CNLiveUserManager manager] addObserver];
 }
++ (void)setUserId:(NSString *)userId
+{
+    [CNLiveUserManager manager].userId = userId;
+}
+
 /**
  *  注册
  */
@@ -103,7 +108,7 @@
 }
 /**
- *  发送验证码
+ *  发送验证码(旧)
  */
 + (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id))success failure :(void (^)(NSDictionary *))failure
 {
@@ -113,6 +118,16 @@
 }
 /**
+ *  发送验证码 (新)
+ */
++ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure
+{
+    CNLiveVerificationCode *verification = [[CNLiveVerificationCode alloc] init];
+    
+    [verification getVerificationCodeWithAppId:[CNLiveUserManager manager].appId appKey:[CNLiveUserManager manager].appKey type:type mobile:mobile countryCode:countryCode success:success failure:failure];
+}
+
+/**
  *  更新用户附加信息
  */
 +(void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
@@ -115,7 +115,7 @@
         NSString *stamp = realTime;
         stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
         NSString *baseUrl = self.isTestEnvironment ? formalStatUrl : testStatUrl;
-        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=&spid=&appid=%@&version=1005_%@&eventid=1000&uri=%@&sid=%@&plat=i_%@&objid=_",baseUrl,kSVer, [self uidForStat:realTime], stamp, [CNLiveUserManager manager].appId, SDKVersion, errorString,[self getSid],StatAppVersion];
+        NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=iphone&spid=&appid=%@&version=1005_%@&eventid=1000&uri=%@&sid=%@&plat=i_%@&objid=_",baseUrl,kSVer, [self uidForStat:realTime], stamp, [CNLiveUserManager manager].appId, SDKVersion, errorString,[self getSid],StatAppVersion];
         [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
     }];
 }
@@ -10,7 +10,10 @@
 #import "CNLiveUserSystemTypeDef.h"
 @interface CNLiveVerificationCode : NSObject
-
+//获取验证码(旧)
 - (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+//获取验证码(新)
+- (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
 @end
@@ -46,6 +46,27 @@ static  NSString *passwordFormalURL = @&quot;https://api.cnlive.com/open/api2/user/se
     }];
 }
+- (void)getVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(VerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    [CNLiveUserSystemTools getRealTimeString:^(NSString * _Nullable realTime, NSDate * _Nullable netDate) {
+        NSString *timeString = realTime;
+        
+        NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
+                                 @"mobile":[CNLiveUserSystemTools verify:mobile],
+                                @"countryCode":countryCode, @"clientPlat":@"i",
+                                 @"platform_id":[NSBundle mainBundle].bundleIdentifier,
+                                 @"timestamp": timeString};
+        
+        NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
+        NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
+        NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
+        
+        [parameter setObject:signString forKey:@"sign"];
+        
+        [self requestWithURL:[self getURL:type] parameter:parameter success:success failure:failure];
+    }];
+}
+
 #pragma mark - request
 - (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
@@ -259,7 +259,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${ACTION}\" = \"build\" ]\nthen\nINSTALL_DIR=${SRCROOT}/Products/${PROJECT_NAME}.framework\n\nDEVICE_DIR=${BUILD_ROOT}/${CONFIGURATION}-iphoneos/${PROJECT_NAME}.framework\n\nSIMULATOR_DIR=${BUILD_ROOT}/${CONFIGURATION}-iphonesimulator/${PROJECT_NAME}.framework\n\nif [ -d \"${INSTALL_DIR}\" ]\nthen\nrm -rf \"${INSTALL_DIR}\"\nfi\n\nmkdir -p \"${INSTALL_DIR}\"\n\ncp -R \"${DEVICE_DIR}/\" \"${INSTALL_DIR}/\"\n#ditto \"${DEVICE_DIR}/Headers\" \"${INSTALL_DIR}/Headers\"\n\nlipo -create \"${DEVICE_DIR}/${PROJECT_NAME}\" \"${SIMULATOR_DIR}/${PROJECT_NAME}\" -output \"${INSTALL_DIR}/${PROJECT_NAME}\"\n\n#open \"${DEVICE_DIR}\"\n#open \"${SRCROOT}/Products\"\nfi";
+			shellScript = "if [ \"${ACTION}\" = \"build\" ]\nthen\nINSTALL_DIR=${SRCROOT}/Products/${PROJECT_NAME}.framework\n\nDEVICE_DIR=${BUILD_ROOT}/${CONFIGURATION}-iphoneos/${PROJECT_NAME}.framework\n\nSIMULATOR_DIR=${BUILD_ROOT}/${CONFIGURATION}-iphonesimulator/${PROJECT_NAME}.framework\n\nif [ -d \"${INSTALL_DIR}\" ]\nthen\nrm -rf \"${INSTALL_DIR}\"\nfi\n\nmkdir -p \"${INSTALL_DIR}\"\n\ncp -R \"${DEVICE_DIR}/\" \"${INSTALL_DIR}/\"\n#ditto \"${DEVICE_DIR}/Headers\" \"${INSTALL_DIR}/Headers\"\n\nlipo -create \"${DEVICE_DIR}/${PROJECT_NAME}\" \"${SIMULATOR_DIR}/${PROJECT_NAME}\" -output \"${INSTALL_DIR}/${PROJECT_NAME}\"\n\n#open \"${DEVICE_DIR}\"\n#open \"${SRCROOT}/Products\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -24,6 +24,13 @@
  + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret isTestEnvironment:(BOOL)isTestEnvironment;
 /**
+ 用户ID
+
+ @param userId 用户ID
+ */
++ (void)setUserId:(NSString *)userId;
+
+/**
  @abstract      初始化
  @param         appId                   注册成功获得应用ID
  @param         appKey                  注册成功获得应用key
@@ -96,7 +103,7 @@
 /**
- @abstract      发送验证码
+ @abstract      发送验证码(旧)
  @param         mobile                  手机号
  @param         type                    发送验证码类型（详见VerificationCodeType）
  @param         success                 成功回调
@@ -104,6 +111,16 @@
  */
 + (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+/**
+ @abstract      发送验证码(新)
+ @param         type                    发送验证码类型（详见VerificationCodeType）
+ @param         mobile                  手机号
+ @param         countryCode             手机号国家码
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+
 /**
  @abstract      更新用户附加信息