隐私页面、引导页黑夜模式适配

DreamSleep/DreamSleep/Launcher/LeadView.m

@@ -20,6 +20,8 @@
 
 
 - (instancetype)initWithFrame:(CGRect)frame {
 - (instancetype)initWithFrame:(CGRect)frame {
     if (self = [super initWithFrame:frame]) {
     if (self = [super initWithFrame:frame]) {
+        self.dk_backgroundColorPicker = DKColorPickerWithKey(LeadViewBG);
+        
         [self addSubview:self.mainScrollView];
         [self addSubview:self.mainScrollView];
         [self addSubview:self.pageControl];
         [self addSubview:self.pageControl];
         
         
@@ -56,6 +58,7 @@
             UIImageView *bgIV = [[UIImageView alloc] initWithFrame:CGRectMake(i*kScreenWidth, 0, kScreenWidth, height)];
             UIImageView *bgIV = [[UIImageView alloc] initWithFrame:CGRectMake(i*kScreenWidth, 0, kScreenWidth, height)];
             bgIV.image = bgImg;
             bgIV.image = bgImg;
             bgIV.contentMode = UIViewContentModeScaleAspectFill;
             bgIV.contentMode = UIViewContentModeScaleAspectFill;
+            bgIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.f, 0.5f, 0.1f);
             [self.mainScrollView addSubview:bgIV];
             [self.mainScrollView addSubview:bgIV];
             // 引导提示标签
             // 引导提示标签
             [self richLabWithLeftStr:letTitle rightStr:rightTitle bgIV:bgIV];
             [self richLabWithLeftStr:letTitle rightStr:rightTitle bgIV:bgIV];
@@ -68,7 +71,8 @@
     NSString *spaceStr = @"   ";
     NSString *spaceStr = @"   ";
     NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@%@", leftStr, spaceStr, rightStr]];
     NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@%@", leftStr, spaceStr, rightStr]];
     [str addAttribute:NSForegroundColorAttributeName value:BrandColor range:NSMakeRange(0, leftStr.length)];
     [str addAttribute:NSForegroundColorAttributeName value:BrandColor range:NSMakeRange(0, leftStr.length)];
-    [str addAttribute:NSForegroundColorAttributeName value:ColorFromHex(0x666666) range:NSMakeRange(leftStr.length + spaceStr.length, rightStr.length)];
+    UIColor *rightColr = [self.dk_manager.themeVersion isEqualToString:DKThemeVersionNormal] ? ColorFromHex(0x666666) : DSWhite;
+    [str addAttribute:NSForegroundColorAttributeName value:rightColr range:NSMakeRange(leftStr.length + spaceStr.length, rightStr.length)];
     [str addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:22.0] range:NSMakeRange(0, str.length)];
     [str addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:22.0] range:NSMakeRange(0, str.length)];
     
     
     UILabel *attrLabel = [[UILabel alloc] init];
     UILabel *attrLabel = [[UILabel alloc] init];
@@ -115,7 +119,7 @@
         _pageControl = [[UIPageControl alloc] init];
         _pageControl = [[UIPageControl alloc] init];
         _pageControl.numberOfPages = 3;
         _pageControl.numberOfPages = 3;
         _pageControl.currentPage = 0;
         _pageControl.currentPage = 0;
-        _pageControl.pageIndicatorTintColor = ColorFromHex(0xC8C8C8);
+        _pageControl.dk_pageIndicatorTintColorPicker = DKColorPickerWithKey(LeadPageIndicator);
         _pageControl.currentPageIndicatorTintColor = BrandColor;
         _pageControl.currentPageIndicatorTintColor = BrandColor;
         _pageControl.enabled = NO;
         _pageControl.enabled = NO;
     }
     }

DreamSleep/DreamSleep/Launcher/LeadingController.m

