灰度，上色调节

yanglingyu
1 parent 417ad66a
Showing 13 changed files with 103 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Header/PrefixHeader.pch
CNLiveScioLive/Pages/Header/SystemMacro.h
CNLiveScioLive/Pages/Home/CNHomeViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsNoPicTableViewCell.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsThreePicTableViewCell.m
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
CNLiveScioLive/Pages/Live/View/CNLiveHeaderView.m
CNLiveScioLive/Pages/Tools/ImageGray/UILabel+CNGray.h
CNLiveScioLive/Pages/Tools/ImageGray/UILabel+CNGray.m
CNLiveScioLive/Pages/Tools/ZXWSegmentControl/ZXWKitConst.h
@@ -13,6 +13,7 @@
 		080AB4C8217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
 		0816B5E42648C23A005E1F8C /* UIColor+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816B5E32648C23A005E1F8C /* UIColor+CNGray.m */; };
 		0816B5E92648C320005E1F8C /* WKWebView+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816B5E82648C320005E1F8C /* WKWebView+CNGray.m */; };
+		0836125A264BA2BF00A18E52 /* UILabel+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 08361259264BA2BF00A18E52 /* UILabel+CNGray.m */; };
 		083847E1215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
 		083847E2215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
 		083847E3215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
@@ -740,6 +741,8 @@
 		0816B5E32648C23A005E1F8C /* UIColor+CNGray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIColor+CNGray.m"; sourceTree = "<group>"; };
 		0816B5E72648C320005E1F8C /* WKWebView+CNGray.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WKWebView+CNGray.h"; sourceTree = "<group>"; };
 		0816B5E82648C320005E1F8C /* WKWebView+CNGray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+CNGray.m"; sourceTree = "<group>"; };
+		08361258264BA2BF00A18E52 /* UILabel+CNGray.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+CNGray.h"; sourceTree = "<group>"; };
+		08361259264BA2BF00A18E52 /* UILabel+CNGray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+CNGray.m"; sourceTree = "<group>"; };
 		083847DF215C5DDD00186618 /* VPImageCropperViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPImageCropperViewController.h; sourceTree = "<group>"; };
 		083847E0215C5DDD00186618 /* VPImageCropperViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPImageCropperViewController.m; sourceTree = "<group>"; };
 		0838483C215C838B00186618 /* CNLiveENTabBarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveENTabBarController.h; sourceTree = "<group>"; };
@@ -2252,6 +2255,8 @@
 				0816B5E32648C23A005E1F8C /* UIColor+CNGray.m */,
 				0816B5E72648C320005E1F8C /* WKWebView+CNGray.h */,
 				0816B5E82648C320005E1F8C /* WKWebView+CNGray.m */,
+				08361258264BA2BF00A18E52 /* UILabel+CNGray.h */,
+				08361259264BA2BF00A18E52 /* UILabel+CNGray.m */,
 			);
 			path = ImageGray;
 			sourceTree = "<group>";
@@ -2840,6 +2845,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0836125A264BA2BF00A18E52 /* UILabel+CNGray.m in Sources */,
 				08B5C5822153400700F5476E /* CNNewsoundBaseModel.m in Sources */,
 				08585DB5215B4DA300FC2CA2 /* CNLiveAdvancedSearchViewController.m in Sources */,
 				08C28A30263932960065B372 /* UIImageView+CNGrayImage.m in Sources */,
@@ -102,11 +102,18 @@
     [XWHTTPTool GET:urlStr params:parameters success:^(id json) {
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         NSURL *url = [NSURL URLWithString:dic[@"data"][@"image"]];
-        if ([dic[@"data"][@"grayMode"] isEqualToString:@"true"]) {
+        NSString * mode = dic[@"grayMode"];
+        if (mode.intValue == 1) {
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:ISGRAYMODE];
         }else{
             [[NSUserDefaults standardUserDefaults] setBool:NO forKey:ISGRAYMODE];
         }
+        if (dic[@"homeTitleColor"]&&![dic[@"homeTitleColor"] isEqualToString:@""]) {
+            [[NSUserDefaults standardUserDefaults] setValue:dic[@"homeTitleColor"] forKey:HOMETITLECOLOR];
+        }else
+        {
+            [[NSUserDefaults standardUserDefaults] setValue:nil forKey:HOMETITLECOLOR];
+        }
         NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"lanchImage"];
         if (data.length<=0) {
             [self addRootViewController];
@@ -83,6 +83,7 @@
 #import "UIImageView+CNGrayImage.h"
 #import "UIColor+CNGray.h"
 #import "WKWebView+CNGray.h"
+#import "UILabel+CNGray.h"
 //友盟统计
 #import <UMCommon/MobClick.h>
 #import <UMCommon/UMConfigure.h>
@@ -99,7 +99,9 @@ NO)
 #define ExitSuccessful                         @"ExitSuccessful"
 #define GetCodeSuccessful                      @"GetCodeSuccessful"
 #define ISGRAYMODE                             @"isGrayMode"
+#define HOMETITLECOLOR                         @"homeTitleColor"
+#define HOMETITLECOLORSTR   [[NSUserDefaults standardUserDefaults] valueForKey:HOMETITLECOLOR]
 //图片
 #define Image(image)  [UIImage imageNamed:image]
@@ -9,6 +9,7 @@
 #import "CNHomeViewController.h"
 #import "XLSlideMenu.h"
 #import "CNHomeModel.h"
+#import "ZXWKitConst.h"
 #import "CNLiveHeraldedNewsViewController.h"
 #import "CNLiveReporterAskedViewController.h"
@@ -93,9 +94,16 @@
             }
             if(controllers.count > 0){
                 self.segmentControl.titles = titles;
-                if (ininavArray[0][@"textColor"]) {
+                if (HOMETITLECOLORSTR) {
+                    self.segmentControl.titleNormalColor = segementColor_title_color;
+                    self.segmentControl.titleSelectColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
+                [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:HOMETITLECOLORSTR]];
+                }else{
+                if (ininavArray[0][@"textColor"]&&![ininavArray[0][@"textColor"] isEqualToString:@""]) {
+
                     self.segmentControl.titleSelectColor = [UIColor colorWithHexString:ininavArray[0][@"textColor"]];
-                [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininavArray[0][@"textColor"]]];
+                    [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininavArray[0][@"textColor"]]];
+                    }
                 }
                 self.segmentControl.viewControllers = controllers;
             }
