Merge commit '09353b60ec8c617fd95b8aab01e68dd8dd552e38' into HiBoxde1.0

创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -293,7 +293,7 @@
     }
     
     //提示语
-    [[iToast makeText:NSLocalizedString(@"my_set_no_restart_phone_ok_tips",nil)] show];
+    [[iToast makeText:NSLocalizedString(@"player_link_rebooting_Tips",nil)] show];
 }
 
 @end

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

@@ -149,6 +149,7 @@ ComontAlretViewControllerDelegate>
 
 @property (nonatomic, copy)   NSString*LogoutTimerStr;//单点登出时间
 @property (nonatomic, assign) BOOL needShowLogoutDelayType;//是否是延时显示单点登出
+@property (nonatomic, assign) BOOL isRebootIngType;//是否为重启中
 @end
 
 @implementation PlayerViewController
@@ -1155,12 +1156,22 @@ ComontAlretViewControllerDelegate>
                 self.isFirstEnterPhone = NO;
             }
             
+            //重启后重连 出来的
+            if(_isRebootIngType){
+                mainBlock(^{
+                    [[iToast makeText:NSLocalizedString(@"player_link_reboot_suc_Tips",nil)] show];
+                });
+                _isRebootIngType = NO;
+            }
+            
             //  报链接失败 后面又连接上了
             if(linkFailAlretVC){
-                [linkFailAlretVC dismissViewControllerAnimated:YES completion:^{
-                                    
-                }];
-                linkFailAlretVC = nil;
+                mainBlock(^{
+                    [self->linkFailAlretVC dismissViewControllerAnimated:YES completion:^{
+                                        
+                    }];
+                    self->linkFailAlretVC = nil;
+                });
             }
         }
             break;
@@ -1531,6 +1542,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         //最后一帧 没显示正在重启问题
         self->_canShowImgAndVoiceType = YES;
         
+        self->_isRebootIngType = YES;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self reconnectDevice];
         });
@@ -1881,6 +1893,12 @@ 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){
         linkErrTip = NSLocalizedString(@"player_link_fail_phone_Tips",nil);
@@ -1924,9 +1942,11 @@ BOOL inReconnect = NO;
                 self.isFirstEnterPhone = NO;
             }
             
-            /*链接失败*/
-            
-            [[iToast makeText:NSLocalizedString(@"player_link_fail_tip",nil)] show];
+            //重启后重连 出来的 不显示
+            if(!self->_isRebootIngType){
+                /*链接失败*/
+                [[iToast makeText:NSLocalizedString(@"player_link_fail_tip",nil)] show];
+            }
             
             HLog(@"yyyyyyyyyyyyy");
             

创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -229,4 +229,5 @@
 "player_link_fail_couldPhone_Tips" = "The box status is abnormal. Please check the running status of the box and restart it before trying again. If the problem still exists, please contact Private-X customer service for help!";
 
 "player_link_fail_tryAgain" = "Please try again";
-
+"player_link_rebooting_Tips" = "Please wait a few minutes while Private-X is rebooted.";
+"player_link_reboot_suc_Tips" = "Successfully rebooted!";

创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -227,3 +227,5 @@
 "player_link_fail_couldPhone_Tips" = "盒子状态异常，请检查盒子运行状态并重启后再试，若问题仍然存在，请联系Private-X公众号客服寻求帮助 !";
 
 "player_link_fail_tryAgain" = "重试";
+"player_link_rebooting_Tips" = "小主，空间正在重启中，稍等片刻哦。";
+"player_link_reboot_suc_Tips" = "小主，你的空间已经成功重启啦！";

创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

@@ -228,4 +228,5 @@
 "player_link_fail_couldPhone_Tips" = "盒子狀態异常，請檢查盒子運行狀態並重啟後再試，若問題仍然存在，請聯系Private-X公眾號客服尋求幫助！";
 
 "player_link_fail_tryAgain" = "重試";
-
+"player_link_rebooting_Tips" = "小主，空間正在重啓中，稍等片刻哦。";
+"player_link_reboot_suc_Tips" = "小主，你的空間已經成功重啓啦！";