Merge commit '2c5714c7bd46529186235d3f3815defd71ac3506' into HiBoxde1.0

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -1885,7 +1885,16 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         return;
     }
     
+    //重启后重连 出来的
+    if(_isRebootIngType){
+        if(![self isPlayerViewIsTopVCFun]){
+            [[iToast makeText:NSLocalizedString(@"player_link_rebooting_Tips",nil)] show];
+        }
+        return;
+    }
+    
     if([self isPlayerViewIsTopVCFun]){
+        
         //等下再发
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self showNetErrorAlertFun];
@@ -1893,11 +1902,6 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         return;
     }
     
-    //重启后重连 出来的
-    if(_isRebootIngType){
-        [[iToast makeText:NSLocalizedString(@"player_link_rebooting_Tips",nil)] show];
-        return;
-    }
     
     NSString *linkErrTip = NSLocalizedString(@"player_link_fail_couldPhone_Tips",nil);
     if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable){