huangxiaodong 1 год назад
Родитель
Сommit
5fca802287

+ 2 - 2
创维盒子/双子星云手机/Class/Guide/forgetSecretKeyViewController.m

@@ -91,10 +91,10 @@
             mainBlock(^{
                 if (error) {
                     //NSLog(@"%@",@"保存失败");
-                    [[iToast makeText:@"存失败"] show];
+                    [[iToast makeText:NSLocalizedString(@"common_save_fail",nil)] show];
                 } else {
                     //NSLog(@"%@",@"保存成功");
-                    [[iToast makeText:@"保存成功"] show];
+                    [[iToast makeText:NSLocalizedString(@"common_save_suc",nil)] show];
                 }
             });
             

+ 6 - 1
创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -315,7 +315,12 @@ bool isDownType22 = YES;
             }else{
                 [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_get_SdnID_fail",nil)] show];
                 
-                [self.navigationController popViewControllerAnimated:YES];
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    mainBlock(^{
+                        [self.navigationController popViewControllerAnimated:YES];
+                    });
+                });
+                
             }
         }];
     }

+ 2 - 2
创维盒子/双子星云手机/Class/Set/appUpdate/AboutViewController.m

@@ -216,12 +216,12 @@
        }
        else
        {
-           [[iToast makeText:model.msg] show];
+           //[[iToast makeText:model.msg] show];
        }
 
     } failure:^(NSError * _Nonnull error) {
       HLog(@"%@", error);
-        [[iToast makeText:@"网络异常,请稍后重试!"] show];
+        [[iToast makeText:NSLocalizedString(@"player_link_fail_tip",nil)] show];
       [self removeNewIndicatorHaveStr];
     }];
 }

+ 2 - 2
创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeTipViewController.m

@@ -181,12 +181,12 @@
        }
        else
        {
-           [[iToast makeText:model.msg] show];
+           //[[iToast makeText:model.msg] show];
        }
 
     } failure:^(NSError * _Nonnull error) {
        HLog(@"%@", error);
-        [[iToast makeText:@"网络异常,请稍后重试!"] show];
+        [[iToast makeText:NSLocalizedString(@"player_link_fail_tip",nil)] show];
       [self removeNewIndicator];
     }];
 }

+ 1 - 1
创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.m

@@ -297,7 +297,7 @@
 
     } failure:^(NSError * _Nonnull error) {
        HLog(@"%@", error);
-        [[iToast makeText:@"网络异常,请稍后重试!"] show];
+        [[iToast makeText:NSLocalizedString(@"player_link_fail_tip",nil)] show];
       [self removeNewIndicator];
     }];
 }

+ 1 - 3
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.mm

@@ -56,13 +56,11 @@
        }
        else
        {
-           [[iToast makeText:model.msg] show];
+           //[[iToast makeText:model.msg] show];
        }
 
     } failure:^(NSError * _Nonnull error) {
       HLog(@"%@", error);
-        [[iToast makeText:@"网络异常,请稍后重试!"] show];
-      [self removeNewIndicatorHaveStr];
     }];
 }
 

+ 3 - 6
创维盒子/双子星云手机/connectDeviceManager/connectDeviceManager.m

@@ -76,13 +76,10 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
         
         DeviceThirdIdModel *model = [[DeviceThirdIdModel alloc] initWithDictionary:responseObject error:nil];
 
-        if(model && model.data){
-            weakSelf.DeviceThirdIdMod = model;
-        }
-       
-        if(weakSelf.DeviceThirdIdMod.status == 0
-           && weakSelf.DeviceThirdIdMod.data)
+        if(model.status == 0
+           && model.data)
         {
+            weakSelf.DeviceThirdIdMod = model;
             
             NSString*desPwdstr = [RSATool AES128Decrypt:weakSelf.DeviceThirdIdMod.data.password key:AESCODEKEEYY];
             

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

@@ -289,4 +289,5 @@
 "logo_did_change_login" = "设置已成功";
 "my_set_no_close_TV_p2p"   = "关闭投屏";
 "my_set_no_close_TV_p2p_tip"   = "正在投屏中,确定关闭投屏";
-
+"common_save_suc"   = "保存成功";
+"common_save_fail"   = "保存失败";