大鹅开黑的UI

xplan-ios.xcodeproj/project.pbxproj

@@ -45,7 +45,6 @@
 		189DD52E26DE255300AB55B1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD52D26DE255300AB55B1 /* AppDelegate.m */; };
 		189DD53426DE255300AB55B1 /* TabbarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD53326DE255300AB55B1 /* TabbarViewController.m */; };
 		189DD53926DE255600AB55B1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 189DD53826DE255600AB55B1 /* Assets.xcassets */; };
-		189DD53C26DE255600AB55B1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 189DD53A26DE255600AB55B1 /* LaunchScreen.storyboard */; };
 		189DD53F26DE255600AB55B1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD53E26DE255600AB55B1 /* main.m */; };
 		189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD54A26DE338800AB55B1 /* BaseViewController.m */; };
 		189DD55026DE37F900AB55B1 /* MvpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD54F26DE37F900AB55B1 /* MvpViewController.m */; };
@@ -241,6 +240,7 @@
 		E8937ACB276C3EDE00B2C7E1 /* svga_member_in_lv60.svga in Resources */ = {isa = PBXBuildFile; fileRef = E8937AC4276C3EDE00B2C7E1 /* svga_member_in_lv60.svga */; };
 		E8937ACC276C3EDE00B2C7E1 /* svga_member_in_lv80.svga in Resources */ = {isa = PBXBuildFile; fileRef = E8937AC5276C3EDE00B2C7E1 /* svga_member_in_lv80.svga */; };
 		E8937ACD276C3EDE00B2C7E1 /* svga_member_in_lv30.svga in Resources */ = {isa = PBXBuildFile; fileRef = E8937AC6276C3EDE00B2C7E1 /* svga_member_in_lv30.svga */; };
+		E8937ACF276C99C300B2C7E1 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8937ACE276C99C300B2C7E1 /* Launch Screen.storyboard */; };
 		E899C68927508F4E00E189E5 /* XPUserCardInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E899C68827508F4E00E189E5 /* XPUserCardInfoModel.m */; };
 		E899C68C275093B800E189E5 /* XPUserCardMicroItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E899C68B275093B800E189E5 /* XPUserCardMicroItemModel.m */; };
 		E89D60BA271D643A001F8895 /* Api+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60B9271D643A001F8895 /* Api+Room.m */; };
@@ -460,7 +460,6 @@
 		189DD53226DE255300AB55B1 /* TabbarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TabbarViewController.h; sourceTree = "<group>"; };
 		189DD53326DE255300AB55B1 /* TabbarViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TabbarViewController.m; sourceTree = "<group>"; };
 		189DD53826DE255600AB55B1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		189DD53B26DE255600AB55B1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		189DD53D26DE255600AB55B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		189DD53E26DE255600AB55B1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		189DD54926DE338800AB55B1 /* BaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
@@ -825,6 +824,7 @@
 		E8937AC4276C3EDE00B2C7E1 /* svga_member_in_lv60.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = svga_member_in_lv60.svga; sourceTree = "<group>"; };
 		E8937AC5276C3EDE00B2C7E1 /* svga_member_in_lv80.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = svga_member_in_lv80.svga; sourceTree = "<group>"; };
 		E8937AC6276C3EDE00B2C7E1 /* svga_member_in_lv30.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = svga_member_in_lv30.svga; sourceTree = "<group>"; };
+		E8937ACE276C99C300B2C7E1 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		E899C68727508F4E00E189E5 /* XPUserCardInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardInfoModel.h; sourceTree = "<group>"; };
 		E899C68827508F4E00E189E5 /* XPUserCardInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardInfoModel.m; sourceTree = "<group>"; };
 		E899C68A275093B700E189E5 /* XPUserCardMicroItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardMicroItemModel.h; sourceTree = "<group>"; };
@@ -1291,7 +1291,7 @@
 				189DD56126DE45F800AB55B1 /* Main */,
 				E81C27AF26EF39B00031E639 /* AppDelegate */,
 				189DD53826DE255600AB55B1 /* Assets.xcassets */,
-				189DD53A26DE255600AB55B1 /* LaunchScreen.storyboard */,
+				E8937ACE276C99C300B2C7E1 /* Launch Screen.storyboard */,
 				189DD53D26DE255600AB55B1 /* Info.plist */,
 				189DD53E26DE255600AB55B1 /* main.m */,
 			);
