Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4086eb77 由 cgx
选项

更新启动Logo、哄睡、正念球、均衡呼吸法、4-7-8退到后台暂停，回到前台播放

1 个父辈 b03a938d
内嵌 并排
正在显示 10 个修改的文件 包含 68 行增加 和 17 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
......@@ -172,9 +172,6 @@
D0C50B4227FD39C800DC68F0 /* UIViewController+FullScreenModal.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C50B4127FD39C800DC68F0 /* UIViewController+FullScreenModal.m */; };
D0C50B4627FD66FB00DC68F0 /* DSConstUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C50B4527FD66FB00DC68F0 /* DSConstUtil.m */; };
D0C50B4F27FD832300DC68F0 /* LeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C50B4E27FD832300DC68F0 /* LeadView.m */; };
D0CFD3CF27FB3B920002982B /* launcher@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CC27FB3B910002982B /* launcher@2x.png */; };
D0CFD3D027FB3B920002982B /* launcher@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CD27FB3B910002982B /* launcher@3x.png */; };
D0CFD3D127FB3B920002982B /* launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CE27FB3B920002982B /* launcher.png */; };
D0D00199282C9402004EAFA1 /* NoiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D00198282C9402004EAFA1 /* NoiseView.m */; };
D0D3826728124E8A005BB219 /* FeedbackController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D3826628124E8A005BB219 /* FeedbackController.m */; };
D0D4107C2844B8DB00009638 /* DailyTaskController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D4107B2844B8DB00009638 /* DailyTaskController.m */; };
......@@ -201,6 +198,9 @@
D0F808FE280421C20097899F /* UnityGameController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808FD280421C20097899F /* UnityGameController.m */; };
D0F80907280431100097899F /* UILabel+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F80906280431100097899F /* UILabel+Extras.m */; };
D0F82286280C44D10039F586 /* SetTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F82285280C44D10039F586 /* SetTableView.m */; };
D0F82D32285C7F8E0058DDB2 /* logo_start_classic@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0F82D2F285C7F8E0058DDB2 /* logo_start_classic@3x.png */; };
D0F82D33285C7F8E0058DDB2 /* logo_start_classic.png in Resources */ = {isa = PBXBuildFile; fileRef = D0F82D30285C7F8E0058DDB2 /* logo_start_classic.png */; };
D0F82D34285C7F8E0058DDB2 /* logo_start_classic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0F82D31285C7F8E0058DDB2 /* logo_start_classic@2x.png */; };
D0F963CA285C51E100D75CD7 /* UMShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0F963B8285C51E100D75CD7 /* UMShare.framework */; };
D0F963CB285C51E100D75CD7 /* libSocialWeChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0F963BB285C51E100D75CD7 /* libSocialWeChat.a */; };
D0F963CC285C51E100D75CD7 /* libSocialOfficialWeChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0F963BE285C51E100D75CD7 /* libSocialOfficialWeChat.a */; };
......@@ -560,9 +560,6 @@
D0C50B4527FD66FB00DC68F0 /* DSConstUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSConstUtil.m; sourceTree = "<group>"; };
D0C50B4D27FD832300DC68F0 /* LeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LeadView.h; sourceTree = "<group>"; };
D0C50B4E27FD832300DC68F0 /* LeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LeadView.m; sourceTree = "<group>"; };
D0CFD3CC27FB3B910002982B /* launcher@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launcher@2x.png"; sourceTree = "<group>"; };
D0CFD3CD27FB3B910002982B /* launcher@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launcher@3x.png"; sourceTree = "<group>"; };
D0CFD3CE27FB3B920002982B /* launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launcher.png; sourceTree = "<group>"; };
D0D00197282C9402004EAFA1 /* NoiseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NoiseView.h; sourceTree = "<group>"; };
D0D00198282C9402004EAFA1 /* NoiseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NoiseView.m; sourceTree = "<group>"; };
D0D3826528124E8A005BB219 /* FeedbackController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FeedbackController.h; sourceTree = "<group>"; };
......@@ -618,6 +615,9 @@
D0F80906280431100097899F /* UILabel+Extras.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+Extras.m"; sourceTree = "<group>"; };
D0F82284280C44D10039F586 /* SetTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SetTableView.h; sourceTree = "<group>"; };
D0F82285280C44D10039F586 /* SetTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SetTableView.m; sourceTree = "<group>"; };
D0F82D2F285C7F8E0058DDB2 /* logo_start_classic@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo_start_classic@3x.png"; sourceTree = "<group>"; };
D0F82D30285C7F8E0058DDB2 /* logo_start_classic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_start_classic.png; sourceTree = "<group>"; };
D0F82D31285C7F8E0058DDB2 /* logo_start_classic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo_start_classic@2x.png"; sourceTree = "<group>"; };
D0F963B8285C51E100D75CD7 /* UMShare.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UMShare.framework; sourceTree = "<group>"; };
D0F963BB285C51E100D75CD7 /* libSocialWeChat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialWeChat.a; sourceTree = "<group>"; };
D0F963BC285C51E100D75CD7 /* UMSocialWechatHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSocialWechatHandler.h; sourceTree = "<group>"; };
......@@ -872,6 +872,9 @@
D0C09ED328007D9100709D4C /* relax_normal_lottie.json */,
D0B5ECB027F2D9E0003EDFE3 /* Assets.xcassets */,
D07F9DE827F4683B0036372F /* DKColorTable.txt */,
D0F82D30285C7F8E0058DDB2 /* logo_start_classic.png */,
D0F82D31285C7F8E0058DDB2 /* logo_start_classic@2x.png */,
D0F82D2F285C7F8E0058DDB2 /* logo_start_classic@3x.png */,
);
path = Resource;
sourceTree = "<group>";
......@@ -879,14 +882,11 @@
D04567A927F6D038009F0A82 /* Launcher */ = {
isa = PBXGroup;
children = (
D0CFD3CE27FB3B920002982B /* launcher.png */,
D0CFD3CC27FB3B910002982B /* launcher@2x.png */,
D0CFD3CD27FB3B910002982B /* launcher@3x.png */,
D0B5ECB227F2D9E0003EDFE3 /* LaunchScreen.storyboard */,
D0C50B4D27FD832300DC68F0 /* LeadView.h */,
D0C50B4E27FD832300DC68F0 /* LeadView.m */,
D04B3D9727F6D4D90022F8DF /* LeadingController.h */,
D04B3D9827F6D4D90022F8DF /* LeadingController.m */,
D0B5ECB227F2D9E0003EDFE3 /* LaunchScreen.storyboard */,
);
path = Launcher;
sourceTree = "<group>";
......@@ -1871,7 +1871,9 @@
D0C09ED728007D9100709D4C /* relax_normal_lottie.json in Resources */,
D01C9D6E28168BFC00163567 /* WSDatePickerView.xib in Resources */,
D0C09ED828007D9100709D4C /* 478_lottie.json in Resources */,
D0F82D33285C7F8E0058DDB2 /* logo_start_classic.png in Resources */,
D0FAC425281B817D00D4B859 /* GKPhotoBrowser.bundle in Resources */,
D0F82D34285C7F8E0058DDB2 /* logo_start_classic@2x.png in Resources */,
D04B3DB327F6F6070022F8DF /* Home.storyboard in Resources */,
D020CE1F280D951400E7E82F /* invite_friend.webp in Resources */,
D0F963CD285C51E100D75CD7 /* README.txt in Resources */,
......@@ -1881,15 +1883,13 @@
D04B3DBD27F6F8090022F8DF /* Profile.storyboard in Resources */,
D051032F282A4E9200560A0D /* fse.mp3 in Resources */,
D0C09EDA28007D9100709D4C /* relax_lottie.json in Resources */,
D0CFD3D027FB3B920002982B /* launcher@3x.png in Resources */,
D08F79DB281A1838000D99DD /* TZImagePickerController.bundle in Resources */,
D0F82D32285C7F8E0058DDB2 /* logo_start_classic@3x.png in Resources */,
D051032E282A4E9200560A0D /* instant_eternity.mp3 in Resources */,
D0C09ED928007D9100709D4C /* 478normal_lottie.json in Resources */,
D013CD4628585C7800F920B4 /* UMCommonLog.bundle in Resources */,
D0B5ECAF27F2D9DE003EDFE3 /* Main.storyboard in Resources */,
D0CFD3D127FB3B920002982B /* launcher.png in Resources */,
D07DACAA2810557D0067A1BF /* RSKImageCropperStrings.bundle in Resources */,
D0CFD3CF27FB3B920002982B /* launcher@2x.png in Resources */,
D04B3DB527F6F7430022F8DF /* AISleepCoach.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
DreamSleep/DreamSleep/Class/HomeModule/BreathingMethod/BreatheController.m
......@@ -49,6 +49,27 @@
self.zoomLottieFile = self.style == LottieStyleBalance ? @"relax_lottie.json" : @"478_lottie.json";
[self initView];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(didBecomeActive)
name:UIApplicationDidBecomeActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(didEnterBackground)
name:UIApplicationDidEnterBackgroundNotification object:nil];
}
- (void)didBecomeActive {
if (self.audioStreamer.status == DOUAudioStreamerPaused) {
[self.audioStreamer play];
[self.controlTimer setFireDate:[NSDate date]];
}
}
- (void)didEnterBackground {
if (self.audioStreamer.status == DOUAudioStreamerPlaying) {
[self.audioStreamer pause];
[self.controlTimer setFireDate:[NSDate distantFuture]];
}
}
- (void)viewDidDisappear:(BOOL)animated {
......@@ -59,6 +80,8 @@
- (void)dealloc {
[[UIApplication sharedApplication] removeObserver:self forKeyPath:@"idleTimerDisabled"];
[UIApplication sharedApplication].idleTimerDisabled = NO;
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil];
}
#pragma mark - 导航栏夜间模式
......
DreamSleep/DreamSleep/Class/HomeModule/UnityGame/UnityGameController.m
......@@ -20,15 +20,33 @@
self.view.backgroundColor = DSBlack;
[self showUnityView:self.gameType];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(exitCoaxSleep) name:ExitCoaxSleep object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(didBecomeActive)
name:UIApplicationDidBecomeActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(didEnterBackground)
name:UIApplicationDidEnterBackgroundNotification object:nil];
}
- (void)exitCoaxSleep {
[self.navigationController popViewControllerAnimated:YES];
}
- (void)didBecomeActive {
[self.ufw pause:NO];
}
- (void)didEnterBackground {
[self.ufw pause:YES];
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self name:ExitCoaxSleep object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil];
}
#pragma mark - 隐藏导航栏
......@@ -41,10 +59,20 @@
return YES;
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
}
- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
[[UIApplication sharedApplication] setIdleTimerDisabled:NO];
}
#pragma mark - Unity
UnityFramework* UnityFrameworkLoad(void) {
NSString* bundlePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Frameworks/UnityFramework.framework"];
NSBundle* bundle = [NSBundle bundleWithPath:bundlePath];
NSString *bundlePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Frameworks/UnityFramework.framework"];
NSBundle *bundle = [NSBundle bundleWithPath:bundlePath];
if ([bundle isLoaded] == false) { [bundle load]; }
UnityFramework *ufw = [bundle.principalClass getInstance];
......
DreamSleep/DreamSleep/Class/Start/Launcher/Base.lproj/LaunchScreen.storyboard
......@@ -17,7 +17,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launcher.png" translatesAutoresizingMaskIntoConstraints="NO" id="uPj-2O-U8f">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo_start_classic.png" translatesAutoresizingMaskIntoConstraints="NO" id="uPj-2O-U8f">
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
</imageView>
</subviews>
......@@ -39,7 +39,7 @@
</scene>
</scenes>
<resources>
<image name="launcher.png" width="147" height="90"/>
<image name="logo_start_classic.png" width="147" height="89"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!