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

FuSiLive/AppDelegate.m

@@ -46,13 +46,13 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
     
     
     //     通过 个推平台 分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用
     //     通过 个推平台 分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用
     [GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions];
     [GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions];
-    [GeTuiSdk registerRemoteNotification:UNAuthorizationOptionSound|UNAuthorizationOptionAlert|UNAuthorizationOptionBadge];
+    [GeTuiSdk registerRemoteNotification:UNAuthorizationOptionSound|UNAuthorizationOptionAlert|UNAuthorizationOptionBadge|UNAuthorizationOptionProvidesAppNotificationSettings];
     [GeTuiSdk runBackgroundEnable:NO];
     [GeTuiSdk runBackgroundEnable:NO];
     
     
-    [[UNUserNotificationCenter currentNotificationCenter] requestAuthorizationWithOptions:UNAuthorizationOptionBadge|UNAuthorizationOptionSound|UNAuthorizationOptionAlert completionHandler:^(BOOL granted, NSError * _Nullable error) {
-    }];
-    [UNUserNotificationCenter currentNotificationCenter].delegate = self;
-    [UIApplication.sharedApplication registerForRemoteNotifications];
+//    [[UNUserNotificationCenter currentNotificationCenter] requestAuthorizationWithOptions:UNAuthorizationOptionBadge|UNAuthorizationOptionSound|UNAuthorizationOptionAlert|UNAuthorizationOptionProvidesAppNotificationSettings completionHandler:^(BOOL granted, NSError * _Nullable error) {
+//    }];
+//    [UNUserNotificationCenter currentNotificationCenter].delegate = self;
+//    [UIApplication.sharedApplication registerForRemoteNotifications];
     
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [FIRApp configure];
         [FIRApp configure];

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatService.m

@@ -228,7 +228,7 @@
         //TODO:环信证书: added By Pidan
         //TODO:环信证书: added By Pidan
         mainOptions.apnsCertName = @"ft_chat_iOS_for_test_apns.p12";     //生产环境推送证书名称
         mainOptions.apnsCertName = @"ft_chat_iOS_for_test_apns.p12";     //生产环境推送证书名称
 //        mainOptions.apnsCertName = @"fireflylive_dev_push.p12"; //测试环境推送证书名称
 //        mainOptions.apnsCertName = @"fireflylive_dev_push.p12"; //测试环境推送证书名称
-    } else if ([currentEaseMobKey isEqualToString:FUSConfig.sharedInstanced.sdkConfigs.easeMobAppKey]) {
+    } else {
         // 正式服
         // 正式服
         //TODO:环信证书: added By Pidan
         //TODO:环信证书: added By Pidan
         mainOptions.apnsCertName = @"FusiClub_AppStore_APNs.p12";     //生产环境推送证书名称
         mainOptions.apnsCertName = @"FusiClub_AppStore_APNs.p12";     //生产环境推送证书名称

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMUserService.m

@@ -180,7 +180,6 @@
         // 重置重试次数
         // 重置重试次数
         self.retryCount = 0;
         self.retryCount = 0;
         
         
-        [self fus_bindAPNsToken];
     } failure:^(NSString *errorMsg) {
     } failure:^(NSString *errorMsg) {
         
         
         // 重试次数加1
         // 重试次数加1
@@ -204,7 +203,6 @@
 - (void)fus_bindAPNsToken {
 - (void)fus_bindAPNsToken {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSData *token = [[NSUserDefaults standardUserDefaults] objectForKey:FUSChatUDKeys.fus_DEVICE_TOKEN_DATA];
         NSData *token = [[NSUserDefaults standardUserDefaults] objectForKey:FUSChatUDKeys.fus_DEVICE_TOKEN_DATA];
-        [[EMClient sharedClient] bindDeviceToken:token];
         [[EMClient sharedClient] registerForRemoteNotificationsWithDeviceToken:token completion:^(EMError *aError) {
         [[EMClient sharedClient] registerForRemoteNotificationsWithDeviceToken:token completion:^(EMError *aError) {
             FUSLogInfo(@"");
             FUSLogInfo(@"");
         }];
         }];

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m

@@ -494,10 +494,10 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
             [_streamView.playView fus_setVideoframeCallBackOpen:self.autoStartPictureInPicture forUid:self.streamView.playView.mainUID];
             [_streamView.playView fus_setVideoframeCallBackOpen:self.autoStartPictureInPicture forUid:self.streamView.playView.mainUID];
             [_contentView addSubview:_streamView];
             [_contentView addSubview:_streamView];
             [FUSLiveHelper shareInstance].streamView = _streamView;
             [FUSLiveHelper shareInstance].streamView = _streamView;
-            
             if (_streamURL) {
             if (_streamURL) {
                 [_streamView.playView fus_playWithUID:[FUSLiveHelper shareInstance].roomInfoModel.roomId Url:_streamURL];
                 [_streamView.playView fus_playWithUID:[FUSLiveHelper shareInstance].roomInfoModel.roomId Url:_streamURL];
             }
             }
+            _playView = _streamView.playView;
             
             
             if (self.autoStartPictureInPicture) {
             if (self.autoStartPictureInPicture) {
                 [self setupPictureInPicture];
                 [self setupPictureInPicture];