@@ -17,7 +17,6 @@
 - (void)viewDidLoad {
 - (void)viewDidLoad {
     [super viewDidLoad];
     [super viewDidLoad];
 
 
-    self.view.backgroundColor = ColorFromHex(0xF0F2F5);
     self.view = self.leadView;
     self.view = self.leadView;
 }
 }
 
 

DreamSleep/DreamSleep/Main/BaseNaviController.m

@@ -58,10 +58,12 @@
         naviBar.scrollEdgeAppearance = appearance;
         naviBar.scrollEdgeAppearance = appearance;
         // 滚动视图滚动后导航栏背景色不会被影响
         // 滚动视图滚动后导航栏背景色不会被影响
         naviBar.standardAppearance = appearance;
         naviBar.standardAppearance = appearance;
+        // view的原点坐标在导航栏下面
+        naviBar.translucent = NO;
     } else {
     } else {
         // 导航栏title颜色
         // 导航栏title颜色
         [naviBar setTitleTextAttributes:titleTextAttributes];
         [naviBar setTitleTextAttributes:titleTextAttributes];
-        // 导航栏背景色
+        // 导航栏背景色 && view的原点坐标在导航栏下面
         naviBar.barTintColor = barTintColor;
         naviBar.barTintColor = barTintColor;
         naviBar.translucent = NO;
         naviBar.translucent = NO;
         // 隐藏分割线
         // 隐藏分割线

DreamSleep/DreamSleep/PrivacyPolicy/PrivacyView.m

@@ -74,7 +74,7 @@
         make.right.equalTo(self.bigView.mas_right).offset(-56);
         make.right.equalTo(self.bigView.mas_right).offset(-56);
         make.bottom.equalTo(self.bigView.mas_bottom).offset(-12);
         make.bottom.equalTo(self.bigView.mas_bottom).offset(-12);
         make.height.equalTo(@21);
         make.height.equalTo(@21);
-        make.width.equalTo(@50);
+        make.width.equalTo(@60);
     }];
     }];
     
     
     self.textView = [UITextView new];
     self.textView = [UITextView new];

DreamSleep/DreamSleep/PrivacyPolicy/PrivacyViewController.m

@@ -43,7 +43,9 @@
         [self showPrivacyView];
         [self showPrivacyView];
     }
     }
     
     
+    if (self.isDetail) {
         self.darkMaskView.hidden = ![self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight];
         self.darkMaskView.hidden = ![self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight];
+    }
 }
 }
 
 
 - (void)dealloc {
 - (void)dealloc {
@@ -56,6 +58,11 @@
     self.navigationController.navigationBarHidden = !self.isDetail;
     self.navigationController.navigationBarHidden = !self.isDetail;
 }
 }
 
 
+#pragma mark - 关闭侧滑
+- (BOOL)enableInteractivePopGestureRecognizer {
+    return NO;
+}
+
 - (void)showPrivacyView {
 - (void)showPrivacyView {
     self.policyView = [[PrivacyView alloc] init];
     self.policyView = [[PrivacyView alloc] init];
     [self.view addSubview:self.policyView];
     [self.view addSubview:self.policyView];

DreamSleep/DreamSleep/Resource/DKColorTable.txt

@@ -9,6 +9,9 @@ NORMAL   NIGHT    RED
 #FFFFFF  #131724  #FAF5F5 TabBarBG
 #FFFFFF  #131724  #FAF5F5 TabBarBG
 #F5F7FA  #161E38  #FAF5F5 VCViewBG
 #F5F7FA  #161E38  #FAF5F5 VCViewBG
 
 
+#F0F2F5  #161E38  #000000 LeadViewBG
+#E5E5E5  #FFFFFF  #000000 LeadPageIndicator
+
 #FFFFFF  #161E38  #FAF5F5 NaviBG
 #FFFFFF  #161E38  #FAF5F5 NaviBG
 #333333  #FFFFFF  #000000 TEXT
 #333333  #FFFFFF  #000000 TEXT
 #AAAAAA  #FFFFFF  #000000 SubTEXT
 #AAAAAA  #FFFFFF  #000000 SubTEXT