#1249

更换新主题色物料
2024-07-02 18:54:42 +08:00
parent c6169242bd
commit 1b9c86d66f
81 changed files with 75 additions and 71 deletions
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
@@ -95,6 +95,8 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 ///类型,0，密码，1.手机
@property(nonatomic,assign) int loginType;

+@property (nonatomic, strong) UIButton *feedBackButton;
+
@end

@implementation XPLoginViewController
@@ -157,7 +159,8 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    self.view.backgroundColor = [UIColor whiteColor];
    [self.view addSubview:self.bgImageView];
    [self.view addSubview:self.logoView];
-    
+    [self.view addSubview:self.feedBackButton];
+
    [self.view addSubview:self.chooseAccountBtn];
    [self.view addSubview:self.chooseSMSBtn];
    [self.view addSubview:self.chooseTypeView];
@@ -218,7 +221,8 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 
    [self.chooseTypeView mas_makeConstraints:^(MASConstraintMaker *make) {
        make.top.equalTo(self.logoView.mas_bottom).mas_offset(kGetScaleWidth(48));
-        make.width.height.mas_equalTo(kGetScaleWidth(24));
+        make.width.mas_equalTo(kGetScaleWidth(24));
+        make.height.mas_equalTo(kGetScaleWidth(14));
        make.leading.mas_equalTo(KScreenWidth/4 - kGetScaleWidth(12));
    }];

@@ -352,7 +356,12 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 //            make.edges.equalTo(self.nextView);
 //        }];
    }
-    
+
+    [self.feedBackButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.trailing.mas_equalTo(-15);
+        make.top.mas_equalTo(kStatusBarHeight+20);
+    }];
+
 }
 -(void)setSwitchingEnvironmentVC{
    UIButton *but = [UIButton new];
@@ -361,10 +370,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    [self.view addSubview:but];
    [but addTarget:self action:@selector(switchingEnvironmentVCAction) forControlEvents:UIControlEventTouchUpInside];
    [but mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.mas_equalTo(-kGetScaleWidth(30));
+        make.leading.mas_equalTo(kGetScaleWidth(30));
        make.top.mas_equalTo(kStatusBarHeight+20);
    }];
-
 }
 -(void)switchingEnvironmentVCAction{
 #ifdef DEBUG
@@ -482,6 +490,10 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    [self.navigationController pushViewController:forgetVC animated:YES];
 }

+- (void)didTapFeedback {
+
+}
+
 #pragma mark - LoginProtocol
 - (void)loginThirdPartSuccess {
    [self.codeInputView cancelTimer];
@@ -503,8 +515,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    _chooseAccountBtn.selected = _loginType == 0;
    _chooseSMSBtn.selected = _loginType != 0;
    _forgetBtn.hidden = _loginType != 0;
-    
-    
+
    _accountView.hidden = _loginType != 0;
    _accountPwdView.hidden = _loginType != 0;
    
@@ -740,7 +751,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 - (UIImageView *)bgImageView{
    if(!_bgImageView){
        _bgImageView = [[UIImageView alloc]init];
-        _bgImageView.image = kImage(@"pi_app_login_new_bg");
+        _bgImageView.image = kImage(@"Login_top_bg");
        _bgImageView.contentMode = UIViewContentModeScaleAspectFill;
    }
    return _bgImageView;
@@ -799,9 +810,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    if (!_loginBtn) {
        _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
        
-        UIImage *nextImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))];
-        UIImage *disableImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xD1F9FF),UIColorFromRGB(0xDEE4FF),UIColorFromRGB(0xEEDCFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))];
-        
+        UIImage *nextImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x57e193), UIColorFromRGB(0x14d2a6)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))];
+        UIImage *disableImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xa5eec8), UIColorFromRGB(0xabf5e3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))];
+
        [_loginBtn setImage:nextImage forState:UIControlStateNormal];
        [_loginBtn setImage:disableImage forState:UIControlStateDisabled];
        _loginBtn.layer.cornerRadius = kGetScaleWidth(48)/2;
@@ -825,9 +836,8 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    if(!_chooseTypeView){
        _chooseTypeView = [UIImageView new];
        _chooseTypeView.userInteractionEnabled = YES;
+        _chooseTypeView.contentMode = UIViewContentModeScaleAspectFit;
        [_chooseTypeView setImage:kImage(@"ms_login_choose_phone_icon")];
-      
-      
    }
    return _chooseTypeView;
 }
@@ -892,4 +902,17 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    return _forgetBtn;
 }