@@ -3076,7 +3076,6 @@
 			files = (
 				E8937AC7276C3EDE00B2C7E1 /* svga_member_in_lv40.svga in Resources */,
 				E8A1E461276220DA00B294CA /* candyTree.svga in Resources */,
-				189DD53C26DE255600AB55B1 /* LaunchScreen.storyboard in Resources */,
 				E8937AC9276C3EDE00B2C7E1 /* svga_member_in_lv90.svga in Resources */,
 				E8937ACC276C3EDE00B2C7E1 /* svga_member_in_lv80.svga in Resources */,
 				E8937AC8276C3EDE00B2C7E1 /* svga_member_in_lv70.svga in Resources */,
@@ -3085,6 +3084,7 @@
 				E8937ACA276C3EDE00B2C7E1 /* svga_member_in_lv50.svga in Resources */,
 				E8937ACD276C3EDE00B2C7E1 /* svga_member_in_lv30.svga in Resources */,
 				E8A1E462276220DA00B294CA /* candyTree_light.svga in Resources */,
+				E8937ACF276C99C300B2C7E1 /* Launch Screen.storyboard in Resources */,
 				189DD53926DE255600AB55B1 /* Assets.xcassets in Resources */,
 				E8DEC98C27637EA50078CB70 /* candyTree_transform.svga in Resources */,
 				186A52E726FC559700D67B2C /* yw_1222_0769.jpg in Resources */,
@@ -3476,17 +3476,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		189DD53A26DE255600AB55B1 /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				189DD53B26DE255600AB55B1 /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		189DD54026DE255600AB55B1 /* Debug */ = {
 			isa = XCBuildConfiguration;

xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,62 +1 @@
-{
-  "images" : [
-    {
-      "filename" : "Icon-Spotlight-40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-Small@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-Small@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-Spotlight-40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-60@2x-1.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "APP Store 1024_1024 (2).png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}

xplan-ios/Assets.xcassets/Gift/gift_all_micro_normal.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Gift/gift_all_micro_select.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Home/home_nav_background.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Tabbar/tab_discover_normal.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Tabbar/tab_discover_selected.imageset/Contents.json

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

xplan-ios/Assets.xcassets/app_launch_screen_1.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "app_launch_screen.png",
+      "filename" : "1242-2208.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

xplan-ios/Base/UI/BaseNavigationController.m

@@ -17,6 +17,9 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+	if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+		self.interactivePopGestureRecognizer.delegate = self;
+	}
     [self themeConfig];
 }
 
@@ -24,12 +27,19 @@
     if(self.topViewController == viewController) return;
     if (self.childViewControllers.count > 0) {
         viewController.hidesBottomBarWhenPushed = YES;
+		UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"common_nav_back"] style:UIBarButtonItemStyleDone target:self action:@selector(backClick)];
+		leftBarButtonItem.tintColor = [ThemeColor mainTextColor];
+		viewController.navigationItem.leftBarButtonItem = leftBarButtonItem;
     }
     viewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
     
     [super pushViewController:viewController animated:animated];
 }
 
+- (void)backClick{
+	[self popViewControllerAnimated:YES];
+}
+
 - (void)themeConfig {
     self.navigationBar.shadowImage = [[UIImage alloc] init];
     self.navigationBar.barTintColor = [ThemeColor appBackgroundColor];
@@ -38,19 +48,25 @@
     
     [self.navigationBar setTitleTextAttributes:@{
         NSFontAttributeName:[UIFont systemFontOfSize:18 weight:UIFontWeightMedium],
-        NSForegroundColorAttributeName:UIColor.whiteColor
+        NSForegroundColorAttributeName:[ThemeColor mainTextColor]
     }];
 	
 	/// scrollEdgeAppearance 属性iOS15 强制适用于 所有导航器 如果为nil 则使用 standardAppearance属性中的设置，并修改为使用透明背景  @fengshuo
 	if (@available(iOS 15.0, *)) {
 		UINavigationBarAppearance *appearance = [UINavigationBarAppearance new];
 		appearance.titleTextAttributes = @{NSFontAttributeName:[UIFont systemFontOfSize:18 weight:UIFontWeightMedium],
-										   NSForegroundColorAttributeName:UIColor.whiteColor};
-		appearance.backgroundColor = [ThemeColor appBackgroundColor];
+										   NSForegroundColorAttributeName:[ThemeColor mainTextColor]};
+		appearance.backgroundColor = [ThemeColor appCellBackgroundColor];
 		self.navigationBar.standardAppearance = appearance;
 		self.navigationBar.scrollEdgeAppearance = appearance;
 	}
 }
 
+#pragma mark - UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer {
+	return YES;
+}
+
 
 @end

xplan-ios/Base/UI/BaseViewController.m