@@ -83,8 +83,13 @@
     if (model.titleColor) {
         _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
     }
-    if (model.tagsColor) {
+    if (HOMETITLECOLORSTR) {
+        _projectLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
+    }else{
+        if (model.tagsColor) {
+        
         _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
+        }
     }
     //专题
     if(model.tags && ![model.tags isEqualToString:@""]){
@@ -66,8 +66,13 @@
     if (model.titleColor) {
         _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
     }
-    if (model.tagsColor) {
+    
+    if (HOMETITLECOLORSTR) {
+        _projectLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
+    }else{
+        if (model.tagsColor) {
         _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
+        }
     }
     _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
@@ -97,8 +97,12 @@
     if (model.titleColor) {
         _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
     }
-    if (model.tagsColor) {
+    if (HOMETITLECOLORSTR) {
+        _projectLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
+    }else{
+        if (model.tagsColor) {
         _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
+        }
     }
     [_leftImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
     [_picImage sd_setImageWithURL:[NSURL URLWithString:model.imgSmall] placeholderImage:[UIImage imageNamed:@"placeholder"]];
@@ -60,7 +60,6 @@
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
-    [AlertViewTool showHUDView];
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
@@ -7,6 +7,7 @@
 //
 #import "CNLiveHeaderView.h"
+#import "UIColor+CNGray.h"
 #import "CNLiveModel.h"
 @interface CNLiveHeaderView()
@@ -41,7 +42,13 @@
         _stateLabel.numberOfLines = 1;
         _stateLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         _stateLabel.textColor = [UIColor whiteColor];
+        if ([[NSUserDefaults standardUserDefaults] boolForKey:ISGRAYMODE]) {
+            _stateLabel.backgroundColor = [UIColor grayColor];
+        }else if (HOMETITLECOLORSTR){
+            _stateLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
+        }else{
         _stateLabel.backgroundColor = [UIColor redColor];
+        }
         _stateLabel.font = [UIFont systemFontOfSize:13];
         _stateLabel.layer.masksToBounds = YES;
         _stateLabel.layer.cornerRadius = 2;
+//
+//  UILabel+CNGray.h
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/5/12.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UILabel (CNGray)
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  UILabel+CNGray.m
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/5/12.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import "UILabel+CNGray.h"
+#import "UIColor+CNGray.h"
+#import "ZXWKitConst.h"
+
+@implementation UILabel (CNGray)
++(void)load
+{
+    static dispatch_once_t onceToken;
+        dispatch_once(&onceToken, ^{
+            Method setImage = class_getInstanceMethod(self,@selector(setTextColor:));
+            Method xmtSwizzledSetImage = class_getInstanceMethod(self,@selector(cn_setTextColor:));
+            ///交换IMP
+            method_exchangeImplementations(setImage, xmtSwizzledSetImage);
+        });
+}
+-(void)cn_setTextColor:(UIColor *)textColor{
+    if (HOMETITLECOLORSTR) {
+        if (![textColor isEqual:[UIColor whiteColor]]&&![textColor isEqual:segementColor_title_color]) {
+                textColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
+          
+        }
+    }
+    [self cn_setTextColor:textColor];
+}
+
+@end
@@ -28,7 +28,7 @@
 #define segementTitleNormalFont [UIFont systemFontOfSize:16]
 // 设置标题文本颜色(LBSegementView)
-#define segementColor_title_color [UIColor colorWithRed:180 / 255.0 green:149 / 255.0 blue:111 / 255.0 alpha:1.0]
+#define segementColor_title_color [UIColor colorWithRed:52 / 255.0 green:52 / 255.0 blue:52 / 255.0 alpha:1.0]
 // 设置标题文本选中颜色(LBSegementView)
 #define segementColor_title_select_color [UIColor colorWithRed:130 / 255.0 green:79 / 255.0 blue:15 / 255.0 alpha:1.0]