1.修改提示语bug等

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -28,6 +28,8 @@
 @property(nonatomic, strong)   inputPWDViewController *inputVC;
 @property(nonatomic, strong)   NSTimer *checkSNDataTimer;//
 @property(nonatomic, strong)   customLaunchView *customLaunchV;//
+
+@property(nonatomic, assign)   bool isQRCodeType;//第一次 扫码进来的
 @end
 
 @implementation SceneDelegate
@@ -72,10 +74,13 @@
         TipsQRCodeViewController *qrCodeVC = [[TipsQRCodeViewController alloc] init];
         BaseNavigationController *qrCodeVCNav = [[BaseNavigationController alloc] initWithRootViewController:qrCodeVC];
         self.window.rootViewController = qrCodeVCNav;
-
+        
+        _isQRCodeType = YES;
         return;
     }
     
+   
+    
     //有设备了先去做链接准备  // 80bec9c5
     NSString *SNStr = deviceDict[@"Const_Have_Add_Device_SN"];
     if(SNStr){
@@ -155,7 +160,11 @@
     BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
     self.window.rootViewController = playerNav;
     
-    [self showCalculatorVC];
+    if(!_isQRCodeType){
+        [self showCalculatorVC];
+        _isQRCodeType = NO;
+    }
+    
     
    
     

创维盒子/双子星云手机/Class/Guide/GuideViewController.m

@@ -62,6 +62,7 @@
         if(curPwd && curPwd.length > 0){
             /*设置密码*/
             inputPWDViewController *nextVC = [[inputPWDViewController alloc] init];
+            nextVC.isQRCodeType = YES;
             [self.navigationController pushViewController:nextVC animated:YES];
         }
         else{

创维盒子/双子星云手机/Class/Guide/SetPWDFirstViewController.m

@@ -15,6 +15,8 @@
     UILabel *pointView1;
     UILabel *pointView2;
     UILabel *pointView3;
+    
+    UIButton *keyBoardBtn0;
 }
 
 @end
@@ -163,13 +165,15 @@
     }];
     
     /*0*/
