Browse Source

1.修改输入密码网络错误提示语

huangxiaodong 1 year ago
parent
commit
609d5a63b3

+ 10 - 4
创维盒子/双子星云手机/Class/Guide/inputPWDViewController.m

@@ -411,12 +411,12 @@
                         [self verifyPwdRightFun];
                     }
                     else{
-                        [self verifyPwdWrongFun];
+                        [self verifyPwdWrongFun:NO];
                     }
                     
                 }
                 else{
-                    [self verifyPwdWrongFun];
+                    [self verifyPwdWrongFun:YES];
                 }
                 
             }];
@@ -443,7 +443,7 @@
 }
 
 #pragma mark 验证密码错误
--(void)verifyPwdWrongFun
+-(void)verifyPwdWrongFun:(BOOL)isNetFail
 {
     [self deleteBoardBtnPressed];
     [self deleteBoardBtnPressed];
@@ -454,7 +454,13 @@
     //[[iToast makeText:@"111"] show];
     
     _pwdErrorTip = [[UILabel alloc] init];
-    _pwdErrorTip.text = NSLocalizedString(@"logo_input_pwd_fail",nil);
+    if(isNetFail){
+        _pwdErrorTip.text = NSLocalizedString(@"log_login_system_busy",nil);
+    }
+    else{
+        _pwdErrorTip.text = NSLocalizedString(@"logo_input_pwd_fail",nil);
+    }
+    
     _pwdErrorTip.textAlignment = NSTextAlignmentCenter;
     _pwdErrorTip.textColor = [UIColor whiteColor];
     _pwdErrorTip.backgroundColor = [UIColor hwColor:@"000000" alpha:0.7];

+ 2 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -1497,6 +1497,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     [self.navigationController pushViewController:nextVC animated:YES];
     self.isNeedRecyclResource = NO;
     
+#pragma mark 重启盒子
     //{"type":"reboot"}
     nextVC.needToReboot = ^{
         NSString *commondStr  = @"{\"type\":\"reboot\"}";
@@ -1507,6 +1508,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         });
     };
     
+#pragma mark TV投屏
     nextVC.needToTVP2P = ^{
         NSString *commondStr  = @"{\"type\":\"wakeupTV\"}";
         [self send_data:commondStr];

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

@@ -58,7 +58,7 @@
 
 
 //"log_login_other" = "设备已在别处登录";
-//"log_login_system_busy" = "系统繁忙,请稍后再试!";
+"log_login_system_busy" = "The system is busy, please try again later!";
 
 
 

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

@@ -37,9 +37,6 @@
 "history_delete_history_tips" = "确认删除所有历史记录?";
 "app_install_whatsApp_tips" = "请先安装whatsApp!";
 
-//NSLocalizedString(@"logo_input_pwd_no_same_tips",nil)
-//NSLocalizedString(@"history_yesterday",nil)
-//NSLocalizedString(@"log_login_system_busy",nil)
 
 /*启动初始化*/
 "set_launch_pwd_tips" = "请设置一个启动密码";

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

@@ -37,9 +37,6 @@
 "history_delete_history_tips" = "確定刪除所有歷史記錄?";
 "app_install_whatsApp_tips" = "請先安裝whatsApp!";
 
-//NSLocalizedString(@"logo_input_pwd_no_same_tips",nil)
-//NSLocalizedString(@"history_yesterday",nil)
-//NSLocalizedString(@"log_login_system_busy",nil)
 
 /*启动初始化*/
 "set_launch_pwd_tips" = "請設置一個啟動密碼";