@@ -18,6 +18,7 @@
 
 - (void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
+	[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
 	// 根据子类属性重写判断是否隐藏导航栏
 	[self.navigationController setNavigationBarHidden:self.isHiddenNavBar animated:animated];
 	///解决iOS15 导航栏下面有一条黑色的线 @fengshuo
@@ -43,7 +44,7 @@
 
 - (void)themeConfig {
 	self.view.backgroundColor = [ThemeColor appBackgroundColor];
-    [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
+    [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
 }
 
 /**
@@ -139,7 +140,7 @@
 	spaceItem.width= -10;
 	[items addObject:spaceItem];
 	if (titleColor == nil) {
-		titleColor = [UIColor whiteColor];
+		titleColor = [ThemeColor mainTextColor];
 	}
 	NSInteger i = 0;
 	for (NSString * title in titles) {

xplan-ios/Base/UI/ThemeColor.h

@@ -13,40 +13,43 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ThemeColor : NSObject
-/// 主题色 #248CFE
+/// 主题色0xFFBC52
 + (UIColor *)appMainColor;
 
+///强调色 #248CFE
++ (UIColor *)appEmphasizeColor;
+
 /* ------页面相关颜色 START------ */
-/// view的背景色 #1C1B22
+/// view的背景色 0xF4F4FA
 + (UIColor *)appBackgroundColor;
-/// cell的背景色 #2A2A39
+/// cell的背景色 0xFFFFFF
 + (UIColor *)appCellBackgroundColor;
-///正文颜色  #FFFFFF
+///正文颜色  0x333333
 + (UIColor *)mainTextColor;
-/// 二级文字颜色 #C6C6E9
+/// 二级文字颜色 0x666666
 + (UIColor *)secondTextColor;
-///三级文字的颜色 #999999
+///三级文字的颜色 0x999999
 + (UIColor *)textThirdColor;
-///分割线的颜色  #201F27
+///分割线的颜色  0xE8E8E8
 + (UIColor *)dividerColor;
 /* ------页面相关颜色 END------ */
 
 /* ------Button 相关颜色 START------ */
-/// button 可用 渐变色的开始 #218EFF
+/// button 可用 渐变色的开始 0xFFA936
 + (UIColor *)confirmButtonGradientStartColor;
-/// button 可用 渐变色的开始 #7727E4
+/// button 可用 渐变色的开始 0xFFCB47
 + (UIColor *)confirmButtonGradientEndColor;
 /// 确定的按钮文字颜色 #FFFFFF
 + (UIColor *)confirmButtonTextColor;
-/// 取消按钮  渐变色的开始 #BCDDFF
+/// 取消按钮  渐变色的开始 0xF7DDBF
 + (UIColor *)cancelButtonGradientStartColor;
-/// 取消按钮  渐变色的结束 #D6BEF7
+/// 取消按钮  渐变色的结束 0xF7E8C4
 + (UIColor *)cancelButtonGradientEndColor;
-/// 取消的按钮文字颜色 #4C5AF1
+/// 取消的按钮文字颜色 0xFFA936
 + (UIColor *)cancelButtonTextColor;
-/// 按钮不可点击背景色 #303043
+/// 按钮不可点击背景色 0xD2D5D7
 + (UIColor *)disableButtonColor;
-/// 按钮不可点击文字颜色 #4F516A
+/// 按钮不可点击文字颜色 0xF9F9F9
 + (UIColor *)disableButtonTextColor;
 /* ------Button 相关颜色 END------ */
 
@@ -57,8 +60,10 @@ NS_ASSUME_NONNULL_BEGIN
 + (UIColor *)actionSeparatorColor;
 /* ------弹窗相关颜色 END------ */
 
-///tabbar 没有点击的时候颜色#555574
+///tabbar 没有点击的时候颜色 0x333333, 0.4
 + (UIColor *)tabbarNormalColor;
+/// tabbar的View的color 0xFFFFFF
++ (UIColor *)tabbarViewColor;
 
 @end
 

xplan-ios/Base/UI/ThemeColor.m

@@ -8,91 +8,100 @@
 #import "ThemeColor.h"
 
 @implementation ThemeColor
-/// 主题色 #248CFE
+/// 主题色0xFFBC52
 + (UIColor *)appMainColor {
+	return UIColorFromRGB(0xFFBC52);
+}
+
+///强调色 #248CFE
++ (UIColor *)appEmphasizeColor {
 	return UIColorFromRGB(0x248CFE);
 }
 
 /* ------页面相关颜色 START------ */
-/// view的背景色 #1C1B22
+/// view的背景色 0xF4F4FA
 + (UIColor *)appBackgroundColor {
-	return UIColorFromRGB(0x1C1B22);
+	return UIColorFromRGB(0xF4F4FA);
 }
-/// cell的背景色 #2A2A39
+/// cell的背景色 0xFFFFFF
 + (UIColor *)appCellBackgroundColor {
-	return UIColorFromRGB(0x2A2A39);
-}
-///正文颜色  #FFFFFF
-+ (UIColor *)mainTextColor {
 	return UIColorFromRGB(0xFFFFFF);
 }
-/// 二级文字颜色 #C6C6E9
+///正文颜色  0x333333
++ (UIColor *)mainTextColor {
+	return UIColorFromRGB(0x333333);
+}
+/// 二级文字颜色 0x666666
 + (UIColor *)secondTextColor {
-	return UIColorFromRGB(0xC6C6E9);
+	return UIColorFromRGB(0x666666);
 }
-///三级文字的颜色 #4F516A
+///三级文字的颜色 0x999999
 + (UIColor *)textThirdColor {
-	return UIColorFromRGB(0x4F516A);
+	return UIColorFromRGB(0x999999);
 }
-///分割线的颜色  #201F27
+///分割线的颜色  0xE8E8E8
 + (UIColor *)dividerColor {
-	return UIColorFromRGB(0x201F27);
+	return UIColorFromRGB(0xE8E8E8);
 }
 /* ------页面相关颜色 END------ */
 
 /* ------Button 相关颜色 START------ */
-/// button 可用 渐变色的开始 #218EFF
+/// button 可用 渐变色的开始 0xFFA936
 + (UIColor *)confirmButtonGradientStartColor {
-	return UIColorFromRGB(0x218EFF);
+	return UIColorFromRGB(0xFFA936);
 }
-/// button 可用 渐变色的开始 #7727E4
+/// button 可用 渐变色的开始 0xFFCB47
 + (UIColor *)confirmButtonGradientEndColor {
-	return UIColorFromRGB(0x7727E4);
+	return UIColorFromRGB(0xFFCB47);
 }
 /// 确定的按钮文字颜色 #FFFFFF
 + (UIColor *)confirmButtonTextColor {
 	return UIColorFromRGB(0xFFFFFF);
 }
-/// 取消按钮  渐变色的开始 #BCDDFF
+/// 取消按钮  渐变色的开始 0xF7DDBF
 + (UIColor *)cancelButtonGradientStartColor {
-	return UIColorFromRGB(0xBCDDFF);
+	return UIColorFromRGB(0xF7DDBF);
 }
-/// 取消按钮  渐变色的结束 #D6BEF7
+/// 取消按钮  渐变色的结束 0xF7E8C4
 + (UIColor *)cancelButtonGradientEndColor {
-	return UIColorFromRGB(0xD6BEF7);
+	return UIColorFromRGB(0xF7E8C4);
 }
-/// 取消的按钮文字颜色 #4C5AF1
+/// 取消的按钮文字颜色 0xFFA936
 + (UIColor *)cancelButtonTextColor {
-	return UIColorFromRGB(0x4C5AF1);
+	return UIColorFromRGB(0xFFA936);
 }
-/// 按钮不可点击背景色 #303043
+/// 按钮不可点击背景色 0xD2D5D7
 + (UIColor *)disableButtonColor {
-	return UIColorFromRGB(0x303043);
+	return UIColorFromRGB(0xD2D5D7);
 }
-/// 按钮不可点击文字颜色 #4F516A
+/// 按钮不可点击文字颜色 0xF9F9F9
 + (UIColor *)disableButtonTextColor {
-	return UIColorFromRGB(0x4F516A);
+	return UIColorFromRGB(0xF9F9F9);
 }
 /* ------Button 相关颜色 END------ */
 
 /* ------弹窗相关颜色 START------ */
 + (UIColor *)alertBackgroundColor {
-    return UIColorFromRGB(0xFFFFFF);
+	return UIColorFromRGB(0xFFFFFF);
 }
 + (UIColor *)alertTitleColor {
-    return UIColorFromRGB(0x333333);
+	return UIColorFromRGB(0x333333);
 }
 + (UIColor *)alertMessageColor {
-    return UIColorFromRGB(0x333333);
+	return UIColorFromRGB(0x333333);
 }
 + (UIColor *)actionSeparatorColor {
 	return UIColorFromRGB(0xF0F0F0);
 }
 /* ------弹窗相关颜色 END------ */
 
-///tabbar 没有点击的时候颜色#555574
+///tabbar 没有点击的时候颜色 0x333333, 0.4
 + (UIColor *)tabbarNormalColor {
-	return UIColorFromRGB(0x555574);
+	return UIColorRGBAlpha(0x333333, 0.4);
+}
+/// tabbar的View的color 0xFFFFFF
++ (UIColor *)tabbarViewColor {
+	return UIColorFromRGB(0xFFFFFF);
 }
 
 @end

xplan-ios/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>音游</string>
+	<string>大鹅开黑</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -75,13 +75,13 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>“音游”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看</string>
+	<string>“大鹅开黑”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>“音游”需要您的同意,才可以进行语音聊天</string>
+	<string>“大鹅开黑”需要您的同意,才可以进行语音聊天</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>“音游”需要您的同意,才可以存储相片到相册</string>
+	<string>“大鹅开黑”需要您的同意,才可以存储相片到相册</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>“音游”需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看</string>
+	<string>“大鹅开黑”需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看</string>
 	<key>NSUserTrackingUsageDescription</key>
 	<string>请允许我们获取您的IDFA权限，可以为您提供个性化活动和服务。未经您的允许，您的信息将不作其他用途</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
@@ -91,7 +91,7 @@
 		<string>audio</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>Launch Screen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

xplan-ios/Launch Screen.storyboard

@@ -4,8 +4,6 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -13,21 +11,20 @@
         <scene sceneID="EHf-IW-A2E">
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                    <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="app_launch_screen" translatesAutoresizingMaskIntoConstraints="NO" id="QzX-Os-l6Y">
-                                <rect key="frame" x="0.0" y="44" width="414" height="818"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="app_launch_screen_1" translatesAutoresizingMaskIntoConstraints="NO" id="saT-Dw-TKR">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                         </subviews>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="QzX-Os-l6Y" secondAttribute="bottom" id="FKd-3a-J2X"/>
-                            <constraint firstItem="QzX-Os-l6Y" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="I8h-IF-0zU"/>
-                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="QzX-Os-l6Y" secondAttribute="trailing" id="YP4-B2-NED"/>
-                            <constraint firstItem="QzX-Os-l6Y" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="ZFu-kD-Nex"/>
+                            <constraint firstItem="saT-Dw-TKR" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailing" id="Pfd-Eo-1XS"/>
+                            <constraint firstItem="saT-Dw-TKR" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="aJn-KF-Sne"/>
+                            <constraint firstItem="saT-Dw-TKR" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="k0t-31-CQ8"/>
+                            <constraint firstItem="saT-Dw-TKR" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="nlf-uX-FOT"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -37,9 +34,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="app_launch_screen" width="621" height="1104"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
+        <image name="app_launch_screen_1" width="621" height="1104"/>
     </resources>
 </document>

xplan-ios/Main/Home/View/Cell/XPHomeListCollectionViewCell.m

@@ -166,7 +166,7 @@
 	if (!_numberLabel) {
 		_numberLabel = [[UILabel alloc] init];
 		_numberLabel.font = [UIFont systemFontOfSize:10];
-		_numberLabel.textColor = [ThemeColor mainTextColor];
+		_numberLabel.textColor = [UIColor whiteColor];
 	}
 	return _numberLabel;
 }
@@ -174,7 +174,7 @@
 - (XPNoteView *)noteView {
 	if (!_noteView) {
 		_noteView = [[XPNoteView alloc] init];
-		_noteView.pillarColor = [ThemeColor mainTextColor];
+		_noteView.pillarColor = [UIColor whiteColor];
 		_noteView.pillarWidth = 1.5;
 		[_noteView startAnimation];
 	}

xplan-ios/Main/Home/View/Cell/XPSearchListTableViewCell.m

@@ -193,7 +193,7 @@
 		_numberView.backgroundColor = [UIColor clearColor];
 		_numberView.layer.masksToBounds = YES;
 		_numberView.layer.cornerRadius = 18/2;
-		_numberView.layer.borderColor = [ThemeColor appMainColor].CGColor;
+		_numberView.layer.borderColor = [ThemeColor appEmphasizeColor].CGColor;
 		_numberView.layer.borderWidth = 1;
 	}
 	return _numberView;
@@ -213,7 +213,7 @@
 		_numberLabel = [[UILabel alloc] init];
 		_numberLabel.text = @"直播中";
 		_numberLabel.font = [UIFont systemFontOfSize:10];
-		_numberLabel.textColor = [ThemeColor appMainColor];
+		_numberLabel.textColor = [ThemeColor appEmphasizeColor];
 	}
 	return _numberLabel;
 }

xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m

@@ -18,8 +18,6 @@
 @property (nonatomic,strong) UIButton *searchButton;
 ///标题
 @property (nonatomic,strong) UILabel *titleLabel;
-///背景色
-@property (nonatomic,strong) UIImageView *backImageView;
 @end
 
 @implementation XPHomeNavView
@@ -36,16 +34,12 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
-	[self addSubview:self.backImageView];
+	self.backgroundColor = [UIColor clearColor];
 	[self addSubview:self.searchButton];
 	[self addSubview:self.titleLabel];
 }
 
 - (void)initSubViewConstraints {
-	[self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.edges.mas_equalTo(self);
-	}];
-	
 	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.top.mas_equalTo(self).offset(statusbarHeight);
 		make.height.mas_equalTo(44);
