Skip to content

陈高翔 / DreamSleep-iOS

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

每日任务、我的积分页面添加授权登录

1 个父辈 1fd29804
内嵌 并排
正在显示 5 个修改的文件 包含 57 行增加 和 3 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
D0CFD3D127FB3B920002982B /* launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CE27FB3B920002982B /* launcher.png */; }; D0CFD3D127FB3B920002982B /* launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CE27FB3B920002982B /* launcher.png */; };
D0D00199282C9402004EAFA1 /* NoiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D00198282C9402004EAFA1 /* NoiseView.m */; }; D0D00199282C9402004EAFA1 /* NoiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D00198282C9402004EAFA1 /* NoiseView.m */; };
D0D3826728124E8A005BB219 /* FeedbackController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D3826628124E8A005BB219 /* FeedbackController.m */; }; D0D3826728124E8A005BB219 /* FeedbackController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D3826628124E8A005BB219 /* FeedbackController.m */; };
D0D4107C2844B8DB00009638 /* DailyTaskController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D4107B2844B8DB00009638 /* DailyTaskController.m */; };
D0D69ED3282360F100A0D5EB /* LookAllController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D69ED2282360F100A0D5EB /* LookAllController.m */; }; D0D69ED3282360F100A0D5EB /* LookAllController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D69ED2282360F100A0D5EB /* LookAllController.m */; };
D0D69ED628236E0800A0D5EB /* SafeSleepListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D69ED528236E0800A0D5EB /* SafeSleepListController.m */; }; D0D69ED628236E0800A0D5EB /* SafeSleepListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D69ED528236E0800A0D5EB /* SafeSleepListController.m */; };
D0DB33A528204E7C00E15914 /* FirstLeadAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DB33A428204E7C00E15914 /* FirstLeadAlertView.m */; }; D0DB33A528204E7C00E15914 /* FirstLeadAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DB33A428204E7C00E15914 /* FirstLeadAlertView.m */; };
...@@ -530,6 +531,8 @@ ...@@ -530,6 +531,8 @@
D0D00198282C9402004EAFA1 /* NoiseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NoiseView.m; 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>"; }; D0D3826528124E8A005BB219 /* FeedbackController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FeedbackController.h; sourceTree = "<group>"; };
D0D3826628124E8A005BB219 /* FeedbackController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FeedbackController.m; sourceTree = "<group>"; }; D0D3826628124E8A005BB219 /* FeedbackController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FeedbackController.m; sourceTree = "<group>"; };
D0D4107A2844B8DB00009638 /* DailyTaskController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DailyTaskController.h; sourceTree = "<group>"; };
D0D4107B2844B8DB00009638 /* DailyTaskController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DailyTaskController.m; sourceTree = "<group>"; };
D0D69ED1282360F100A0D5EB /* LookAllController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LookAllController.h; sourceTree = "<group>"; }; D0D69ED1282360F100A0D5EB /* LookAllController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LookAllController.h; sourceTree = "<group>"; };
D0D69ED2282360F100A0D5EB /* LookAllController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LookAllController.m; sourceTree = "<group>"; }; D0D69ED2282360F100A0D5EB /* LookAllController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LookAllController.m; sourceTree = "<group>"; };
D0D69ED428236E0800A0D5EB /* SafeSleepListController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeSleepListController.h; sourceTree = "<group>"; }; D0D69ED428236E0800A0D5EB /* SafeSleepListController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeSleepListController.h; sourceTree = "<group>"; };
...@@ -999,6 +1002,8 @@ ...@@ -999,6 +1002,8 @@
D091E66D283F29D100D3279E /* ScoreDetailController.m */, D091E66D283F29D100D3279E /* ScoreDetailController.m */,
D091E66F283F2E6F00D3279E /* ScoreDetailListController.h */, D091E66F283F2E6F00D3279E /* ScoreDetailListController.h */,
D091E670283F2E6F00D3279E /* ScoreDetailListController.m */, D091E670283F2E6F00D3279E /* ScoreDetailListController.m */,
D0D4107A2844B8DB00009638 /* DailyTaskController.h */,
D0D4107B2844B8DB00009638 /* DailyTaskController.m */,
); );
path = ScoreTaskAI; path = ScoreTaskAI;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1742,6 +1747,7 @@ ...@@ -1742,6 +1747,7 @@
D08F79E2281A1838000D99DD /* TZGifPhotoPreviewController.m in Sources */, D08F79E2281A1838000D99DD /* TZGifPhotoPreviewController.m in Sources */,
D0496798283484CC00FB81E5 /* ProfileTableView.m in Sources */, D0496798283484CC00FB81E5 /* ProfileTableView.m in Sources */,
D0E660022807B5AE006562F2 /* SafeSleepRequestModel.m in Sources */, D0E660022807B5AE006562F2 /* SafeSleepRequestModel.m in Sources */,
D0D4107C2844B8DB00009638 /* DailyTaskController.m in Sources */,
D0E6600828080F97006562F2 /* SystemSetController.m in Sources */, D0E6600828080F97006562F2 /* SystemSetController.m in Sources */,
D091BBB72808F9DA00487A50 /* BreathTextView.m in Sources */, D091BBB72808F9DA00487A50 /* BreathTextView.m in Sources */,
D08F79E1281A1838000D99DD /* TZLocationManager.m in Sources */, D08F79E1281A1838000D99DD /* TZLocationManager.m in Sources */,
......
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#import "WhiteNoiseRequestModel.h" #import "WhiteNoiseRequestModel.h"
#import "NoisePlayBar.h" #import "NoisePlayBar.h"
#import "NoisePlayerManager.h" #import "NoisePlayerManager.h"
#import "DailyTaskController.h"
@interface HomeViewController () @interface HomeViewController ()
@property (nonatomic, strong) DSHomeView *homeTV; @property (nonatomic, strong) DSHomeView *homeTV;
...@@ -222,7 +223,11 @@ ...@@ -222,7 +223,11 @@
} }
- (void)jumpToDailyTaskPage { - (void)jumpToDailyTaskPage {
if ([LoginUtils getUserLoginData]) {
[self.navigationController pushViewController:[DailyTaskController new] animated:YES];
} else {
[LoginUtils jumpToLoginControllerWithTarget:self];
}
} }
#pragma mark - 导航栏日间、黑夜模式 #pragma mark - 导航栏日间、黑夜模式
......
DreamSleep/DreamSleep/Class/ProfileModule/Me/ProfileController.m
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#import "InviteController.h" #import "InviteController.h"
#import "ProfileAlertView.h" #import "ProfileAlertView.h"
#import "ProfileTableView.h" #import "ProfileTableView.h"
#import "DailyTaskController.h"
#import "MyPointController.h" #import "MyPointController.h"
@interface ProfileController () <ProfileTableViewDelegate> @interface ProfileController () <ProfileTableViewDelegate>
...@@ -96,12 +97,12 @@ ...@@ -96,12 +97,12 @@
switch (index) { switch (index) {
case 1: // 每日任务 case 1: // 每日任务
{ {
[self jumpViewController:@"DailyTaskController"];
} }
break; break;
case 2: // 我的积分 case 2: // 我的积分
{ {
[self.navigationController pushViewController:[MyPointController new] animated:YES]; [self jumpViewController:@"MyPointController"];
} }
break; break;
case 3: // 开通AI case 3: // 开通AI
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskController.h 0 → 100644
//
// DailyTaskController.h
// DreamSleep
//
// Created by peter on 2022/5/30.
//
#import "DSNaviBarViewController.h"
NS_ASSUME_NONNULL_BEGIN
/// 每日任务页面
@interface DailyTaskController : DSNaviBarViewController
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskController.m 0 → 100644
//
// DailyTaskController.m
// DreamSleep
//
// Created by peter on 2022/5/30.
//
#import "DailyTaskController.h"
@interface DailyTaskController ()
@end
@implementation DailyTaskController
- (void)viewDidLoad {
[super viewDidLoad];
self.view.backgroundColor = DSWhite;
self.naviBgColor = DSClearColor;
self.naviBarAlpha = 1.0;
[self.dsNaviBar addSubview:self.backBtn];
}
@end
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!