+- (UIButton *)feedBackButton {
+    if (!_feedBackButton) {
+        _feedBackButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_feedBackButton setTitle:@"反馈" forState:UIControlStateNormal];
+        [_feedBackButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        _feedBackButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold];
+        [_feedBackButton addTarget:self 
+                            action:@selector(didTapFeedback)
+                  forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _feedBackButton;
+}
+
@end
--- a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m
+++ b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m
@@ -215,11 +215,12 @@
        _titleView.listContainer = (id<JXCategoryViewListContainer>)self.pagingView.listContainerView;
        
        JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
-        lineView.indicatorImageViewSize = CGSizeMake(45, 10);
-        lineView.verticalMargin = 10;
+        lineView.indicatorImageViewSize = CGSizeMake(24, 7);
+//        lineView.verticalMargin = 10;
        lineView.indicatorImageView.layer.masksToBounds = YES;
        lineView.indicatorImageView.layer.cornerRadius = 3;
-        lineView.indicatorImageView.image = [UIImage imageNamed:@"mine_dynamic"];
+        lineView.indicatorImageView.image = [UIImage imageNamed:@"ms_login_choose_phone_icon"];
+        lineView.contentMode = UIViewContentModeScaleAspectFit;
        _titleView.indicators = @[lineView];
    }
    return _titleView;
@@ -242,7 +243,7 @@
 -(UIImageView *)headBgImageView{
    if (!_headBgImageView){
        _headBgImageView = [UIImageView new];
-        _headBgImageView.image = [UIImage imageNamed:@"ms_tabbar_vc_main_bg"];
+        _headBgImageView.image = [UIImage imageNamed:@"home_top_bg"];
    }
    return _headBgImageView;
 }
--- a/YuMi/Modules/YMMine/View/XPMineViewController.m
+++ b/YuMi/Modules/YMMine/View/XPMineViewController.m
@@ -181,8 +181,6 @@ UIKIT_EXTERN NSString *kRequestRicket;
 	setItem.skipType = XPMineItemType_My_Set;
 	[self.functionArray addObject:setItem];

-
-    
 	[self.view addSubview:self.bgImageView];
 	[self.view addSubview:self.tableView];
 	//	[self.view addSubview:self.settingButton];
@@ -785,7 +783,7 @@ UIKIT_EXTERN NSString *kRequestRicket;

 - (UIView *)bgImageView {
 	if (!_bgImageView) {
-		_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ms_tabbar_vc_main_bg"]];
+		_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Login_top_bg"]];
 		_bgImageView.contentMode = UIViewContentModeScaleAspectFill;
 	}
 	return _bgImageView;
--- a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m
+++ b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m
@@ -43,7 +43,6 @@
    self.view.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#F3F5FA"];

    [self setupTopTheme];
-
    [self setupTopControl];

    _pageContainer = [[UIPageViewController alloc] initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll
@@ -137,11 +136,12 @@
    }];

    _tabMarks = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_top_tab_marks"]];
+    _tabMarks.contentMode = UIViewContentModeScaleAspectFill;
    [_topControlView addSubview:_tabMarks];
    [_tabMarks mas_makeConstraints:^(MASConstraintMaker *make) {
        make.bottom.mas_equalTo(self.topControlView).offset(-8);
-        make.width.mas_equalTo(10);
-        make.height.mas_equalTo(2.5);
+        make.width.mas_equalTo(14);
+        make.height.mas_equalTo(4);
        make.centerX.mas_equalTo(self.recommendButton.mas_centerX);
    }];
 }
@@ -149,14 +149,14 @@
 - (void)displayMineTab {
    [_mineButton.titleLabel setFont:kFontBold(21)];
    [_recommendButton.titleLabel setFont:kFontBold(18)];
-    [_mineButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    [_recommendButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal];
+    [_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal];
+    [_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal];

 //    [UIView animateWithDuration:0.25 animations:^{
        [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) {
            make.bottom.mas_equalTo(self.topControlView).offset(-8);
-            make.width.mas_equalTo(10);
-            make.height.mas_equalTo(2.5);
+            make.width.mas_equalTo(14);
+            make.height.mas_equalTo(4);
            make.centerX.mas_equalTo(self.mineButton.mas_centerX);
        }];
 //        [self.view setNeedsLayout];
@@ -166,14 +166,14 @@
 - (void)displayRecommendTab {
    [_mineButton.titleLabel setFont:kFontBold(18)];
    [_recommendButton.titleLabel setFont:kFontBold(21)];
-    [_recommendButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    [_mineButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal];
+    [_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal];
+    [_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal];

 //    [UIView animateWithDuration:0.25 animations:^{
    [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) {
        make.bottom.mas_equalTo(self.topControlView).offset(-8);
-        make.width.mas_equalTo(10);
-        make.height.mas_equalTo(2.5);
+        make.width.mas_equalTo(14);
+        make.height.mas_equalTo(4);
        make.centerX.mas_equalTo(self.recommendButton.mas_centerX);
    }];
 //        [self.view setNeedsLayout];
--- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
+++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
@@ -519,7 +519,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
        _titleView.listContainer = (id<JXCategoryViewListContainer>)self.pagingView.listContainerView;
        
        JXCategoryIndicatorImageView * indicator = [[JXCategoryIndicatorImageView alloc] init];
-        indicator.indicatorImageView.image = [UIImage imageNamed:@"ms_hoem_index_icon"];
+        indicator.indicatorImageView.image = kImage(@"ms_login_choose_phone_icon");
        indicator.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(24), kGetScaleWidth(24));
        indicator.verticalMargin = -kGetScaleWidth(4);
        indicator.contentMode = UIViewContentModeScaleAspectFit;