BaseNaviController设置

DreamSleep/DreamSleep.xcodeproj/project.pbxproj

@@ -59,6 +59,7 @@
 		D0CFD3D127FB3B920002982B /* launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CE27FB3B920002982B /* launcher.png */; };
 		D0E9408927FE96A900D57495 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E9408727FE96A900D57495 /* libWeChatSDK.a */; settings = {ATTRIBUTES = (Required, ); }; };
 		D0F808F52803D4E70097899F /* Track.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808F32803D4E70097899F /* Track.m */; };
+		D0F808FE280421C20097899F /* ThreeMinuteController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808FD280421C20097899F /* ThreeMinuteController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -164,6 +165,8 @@
 		D0F808ED2803C83A0097899F /* DreamSleepDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DreamSleepDebug.entitlements; sourceTree = "<group>"; };
 		D0F808F32803D4E70097899F /* Track.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Track.m; sourceTree = "<group>"; };
 		D0F808F42803D4E70097899F /* Track.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Track.h; sourceTree = "<group>"; };
+		D0F808FC280421C20097899F /* ThreeMinuteController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThreeMinuteController.h; sourceTree = "<group>"; };
+		D0F808FD280421C20097899F /* ThreeMinuteController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThreeMinuteController.m; sourceTree = "<group>"; };
 		F02C34A5649294F60932630C /* Pods-DreamSleep.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DreamSleep.release.xcconfig"; path = "Target Support Files/Pods-DreamSleep/Pods-DreamSleep.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -282,28 +285,14 @@
 			path = Main;
 			sourceTree = "<group>";
 		};
-		D04567AB27F6D0A5009F0A82 /* Home */ = {
+		D04567AB27F6D0A5009F0A82 /* HomeModule */ = {
 			isa = PBXGroup;
 			children = (
-				D04B3DB227F6F6070022F8DF /* Home.storyboard */,
-				D04B3DC127F6F9390022F8DF /* HomeViewController.h */,
-				D04B3DC227F6F9390022F8DF /* HomeViewController.m */,
-				D01814EC28002DC700583D4E /* HeaderDataModel.h */,
-				D01814ED28002DC700583D4E /* HeaderDataModel.m */,
-				D01814E928002A8200583D4E /* DsMiddleView.h */,
-				D01814EA28002A8200583D4E /* DsMiddleView.m */,
-				D01814E027FFDBB800583D4E /* HomeHeaderView.h */,
-				D01814E127FFDBB800583D4E /* HomeHeaderView.m */,
-				D01814D327FFCCFA00583D4E /* HomeTableView.h */,
-				D01814D427FFCCFA00583D4E /* HomeTableView.m */,
-				D01814DD27FFDB6A00583D4E /* HomeTableViewCell.h */,
-				D01814DE27FFDB6A00583D4E /* HomeTableViewCell.m */,
-				D0C09EDE28007E5F00709D4C /* BreatheController.h */,
-				D0C09EDF28007E5F00709D4C /* BreatheController.m */,
-				D0F808F42803D4E70097899F /* Track.h */,
-				D0F808F32803D4E70097899F /* Track.m */,
+				D0F808F72804204B0097899F /* Home */,
+				D0F808FB280421160097899F /* FallAsleep */,
+				D0F808F628041FB60097899F /* BreathingMethod */,
 			);
-			path = Home;
+			path = HomeModule;
 			sourceTree = "<group>";
 		};
 		D04567AC27F6D0BA009F0A82 /* AISleepCoach */ = {
@@ -362,7 +351,7 @@
 				D0F808ED2803C83A0097899F /* DreamSleepDebug.entitlements */,
 				D0E9408127FE961300D57495 /* Vendors */,
 				D04567AA27F6D067009F0A82 /* Main */,
-				D04567AB27F6D0A5009F0A82 /* Home */,
+				D04567AB27F6D0A5009F0A82 /* HomeModule */,
 				D04567AC27F6D0BA009F0A82 /* AISleepCoach */,
 				D04567AD27F6D0F4009F0A82 /* Profile */,
 				D04567A927F6D038009F0A82 /* Launcher */,
@@ -439,6 +428,70 @@
 			path = WechatOpenSDK_1.9.2_NoPay;
 			sourceTree = "<group>";
 		};
+		D0F808F628041FB60097899F /* BreathingMethod */ = {
+			isa = PBXGroup;
+			children = (
+				D0F808F42803D4E70097899F /* Track.h */,
+				D0F808F32803D4E70097899F /* Track.m */,
+				D0C09EDE28007E5F00709D4C /* BreatheController.h */,
+				D0C09EDF28007E5F00709D4C /* BreatheController.m */,
+			);
+			path = BreathingMethod;
+			sourceTree = "<group>";
+		};
+		D0F808F72804204B0097899F /* Home */ = {
+			isa = PBXGroup;
+			children = (
+				D0F808FA280420DE0097899F /* Model */,
+				D0F808F9280420A30097899F /* View */,
+				D0F808F82804208C0097899F /* Controller */,
+			);
+			path = Home;
+			sourceTree = "<group>";
+		};
+		D0F808F82804208C0097899F /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				D04B3DB227F6F6070022F8DF /* Home.storyboard */,
+				D04B3DC127F6F9390022F8DF /* HomeViewController.h */,
+				D04B3DC227F6F9390022F8DF /* HomeViewController.m */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		D0F808F9280420A30097899F /* View */ = {
+			isa = PBXGroup;
+			children = (
+				D01814D327FFCCFA00583D4E /* HomeTableView.h */,
+				D01814D427FFCCFA00583D4E /* HomeTableView.m */,
+				D01814E027FFDBB800583D4E /* HomeHeaderView.h */,
+				D01814E127FFDBB800583D4E /* HomeHeaderView.m */,
+				D01814E928002A8200583D4E /* DsMiddleView.h */,
+				D01814EA28002A8200583D4E /* DsMiddleView.m */,
+				D01814DD27FFDB6A00583D4E /* HomeTableViewCell.h */,
+				D01814DE27FFDB6A00583D4E /* HomeTableViewCell.m */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		D0F808FA280420DE0097899F /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				D01814EC28002DC700583D4E /* HeaderDataModel.h */,
+				D01814ED28002DC700583D4E /* HeaderDataModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		D0F808FB280421160097899F /* FallAsleep */ = {
+			isa = PBXGroup;
+			children = (
+				D0F808FC280421C20097899F /* ThreeMinuteController.h */,
+				D0F808FD280421C20097899F /* ThreeMinuteController.m */,
+			);
+			path = FallAsleep;
+			sourceTree = "<group>";
+		};
 		E9799C724D3AE78E7105C4CE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -607,6 +660,7 @@
 				D0C50B3C27FD2EFD00DC68F0 /* PrivacyViewController.m in Sources */,
 				D0930F122801124E006B497A /* BaseNaviController.m in Sources */,
 				D0930F1A2801874B006B497A /* UIViewController+Swizzling.m in Sources */,
+				D0F808FE280421C20097899F /* ThreeMinuteController.m in Sources */,
 				D01814E8280020F900583D4E /* CWPageControl.m in Sources */,
 				D027EE3027FB52DA004BBA61 /* UIImage+Extras.m in Sources */,
 				D04B3DC327F6F9390022F8DF /* HomeViewController.m in Sources */,

DreamSleep/DreamSleep/HomeModule/FallAsleep/ThreeMinuteController.h

+//
+//  ThreeMinuteController.h
+//  DreamSleep
+//
+//  Created by peter on 2022/4/11.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// 三分钟即刻入睡VC
+@interface ThreeMinuteController : UIViewController
+@end
+
+NS_ASSUME_NONNULL_END

DreamSleep/DreamSleep/HomeModule/FallAsleep/ThreeMinuteController.m

+//
+//  ThreeMinuteController.m
+//  DreamSleep
+//
+//  Created by peter on 2022/4/11.
+//
+
+#import "ThreeMinuteController.h"
+
+@interface ThreeMinuteController ()
+@end
+
+@implementation ThreeMinuteController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    self.view.backgroundColor = DSWhite;
+    
+    // 加载unity
+}
+
+@end

DreamSleep/DreamSleep/Home/DsMiddleView.m → DreamSleep/DreamSleep/HomeModule/Home/View/DsMiddleView.m

@@ -7,6 +7,7 @@
 
 #import "DsMiddleView.h"
 #import "HeaderDataModel.h"
+#import "ThreeMinuteController.h"
 #import "BreatheController.h"
 #import "WXApi.h"
 
@@ -67,16 +68,15 @@
 }
 
 - (void)btnAction:(UIButton *)sender {
-    DSLog(@"tag:%ld", sender.tag);
-    
-    if (sender.tag != 0) {
+    if (sender.tag == 0) {
+        // 进入三分钟即刻入睡页面
+        ThreeMinuteController *threeVC = [[ThreeMinuteController alloc] init];
+        [self.ds_viewController.navigationController pushViewController:threeVC animated:YES];
+    } else {
         BreatheController *breatheVC = [[BreatheController alloc] init];
         breatheVC.style = sender.tag == 1 ? LottieStyleBalance : LottieStyleComfortable;
         breatheVC.title = sender.tag == 1 ? @"均衡呼吸法" : @"舒睡4-7-8呼吸法";
-        
-        self.ds_viewController.hidesBottomBarWhenPushed = YES;
         [self.ds_viewController.navigationController pushViewController:breatheVC animated:YES];
-        self.ds_viewController.hidesBottomBarWhenPushed = NO;
     }
     
 #pragma mark - 模拟微信登录

DreamSleep/DreamSleep/Main/BaseNaviController.m

@@ -19,6 +19,15 @@
     self.navigationBar.tintColor = DSWhite;
 }
 
+- (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    if (self.childViewControllers.count == 1) {
+        viewController.hidesBottomBarWhenPushed = YES;
+    } else {
+        viewController.hidesBottomBarWhenPushed = NO;
+    }
+    [super pushViewController:viewController animated:animated];
+}
+
 + (void)setNavigationBarStyle:(NaviStyle)style vc:(UIViewController *)vc {
     UINavigationBar *naviBar = vc.navigationController.navigationBar;
     // NaviStyleDefault