add IDFA for request and check weakself

shshjing · shshjing · commit 0acfbd26a603 · 2019-07-23T16:36:10.000+08:00
diff --git a/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPInterfaceController.m b/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPInterfaceController.m
@@ -570,13 +570,17 @@ - (void)registerLuaViewRoutes {
     __weak typeof(self) weakSelf = self;
     [[VPUPRoutes routesForScheme:VPUPRoutesSDKLuaView] addRoute:@"/defaultLuaView" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
         
+        if (weakSelf) {
+            return NO;
+        }
+        __strong typeof(self) strongSelf = weakSelf;
         //判定osView是否存在，若不存在，先创建
-        if (!weakSelf.osView) {
-            [weakSelf initOSViewWithFrame:weakSelf.view.bounds];
+        if (!strongSelf.osView) {
+            [strongSelf initOSViewWithFrame:strongSelf.view.bounds];
             //TODO MQTT,如果_liveView不存在情况怎么处理
             
-            if(!weakSelf.canSet) {
-                [weakSelf.osView startLoading];
+            if(!strongSelf.canSet) {
+                [strongSelf.osView startLoading];
             }
         }
         
@@ -590,7 +594,7 @@ - (void)registerLuaViewRoutes {
         if (!luaFile) {
             luaFile = [data objectForKey:@"template"];
         }
-        [weakSelf.osView loadLua:luaFile data:parameters];
+        [strongSelf.osView loadLua:luaFile data:parameters];
         return YES;
     }];
 }
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaNativeScanner.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaNativeScanner.m
@@ -36,6 +36,9 @@ - (void)showPhotoPickerController:(NSString *)requestMethod {
     __weak typeof(self) weakSelf = self;
     
     imagePicker.imagePickerControllerDidCancelHandle = ^(void) {
+        if (!weakSelf) {
+            return;
+        }
         lua_State* l = self.luaNode.lvCore.l;
         if( l ){
             lua_checkstack32(l);
@@ -45,6 +48,9 @@ - (void)showPhotoPickerController:(NSString *)requestMethod {
     };
     
     imagePicker.didFinishPickingPhotosWithFilePathHandle = ^(NSString *filePath) {
+        if (!weakSelf) {
+            return;
+        }
         lua_State* l = self.luaNode.lvCore.l;
         if( l ){
             lua_checkstack32(l);
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaCommonInfo.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaCommonInfo.m
@@ -26,6 +26,7 @@ + (NSMutableDictionary *)commonParam {
         [_commonParam setObject:[VPUPGeneralInfo platformSDKVersion] forKey:@"SDK_VERSION"];
         [_commonParam setObject:[VPUPGeneralInfo appDeviceSystemVersion] forKey:@"OS_VERSION"];
         [_commonParam setObject:[VPUPGeneralInfo userIdentity] forKey:@"UD_ID"];
+        [_commonParam setObject:[VPUPGeneralInfo IDFA] forKey:@"IDFA"];
         [_commonParam setObject:[VPUPGeneralInfo appDeviceLanguage] forKey:@"LANGUAGE"];
         [_commonParam setObject:[VPUPGeneralInfo iPhoneDeviceType] forKey:@"PHONE_MODEL"];
         [_commonParam setObject:[VPUPDeviceUtil phoneCarrier] forKey:@"PHONE_PROVIDER"];
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaScriptManager.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaScriptManager.m
@@ -8,7 +8,7 @@
 
 #import "VPLuaScriptManager.h"
 #import "VPUPResumeDownloader.h"
-#import "VPUPHTTPGeneralAPI.h"
+#import "VPUPHTTPBusinessAPI.h"
 #import "VPUPHTTPAPIManager.h"
 #import "VPUPJsonUtil.h"
 #import <VPLuaViewSDK/LVZipArchive.h>
@@ -63,47 +63,48 @@ - (VPUPPrefetchManager *)prefetchManager {
 
 - (void)getLuaVersionInfoWithVersionUrl:(NSString *)url {
     __weak typeof(self) weakSelf = self;
-    VPUPHTTPGeneralAPI *api = [[VPUPHTTPGeneralAPI alloc] init];
-    if ([VPLuaSDK sharedSDK].appKey && [VPLuaSDK sharedSDK].appKey.length > 0) {
-        NSMutableDictionary *headers = [NSMutableDictionary dictionaryWithCapacity:0];
-        [headers addEntriesFromDictionary:api.apiRequestHTTPHeaderField];
-        [headers setObject:[VPLuaSDK sharedSDK].appKey forKey:@"appKey"];
-        api.apiRequestHTTPHeaderField = headers;
-    }
+    VPUPHTTPBusinessAPI *api = [[VPUPHTTPBusinessAPI alloc] init];
     api.baseUrl = url;
     api.apiRequestMethodType = VPUPRequestMethodTypePOST;
     NSString *commonParamString = VPUP_DictionaryToJson(@{@"commonParam":[VPLuaCommonInfo commonParam]});
     api.requestParameters = @{@"data":[VPUPAESUtil aesEncryptString:commonParamString key:[VPLuaSDK sharedSDK].appSecret initVector:[VPLuaSDK sharedSDK].appSecret]};
     api.apiCompletionHandler = ^(id  _Nonnull responseObject, NSError * _Nullable error, NSURLResponse * _Nullable response) {
         
+        if (!weakSelf) {
+            return;
+        }
+        
+        __strong typeof(self) strongSelf = weakSelf;
+        
         if (error || !responseObject || ![responseObject objectForKey:@"encryptData"]) {
-            [weakSelf error:error type:VPLuaScriptManagerErrorTypeGetVersion];
+            [strongSelf error:error type:VPLuaScriptManagerErrorTypeGetVersion];
             return;
         }
+        
         NSString *dataString = [VPUPAESUtil aesDecryptString:[responseObject objectForKey:@"encryptData"] key:[VPLuaSDK sharedSDK].appSecret initVector:[VPLuaSDK sharedSDK].appSecret];
-        weakSelf.versionData = dataString;
+        strongSelf.versionData = dataString;
         NSDictionary *data = VPUP_JsonToDictionary(dataString);
         
         NSString *version = [data objectForKey:@"version"];
-        NSString *versionFileString = [NSString stringWithContentsOfURL:[NSURL fileURLWithPath:weakSelf.versionFilePath] encoding:NSUTF8StringEncoding error:nil];
+        NSString *versionFileString = [NSString stringWithContentsOfURL:[NSURL fileURLWithPath:strongSelf.versionFilePath] encoding:NSUTF8StringEncoding error:nil];
         NSDictionary *versionFile = VPUP_JsonToDictionary(versionFileString);
         NSString *localVersion = [versionFile objectForKey:@"version"];
         
         if (!localVersion || ![localVersion isEqualToString:version]) {
             
             NSString *url = [data objectForKey:@"downloadUrl"];
             if (!url || [url isEqual:[NSNull null]]) {
-                [weakSelf error:error type:VPLuaScriptManagerErrorTypeDownloadFile];
+                [strongSelf error:error type:VPLuaScriptManagerErrorTypeDownloadFile];
                 return;
             }
             
             //下载并删除之前下载的所有文件
             //[weakSelf removeAllFileAtLuaPath];
-            [weakSelf downloadWithFileUrl:data];
+            [strongSelf downloadWithFileUrl:data];
             return;
         }
         // 无需下载，本地已经是最新版本
-        [weakSelf downloadSuccess:YES];
+        [strongSelf downloadSuccess:YES];
     };
     [_apiManager sendAPIRequest:api];
 }
@@ -195,7 +196,7 @@ - (void)downloadFilesList:(NSArray *)filesList {
                            }
                            else {
                                count = 0;
-                               [self checkDownLoadFiles:filesList];
+                               [weakSelf checkDownLoadFiles:filesList];
                            }
                        }];
     count ++;
diff --git a/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/DownLoad/VPUPResumeDownloader.m b/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/DownLoad/VPUPResumeDownloader.m
@@ -404,6 +404,9 @@ - (void)cancelBySaveData:(BOOL)isSaveData
     self.isSaveStepCancel = isSaveData;
     __weak __typeof(self) weakSelf = self;
     [self.downloadTask cancelByProducingResumeData:^(NSData * _Nullable resumeData) {
+        if (!weakSelf) {
+            return;
+        }
         __strong __typeof(weakSelf) strongSelf = weakSelf;
         NSURL *localUrl = [strongSelf incompleteDownloadTempPathForDownloadPath:strongSelf.downloadUrl];
         [resumeData writeToURL:localUrl atomically:YES];
diff --git a/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/HTTP/VPUPHTTPBusinessAPI.m b/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/HTTP/VPUPHTTPBusinessAPI.m
@@ -27,7 +27,7 @@ - (nullable NSDictionary *)apiRequestHTTPHeaderField {
         NSString *udid = [[VPUPGeneralInfo IDFA] copy];
         if(VPUP_IsStringTrimExist(udid)) {
             [headerField setObject:udid
-                            forKey:@"udid"];
+                            forKey:@"IDFA"];
         }
         
         NSString *userIdentity = [[VPUPGeneralInfo userIdentity] copy];
diff --git a/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/Player/VPUPPlayer.m b/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/Player/VPUPPlayer.m
@@ -75,9 +75,13 @@ - (void)play {
     @try {
         __weak typeof(self) weakSelf = self;
         [_player seekToTime:self.currentTime toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero completionHandler:^(BOOL finished) {
+            if (!weakSelf) {
+                return;
+            }
+            __strong __typeof(weakSelf) strongSelf = weakSelf;
             if (finished) {
-                [weakSelf.player play];
-                self.status = VPUPPlayerStatusPlaying;
+                [strongSelf.player play];
+                strongSelf.status = VPUPPlayerStatusPlaying;
             }
         }];
     } @catch (NSException *exception) {
@@ -179,21 +183,27 @@ - (void)addPlayerObserver {
     [_player.currentItem addObserver:self forKeyPath:@"playbackLikelyToKeepUp" options:NSKeyValueObservingOptionNew context:nil];
     _timeObserver = [self.player addPeriodicTimeObserverForInterval:CMTimeMake(1, 3) queue:NULL usingBlock:^(CMTime time) {
         
-        CMTime current = weakSelf.player.currentItem.currentTime;
-        CMTime duration = weakSelf.player.currentItem.duration;
+        if (!weakSelf) {
+            return;
+        }
+        
+        __strong typeof(self) strongSelf = weakSelf;
+        
+        CMTime current = strongSelf.player.currentItem.currentTime;
+        CMTime duration = strongSelf.player.currentItem.duration;
        
-        if ([weakSelf.playerDelegate respondsToSelector:@selector(player:playedTime:totalTime:)]) {
-            [weakSelf.playerDelegate player:weakSelf playedTime:((double)current.value/current.timescale) totalTime:((double)duration.value/duration.timescale)];
+        if ([strongSelf.playerDelegate respondsToSelector:@selector(player:playedTime:totalTime:)]) {
+            [strongSelf.playerDelegate player:strongSelf playedTime:((double)current.value/current.timescale) totalTime:((double)duration.value/duration.timescale)];
         }
         
         double margin = ((double)duration.value/duration.timescale) - ((double)current.value/current.timescale);
         
-        if (weakSelf.video.ex > 0 && weakSelf.video.ex < ((double)current.value/current.timescale)) {
-            [weakSelf playbackFinished];
+        if (strongSelf.video.ex > 0 && strongSelf.video.ex < ((double)current.value/current.timescale)) {
+            [strongSelf playbackFinished];
         }
         
         if (margin <= 0.5 && margin > 0) {
-            [weakSelf playbackFinished];
+            [strongSelf playbackFinished];
         }
 
         
diff --git a/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Subspec/MQTT/VPUPMQTTMosquittoManager.m b/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Subspec/MQTT/VPUPMQTTMosquittoManager.m
@@ -124,6 +124,9 @@ - (void)addTopic:(NSString *)topic observer:(id<VPUPMQTTObserverProtocol>)observ
 - (void)addTopic:(NSString *)topic qos:(VPUPMQTTQoSLevel)qos observer:(id<VPUPMQTTObserverProtocol>)observer {
     __weak typeof(self) weakSelf = self;
     dispatch_async(mqtt_manager_queue(), ^{
+        if (!weakSelf) {
+            return;
+        }
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if (!strongSelf || !observer) {
             return;
@@ -170,6 +173,9 @@ - (void)addTopics:(NSArray<NSString *> *)topic observer:(id<VPUPMQTTObserverProt
 - (void)attachWithObserver:(id<VPUPMQTTObserverProtocol>)observer {
     __weak typeof(self) weakSelf = self;
     dispatch_async(mqtt_manager_queue(), ^{
+        if (!weakSelf) {
+            return;
+        }
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf.canConnect) {
             return;
@@ -192,10 +198,10 @@ - (void)attachWithObserver:(id<VPUPMQTTObserverProtocol>)observer {
 - (void)detachWithObserver:(id<VPUPMQTTObserverProtocol>)observer {
     __weak typeof(self) weakSelf = self;
     dispatch_async(mqtt_manager_queue(), ^{
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if (!strongSelf) {
+        if (!weakSelf) {
             return;
         }
+        __strong typeof(weakSelf) strongSelf = weakSelf;
         
         [strongSelf.topicObservers.allKeys enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             NSMutableArray *observers = [strongSelf.topicObservers objectForKey:obj];
@@ -287,6 +293,9 @@ - (void)connectWithConfig:(VPUPMQTTConfig *)config {
     __weak typeof(self) weakSelf = self;
     dispatch_barrier_async(self.mqttQueue, ^{
         
+        if (!weakSelf) {
+            return;
+        }
         __strong typeof(weakSelf) strongSelf = weakSelf;
         
         VPUPMQTTConfig *useConfig = config;
@@ -353,6 +362,9 @@ - (void)subscribeTopic:(NSString *)topic qos:(VPUPMQTTQoSLevel)qos {
     __weak typeof(self) weakSelf = self;
     [self.session subscribeToTopic:topic atLevel:MQTTQosLevelAtMostOnce subscribeHandler:^(NSError *error, NSArray<NSNumber *> *gQoss) {
         dispatch_async(mqtt_manager_queue(), ^{
+            if (!weakSelf) {
+                return;
+            }
             __strong typeof(weakSelf) strongSelf = weakSelf;
             NSArray *observers = [strongSelf.topicObservers objectForKey:topic];
             if([observers count] == 0) {
@@ -425,6 +437,9 @@ - (void)onMessage:(NSData *)message topic:(NSString *)topic {
     
     __weak typeof(self) weakSelf = self;
     dispatch_async(mqtt_manager_queue(), ^{
+        if (!weakSelf) {
+            return;
+        }
         __strong typeof(weakSelf) strongSelf = weakSelf;
         NSArray *observers = [strongSelf.topicObservers objectForKey:topic];
         

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ - (nullable NSDictionary *)apiRequestHTTPHeaderField {`
`27`	`27`	`NSString *udid = [[VPUPGeneralInfo IDFA] copy];`
`28`	`28`	`if(VPUP_IsStringTrimExist(udid)) {`
`29`	`29`	`[headerField setObject:udid`
`30`		`- forKey:@"udid"];`
	`30`	`+ forKey:@"IDFA"];`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`NSString *userIdentity = [[VPUPGeneralInfo userIdentity] copy];`