1.同步log-- 1.启动页 等相关页面图片已经UI修改

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

@@ -505,7 +505,7 @@
     }
     
     //tabBarController.tabBar.barTintColor = [UIColor hwColor:@"#F6F8FA"]; // 设置标签栏背景色
-    tabBarController.tabBar.tintColor = [UIColor hwColor:@"#01B7EA"]; // 设置选中标签项的颜色
+    tabBarController.tabBar.tintColor = [UIColor hwColor:@"#FF9500"]; // 设置选中标签项的颜色
     tabBarController.tabBar.unselectedItemTintColor = [UIColor hwColor:@"#7C8196"]; // 设置未选中标签项的颜色
     tabBarController.tabBar.backgroundColor = [UIColor whiteColor];
 

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

@@ -1,8 +1,8 @@
 //
 //  customLaunchView.m
-//  隐私保护
+  //
 //
-//  Created by xd h on 2023/10/12.
+//  Created David on 2023/10/12.
 //
 
 #import "customLaunchView.h"
@@ -59,14 +59,25 @@
         //make.height.mas_equalTo(320.0);
     }];
     
-    //    guide_up_icon
-    UIImageView *upImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_up_icon"]];
-    [self addSubview:upImageView];
-    [upImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+    //
+    UIImageView *loginImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"logo_pic"]];
+    [self addSubview:loginImageView];
+    [loginImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.mas_equalTo(-60);
-        make.centerX.mas_equalTo(0);
-        make.width.mas_equalTo(132*1.3);
-        make.height.mas_equalTo(28*1.3);
+        make.centerX.mas_equalTo(-40);
+        make.width.mas_equalTo(40);
+        make.height.mas_equalTo(40);
+    }];
+    
+    UILabel *appNameLabel = [[UILabel alloc] init];
+    appNameLabel.text = @"GBOX";
+    appNameLabel.textColor = [UIColor blackColor];
+    appNameLabel.font = [UIFont boldSystemFontOfSize:18.0];
+    [self addSubview:appNameLabel];
+    [appNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(-60);
+        make.height.mas_equalTo(40);
+        make.left.equalTo(loginImageView.mas_right).offset(5);
     }];
 }
 @end

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

@@ -1,6 +1,6 @@
 //
 //  SetPWDFirstViewController.m
-//  隐私保护
+  //
 //
 //  Created by APPLE on 2023/9/19.
 //
@@ -191,7 +191,7 @@
     /*OK*/
     UIButton *keyBoardBtnOK = [[UIButton alloc] init];
     [keyBoardBtnOK setBackgroundColor:[UIColor clearColor]];
-    [keyBoardBtnOK setTitleColor:HW13B2EBColor forState:(UIControlStateNormal)];
+    [keyBoardBtnOK setTitleColor:HWFFD315Color forState:(UIControlStateNormal)];
     [keyBoardBtnOK.titleLabel setFont:[UIFont boldSystemFontOfSize:30.f]];
     [keyBoardBtnOK setTitle:@"OK" forState:(UIControlStateNormal)];
     [keyBoardBtnOK addTarget:self action:@selector(keyBoardBtnOKPressed) forControlEvents:(UIControlEventTouchUpInside)];
@@ -279,15 +279,15 @@
     gl.frame = CGRectMake(0,0,250,40.f);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
-    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+    gl.colors = @[(__bridge id)[UIColor hwColor:@"#FFD315"].CGColor, (__bridge id)[UIColor hwColor:@"#FFD315"].CGColor];
     gl.locations = @[@(0), @(1.0f)];
     
     [unableBtn.layer addSublayer:gl];
     [unableBtn setUserInteractionEnabled:NO];
     [unableBtn setTitle:NSLocalizedString(@"guide_set_pwd_guide",nil) forState:(UIControlStateNormal)];
