优化二级导航栏页面导航栏日间和夜间模式

DreamSleep/DreamSleep/Basement/Utils/AdaptationUtil.h

@@ -59,6 +59,8 @@
 #define SubTitleColor ColorFromHex(0x777777)
 #define SubTitleColor ColorFromHex(0x777777)
 /** 品牌色 */
 /** 品牌色 */
 #define BrandColor ColorFromHex(0x62C3D5)
 #define BrandColor ColorFromHex(0x62C3D5)
+/// 二级导航栏夜间模式背景色
+#define SubNaviDarkColor ColorFromHex(0x45A4B5)
 /** 背景色深色 */
 /** 背景色深色 */
 #define DarkColor ColorFromHex(0x161E38)
 #define DarkColor ColorFromHex(0x161E38)
 /** 背景色 */
 /** 背景色 */

DreamSleep/DreamSleep/Class/ProfileModule/SystemSet/SetTableView.m

@@ -226,6 +226,7 @@
             weakSelf.slideView.x = x;
             weakSelf.slideView.x = x;
         }];
         }];
         self.dk_manager.themeVersion = sender.tag == 0 ? DKThemeVersionNormal : DKThemeVersionNight;
         self.dk_manager.themeVersion = sender.tag == 0 ? DKThemeVersionNormal : DKThemeVersionNight;
+        [BaseNaviController setNavigationBarStyle:NaviStyleDefault vc:self.ds_viewController];
         
         
         kSetUserDefaultsBOOL(NO, ThemeAutoSwitch);
         kSetUserDefaultsBOOL(NO, ThemeAutoSwitch);
         kUserDefaultsSynchronize;
         kUserDefaultsSynchronize;

DreamSleep/DreamSleep/Class/Start/Root/BaseNaviController.m

@@ -33,6 +33,10 @@
     // NaviStyleDefault
     // NaviStyleDefault
     UIColor *titleColor = DSWhite;
     UIColor *titleColor = DSWhite;
     UIColor *bgColor = BrandColor;
     UIColor *bgColor = BrandColor;
+    // 二级导航栏需要适配白天和黑夜模式（最后才告诉我有这个需求）
+    if (vc.navigationController.viewControllers.count > 1) {
+        bgColor = [vc.dk_manager.themeVersion isEqualToString:DKThemeVersionNormal] ? BrandColor : SubNaviDarkColor;
+    }
     UIColor *barTintColor = BrandColor;
     UIColor *barTintColor = BrandColor;
     if (style == NaviStyleLight) {
     if (style == NaviStyleLight) {
         titleColor = MainTextColor;
         titleColor = MainTextColor;

DreamSleep/DreamSleep/Class/Start/Root/DSBaseViewController.h

@@ -8,7 +8,10 @@
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
 
 
 NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_BEGIN
-
+/*
+ 课程详情页（音频列表）
+ 放松训练、腹式呼吸法页面
+ */
 @interface DSBaseViewController : UIViewController
 @interface DSBaseViewController : UIViewController
 /// 自定义导航栏
 /// 自定义导航栏
 @property (nonatomic, strong) UIView *dsNaviBar;
 @property (nonatomic, strong) UIView *dsNaviBar;

DreamSleep/DreamSleep/Class/Start/Root/DSBaseViewController.m

@@ -51,7 +51,7 @@
     if (!_dsNaviBar) {
     if (!_dsNaviBar) {
         _dsNaviBar = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kTopHeight(0))];
         _dsNaviBar = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kTopHeight(0))];
         _dsNaviBar.alpha = 0;
         _dsNaviBar.alpha = 0;
-        _dsNaviBar.backgroundColor = BrandColor;
+        _dsNaviBar.dk_backgroundColorPicker = DKColorPickerWithColors(BrandColor, SubNaviDarkColor, DSWhite);
         
         
         [_dsNaviBar addSubview:self.titleLab];
         [_dsNaviBar addSubview:self.titleLab];
         [_dsNaviBar addSubview:self.cusBackBtn];
         [_dsNaviBar addSubview:self.cusBackBtn];

DreamSleep/DreamSleep/Class/Start/Root/DSNaviBarViewController.h

@@ -9,7 +9,12 @@
 
 
 NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_BEGIN
 
 
-/// 自定义导航栏基类
+/*
+ 自定义导航栏基类
+ 
+ 我的积分页面
+ 每日任务页面
+ */
 @interface DSNaviBarViewController : UIViewController
 @interface DSNaviBarViewController : UIViewController
 /// 自定义导航栏
 /// 自定义导航栏
 @property (nonatomic, strong) UIView *dsNaviBar;
 @property (nonatomic, strong) UIView *dsNaviBar;