Revert "Video 双向音视频断网重连：WIFI-WIFI切网拉流/推流成功率"

This reverts commit 4b8d855.

Reason for revert: <暂时撤回>

Change-Id: Ifacb6319401c95e34323ddafc2ba96f56fd09dc3

Author: ccharlesren

Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTAVP2PPlayCaptureVC.m

@@ -704,28 +704,15 @@ - (void)hangupTapped {    //挂断
 
 //刷新播放器
 - (void)refreshPlayer {
-    
-        if (self.player != nil) {
-            _is_init_alert = NO;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self preparePlayer];
-            });
-            
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                self.resolutionRatio = [[TIoTP2PCommunicateUIManage sharedManager] getP2pCommunicateResolutionRatio];
-                self.samplingRate = [[TIoTP2PCommunicateUIManage sharedManager] getP2pCommunicateSamplingRate];
-                [self startAVCapture];
-            });
-        }
-//    if (self.player != nil) {
-//        _is_init_alert = NO;
-//        [self preparePlayer];
-//
-//        self.resolutionRatio = [[TIoTP2PCommunicateUIManage sharedManager] getP2pCommunicateResolutionRatio];
-//        self.samplingRate = [[TIoTP2PCommunicateUIManage sharedManager] getP2pCommunicateSamplingRate];
-//
-//        [self startAVCapture];
-//    }
+    if (self.player != nil) {
+        _is_init_alert = NO;
+        [self preparePlayer];
+        
+        self.resolutionRatio = [[TIoTP2PCommunicateUIManage sharedManager] getP2pCommunicateResolutionRatio];
+        self.samplingRate = [[TIoTP2PCommunicateUIManage sharedManager] getP2pCommunicateSamplingRate];
+        
+        [self startAVCapture];
+    }
 }
 
 //是否在通话页面中

Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m

@@ -927,11 +927,7 @@ - (void)starP2PServer {
         }
     }
     NSLog(@"_sys_xp2p_info  xp2pValue : %@",xp2pValue);
-    __block int errorcode = 0;
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:@"" sec_key:@"" pro_id:self.productId?:@"" dev_name:self.deviceName?:@"" xp2pinfo:xp2pValue];
-    });
-//    int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:@"" sec_key:@"" pro_id:self.productId?:@"" dev_name:self.deviceName?:@"" xp2pinfo:xp2pValue];
+    int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:@"" sec_key:@"" pro_id:self.productId?:@"" dev_name:self.deviceName?:@"" xp2pinfo:xp2pValue];
 
     if (errorcode == XP2P_ERR_VERSION) {
         UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
@@ -4010,10 +4006,7 @@ - (void)refushVideo:(NSNotification *)notify {
     self.p2pReady = YES;
 
     //APP侧断网刚重连p2p成功后 重新拉流/推流
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self refreshP2PPlayerAndStartCapture];
-    });
-//    [self refreshP2PPlayerAndStartCapture];
+    [self refreshP2PPlayerAndStartCapture];
 
 //    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(startHungupAction) object:nil];
 }
@@ -4163,10 +4156,7 @@ - (void)reconnectNetworkActioin {
             //更新objectModel里的p2pinfo 重起p2p服务
             //先stopService 防止 WIFI 4G互切问题
             [[TIoTCoreXP2PBridge sharedInstance] stopService:self.deviceName?:@""];
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self restartP2PServer];
-            });
-            
+            [self restartP2PServer];
 
         }
 //    }
@@ -4234,10 +4224,7 @@ - (void)refreshP2PPlayerAndStartCapture {
         [self getDeviceStatusWithType:action_voice qualityType:quality_standard completion:^(BOOL finished) {
             if (finished) {
                 //当前如果还在通话页面，重连后刷新播放器
-//                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [[TIoTP2PCommunicateUIManage sharedManager] refreshP2PVideoPlayer];
-//                });
-//                [[TIoTP2PCommunicateUIManage sharedManager] refreshP2PVideoPlayer];
+                [[TIoTP2PCommunicateUIManage sharedManager] refreshP2PVideoPlayer];
             }else {
                 [MBProgressHUD showMessage:NSLocalizedString(@"reconnectFail_check_device_status", @"重连失败,请检查设备状态") icon:@""];
             }