Просмотр исходного кода

1.同步日志--1.隐私模式UI修改

huangxiaodong месяцев назад: 6
Родитель
Сommit
d207c5a468

BIN
创维盒子/双子星云手机/Assets.xcassets/Set/fanzhuan.imageset/编组 11@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/fanzhuan.imageset/编组 11@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/icon_Privacy_model.imageset/icon_Privacy_model@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/icon_Privacy_model.imageset/icon_Privacy_model@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/icon_change_logo.imageset/编组 6@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/icon_change_logo.imageset/编组 6@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/mdoify_pwd.imageset/编组@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Set/mdoify_pwd.imageset/编组@3x.png


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

@@ -1,6 +1,6 @@
 //
 //  ModifyPWDFirstViewController.m
-//  隐私保护
+  //
 //
 //  Created by APPLE on 2023/9/19.
 //
@@ -40,7 +40,7 @@
     /*添加取消按钮*/
     UIButton *upStepBtn = [[UIButton alloc] init];
     [upStepBtn setTitle:NSLocalizedString(@"other_cancel",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:)
@@ -200,7 +200,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)];

+ 7 - 10
创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDSecondViewController.m

@@ -1,14 +1,12 @@
 //
 //  ModifyPWDSecondViewController.m
-//  隐私保护
+  //
 //
 //  Created by APPLE on 2023/9/19.
 //
 
 #import "ModifyPWDSecondViewController.h"
 #import <Masonry.h>
-#import "MySetViewController.h"
-#import "connectDeviceManager.h"
 #import "mineViewController.h"
 
 @interface ModifyPWDSecondViewController (){
@@ -44,7 +42,7 @@
     /*添加取消按钮*/
     UIButton *cancelStepBtn = [[UIButton alloc] init];
     [cancelStepBtn setTitle:NSLocalizedString(@"other_cancel",nil) forState:(UIControlStateNormal)];
-    [cancelStepBtn setTitleColor:HW05BAFBColor forState:(UIControlStateNormal)];
+    [cancelStepBtn setTitleColor:HWFFD315Color forState:(UIControlStateNormal)];
     [cancelStepBtn.titleLabel setFont:[UIFont systemFontOfSize:16]];
     [cancelStepBtn addTarget:self
                   action:@selector(goSetHome)
@@ -60,16 +58,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);
     }];
@@ -221,7 +219,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)];
@@ -299,8 +297,7 @@
 
 - (void)goSetHome{
     for (UIViewController *vc in [self.navigationController viewControllers]) {
-        if ([vc isKindOfClass:[MySetViewController class]]
-            ||[vc isKindOfClass:[mineViewController class]]){
+        if ([vc isKindOfClass:[mineViewController class]]){
             [self.navigationController popToViewController:vc animated:YES];
             [[NSNotificationCenter defaultCenter] postNotificationName:showTabbarNotification object:nil];/*发送通知*/
             break;