Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/FUSStreamPushConfigModel.m

@@ -97,16 +97,19 @@
         self.beautyfilterkey = config.beautyfilterkey;
         self.beautyfilterkey = config.beautyfilterkey;
     }
     }
     
     
-    if  ([NSString isNullWithString:config.bdurl]) {
+    if ([NSString isNullWithString:config.bdurl]) {
         self.bdurl = config.bdurl;
         self.bdurl = config.bdurl;
     }
     }
-    if  ([NSString isNullWithString:config.bdurlmd5]) {
+
+    if ([NSString isNullWithString:config.bdurlmd5]) {
         self.bdurlmd5 = config.bdurlmd5;
         self.bdurlmd5 = config.bdurlmd5;
     }
     }
-    if  ([NSString isNullWithString:config.licbag]) {
+
+    if ([NSString isNullWithString:config.licbag]) {
         self.licbag = config.licbag;
         self.licbag = config.licbag;
     }
     }
-    if  ([NSString isNullWithString:config.licbagmd5]) {
+    
+    if ([NSString isNullWithString:config.licbagmd5]) {
         self.licbagmd5 = config.licbagmd5;
         self.licbagmd5 = config.licbagmd5;
     }
     }
 }
 }

FuSiLive/AppDelegate.m

@@ -336,6 +336,8 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
 }
 }
 
 
 - (void)GeTuiSdkDidReceiveNotification:(NSDictionary *)userInfo notificationCenter:(UNUserNotificationCenter *)center response:(UNNotificationResponse *)response fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
 - (void)GeTuiSdkDidReceiveNotification:(NSDictionary *)userInfo notificationCenter:(UNUserNotificationCenter *)center response:(UNNotificationResponse *)response fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
+    
+    [self handleNotificationEventWithContent:response.notification.request.content.userInfo];
     if (completionHandler) completionHandler(UIBackgroundFetchResultNoData);
     if (completionHandler) completionHandler(UIBackgroundFetchResultNoData);
 }
 }
 
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m

@@ -201,8 +201,15 @@
         if ([FUSFileHelper fus_isExistFileAtPath:bytedanceResource]) {
         if ([FUSFileHelper fus_isExistFileAtPath:bytedanceResource]) {
             [[NSFileManager defaultManager] removeItemAtPath:bytedanceResource error:nil];
             [[NSFileManager defaultManager] removeItemAtPath:bytedanceResource error:nil];
         }
         }
-        [FUSResourceDownloader.shareInstance fus_removeTaskKeyWithDownloadUrl:FUSLiveHelper.shareInstance.livePushConfig.bdurl md5:FUSLiveHelper.shareInstance.livePushConfig.bdurlmd5];
-        [FUSResourceDownloader.shareInstance fus_removeTaskKeyWithDownloadUrl:FUSLiveHelper.shareInstance.livePushConfig.licbag md5:FUSLiveHelper.shareInstance.livePushConfig.licbagmd5];
+        
+        NSString *bdurl = FUSLiveHelper.shareInstance.livePushConfig.bdurl;
+        NSString *bdurlmd5 = FUSLiveHelper.shareInstance.livePushConfig.bdurlmd5;
+        [FUSResourceDownloader.shareInstance fus_removeTaskKeyWithDownloadUrl:bdurl md5:bdurlmd5];
+        
+        NSString *licbag = FUSLiveHelper.shareInstance.livePushConfig.licbag;
+        NSString *licbagmd5 = FUSLiveHelper.shareInstance.livePushConfig.licbagmd5;
+
+        [FUSResourceDownloader.shareInstance fus_removeTaskKeyWithDownloadUrl:licbag md5:licbagmd5];
         
         
         FUSDownloadResourceModel *downloadModel = [[FUSDownloadResourceModel alloc] init];
         FUSDownloadResourceModel *downloadModel = [[FUSDownloadResourceModel alloc] init];
         downloadModel.resourceUrl = FUSLiveHelper.shareInstance.livePushConfig.bdurl;
         downloadModel.resourceUrl = FUSLiveHelper.shareInstance.livePushConfig.bdurl;