no message

ZhiJi/Assets.xcassets/Map/map_track_move_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "map_track_move_icon@2x.png",
+      "filename" : "编组@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "map_track_move_icon@3x.png",
+      "filename" : "编组@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/Map/map_track_srart_end_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "编组 7@2x.png",
+      "filename" : "location_start@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "编组 7@3x.png",
+      "filename" : "location_start@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/Map/userPosition.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "userPosition.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "userPosition@2x.png",
+      "filename" : "userPosition.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "userPosition@2x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/Mine/mine_setting_icon.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "mine_setting_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "mine_setting_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ZhiJi/Assets.xcassets/Mine/share_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "appicon-4.png",
+      "filename" : "appicon.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "appicon-5.png",
+      "filename" : "appicon-1.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Classes/LocationAttention/Base.lproj/Location.storyboard

@@ -29,6 +29,11 @@
                                         <state key="normal" title="确认">
                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="massBackgroundColor">
+                                                <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
                                         <connections>
                                             <action selector="commitAction:" destination="l8V-I4-JBm" eventType="touchUpInside" id="5CE-fk-gjA"/>
                                         </connections>
@@ -306,6 +311,11 @@
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="取消"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="massTitleColor">
+                                        <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="cancelSearchAction:" destination="YEz-br-hE9" eventType="touchUpInside" id="zv6-Gu-Oxc"/>
                                 </connections>

ZhiJi/Classes/LocationAttention/ZJLocationAttentionFooter.xib

@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ZJLocationAttentionFooter" customModule="ZhiJi" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ZJLocationAttentionFooter" customModule="Family_Mapp" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="414" height="70"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -29,6 +29,9 @@
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                             <real key="value" value="24.5"/>
                         </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="massBackgroundColor">
+                            <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </button>
             </subviews>

ZhiJi/Classes/LocationVC/View/ZJAlertView.xib

@@ -57,6 +57,9 @@
                                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                             <real key="value" value="25"/>
                                         </userDefinedRuntimeAttribute>
+                                        <userDefinedRuntimeAttribute type="color" keyPath="massBackgroundColor">
+                                            <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </userDefinedRuntimeAttribute>
                                     </userDefinedRuntimeAttributes>
                                 </button>
                             </subviews>

ZhiJi/Classes/LocationVC/ZJLocationVC.xib

@@ -72,6 +72,9 @@
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                     <real key="value" value="17"/>
                                 </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="massBackgroundColor">
+                                    <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YK4-n6-cGm">

ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m

@@ -405,8 +405,8 @@
     NSMutableParagraphStyle * style = [[NSMutableParagraphStyle alloc] init];
     style.lineSpacing = KScaleWidth(6);
     
-    [attStr addAttributes:@{NSForegroundColorAttributeName:kColorWithRGB(82, 139, 255), NSLinkAttributeName:@"user://"} range:[clauseStr rangeOfString:str2]];
-    [attStr addAttributes:@{NSForegroundColorAttributeName:kColorWithRGB(82, 139, 255), NSLinkAttributeName:@"privacy://"} range:[clauseStr rangeOfString:str4]];
+    [attStr addAttributes:@{NSForegroundColorAttributeName:kMassColor, NSLinkAttributeName:@"user://"} range:[clauseStr rangeOfString:str2]];
+    [attStr addAttributes:@{NSForegroundColorAttributeName:kMassColor, NSLinkAttributeName:@"privacy://"} range:[clauseStr rangeOfString:str4]];
     
 //    UIImage *image = [UIImage imageNamed:isSelect == NO ? @"quick_login_clause_select" : @"quick_login_clause_selected"];
 //

ZhiJi/Classes/Main/Base/BaseWebViewController.m

@@ -69,7 +69,7 @@
     
     self.progressView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 2)];
     _progressView.backgroundColor = [UIColor groupTableViewBackgroundColor];
-    _progressView.progressTintColor = kColorWithRGB(112, 156, 246);
+    _progressView.progressTintColor = kMassColor;
     _progressView.transform = CGAffineTransformMakeScale(1.0f, 1.5f);
     [self.view addSubview:_progressView];
     [self.view bringSubviewToFront:self.progressView];

ZhiJi/Classes/Main/View/Protocol.m

@@ -94,7 +94,7 @@
     // 左侧按钮
     _lBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     [_lBtn setTitle:kLocalizedString(@"alert_disagree") forState:0];
