Merge branch 'master' into HiBoxde1.0

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

@@ -1503,10 +1503,14 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 #pragma mark 重启盒子
     //{"type":"reboot"}
     nextVC.needToReboot = ^{
+        
         NSString *commondStr  = @"{\"type\":\"reboot\"}";
         [self send_data:commondStr];
         
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        //最后一帧 没显示正在重启问题
+        self->_canShowImgAndVoiceType = YES;
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self reconnectDevice];
         });
     };