-    UIButton *keyBoardBtn0 = [[UIButton alloc] init];
+     keyBoardBtn0 = [[UIButton alloc] init];
     [keyBoardBtn0 setBackgroundColor:[UIColor clearColor]];
     [keyBoardBtn0 setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+    [keyBoardBtn0 setTitleColor:COLOR_PACEHOLDER forState:(UIControlStateDisabled)];
     [keyBoardBtn0.titleLabel setFont:[UIFont boldSystemFontOfSize:40.f]];
     [keyBoardBtn0 setTitle:@"0" forState:(UIControlStateNormal)];
     [keyBoardBtn0 addTarget:self action:@selector(keyBoardBtnPressed:) forControlEvents:(UIControlEventTouchUpInside)];
     [bgViewForNumberBoard addSubview:keyBoardBtn0];
+    keyBoardBtn0.enabled = NO;
     [keyBoardBtn0 mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(w_key_btn);
         make.bottom.mas_equalTo(0);
@@ -345,6 +349,7 @@
             [pointView0 setText:selectNumberStr];
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self->pointView0 setBackgroundColor:HW0A132BColor];
+                self->keyBoardBtn0.enabled = YES;
             });
         }else if (numberLength == 1){
             [pointView1 setText:selectNumberStr];

创维盒子/双子星云手机/Class/Guide/inputPWDViewController.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface inputPWDViewController : BaseViewController
-
+@property(nonatomic, assign)   bool isQRCodeType;//第一次 扫码进来的
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/Class/Guide/inputPWDViewController.m

@@ -339,6 +339,12 @@
         NSString*desPwdStr  = [RSATool AES128Decrypt:curPwd key:@"fvO8gAfNSr1tbdQe"];
         
         if([desPwdStr isEqualToString:pwd]){
+            
+            if(_isQRCodeType){
+                [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
+            }
+            
+            
             //view 加载在windows上
             [self.view removeFromSuperview];
         }

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

@@ -168,8 +168,8 @@
     [okBtn addTarget:self
                action:@selector(okBtnPressed)
      forControlEvents:(UIControlEventTouchUpInside)];
-    [okBtn setEnabled:NO];
-    [okBtn setAlpha:0.5];
+//    [okBtn setEnabled:NO];
+//    [okBtn setAlpha:0.5];
 }
 
 /*
@@ -239,18 +239,25 @@
    
     if (logoSelectView.selectIndex == 1){
         /*设置图标*/
-        [[UIApplication sharedApplication] setAlternateIconName:@"AppIcon 1" completionHandler:^(NSError * _Nullable error) {
-            [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:1];
-        }];
+//        [[UIApplication sharedApplication] setAlternateIconName:@"AppIcon 1" completionHandler:^(NSError * _Nullable error) {
+//            [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:1];
+//        }];
+        
+        [self lc_setAlternateIconName:@"AppIcon 1"];
+        [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:1];
+        
         // 修改应用名称
         [infoDict setObject:NSLocalizedString(@"logo_calculator",nil) forKey:@"CFBundleDisplayName"]; // 或者使用CFBundleName
 
         
     }else if (logoSelectView.selectIndex == 2){
         /*设置图标*/
-        [[UIApplication sharedApplication] setAlternateIconName:@"AppIcon 2" completionHandler:^(NSError * _Nullable error) {
-            [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:2];
-        }];
+//        [[UIApplication sharedApplication] setAlternateIconName:@"AppIcon 2" completionHandler:^(NSError * _Nullable error) {
+//            [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:2];
+//        }];
+        
+        [self lc_setAlternateIconName:@"AppIcon 2"];
+        [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:2];
         
         // 修改应用名称
         [infoDict setObject:NSLocalizedString(@"logo_bowser",nil) forKey:@"CFBundleDisplayName"]; // 或者使用CFBundleName
@@ -269,6 +276,33 @@
     
     NSString *DisplayName = [NSBundle mainBundle].infoDictionary[@"CFBundleDisplayName"];
     HLog(@"CFBundleDisplayName:%@",DisplayName);
+    
+    
+    //提示语
+    [[iToast makeText:NSLocalizedString(@"logo_did_change_logo",nil)] show];
+    
+}
+
+
+- (void)lc_setAlternateIconName:(NSString*)iconName
+{
+    //anti apple private method call analyse
+    if ([[UIApplication sharedApplication] respondsToSelector:@selector(supportsAlternateIcons)] &&
+        [[UIApplication sharedApplication] supportsAlternateIcons])
+    {
+        NSMutableString *selectorString = [[NSMutableString alloc] initWithCapacity:40];
+        [selectorString appendString:@"_setAlternate"];
+        [selectorString appendString:@"IconName:"];
+        [selectorString appendString:@"completionHandler:"];
+        
+        SEL selector = NSSelectorFromString(selectorString);
+        IMP imp = [[UIApplication sharedApplication] methodForSelector:selector];
+        void (*func)(id, SEL, id, id) = (void *)imp;
+        if (func)
+        {
+            func([UIApplication sharedApplication], selector, iconName, ^(NSError * _Nullable error) {});
+        }
+    }
 }
 
 - (void)logoSelectViewHaveSelect{

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

@@ -120,5 +120,12 @@
 
 - (void)maskSwitchPressed:(UISwitch *)maskSwitch{
     [HWDataManager setBoolWithKey:Consn_Fanzhuan_Exit_app_Open value:maskSwitch.on];
+    
+    if (maskSwitch.on) {
+        [[iToast makeText:NSLocalizedString(@"my_set_no_fanzhuan_exit_open",nil)] show];
+    }
+    else{
+        [[iToast makeText:NSLocalizedString(@"my_set_no_fanzhuan_exit_close",nil)] show];
+    }
 }
 @end

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

@@ -15,6 +15,8 @@
     UILabel *pointView1;
     UILabel *pointView2;
     UILabel *pointView3;
+    
+    UIButton *keyBoardBtn0;
 }
 
 @end