-    [_lBtn setTitleColor:[UIColor colorWithHex:0x568EFC] forState:0];
+    [_lBtn setTitleColor:kMassColor forState:0];
     [_lBtn.titleLabel setFont:[UIFont systemFontOfSize:KFont(15)]];
     [_lBtn setBackgroundColor:[UIColor colorWithHex:0xffffff]];
     [_bgView addSubview:_lBtn];
@@ -107,7 +107,7 @@
     _lBtn.layer.cornerRadius = KScaleWidth(20);
     _lBtn.layer.masksToBounds = YES;
     _lBtn.layer.borderWidth = 0.5;
-    _lBtn.layer.borderColor = [UIColor colorWithHex:0x568EFC].CGColor;
+    _lBtn.layer.borderColor = kMassColor.CGColor;
     [_lBtn addTarget:self action:@selector(lBtnClick) forControlEvents:UIControlEventTouchUpInside];
     
     // 右侧按钮
@@ -115,7 +115,7 @@
     [_rBtn setTitle:kLocalizedString(@"alert_agree") forState:0];
     [_rBtn setTitleColor:[UIColor colorWithHex:0xffffff] forState:UIControlStateNormal];
     [_rBtn.titleLabel setFont:[UIFont systemFontOfSize:KFont(15)]];