@@ -87,15 +81,5 @@
 	}
 	return _titleLabel;
 }
-- (UIImageView *)backImageView {
-	if (!_backImageView) {
-		_backImageView = [[UIImageView alloc] init];
-		_backImageView.userInteractionEnabled = YES;
-		_backImageView.image = [UIImage gradientColorImageFromColors:@[[ThemeColor homeNavGradientStart], [ThemeColor homeNavGradientEnd]] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)];
-		_backImageView.contentMode = UIViewContentModeScaleAspectFill;
-		_backImageView.layer.masksToBounds = YES;
-	}
-	return _backImageView;
-}
 
 @end

xplan-ios/Main/Home/View/SubViews/XPHomeSearchNavView.m

@@ -101,8 +101,8 @@
 - (UIButton *)backButton {
 	if (!_backButton) {
 		_backButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_backButton setImage:[UIImage imageNamed:@"home_search_white_back"] forState:UIControlStateNormal];
-		[_backButton setImage:[UIImage imageNamed:@"home_search_white_back"] forState:UIControlStateSelected];
+		[_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateNormal];
+		[_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateSelected];
 		[_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 		[_backButton setEnlargeEdgeWithTop:10 right:5 bottom:10 left:8];
 	}

xplan-ios/Main/Home/View/XPHomeContainerViewController.m

@@ -25,6 +25,8 @@
 
 
 @interface XPHomeContainerViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeContainerProtocol,XPHomeNavViewDelegate>
+///背景
+@property (nonatomic,strong) UIImageView *backImageView;
 ///导航栏
 @property (nonatomic,strong) XPHomeNavView *navView;
 ///背景图
@@ -59,6 +61,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
+	[self.view addSubview:self.backImageView];
 	[self.view addSubview:self.navView];
 	[self.view addSubview:self.backView];
 	[self.backView addSubview:self.titleView];
@@ -66,6 +69,10 @@
 }
 
 - (void)initSubViewConstraints {
+	[self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.left.top.right.mas_equalTo(self.view);
+		make.height.mas_equalTo(336);
+	}];
 	
 	[self.navView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.right.top.mas_equalTo(self.view);
@@ -134,6 +141,7 @@
 #pragma mark - XPHoneNavViewDelegate
 - (void)xPHomeNavView:(XPHomeNavView *)view didClickSearch:(UIButton *)sender {
 	XPRoomSearchContainerViewController * searchVC = [[XPRoomSearchContainerViewController alloc] init];
+	searchVC.modalPresentationStyle = UIModalPresentationFullScreen;
 	[self.navigationController presentViewController:searchVC animated:YES completion:nil];
 }
 
@@ -180,5 +188,14 @@
 	return _navView;
 }
 