-    [unableBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+    [unableBtn setTitleColor:[UIColor blackColor] forState:(UIControlStateNormal)];
     [unableBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
-    [unableBtn.layer setCornerRadius:8.f];
+    [unableBtn.layer setCornerRadius:20.f];
     unableBtn.clipsToBounds = YES;
     [bgView addSubview:unableBtn];
     [unableBtn mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -1,6 +1,6 @@
 //
 //  SetPWDSecondViewController.m
-//  隐私保护
+  //
 //
 //  Created by APPLE on 2023/9/19.
 //
@@ -8,7 +8,6 @@
 #import "SetPWDSecondViewController.h"
 #import <Masonry.h>
 
-#import "connectDeviceManager.h"
 #import "privacyModeTipViewController.h"
 
 @interface SetPWDSecondViewController (){
@@ -44,16 +43,16 @@
     /*上一步按钮*/
     UIButton *upStepBtn = [[UIButton alloc] init];
     [upStepBtn setTitle:NSLocalizedString(@"guide_set_pwd_up_step",nil) forState:(UIControlStateNormal)];
-    [upStepBtn setTitleColor:HW05BAFBColor forState:(UIControlStateNormal)];
+    [upStepBtn setTitleColor:HWFFD315Color forState:(UIControlStateNormal)];
     [upStepBtn.titleLabel setFont:[UIFont systemFontOfSize:16]];
     [upStepBtn addTarget:self.navigationController
                   action:@selector(popViewControllerAnimated:)
         forControlEvents:(UIControlEventTouchUpInside)];
-    
+    upStepBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
     [self.view addSubview:upStepBtn];
     [upStepBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10.f);
-        make.width.mas_equalTo(58.f);
+        make.width.mas_equalTo(100.f);
         make.top.mas_equalTo(5.f + H_STATE_BAR);
         make.height.mas_equalTo(32.f);
     }];
@@ -205,7 +204,7 @@
     /*OK*/
     UIButton *keyBoardBtnOK = [[UIButton alloc] init];
     [keyBoardBtnOK setBackgroundColor:[UIColor clearColor]];
-    [keyBoardBtnOK setTitleColor:HW13B2EBColor forState:(UIControlStateNormal)];
+    [keyBoardBtnOK setTitleColor:HWFFD315Color forState:(UIControlStateNormal)];
     [keyBoardBtnOK.titleLabel setFont:[UIFont boldSystemFontOfSize:30.f]];
     [keyBoardBtnOK setTitle:@"OK" forState:(UIControlStateNormal)];
     [keyBoardBtnOK addTarget:self action:@selector(keyBoardBtnOKPressed) forControlEvents:(UIControlEventTouchUpInside)];
@@ -311,23 +310,6 @@
 -(void)getPwdFunBy:(NSString*)SNStr
 {
     KWeakSelf
-//    [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:NO  didNetEnd:^(NSInteger didSuc) {
-//        
-//        if(didSuc){
-//            if(self->_isForgetPwdType){
-//                [[NSNotificationCenter defaultCenter] postNotificationName:forgetPwdDidSetNotification object:nil];
-//            }
-//            else{
-////                [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
-//                [weakSelf gotoPrivacyModeTipVCFun];
-//            }
-//            
-//        }
-//        else{
-//            [[iToast makeText:NSLocalizedString(@"log_login_system_busy",nil)] show];
-//        }
-//        
-//    }];
     
     [[netWorkManager shareInstance] getThridMsgBySN:SNStr success:^(id  _Nonnull responseObject) {
         DeviceThirdIdModel *model = responseObject;

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

@@ -1,8 +1,8 @@
 //
 //  forgetPwdViewController.m
-//  隐私保护
+  //
 //
-//  Created by xd h on 2023/11/6.
+//  Created David on 2023/11/6.
 //
 
 #import "forgetPwdViewController.h"
@@ -24,23 +24,23 @@
     [self.navigationBar setHidden:YES];
     [self.navBarBGView setHidden:NO];
     
-    NSString *curTitle = NSLocalizedString(@"input_pwd_forget_secret_key",nil);
-    UIButton *rightBut = [[UIButton alloc] init];
-    //rightBut.backgroundColor = [UIColor redColor];
-    [rightBut setTitle:curTitle forState:UIControlStateNormal];
-    rightBut.titleLabel.font = [UIFont systemFontOfSize:16.0];
-    [rightBut  setTitleColor:[UIColor hwColor:@"#13B2EB" alpha:1.0] forState:UIControlStateNormal];
-    [rightBut addTarget:self action:@selector(rightBtnPressed) forControlEvents:UIControlEventTouchUpInside];
-    [self.navBarBGView addSubview:rightBut];
-    
-    rightBut.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
-    
-    [rightBut mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(self.backBtn.mas_centerY);
-        make.width.mas_equalTo(250);
-        make.right.mas_equalTo(-20);
-        make.height.mas_equalTo(30);
-    }];
+//    NSString *curTitle = NSLocalizedString(@"input_pwd_forget_secret_key",nil);
+//    UIButton *rightBut = [[UIButton alloc] init];
+//    //rightBut.backgroundColor = [UIColor redColor];
+//    [rightBut setTitle:curTitle forState:UIControlStateNormal];
+//    rightBut.titleLabel.font = [UIFont systemFontOfSize:16.0];
+//    [rightBut  setTitleColor:[UIColor hwColor:@"#13B2EB" alpha:1.0] forState:UIControlStateNormal];
+//    [rightBut addTarget:self action:@selector(rightBtnPressed) forControlEvents:UIControlEventTouchUpInside];
+//    [self.navBarBGView addSubview:rightBut];
+//
+//    rightBut.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+//
+//    [rightBut mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.centerY.equalTo(self.backBtn.mas_centerY);
+//        make.width.mas_equalTo(250);
+//        make.right.mas_equalTo(-20);
+//        make.height.mas_equalTo(30);
+//    }];
     
     [self initBaseUIfun];
 }

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

@@ -1,12 +1,11 @@
 //
 //  inputPWDViewController.m
-//  隐私保护
+  //
 //
-//  Created by xd h on 2023/10/12.
+//  Created David on 2023/10/12.
 //
 
 #import "inputPWDViewController.h"
-#import "connectDeviceManager.h"
 #import "RSATool.h"
 #import "forgetPwdViewController.h"
 #import "SceneDelegate.h"
@@ -181,7 +180,7 @@
     //忘记密码按钮
     UIButton *forgetPwdBut = [[UIButton alloc] init];
     [forgetPwdBut setTitle:NSLocalizedString(@"input_pwd_forget_pwd",nil) forState:(UIControlStateNormal)];
-    [forgetPwdBut setTitleColor:[UIColor hwColor:@"#13B2EB" alpha:1.0] forState:(UIControlStateNormal)];
+    [forgetPwdBut setTitleColor:HWFFD315Color forState:(UIControlStateNormal)];
     [forgetPwdBut addTarget:self action:@selector(forgetPwdFun) forControlEvents:UIControlEventTouchUpInside];
     //forgetPwdBut.backgroundColor = [UIColor redColor];
     [self.view addSubview:forgetPwdBut];
@@ -259,7 +258,7 @@
     /*OK*/
     UIButton *keyBoardBtnOK = [[UIButton alloc] init];
     [keyBoardBtnOK setBackgroundColor:[UIColor clearColor]];
-    [keyBoardBtnOK setTitleColor:HW13B2EBColor forState:(UIControlStateNormal)];
+    [keyBoardBtnOK setTitleColor:HWFFD315Color forState:(UIControlStateNormal)];
     [keyBoardBtnOK.titleLabel setFont:[UIFont boldSystemFontOfSize:30.f]];
     [keyBoardBtnOK setTitle:@"OK" forState:(UIControlStateNormal)];
     [keyBoardBtnOK addTarget:self action:@selector(keyBoardBtnOKPressed) forControlEvents:(UIControlEventTouchUpInside)];
@@ -347,15 +346,15 @@
     gl.frame = CGRectMake(0,0,250,40.f);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
-    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+    gl.colors = @[(__bridge id)[UIColor hwColor:@"#FFD315"].CGColor, (__bridge id)[UIColor hwColor:@"#FFD315"].CGColor];
     gl.locations = @[@(0), @(1.0f)];
     
     [unableBtn.layer addSublayer:gl];
     [unableBtn setUserInteractionEnabled:NO];
     [unableBtn setTitle:NSLocalizedString(@"guide_set_pwd_guide",nil) forState:(UIControlStateNormal)];
-    [unableBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+    [unableBtn setTitleColor:[UIColor blackColor] forState:(UIControlStateNormal)];
     [unableBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
-    [unableBtn.layer setCornerRadius:8.f];
+    [unableBtn.layer setCornerRadius:20.f];
     unableBtn.clipsToBounds = YES;
     [bgView addSubview:unableBtn];
     [unableBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -413,58 +412,6 @@
         [self verifyPwdFun:pwd];
         return;
     
-
-//        //是否已经有密码了 有就是输入密码 没有就是设置密码
-//        NSString *curPwd = ksharedAppDelegate.DeviceThirdIdMod.data.password;
-//
-//        NSString*desPwdStr  = [RSATool AES128Decrypt:curPwd key:AESCODEKEEYY];
-//
-//        if([desPwdStr isEqualToString:pwd]){
-//            [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
-//            if(_isQRCodeType){
-//                [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
-//            }
-//
-//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                [[NSNotificationCenter defaultCenter] postNotificationName:ShowImgAndVoiceNotification object:nil];
-//            });
-//
-//            //view 加载在windows上
-//            [self.view removeFromSuperview];
-//
-//        }
-//        else{
-//            [self deleteBoardBtnPressed];
-//            [self deleteBoardBtnPressed];
-//            [self deleteBoardBtnPressed];
-//            [self deleteBoardBtnPressed];
-//
-//            //[[iToast makeText:NSLocalizedString(@"logo_input_pwd_fail",nil)] show];
-//            //[[iToast makeText:@"111"] show];
-//
-//            _pwdErrorTip = [[UILabel alloc] init];
-//            _pwdErrorTip.text = NSLocalizedString(@"logo_input_pwd_fail",nil);
-//            _pwdErrorTip.textAlignment = NSTextAlignmentCenter;
-//            _pwdErrorTip.textColor = [UIColor whiteColor];
-//            _pwdErrorTip.backgroundColor = [UIColor hwColor:@"000000" alpha:0.7];
-//            [self.view addSubview:_pwdErrorTip];
-//
-//            _pwdErrorTip.layer.masksToBounds = YES;
-//            _pwdErrorTip.layer.cornerRadius = 10;
-//
-//            [_pwdErrorTip mas_makeConstraints:^(MASConstraintMaker *make) {
-//                make.center.mas_equalTo(0);
-//                make.width.mas_equalTo(200);
-//                make.height.mas_equalTo(40.f);
-//            }];
-//
-//            ///
-//            [NSTimer scheduledTimerWithTimeInterval:3 repeats:NO block:^(NSTimer * _Nonnull timer) {
-//
-//                [self->_pwdErrorTip removeFromSuperview];
-//                self->_pwdErrorTip = nil;
-//            }];
-//        }
     }
 }