隐私、引导页跳转逻辑

DreamSleep/DreamSleep/Launcher/LeadingController.m

@@ -35,10 +35,14 @@
 
 
 #pragma mark - LeadViewDelegate
 #pragma mark - LeadViewDelegate
 - (void)startExplore {
 - (void)startExplore {
+    // 本地存储首次引导标识
+    kSetUserDefaultsBOOL(YES, IsFirstGuide);
+    kUserDefaultsSynchronize;
+    
     // 切换到主tabvc
     // 切换到主tabvc
     UIStoryboard * mainStoryBoard =[UIStoryboard storyboardWithName:@"Main" bundle:nil];
     UIStoryboard * mainStoryBoard =[UIStoryboard storyboardWithName:@"Main" bundle:nil];
     [UIView transitionWithView:DSKeyWindow
     [UIView transitionWithView:DSKeyWindow
-                      duration:0.5
+                      duration:0.3
                        options:UIViewAnimationOptionTransitionFlipFromLeft
                        options:UIViewAnimationOptionTransitionFlipFromLeft
                     animations:^{
                     animations:^{
         DSKeyWindow.rootViewController = [mainStoryBoard instantiateViewControllerWithIdentifier:@"mainSB"];
         DSKeyWindow.rootViewController = [mainStoryBoard instantiateViewControllerWithIdentifier:@"mainSB"];

DreamSleep/DreamSleep/Main/AppDelegate.m

@@ -6,11 +6,10 @@
 //
 //
 
 
 #import "AppDelegate.h"
 #import "AppDelegate.h"
-#import "PrivacyView.h"
 #import "PrivacyViewController.h"
 #import "PrivacyViewController.h"
+#import "LeadingController.h"
 #import "DSTabBarController.h"
 #import "DSTabBarController.h"
 #import "WXApi.h"
 #import "WXApi.h"
-#import "BaseNaviController.h"
 
 
 @interface AppDelegate () <WXApiDelegate>
 @interface AppDelegate () <WXApiDelegate>
 @end
 @end
@@ -21,11 +20,24 @@
     self.window = [UIWindow.alloc initWithFrame:UIScreen.mainScreen.bounds];
     self.window = [UIWindow.alloc initWithFrame:UIScreen.mainScreen.bounds];
     self.window.backgroundColor = DSWhite;
     self.window.backgroundColor = DSWhite;
     [self.window makeKeyAndVisible];
     [self.window makeKeyAndVisible];
-    UIStoryboard * mainStoryBoard =[UIStoryboard storyboardWithName:@"Main" bundle:nil];
-//    self.window.rootViewController = [mainStoryBoard instantiateViewControllerWithIdentifier:@"mainSB"];
     
     
-        BaseNaviController *navi = [[BaseNaviController alloc] initWithRootViewController:[[PrivacyViewController alloc] init]];
-        self.window.rootViewController = navi;
+    BOOL firstShowPrivacy = kGetUserDefaultsBOOL(FirstShowPrivacy);
+    BOOL firstGuide = kGetUserDefaultsBOOL(IsFirstGuide);
+    if (firstShowPrivacy && firstGuide) {
+        UIStoryboard * mainStoryBoard =[UIStoryboard storyboardWithName:@"Main" bundle:nil];
+        self.window.rootViewController = [mainStoryBoard instantiateViewControllerWithIdentifier:@"mainSB"];
+    } else {
+        if (!firstShowPrivacy) {
+            // 切换到隐私页
+            BaseNaviController *navi = [[BaseNaviController alloc] initWithRootViewController:[[PrivacyViewController alloc] init]];
+            self.window.rootViewController = navi;
+        } else {
+            if (!firstGuide) {
+                // 切换到引导页
+                self.window.rootViewController = [[LeadingController alloc] init];
+            }
+        }
+    }
     
     
     [self initWeChat];
     [self initWeChat];
     
     

DreamSleep/DreamSleep/PrivacyPolicy/PrivacyView.m

@@ -110,8 +110,9 @@
 }
 }
 
 
 - (void)confirmBtnClick:(UIButton *)sender {
 - (void)confirmBtnClick:(UIButton *)sender {
-    DSLog(@"%s", __func__);
     // 本地存储隐私政策标识
     // 本地存储隐私政策标识
+    kSetUserDefaultsBOOL(YES, FirstShowPrivacy);
+    kUserDefaultsSynchronize;
     
     
     // 切换到引导页
     // 切换到引导页
     DSKeyWindow.rootViewController = [[LeadingController alloc] init];
     DSKeyWindow.rootViewController = [[LeadingController alloc] init];

DreamSleep/DreamSleep/Utils/DSConstUtil.h

@@ -13,6 +13,10 @@ NS_ASSUME_NONNULL_BEGIN
 FOUNDATION_EXTERN NSString * const UserServiceAgreement;
 FOUNDATION_EXTERN NSString * const UserServiceAgreement;
 FOUNDATION_EXTERN NSString * const PrivacyPolicy;
 FOUNDATION_EXTERN NSString * const PrivacyPolicy;
 FOUNDATION_EXTERN NSString * const PrivacyStatement;
 FOUNDATION_EXTERN NSString * const PrivacyStatement;
+FOUNDATION_EXTERN NSString * const FirstShowPrivacy;
+
+// 引导页
+FOUNDATION_EXTERN NSString * const IsFirstGuide;
 
 
 #pragma mark - 第三方平台配置
 #pragma mark - 第三方平台配置
 /** 微信开放平台AppID */
 /** 微信开放平台AppID */

DreamSleep/DreamSleep/Utils/DSConstUtil.m

@@ -10,6 +10,9 @@
 NSString * const UserServiceAgreement = @"https://www.cbti.cn/sleep/user/agreement";
 NSString * const UserServiceAgreement = @"https://www.cbti.cn/sleep/user/agreement";
 NSString * const PrivacyPolicy = @"https://www.cbti.cn/sleep/user/privacy";
 NSString * const PrivacyPolicy = @"https://www.cbti.cn/sleep/user/privacy";
 NSString * const PrivacyStatement = @"欢迎来到小梦睡眠，我们依据最新的监管要求更新了用户服务协议和隐私政策，请您知悉：\n 1.为提供相关基本功能及服务，我们会在您同意的前提下收集和使用必要的信息。\n2.使用本产品的过程中会请求相关权限，您可以选择是否授权该权限，也可以在隐私政策中了解详情。\n3.为确保相关功能服务的正常运行，您需要授权小梦睡眠APP获取设备Mac地址，您有权不同意该授权。\n4.未经您许可，小梦睡眠APP不会从第三方获取、提供或共享您的信息。\n可以点击阅读小梦睡眠APP用户服务协议和隐私政策的全部内容，感谢您的支持，欢迎问题反馈。";
 NSString * const PrivacyStatement = @"欢迎来到小梦睡眠，我们依据最新的监管要求更新了用户服务协议和隐私政策，请您知悉：\n 1.为提供相关基本功能及服务，我们会在您同意的前提下收集和使用必要的信息。\n2.使用本产品的过程中会请求相关权限，您可以选择是否授权该权限，也可以在隐私政策中了解详情。\n3.为确保相关功能服务的正常运行，您需要授权小梦睡眠APP获取设备Mac地址，您有权不同意该授权。\n4.未经您许可，小梦睡眠APP不会从第三方获取、提供或共享您的信息。\n可以点击阅读小梦睡眠APP用户服务协议和隐私政策的全部内容，感谢您的支持，欢迎问题反馈。";
+NSString * const FirstShowPrivacy = @"FirstShowPrivacy";
+
+NSString * const IsFirstGuide = @"isFirstGuide";
 
 
 NSString * const WeChatAppID = @"wx4cdd4760092cdfdf";
 NSString * const WeChatAppID = @"wx4cdd4760092cdfdf";
 NSString * const WeChatAppSecret = @"";
 NSString * const WeChatAppSecret = @"";

DreamSleep/DreamSleep/Utils/MacroFuncUtil.h

@@ -28,6 +28,21 @@
 #define DSLog(format, ...)
 #define DSLog(format, ...)
 #endif
 #endif
 
 
+#pragma mark - UserDefaults
+// BOOL
+#define kSetUserDefaultsBOOL(boolValue, key) [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:key]
+#define kGetUserDefaultsBOOL(key) [[NSUserDefaults standardUserDefaults] boolForKey:key]
+// Double
+#define kSetUserDefaultsDouble(doubleValue, key) [[NSUserDefaults standardUserDefaults] setDouble:doubleValue forKey:key]
+#define kGetUserDefaultsDouble(key) [[NSUserDefaults standardUserDefaults] doubleForKey:key]
+// Integer
+#define kSetUserDefaultsInteger(integerValue, key) [[NSUserDefaults standardUserDefaults] setInteger:integerValue forKey:key]
+#define kGetUserDefaultsInteger(key) [[NSUserDefaults standardUserDefaults] integerForKey:key]
+// Synchronize
+#define kUserDefaultsSynchronize [[NSUserDefaults standardUserDefaults] synchronize]
+// Remove
+#define kUserDefaultsRemoveObj(key) [[NSUserDefaults standardUserDefaults] removeObjectForKey:key]
+
 NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_BEGIN
 @interface MacroFuncUtil : NSObject
 @interface MacroFuncUtil : NSObject
 @end
 @end

DreamSleep/DreamSleep/Utils/PrefixHeader.pch

@@ -25,6 +25,7 @@
 #import "NSString+Extras.h"
 #import "NSString+Extras.h"
 
 
 #import "NaviBarHandlerProtocol.h"
 #import "NaviBarHandlerProtocol.h"
+#import "BaseNaviController.h"
 
 
 #import "DSProgressHUD.h"
 #import "DSProgressHUD.h"