+- (UIImageView *)backImageView {
+	if (!_backImageView) {
+		_backImageView = [[UIImageView alloc] init];
+		_backImageView.userInteractionEnabled = YES;
+		_backImageView.image = [UIImage imageNamed:@"home_nav_background"];
+	}
+	return _backImageView;
+}
+
 
 @end

xplan-ios/Main/Login/View/LoginPasswordViewController.m

@@ -12,6 +12,7 @@
 ///Tool
 #import "UIImage+Utils.h"
 #import "ThemeColor.h"
+#import "XPMacro.h"
 ///Presenter
 #import "LoginPasswordPresent.h"
 #import "LoginPasswordProtocol.h"
@@ -33,10 +34,16 @@
 @property (nonatomic,strong) UIButton *forgetPasswordButton;
 ///下一步
 @property (nonatomic,strong) UIButton *nextButton;
+///返回按钮
+@property (nonatomic,strong) UIButton *backButton;
 @end
 
 @implementation LoginPasswordViewController
 
+- (BOOL)isHiddenNavBar {
+	return YES;
+}
+
 - (LoginPasswordPresent *)createPresenter {
 	return [[LoginPasswordPresent alloc] init];
 }
@@ -54,6 +61,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
+	[self.view addSubview:self.backButton];
 	[self.view addSubview:self.codeLoginButton];
 	[self.view addSubview:self.phoneLable];
 	[self.view addSubview:self.phoneView];
