Skip to content

陈高翔 / DreamSleep-iOS

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

新增个性化推荐说明

1 个父辈 b6716fc8
内嵌 并排
正在显示 9 个修改的文件 包含 166 行增加 和 35 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
......@@ -45,6 +45,7 @@
D027EE3027FB52DA004BBA61 /* UIImage+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = D027EE2F27FB52DA004BBA61 /* UIImage+Extras.m */; };
D030C1B8284775930014946F /* RelaxTrainController.m in Sources */ = {isa = PBXBuildFile; fileRef = D030C1B7284775930014946F /* RelaxTrainController.m */; };
D0336163285035AB005573CF /* DailyBgView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0336162285035AB005573CF /* DailyBgView.m */; };
D037B11228752A7E00236753 /* IndividualController.m in Sources */ = {isa = PBXBuildFile; fileRef = D037B11128752A7E00236753 /* IndividualController.m */; };
D037C497284F4A22000F3089 /* SignTaskView.m in Sources */ = {isa = PBXBuildFile; fileRef = D037C496284F4A22000F3089 /* SignTaskView.m */; };
D037C49A284F4F0D000F3089 /* DailyTaskCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D037C499284F4F0D000F3089 /* DailyTaskCell.m */; };
D037C49D284F5DE8000F3089 /* TaskPointSrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D037C49C284F5DE8000F3089 /* TaskPointSrollView.m */; };
......@@ -324,6 +325,8 @@
D030C1B7284775930014946F /* RelaxTrainController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RelaxTrainController.m; sourceTree = "<group>"; };
D0336161285035AB005573CF /* DailyBgView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DailyBgView.h; sourceTree = "<group>"; };
D0336162285035AB005573CF /* DailyBgView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DailyBgView.m; sourceTree = "<group>"; };
D037B11028752A7E00236753 /* IndividualController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IndividualController.h; sourceTree = "<group>"; };
D037B11128752A7E00236753 /* IndividualController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IndividualController.m; sourceTree = "<group>"; };
D037C495284F4A22000F3089 /* SignTaskView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SignTaskView.h; sourceTree = "<group>"; };
D037C496284F4A22000F3089 /* SignTaskView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SignTaskView.m; sourceTree = "<group>"; };
D037C498284F4F0D000F3089 /* DailyTaskCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DailyTaskCell.h; sourceTree = "<group>"; };
......@@ -1268,6 +1271,8 @@
D0F82285280C44D10039F586 /* SetTableView.m */,
D0E6600628080F97006562F2 /* SystemSetController.h */,
D0E6600728080F97006562F2 /* SystemSetController.m */,
D037B11028752A7E00236753 /* IndividualController.h */,
D037B11128752A7E00236753 /* IndividualController.m */,
);
path = SystemSet;
sourceTree = "<group>";
......@@ -2150,6 +2155,7 @@
D08F79D8281A1838000D99DD /* NSBundle+TZImagePicker.m in Sources */,
D08F79E6281A198E000D99DD /* FeedImageCollectionCell.m in Sources */,
D07DACA52810557D0067A1BF /* RSKInternalUtility.m in Sources */,
D037B11228752A7E00236753 /* IndividualController.m in Sources */,
D08F79E0281A1838000D99DD /* TZImagePickerController.m in Sources */,
D091E671283F2E6F00D3279E /* ScoreDetailListController.m in Sources */,
D07DACAB2810557D0067A1BF /* RSKImageScrollView.m in Sources */,
......
DreamSleep/DreamSleep.xcworkspace/xcuserdata/peter.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -16,21 +16,5 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D4B34AD0-00D5-4360-96E2-AEA2CAD80A2E"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DreamSleep/Class/Start/Root/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "138"
endingLineNumber = "138"
landmarkName = "-application:continueUserActivity:restorationHandler:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
DreamSleep/DreamSleep/Class/ProfileModule/SystemSet/IndividualController.h 0 → 100644
//
// IndividualController.h
// DreamSleep
//
// Created by peter on 2022/7/6.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface IndividualController : UIViewController
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/ProfileModule/SystemSet/IndividualController.m 0 → 100644
//
// IndividualController.m
// DreamSleep
//
// Created by peter on 2022/7/6.
//
#import "IndividualController.h"
@interface IndividualController ()
@property (nonatomic, strong) UIView *recDot;
@property (nonatomic, strong) UILabel *recTitleLab;
@property (nonatomic, strong) UILabel *recDetailLab;
@property (nonatomic, strong) UIView *personalDot;
@property (nonatomic, strong) UILabel *personalLab;
@property (nonatomic, strong) UILabel *personalDetailLab;
@end
@implementation IndividualController
- (void)viewDidLoad {
[super viewDidLoad];
self.navigationItem.title = @"个性化推荐说明";
self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
[self.view addSubview:self.recDot];
[self.view addSubview:self.recTitleLab];
[self.view addSubview:self.recDetailLab];
[self.view addSubview:self.personalDot];
[self.view addSubview:self.personalLab];
[self.view addSubview:self.personalDetailLab];
[self.recDot mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.view).offset(30);
make.top.equalTo(self.view).offset(49);
make.width.height.equalTo(@4);
}];
[self.recTitleLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.recDot);
make.left.equalTo(self.recDot).offset(9);
}];
[self.recDetailLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.recTitleLab.mas_bottom).offset(16);
make.left.equalTo(self.view).offset(42);
make.right.equalTo(self.view).offset(-15);
}];
[self.personalDot mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.recDot);
make.top.equalTo(self.recDetailLab.mas_bottom).offset(41);
make.size.equalTo(self.recDot);
}];
[self.personalLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.personalDot);
make.left.equalTo(self.personalDot).offset(9);
}];
[self.personalDetailLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.personalLab.mas_bottom).offset(16);
make.left.right.equalTo(self.recDetailLab);
}];
}
#pragma mark - 品牌模式
- (NaviStyle)navigationBarStyle {
return NaviStyleDefault;
}
#pragma mark - lazy
- (UIView *)recDot {
if (!_recDot) {
_recDot = [UIView new];
_recDot.backgroundColor = BrandColor;
[_recDot cornerRadius:2.0];
}
return _recDot;
}
- (UIView *)personalDot {
if (!_personalDot) {
_personalDot = [UIView new];
_personalDot.backgroundColor = BrandColor;
[_personalDot cornerRadius:2.0];
}
return _personalDot;
}
- (UILabel *)recTitleLab {
if (!_recTitleLab) {
_recTitleLab = [UILabel dkLabWithText:@"推荐" font:BoldFont(16.0)];
}
return _recTitleLab;
}
- (UILabel *)personalLab {
if (!_personalLab) {
_personalLab = [UILabel dkLabWithText:@"个性化" font:BoldFont(16.0)];
}
return _personalLab;
}
- (UILabel *)recDetailLab {
if (!_recDetailLab) {
_recDetailLab = [UILabel labWithText:@"APP内会不定期推出有效助眠的新功能，体验此功能不会收集您的个人信息，更不会涉及其他广告推荐等内容。" font:SysFont(14.0) fit:YES];
_recDetailLab.numberOfLines = 0;
_recDetailLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, DarkTextColor, DSWhite);
}
return _recDetailLab;
}
- (UILabel *)personalDetailLab {
if (!_personalDetailLab) {
_personalDetailLab = [UILabel labWithText:@"个性化睡眠、推荐睡眠时间均为APP改善失眠计划给出的睡眠时间及睡前练习建议，与广告推送无关。" font:SysFont(14.0) fit:YES];
_personalDetailLab.numberOfLines = 0;
_personalDetailLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, DarkTextColor, DSWhite);
}
return _personalDetailLab;
}
@end
DreamSleep/DreamSleep/Class/ProfileModule/SystemSet/SetTableView.m
......@@ -17,10 +17,10 @@
@implementation SetModel
+ (NSArray *)getAllSetDatas {
NSArray *titles = @[@"当前小梦睡眠版本", @"用户协议", @"隐私政策", @"清除缓存"];
NSArray *titles = @[@"当前小梦睡眠版本", @"用户协议", @"隐私政策", @"清除缓存", @"个性化推荐说明"];
NSString *version = [NSString stringWithFormat:@"V %@", DSAppVersion];
NSString *cacheSize = [DsCacheUtils getCacheSize];
NSArray *details = @[version, @"", @"", cacheSize];
NSArray *details = @[version, @"", @"", cacheSize, @""];
NSMutableArray *tmpArr = [NSMutableArray array];
for (int i = 0; i < titles.count; i++) {
SetModel *m = [SetModel new];
......@@ -96,7 +96,7 @@
@implementation SetTableView
- (instancetype)initWithDelegate:(id<SetTableViewDelegate>)delegate {
if (self = [super initWithFrame:CGRectMake(15, 15, kScreenWidth - 30, 348) style:UITableViewStylePlain]) {
if (self = [super initWithFrame:CGRectMake(15, 15, kScreenWidth - 30, 398) style:UITableViewStylePlain]) {
self.dataArr = [SetModel getAllSetDatas];
self.setDelegate = delegate;
[self cornerRadius:10];
......@@ -125,7 +125,7 @@
- (UIView *)footView {
if (!_footView) {
_footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height - 200)];
_footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height - 50*self.dataArr.count)];
UILabel *titleLab = [UILabel dkLabWithFont:SysFont(15.0)];
titleLab.text = @"主题模式";
......
DreamSleep/DreamSleep/Class/ProfileModule/SystemSet/SystemSetController.m
......@@ -7,6 +7,7 @@
#import "SystemSetController.h"
#import "SetTableView.h"
#import "IndividualController.h"
@interface SystemSetController () <SetTableViewDelegate>
@property (nonatomic, strong) SetTableView *sTabView;
......@@ -46,6 +47,11 @@
[self.navigationController pushViewController:[[DsWebController alloc] initWithTitle:@"隐私政策" link:PrivacyPolicy] animated:YES];
}
break;
case 4: // 个性化推荐说明
{
[self.navigationController pushViewController:[IndividualController new] animated:YES];
}
break;
default:
break;
}
......
DreamSleep/Pods/Pods.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,37 +7,37 @@
<key>AFNetworking.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
<integer>4</integer>
</dict>
<key>DKNightVersion.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
<integer>16</integer>
</dict>
<key>DOUAudioStreamer.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
<integer>10</integer>
</dict>
<key>FreeStreamer.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
<integer>5</integer>
</dict>
<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>7</integer>
</dict>
<key>MBProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
<integer>17</integer>
</dict>
<key>MJRefresh.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>11</integer>
</dict>
<key>Masonry.xcscheme_^#shared#^_</key>
<dict>
......@@ -47,37 +47,37 @@
<key>Pods-DreamSleep.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
<integer>8</integer>
</dict>
<key>Reachability.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
<integer>12</integer>
</dict>
<key>YYCache.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
<integer>14</integer>
</dict>
<key>YYImage.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
<integer>18</integer>
</dict>
<key>YYModel.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
<integer>9</integer>
</dict>
<key>YYWebImage.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
<integer>19</integer>
</dict>
<key>lottie-ios.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
<integer>15</integer>
</dict>
</dict>
</dict>
......
DreamSleep/TapiOS/Unity-iPhone.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -12,7 +12,7 @@
<key>UnityFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
<integer>13</integer>
</dict>
</dict>
</dict>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!