-    [_rBtn setBackgroundColor:[UIColor colorWithHex:0x568EFC]];
+    [_rBtn setBackgroundColor:kMassColor];
     [_bgView addSubview:_rBtn];
     [_rBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(_textView.mas_bottom).mas_offset(KScaleWidth(15));

ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -344,7 +344,7 @@
         MAPolylineRenderer *polylineRenderer = [[MAPolylineRenderer alloc] initWithPolyline:overlay];
         
         polylineRenderer.lineWidth    = 4.f;
-        polylineRenderer.strokeColor  = [UIColor colorWithHex:0x568EFC];
+        polylineRenderer.strokeColor  = kMassColor;
         polylineRenderer.lineJoinType = kMALineJoinRound;
         polylineRenderer.lineCapType  = kMALineCapRound;
         

ZhiJi/Classes/Map/Controller/ZJMapStyle2ViewController.m

@@ -89,8 +89,7 @@
     [self.addBtn setTitle:kLocalizedString(@"care_find_now") forState:(UIControlStateNormal)];
     [self.addBtn setTitle:kLocalizedString(@"care_find_now") forState:(UIControlStateSelected)];
     self.addBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
-    [self.addBtn setTitleColor:kColorWithRGB(82, 139, 255) forState:UIControlStateNormal];
-    [self.addBtn setTitleColor:kColorWithRGB(153, 153, 153) forState:UIControlStateSelected];
+    [self.addBtn setTitleColor:kMassColor forState:UIControlStateNormal];
     [self.addBtn addTarget:self action:@selector(tipsBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
     [rightView addSubview:self.addBtn];
     

ZhiJi/Classes/Map/View/ZJMapTrackDatePickerView.xib

@@ -48,6 +48,11 @@
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <color key="textColor" red="0.32156862745098036" green="0.54509803921568623" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="color" keyPath="massTextColor">
+                                            <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </userDefinedRuntimeAttribute>
+                                    </userDefinedRuntimeAttributes>
                                 </label>
                             </subviews>
                             <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

ZhiJi/Classes/Mine/Controller/ZJSettingViewController.m

@@ -92,10 +92,10 @@
     if (!_logOutBtn) {
         _logOutBtn = [[UIButton alloc]init];
         [_logOutBtn setTitle:kLocalizedString(@"setting_sign_out") forState:UIControlStateNormal];
-        [_logOutBtn setTitleColor:[UIColor colorWithHex:0x558EFC] forState:UIControlStateNormal];
+        [_logOutBtn setTitleColor:kMassColor forState:UIControlStateNormal];
         _logOutBtn.titleLabel.font = [UIFont fontWithName:@"PingFangSC-Regular" size:16];
         _logOutBtn.layer.borderWidth = 1;
-        _logOutBtn.layer.borderColor = [UIColor colorWithHex:0x558EFC].CGColor;
+        _logOutBtn.layer.borderColor = kMassColor.CGColor;
         _logOutBtn.layer.cornerRadius = 45/2;
         [_logOutBtn addTarget:self action:@selector(logoutBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }

ZhiJi/Classes/Mine/View/ZJMineHeaderView.m

@@ -45,12 +45,12 @@
      
     
     UIButton * settingBtn = [[UIButton alloc] init];
-    [settingBtn setImage:[UIImage imageNamed:@"mine_setting_icon"] forState:UIControlStateNormal];
-    settingBtn.imageView.contentMode = UIViewContentModeCenter;
+    [settingBtn setImage:[UIImage imageNamed:@"mine_setting"] forState:UIControlStateNormal];
+    settingBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
     [self addSubview:settingBtn];
     [settingBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self).mas_offset(StatusBarHeight);
-        make.size.mas_offset(CGSizeMake(KScaleWidth(50), KScaleWidth(50)));
+        make.top.equalTo(self).mas_offset(StatusBarHeight+KScaleWidth(6));
+        make.size.mas_offset(CGSizeMake(KScaleWidth(36), KScaleWidth(36)));
         make.right.equalTo(self).mas_offset(KScaleWidth(-12.5));
     }];
     
@@ -132,7 +132,7 @@
     self.xuFeiButton.layer.cornerRadius = KScaleWidth(15);
     self.xuFeiButton.layer.masksToBounds = YES;
 //    self.xuFeiButton.layer.borderWidth = 0.5;
-//    self.xuFeiButton.layer.borderColor = [UIColor colorWithHex:0x568EFC].CGColor;
+//    self.xuFeiButton.layer.borderColor = kMassColor.CGColor;
     [self.xuFeiButton addTouchBlock:^(id control) {
         [weakSelf clickType:HeaderTapTypeRennewal];
     }];

ZhiJi/Classes/Mine/View/ZJSelectEmergencyPersonCell.m

@@ -47,7 +47,7 @@
     [self.addPersonBtn setTitle:kLocalizedString(@"care_add") forState:UIControlStateSelected];
     self.addPersonBtn.titleLabel.font = [UIFont fontWithName:@"PingFangSC-Regular" size:14];
     [self.addPersonBtn setTitleColor:[UIColor colorWithHex:0xAAAAAA] forState:UIControlStateNormal];
-    [self.addPersonBtn setTitleColor:[UIColor colorWithHex:0x558EFC] forState:UIControlStateSelected];
+    [self.addPersonBtn setTitleColor:kMassColor forState:UIControlStateSelected];
     self.addPersonBtn.layer.cornerRadius = KScaleWidth(27)/2;
     self.addPersonBtn.layer.borderWidth = 1;
     

ZhiJi/Classes/Tools/PCH/Category/CALayer+UIColor.h

+//
+//  CALayer+UIColor.h
+//  ChineseMedicineButler
+//
+//  Created by QianEn on 2017/11/14.
+//  Copyright © 2017年 lmj. All rights reserved.
+//
+
+#import <QuartzCore/QuartzCore.h>
+
+@interface CALayer (UIColor)
+
+- (void)setBorderColorFromUIColor:(UIColor *)color;
+
+- (void)setBorderMassColorFromUIColor:(UIColor *)color;
+
+- (void)setCornerRadiusWithHalfHeight:(NSNumber *)number;
+
+- (void)setShadow:(NSNumber *)number;
+
+@end

ZhiJi/Classes/Tools/PCH/Category/CALayer+UIColor.m

+//
+//  CALayer+UIColor.m
+//  ChineseMedicineButler
+//
+//  Created by QianEn on 2017/11/14.
+//  Copyright © 2017年 lmj. All rights reserved.
+//
+
+#import "CALayer+UIColor.h"
+
+@implementation CALayer (UIColor)
+
+- (void)setBorderColorFromUIColor:(UIColor *)color
+{
+    self.borderColor = color.CGColor;
+}
+
+- (void)setBorderMassColorFromUIColor:(UIColor *)color
+{
+    self.borderColor = kMassColor.CGColor;
+}
+
+- (void)setCornerRadiusWithHalfHeight:(NSNumber *)number{
+
+    self.cornerRadius = self.frame.size.height/2;
+}
+
+- (void)setShadow:(NSNumber *)number{
+    
+    self.shadowOffset =  CGSizeMake(3, 3);
+    self.shadowOpacity = 0.5;
+    self.shadowColor =  [UIColor blackColor].CGColor;
+}
+
+@end

ZhiJi/Classes/Tools/Category/UIButton+Category.h → ZhiJi/Classes/Tools/PCH/Category/UI/UIButton+Category.h

@@ -24,3 +24,9 @@
 + (UIImage *)createImageWithColor:(UIColor*)color;
 
 @end
+
+@interface UIButton (storyBoard_xib)
+
+- (void)setMassTitleColor:(UIColor *)color;
+
+@end

ZhiJi/Classes/Tools/Category/UIButton+Category.m → ZhiJi/Classes/Tools/PCH/Category/UI/UIButton+Category.m

@@ -91,7 +91,7 @@
 
 + (UIImage *)createImageWithColor:(UIColor*)color{
     
-    CGRect rect=CGRectMake(0.0f, 0.0f, 1.0f, 1.0f);
+    CGRect rect = CGRectMake(0.0f, 0.0f, 1.0f, 1.0f);
     UIGraphicsBeginImageContext(rect.size);
     CGContextRef context = UIGraphicsGetCurrentContext();
     CGContextSetFillColorWithColor(context, [color CGColor]);
@@ -102,3 +102,14 @@
 }
 
 @end
+
+@implementation UIButton (storyBoard_xib)
+
+- (void)setMassTitleColor:(UIColor *)color{
+    
+    [self setTitleColor:kMassColor forState:(UIControlStateNormal)];
+    [self setTitleColor:kMassColor forState:(UIControlStateSelected)];
+    [self setTitleColor:kMassColor forState:(UIControlStateHighlighted)];
+}
+
+@end

ZhiJi/Classes/Tools/PCH/Category/UI/UILabel+Category.h

+//
+//  UILabel+Category.h
+//  ZhiJi
+//
+//  Created by 明津李 on 2020/7/16.
+//  Copyright © 2020 Company. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UILabel (storyBoard_xib)
+
+- (void)setMassTextColor:(UIColor *)color;
+
+@end
+
+NS_ASSUME_NONNULL_END

ZhiJi/Classes/Tools/PCH/Category/UI/UILabel+Category.m

+//
+//  UILabel+Category.m
+//  ZhiJi
+//
+//  Created by 明津李 on 2020/7/16.
+//  Copyright © 2020 Company. All rights reserved.
+//
+
+#import "UILabel+Category.h"
+
+@implementation UILabel (storyBoard_xib)
+
+- (void)setMassTextColor:(UIColor *)color{
+    self.textColor = kMassColor;
+}
+
+@end

ZhiJi/Classes/Tools/PCH/Category/UIView+Category.h → ZhiJi/Classes/Tools/PCH/Category/UI/UIView+Category.h

@@ -297,4 +297,11 @@ CGRect  CGRectMoveToCenter(CGRect rect, CGPoint center);
 @interface UIView (Animation)
 
 - (void)layerRotation:(void (^)())finish;
+
+@end
+
+@interface UIView (storyBoard_xib)
+
+- (void)setMassBackgroundColor:(UIColor *)color;
+
 @end

ZhiJi/Classes/Tools/PCH/Category/UIView+Category.m → ZhiJi/Classes/Tools/PCH/Category/UI/UIView+Category.m

@@ -812,3 +812,11 @@ CGRect CGRectMoveToCenter(CGRect rect, CGPoint center) {
 }
 
 @end
+
+@implementation UIView (storyBoard_xib)
+
+- (void)setMassBackgroundColor:(UIColor *)color{
+    self.backgroundColor = kMassColor;
+}
+
+@end

ZhiJi/Classes/Tools/PCH/PrefixHeader.pch

@@ -78,7 +78,7 @@ isPhoneX = [[UIApplication sharedApplication] delegate].window.safeAreaInsets.bo
 #define kColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 #define kColorWithRGBA(r, g, b, a) [UIColor colorWithRed:(r) / 255.f green:(g) / 255.f blue:(b) / 255.f alpha:(a)]
 #define kColorWithRGB(r, g, b) kColorWithRGBA(r, g, b, 1.f)
-#define kMassColor kColorWithRGB(86, 142, 252)
+#define kMassColor kColorFromRGB(0x05aa60)
 
 #define kLocalizedString(key) NSLocalizedString(key, @"")