@@ -179,12 +181,14 @@
     }];
     
     /*0*/
-    UIButton *keyBoardBtn0 = [[UIButton alloc] init];
+    keyBoardBtn0 = [[UIButton alloc] init];
     [keyBoardBtn0 setBackgroundColor:[UIColor clearColor]];
     [keyBoardBtn0 setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+    [keyBoardBtn0 setTitleColor:COLOR_PACEHOLDER forState:(UIControlStateDisabled)];
     [keyBoardBtn0.titleLabel setFont:[UIFont boldSystemFontOfSize:40.f]];
     [keyBoardBtn0 setTitle:@"0" forState:(UIControlStateNormal)];
     [keyBoardBtn0 addTarget:self action:@selector(keyBoardBtnPressed:) forControlEvents:(UIControlEventTouchUpInside)];
+    keyBoardBtn0.enabled = NO;
     [bgViewForNumberBoard addSubview:keyBoardBtn0];
     [keyBoardBtn0 mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(w_key_btn);
@@ -248,6 +252,7 @@
             [pointView0 setText:selectNumberStr];
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self->pointView0 setBackgroundColor:HW0A132BColor];
+                self->keyBoardBtn0.enabled = YES;
             });
         }else if (numberLength == 1){
             [pointView1 setText:selectNumberStr];

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

@@ -249,6 +249,9 @@
     if(_needToReboot){
         _needToReboot();
     }
+    
+    //提示语
+    [[iToast makeText:NSLocalizedString(@"my_set_no_restart_phone_ok_tips",nil)] show];
 }
 
 @end

创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -187,6 +187,8 @@ ShowImageViewDelegate>{
     [backBtn setImage:backBtnImage forState:(UIControlStateNormal)];
     [backBtn setImageEdgeInsets:(UIEdgeInsetsMake(6.f, 6.f, 6.f, 6.f))];
     [bottomContrView addSubview:backBtn];
+    //测试说图片方向反了
+    backBtn.imageView.transform = CGAffineTransformMakeRotation(M_PI);
 }
 
 - (void)mueBtnPressed:(id)sender{

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

@@ -61,6 +61,7 @@
 "logo_change_logo_tip" = "此APP在手机桌面的图标会更换为你选择的图标及名称";
 "logo_calculator" = "计算器";
 "logo_bowser" = "浏览器";
+"logo_did_change_logo" = "设置已成功,如图标未更新,请重启手机";
 "logo_set_pwd_tips" = "修改入口密码";
 "logo_input_pwd_tips" = "请输入4位数密码";
 "logo_input_pwd_again_tips" = "请再次4位数密码";

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

@@ -69,6 +69,7 @@
 "logo_change_logo_tip" = "此APP在手机桌面的图标会更换为你选择的图标及名称";
 "logo_calculator" = "计算器";
 "logo_bowser" = "浏览器";
+"logo_did_change_logo" = "设置已成功,如图标未更新,请重启手机";
 "logo_set_pwd_tips" = "修改入口密码";
 "logo_input_pwd_tips" = "请输入4位数密码";
 "logo_input_pwd_again_tips" = "请再次4位数密码";
@@ -171,6 +172,8 @@
 "my_set_no_app_kefu"   = "隐私空间客服";
 "my_set_no_buy_recoder"   = "购买记录";
 "my_set_no_fanzhuan_exit" = "翻转退出";
+"my_set_no_fanzhuan_exit_open" = "翻转退出，已开启";
+"my_set_no_fanzhuan_exit_close" = "翻转退出，已关闭";
 "my_set_no_restart_phone" = "重启空间";
 "my_set_no_modify_pwd" = "修改密码";
 "my_set_no_restart_phone_tips" = "你确定要重启空间？";