@@ -63,6 +71,12 @@
 }
 
 - (void)initSubViewConstraints {
+	[self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.left.mas_equalTo(self.view).mas_offset(10);
+		make.top.mas_equalTo(statusbarHeight);
+		make.height.width.mas_equalTo(44);
+	}];
+	
 	[self.codeLoginButton mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.right.mas_equalTo(self.view).offset(-15);
 		make.bottom.mas_equalTo(self.phoneLable.mas_top).offset(-30);
@@ -70,7 +84,7 @@
 	
 	[self.phoneLable mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.centerX.mas_equalTo(self.view);
-		make.top.mas_equalTo(self.view).offset(75);
+		make.top.mas_equalTo(self.view).offset(75 + kNavigationHeight);
 	}];
 	
 	[self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -136,6 +150,9 @@
 	[self.navigationController popViewControllerAnimated:YES];
 }
 
+- (void)backButtonClick {
+	[self.navigationController popViewControllerAnimated:YES];
+}
 #pragma mark - Getters And Setters
 - (UIButton *)nextButton {
 	if (!_nextButton) {
@@ -220,5 +237,13 @@
 	return _codeView;
 }
 
+- (UIButton *)backButton {
+	if (!_backButton) {
+		_backButton = [UIButton buttonWithType:UIButtonTypeCustom];
+		[_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateNormal];
+		[_backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
+	}
+	return _backButton;
+}
 
 @end

xplan-ios/Main/Login/View/LoginPhoneViewController.m

@@ -12,6 +12,7 @@
 ///Tool
 #import "UIImage+Utils.h"
 #import "ThemeColor.h"
+#import "XPMacro.h"
 ///View
 #import "LoginInputView.h"
 ///ViewController
@@ -33,10 +34,16 @@
 @property (nonatomic,strong) UIButton *nextButton;
 ///手机号
 @property (nonatomic,copy) NSString *phone;
+///返回按钮
+@property (nonatomic,strong) UIButton *backButton;
 
 @end
 
 @implementation LoginPhoneViewController
+- (BOOL)isHiddenNavBar {
+	return YES;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 	[self initSubViews];
@@ -46,6 +53,7 @@
 }
 #pragma mark - Private Method
 - (void)initSubViews {
+	[self.view addSubview:self.backButton];
 	[self.view addSubview:self.passwordLoginButton];
 	[self.view addSubview:self.titleStackView];
 	[self.view addSubview:self.phoneView];
@@ -56,6 +64,13 @@
 }
 
 - (void)initSubViewConstraints {
+	
+	[self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.left.mas_equalTo(self.view).mas_offset(10);
+		make.top.mas_equalTo(statusbarHeight);
+		make.height.width.mas_equalTo(44);
+	}];
+	
 	[self.passwordLoginButton mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.right.mas_equalTo(self.view).offset(-15);
 		make.bottom.mas_equalTo(self.titleStackView.mas_top).offset(-30);
@@ -63,7 +78,7 @@
 	
 	[self.titleStackView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.centerX.mas_equalTo(self.view);
-		make.top.mas_equalTo(self.view).offset(75);
+		make.top.mas_equalTo(self.view).offset(75 + kNavigationHeight);
 	}];
 	
 	[self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -172,4 +187,13 @@
 	return _nextButton;
 }
 
+- (UIButton *)backButton {
+	if (!_backButton) {
+		_backButton = [UIButton buttonWithType:UIButtonTypeCustom];
+		[_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateNormal];
+		[_backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
+	}
+	return _backButton;
+}
+
 @end

xplan-ios/Main/Login/View/LoginViewController.m

@@ -367,7 +367,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
     CMModel.checkboxWH = 20;
     
     CMModel.privacyColor = [ThemeColor mainTextColor];
-    CMModel.appPrivacyText = @"登录即代表同意《默认》，并授权音游获取本机号码。";
+    CMModel.appPrivacyText = [NSString stringWithFormat:@"登录即代表同意《默认》，并授权%@获取本机号码。", AppName];
     CMModel.privacyState = NO;
     CMModel.privacyFont = [UIFont systemFontOfSize:12];
     CMModel.protocolColor = [ThemeColor appMainColor];
@@ -429,7 +429,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
     if (!_subTitleLabel) {
         _subTitleLabel = [[UILabel alloc] init];
         _subTitleLabel.font = [UIFont systemFontOfSize:13];
-        _subTitleLabel.text =  @"来音游打游戏，争夺更多赏金！";
+        _subTitleLabel.text = @"来大鹅，快乐不止游戏";
         _subTitleLabel.textColor = [ThemeColor secondTextColor];
         _subTitleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -567,7 +567,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
 - (ASAuthorizationAppleIDButton *)appleButton  API_AVAILABLE(ios(13.0)){
 	if (!_appleButton) {
 		if (@available(iOS 13.0, *)) {
-			_appleButton = [[ASAuthorizationAppleIDButton alloc] initWithAuthorizationButtonType:ASAuthorizationAppleIDButtonTypeSignIn authorizationButtonStyle:ASAuthorizationAppleIDButtonStyleBlack];
+			_appleButton = [[ASAuthorizationAppleIDButton alloc] initWithAuthorizationButtonType:ASAuthorizationAppleIDButtonTypeSignIn authorizationButtonStyle:ASAuthorizationAppleIDButtonStyleWhite];
 		} else {
 			// Fallback on earlier versions
 		}

xplan-ios/Main/Mine/Model/Recharge/WalletInfoModel.h

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, assign) NSInteger uid;
 /// 钻石数量
 @property(nonatomic, copy)NSString *goldNum;
-//钻石数量(音游)
+//钻石数量
 @property(nonatomic, copy)NSString *diamonds;
 
 @property(nonatomic, copy)NSString *chargeGoldNum;

xplan-ios/Main/Mine/Presenter/XPMineSettingPresent.m

@@ -71,7 +71,7 @@
 		clearMemoryItem.type = XPMineSettingItemType_Clear_Memory;
 		
 		XPMineSettingItemModel * aboutusItem = [[XPMineSettingItemModel alloc] init];
-		aboutusItem.title = @"关于音游";
+		aboutusItem.title = [NSString stringWithFormat:@"关于%@", AppName];
 		aboutusItem.subTitle = @"";
 		aboutusItem.type = XPMineSettingItemType_About_Us;
 		

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineUserInfoTableViewCell.m

@@ -151,12 +151,12 @@
 		_onlineButton = [UIButton buttonWithType:UIButtonTypeCustom];
 		[_onlineButton setTitle:@"直播中" forState:UIControlStateNormal];
 		[_onlineButton setImage:[UIImage imageNamed:@"home_search_user_online"] forState:UIControlStateNormal];
-		[_onlineButton setTitleColor:[ThemeColor appMainColor] forState:UIControlStateNormal];
+		[_onlineButton setTitleColor:[ThemeColor appEmphasizeColor] forState:UIControlStateNormal];
 		_onlineButton.backgroundColor = [UIColor clearColor];
 		_onlineButton.titleLabel.font = [UIFont systemFontOfSize:10];
 		_onlineButton.layer.masksToBounds = YES;
 		_onlineButton.layer.cornerRadius = 18/2;
-		_onlineButton.layer.borderColor = [ThemeColor appMainColor].CGColor;
+		_onlineButton.layer.borderColor = [ThemeColor appEmphasizeColor].CGColor;
 		_onlineButton.layer.borderWidth = 1;
 		[_onlineButton addTarget:self action:@selector(onlineButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 	}

xplan-ios/Main/Mine/View/Cell/XPMineSettingTableViewCell.h

@@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN
 ///数据源
 @property (nonatomic,strong) XPMineSettingItemModel *itemModel;
 
-- (void)hideDivider;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/View/Cell/XPMineSettingTableViewCell.m

@@ -22,8 +22,6 @@
 @property (nonatomic,strong) UILabel *subTitleLabel;
 ///箭头
 @property (nonatomic,strong) UIImageView *arrowImageView;
-///分割线
-@property (nonatomic,strong) UIView * partLineView;
 @end
 
 @implementation XPMineSettingTableViewCell
@@ -36,16 +34,12 @@
 	return self;
 }
 
-- (void)hideDivider {
-    self.partLineView.hidden = YES;
-}
 
 #pragma mark - Private Method
 - (void)initSubViews {
 	self.contentView.backgroundColor = [ThemeColor appCellBackgroundColor];
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
 	[self.contentView addSubview:self.stackView];
-	[self.contentView addSubview:self.partLineView];
 	
 	[self.stackView addArrangedSubview:self.titleLabel];
 	[self.stackView addArrangedSubview:self.subTitleLabel];
@@ -58,11 +52,6 @@
 		make.top.bottom.mas_equalTo(self.contentView);
 	}];
 	
-	[self.partLineView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.right.mas_equalTo(self.stackView);
-		make.height.mas_equalTo(1);
-		make.bottom.mas_equalTo(self.contentView);
-	}];
 }
 
 #pragma mark - Getters And Setters
@@ -113,12 +102,5 @@
 	return _arrowImageView;
 }
 
-- (UIView *)partLineView {
-	if (!_partLineView) {
-		_partLineView = [[UIView alloc] init];
-		_partLineView.backgroundColor = [ThemeColor dividerColor];
-	}
-	return _partLineView;
-}
 
 @end

xplan-ios/Main/Mine/View/DressUp/View/XPMineDressUpViewController.m

@@ -158,7 +158,7 @@
 		_titleView.listContainer = self.contentView;
 		
 		JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
-		lineView.indicatorColor = UIColor.whiteColor;
+		lineView.indicatorColor = [ThemeColor appMainColor];
 		lineView.indicatorWidth = 8.f;
 		lineView.indicatorHeight = 4.f;
 		lineView.indicatorCornerRadius = 2.f;

xplan-ios/Main/Mine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m

@@ -287,12 +287,12 @@
 		_onlineButton = [UIButton buttonWithType:UIButtonTypeCustom];
 		[_onlineButton setTitle:@"直播中" forState:UIControlStateNormal];
 		[_onlineButton setImage:[UIImage imageNamed:@"home_search_user_online"] forState:UIControlStateNormal];
-		[_onlineButton setTitleColor:[ThemeColor appMainColor] forState:UIControlStateNormal];
+		[_onlineButton setTitleColor:[ThemeColor appEmphasizeColor] forState:UIControlStateNormal];
 		_onlineButton.backgroundColor = [UIColor clearColor];
 		_onlineButton.titleLabel.font = [UIFont systemFontOfSize:10];
 		_onlineButton.layer.masksToBounds = YES;
 		_onlineButton.layer.cornerRadius = 18/2;
-		_onlineButton.layer.borderColor = [ThemeColor appMainColor].CGColor;
+		_onlineButton.layer.borderColor = [ThemeColor appEmphasizeColor].CGColor;
 		_onlineButton.layer.borderWidth = 1;
 		_onlineButton.hidden = YES;
 		[_onlineButton addTarget:self action:@selector(onlineButtonAction:) forControlEvents:UIControlEventTouchUpInside];

xplan-ios/Main/Mine/View/SubViews/Teenager/XPMineTeenagerDesView.m

@@ -60,7 +60,7 @@
 - (UIView *)circleView {
 	if (!_circleView) {
 		_circleView = [[UIView alloc] init];
-		_circleView.backgroundColor = ThemeColor.disableButtonColor;
+		_circleView.backgroundColor = ThemeColor.textThirdColor;
 		_circleView.layer.cornerRadius = 2;
 		_circleView.layer.masksToBounds = YES;
 	}
@@ -71,7 +71,7 @@
 	if (!_titleLabel) {
 		_titleLabel = [[UILabel alloc] init];
 		_titleLabel.font = [UIFont systemFontOfSize:13];
-		_titleLabel.textColor = [ThemeColor disableButtonTextColor];
+		_titleLabel.textColor = [ThemeColor textThirdColor];
 	}
 	return _titleLabel;
 }

xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m

@@ -127,7 +127,7 @@
 - (void)setUserInfo:(UserInfoModel *)userInfo {
 	_userInfo = userInfo;
 	if (_userInfo) {
-		self.idLabel.text = [NSString stringWithFormat:@"音游号:%ld", (long)_userInfo.erbanNo];
+		self.idLabel.text = [NSString stringWithFormat:@"大鹅号:%ld", (long)_userInfo.erbanNo];
 		self.nameLabel.text = _userInfo.nick.length > 0 ? _userInfo.nick : @"";
         self.avatarImageView.imageUrl = userInfo.avatar;
 		NSString * sexName;

xplan-ios/Main/Mine/View/XPMineSettingViewController.m

@@ -189,11 +189,6 @@
 	NSArray * array = [self.datasource objectAtIndex:indexPath.section];
 	XPMineSettingItemModel * model = [array objectAtIndex:indexPath.row];
 	cell.itemModel = model;
-    
-    if (indexPath.row == [[self.datasource objectAtIndex:indexPath.section] count] - 1) {
-        [cell hideDivider];
-    }
-    
 	return cell;
 }
 

xplan-ios/Main/ModuleKit/SendGiftView/ThemeColor+SendGift.h

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (UIColor *)giftPageIndicatorColor;
 /// 分段控制器文字默认的颜色 #0C0B0C
 + (UIColor *)giftSegmentNormalTitleColor;
+/// 分段控制器文字选中的颜色 #FFFFFF
++ (UIColor *)giftSegmentSelectTitleColor;
 /// 礼物选中的时候的颜色 0xFF903E
 + (UIColor *)giftNameSelectColor;
 /// 礼物选中的时候的颜色 0xFF903E 0.65
@@ -32,6 +34,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (UIColor *)giftSelectBgColor;
 ///玩法规则的图片 7A797A
 + (UIColor *)giftPlayRuleColor;
+///个数 FFFFFF
++ (UIColor *)giftCountTitleColor;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/ModuleKit/SendGiftView/ThemeColor+SendGift.m

@@ -26,7 +26,7 @@
 
 ///钱包余额信息 0xffffff 0.5
 + (UIColor *)giftBalanceColor {
-	return UIColorRGBAlpha(0xffffff, 0.5);
+	return UIColorRGBAlpha(0xFFFFFF, 0.5);
 }
 /// 送礼物 分页指示器的颜色
 + (UIColor *)giftPageIndicatorColor {
@@ -34,7 +34,11 @@
 }
 /// 分段控制器文字默认的颜色 #0C0B0C
 + (UIColor *)giftSegmentNormalTitleColor {
-	return UIColorRGBAlpha(0xffffff, 0.3);
+	return UIColorRGBAlpha(0xFFFFFF, 0.3);
+}
+/// 分段控制器文字选中的颜色 #FFFFFF
++ (UIColor *)giftSegmentSelectTitleColor {
+	return UIColorRGBAlpha(0xFFFFFF, 1);
 }
 /// 礼物选中的时候的颜色 0xFF903E
 + (UIColor *)giftNameSelectColor {
@@ -58,4 +62,9 @@
 	return UIColorFromRGB(0x7A797A);
 }
 
+///玩法规则的图片 FFFFFF
++ (UIColor *)giftCountTitleColor {
+	return UIColorFromRGB(0xFFFFFF);
+}
+
 @end

xplan-ios/Main/ModuleKit/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m

@@ -76,7 +76,7 @@
 	if (!_titleLabel) {
 		_titleLabel = [[UILabel alloc] init];
 		_titleLabel.font = [UIFont systemFontOfSize:13];
-		_titleLabel.textColor = [ThemeColor mainTextColor];
+		_titleLabel.textColor = [ThemeColor giftCountTitleColor];
 	}
 	return _titleLabel;
 }
@@ -85,7 +85,7 @@
 	if (!_countLabel) {
 		_countLabel = [[UILabel alloc] init];
 		_countLabel.font = [UIFont systemFontOfSize:14];
-		_countLabel.textColor = [ThemeColor mainTextColor];
+		_countLabel.textColor = [ThemeColor appMainColor];
 		_countLabel.textAlignment = NSTextAlignmentRight;
 	}
 	return _countLabel;