完善每日任务

DreamSleep/DreamSleep/Basement/Category/UIView+Extras.h

@@ -50,5 +50,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeMask;
 
 - (void)setCornerRadiusRect:(UIRectCorner)rectCorner cornerRadius:(CGFloat)cornerRadius;
+
+// 生成渐变色
+- (UIView *)genGradientWithStart:(CGPoint)start end:(CGPoint)end colors:(NSArray *)colors locations:(NSArray *)locations;
+// 截图
+- (UIImage *)snapshotImage;
 @end
 NS_ASSUME_NONNULL_END

DreamSleep/DreamSleep/Basement/Category/UIView+Extras.m

@@ -162,4 +162,30 @@
     self.layer.mask = maskLayer;
 }
 
+- (UIView *)genGradientWithStart:(CGPoint)start end:(CGPoint)end colors:(NSArray *)colors locations:(NSArray *)locations {
+    UIView *tmp = [[UIView alloc] initWithFrame:self.bounds];
+    CAGradientLayer *gl = [CAGradientLayer layer];
+    gl.frame = tmp.bounds;
+    gl.startPoint = start;
+    gl.endPoint = end;
+    gl.colors = colors;
+    gl.locations = locations;
+    [tmp.layer addSublayer:gl];
+    
+    return tmp;
+}
+
+- (UIImage *)snapshotImage {
+    // 1.开启上下文
+    UIGraphicsBeginImageContextWithOptions(self.bounds.size, self.opaque, 0);
+    // 2.将控制器view的layer渲染到上下文
+    [self.layer renderInContext:UIGraphicsGetCurrentContext()];
+    // 3.获取图片
+    UIImage *snapshotImage=UIGraphicsGetImageFromCurrentImageContext();
+    // 4.结束上下文
+    UIGraphicsEndImageContext();
+    
+    return snapshotImage;
+}
+
 @end

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskCell.h

@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 待领取
 /// @param taskID 每日任务和新手任务ID
 /// @param taskType 任务类型
-- (void)waitingReceiveWithTaskID:(int)taskID taskType:(TaskType)taskType sender:(UIButton *)sender;
+- (void)waitingReceiveWithTaskID:(TaskItem)taskID taskType:(TaskType)taskType sender:(UIButton *)sender;
 @end
 
 /// 每日任务、新手任务cell

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskController.m

@@ -60,41 +60,41 @@
     }
 }
 
-- (void)goToTaskPageWithTaskID:(int)task_id url:(NSString *)url {
-    if (task_id == 5) { // 好眠声音（直接回到首页）
+- (void)goToTaskPageWithTaskID:(TaskItem)task_id url:(NSString *)url {
+    if (task_id == TaskItemGood) { // 好眠声音（直接回到首页）
         [self.navigationController popViewControllerAnimated:YES];
         return;
     }
     
     switch (task_id) {
-        case 1: // AI睡眠教练（该任务不需要手动调用更新状态接口）
+        case TaskItemCoach: // AI睡眠教练（该任务不需要手动调用更新状态接口）
         {
             self.tabBarController.selectedIndex = 1;
         }
             break;
-        case 2: // 哄睡页面
+        case TaskItemCoax: // 哄睡页面
         {
             UnityGameController *gameVC = [UnityGameController new];
             gameVC.gameType = GameTypeCoax;
             [self.navigationController pushViewController:gameVC animated:YES];
         }
             break;
-        case 3: // 助眠音乐页面
+        case TaskItemRelax: // 助眠音乐页面
         {
             [self.navigationController pushViewController:[[LookAllController alloc] initWithDefaultIndex:1] animated:YES];
         }
             break;
-        case 4: // 舒眠课程页面
+        case TaskItemSafe: // 舒眠课程页面
         {
             [self.navigationController pushViewController:[[LookAllController alloc] initWithDefaultIndex:0] animated:YES];
         }
             break;
-        case 6: // 邀请好友页面
+        case TaskItemInvite: // 邀请好友页面
         {
             [self.navigationController pushViewController:[InviteController new] animated:YES];
         }
             break;
-        case 7: // AppStore评价页面
+        case TaskItemStore: // AppStore评价页面
         {
             NSString *evaluateStr = [NSString stringWithFormat: @"itms-apps://itunes.apple.com/app/id%@?action=write-review", AppSotreID];
             NSURL *url = [NSURL URLWithString:evaluateStr];
@@ -108,32 +108,32 @@
             }
         }
             break;
-        case 8: // 意见反馈页面
+        case TaskItemFeedback: // 意见反馈页面
         {
             [self.navigationController pushViewController:[FeedbackController new] animated:YES];
         }
             break;
-        case 9: // 上传头像
+        case TaskItemUpload: // 上传头像
         {
             [self.navigationController pushViewController:[AccountController new] animated:YES];
         }
             break;
-        case 10: // 修改昵称
+        case TaskItemNick: // 修改昵称
         {
             [self.navigationController pushViewController:[AccountController new] animated:YES];
         }
             break;
-        case 11: // 选择性别
+        case TaskItemSex: // 选择性别
         {
             [self.navigationController pushViewController:[AccountController new] animated:YES];
         }
             break;
-        case 12: // 完善生日
+        case TaskItemBirth: // 完善生日
         {
             [self.navigationController pushViewController:[AccountController new] animated:YES];
         }
             break;
-        case 13: // 完成每日一题
+        case TaskItemDaily: // 完成每日一题
         {
             NSString *link = [NSString stringWithFormat:@"%@%@", ServerURL, url];
             [self.navigationController pushViewController:[[DsWebController alloc] initWithLink:link isShowNavi:NO] animated:YES];

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskView.h

@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 去完成任务
 /// @param task_id 任务id
 /// @param url 路由地址
-- (void)goToTaskPageWithTaskID:(int)task_id url:(NSString *)url;
+- (void)goToTaskPageWithTaskID:(TaskItem)task_id url:(NSString *)url;
 @end
 
 /// 每日任务页面自定义主view

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DailyTaskView.m

@@ -41,41 +41,49 @@
 
 #pragma mark - DailyTaskCellDelegate
 - (void)finishWithModel:(id)model taskType:(TaskType)taskType {
+    TaskItem taskID = 0;
+    NSString *url = @"";
     if (taskType == TaskTypeDaily) { // 每日任务
         DailyTaskModel *dailyTaskModel = (DailyTaskModel *)model;
-        if (self.delegate && [self.delegate respondsToSelector:@selector(goToTaskPageWithTaskID:url:)]) {
-            [self.delegate goToTaskPageWithTaskID:dailyTaskModel.task_id url:dailyTaskModel.url];
-        }
+        taskID = dailyTaskModel.task_id;
+        url = dailyTaskModel.url;
     } else { // 新手任务
         NewTaskModel *newTaskModel = (NewTaskModel *)model;
-        if (self.delegate && [self.delegate respondsToSelector:@selector(goToTaskPageWithTaskID:url:)]) {
-            [self.delegate goToTaskPageWithTaskID:newTaskModel.task_id url:newTaskModel.url];
-        }
+        taskID = newTaskModel.task_id;
+        url = newTaskModel.url;
+    }
+    if (self.delegate && [self.delegate respondsToSelector:@selector(goToTaskPageWithTaskID:url:)]) {
+        [self.delegate goToTaskPageWithTaskID:taskID url:url];
     }
 }
 
-- (void)waitingReceiveWithTaskID:(int)taskID taskType:(TaskType)taskType sender:(UIButton *)sender {
+- (void)waitingReceiveWithTaskID:(TaskItem)taskID taskType:(TaskType)taskType sender:(UIButton *)sender {
     if (taskType == TaskTypeDaily) {
         [ScoreTaskRequestModel receiveUserDailyTaskPointWithTaskID:taskID completion:^(ScoreTaskRequestModel * _Nonnull requestModel) {
-            if (requestModel.resCode == DSResCodeSuccess) {
-                [self.dailyBgView updateTodayPointData:requestModel.date_points];
-                [sender setTitle:@"已领取" forState:UIControlStateNormal];
-                sender.userInteractionEnabled = NO;
-            }
+            [self updateBgViewAndBtn:requestModel sender:sender];
         }];
     } else {
         [ScoreTaskRequestModel receiveUserNewsTaskPointWithTaskID:taskID completion:^(ScoreTaskRequestModel * _Nonnull requestModel) {
-            if (requestModel.resCode == DSResCodeSuccess) {
-                [self.dailyBgView updateTodayPointData:requestModel.date_points];
-                [sender setTitle:@"已领取" forState:UIControlStateNormal];
-                sender.userInteractionEnabled = NO;
-            }
+            [self updateBgViewAndBtn:requestModel sender:sender];
         }];
     }
 }
 
+- (void)updateBgViewAndBtn:(ScoreTaskRequestModel *)requestModel sender:(UIButton *)sender {
+    if (requestModel.resCode == DSResCodeSuccess) {
+        [DSProgressHUD showDetailInfo:[NSString stringWithFormat:@"任务已完成，获得%d积分", requestModel.cur_point]];
+        [self.dailyBgView updateTodayPointData:requestModel.date_points];
+        sender.userInteractionEnabled = NO;
+        [sender setTitle:@"已领取" forState:UIControlStateNormal];
+        sender.dk_backgroundColorPicker = DKColorPickerWithColors(ColorFromHexA(0xFC7032, .1), ColorFromHexA(0xFC7032, .1), DSWhite);;
+        [sender dk_setTitleColorPicker:DKColorPickerWithColors(ColorFromHex(0xFC7032), ColorFromHex(0xFC7032), DSWhite) forState:UIControlStateNormal];
+    }
+}
+
 #pragma mark - public
 - (void)updateSignView:(ScoreTaskRequestModel *)requestModel {
+    if (!requestModel) { return; }
+    
     [self.signTaskView updateSignView:requestModel];
 }
 

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DsTaskManager.h

@@ -15,6 +15,7 @@ typedef NS_ENUM(NSInteger, TaskType) {
     TaskTypeDaily = 1, // 每日任务
     TaskTypeNew   = 2  // 新手任务
 };
+
 /// 任务项类型（小类）
 typedef NS_ENUM(int, TaskItem) {
     TaskItemCoach    = 1,  // AI睡眠教练

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/DsTaskManager.m

@@ -23,11 +23,7 @@ SingletonM(DsTaskManager)
 - (void)setTaskRequestModel:(ScoreTaskRequestModel *)taskRequestModel {
     _taskRequestModel = taskRequestModel;
     
-    for (DailyTaskModel *dModel in taskRequestModel.task_items) {
-        if (dModel.task_id == TaskItemCoax) {
-            DSLog(@"dModel444:%@", dModel.yy_modelDescription);
-        }
-    }
+    [DsTaskManager debugPrintWithDesc:@"更新任务"];
 }
 
 #pragma mark - public
@@ -63,7 +59,11 @@ SingletonM(DsTaskManager)
 + (void)excuteGeneralTaskWithType:(TaskType)taskType taskItem:(TaskItem)taskItem {
     // 1、判断任务是否完成
     if ([self taskHasFinishedWithType:taskType taskItem:taskItem]) { return; }
-    // 2、更新任务状态
+    // 2、配置任务参数
+    DsTaskManager *taskManager = [DsTaskManager sharedDsTaskManager];
+    taskManager.taskType = taskType;
+    taskManager.taskItem = taskItem;
+    // 3、更新任务状态
     [DsTaskManager updateTaskWithType:taskType taskItem:taskItem];
 }
 
@@ -96,26 +96,22 @@ SingletonM(DsTaskManager)
         }];
     }
     
-    for (DailyTaskModel *dModel in taskRequestModel.task_items) {
-        if (dModel.task_id == TaskItemCoax) {
-            DSLog(@"dModel222:%@", dModel.yy_modelDescription);
-        }
-    }
+    [DsTaskManager debugPrintWithDesc:@"查询任务"];
     
     return isFinish;
 }
 
-// 白噪音点击成功次数
-static int _noiseSuccessCount = 0;
-
 #pragma mark - 更新任务状态
 + (void)updateTaskWithType:(TaskType)taskType taskItem:(TaskItem)taskItem {
     if (taskType == TaskTypeDaily) {
         [ScoreTaskRequestModel updateUserDailyTaskStatusWithTaskID:taskItem completion:^(ScoreTaskRequestModel * _Nonnull requestModel) {
             if (requestModel.resCode == DSResCodeSuccess) {
-                if (taskItem == TaskItemGood) { // 白噪音成功5次才算完成
+                if (taskItem == TaskItemGood) {
+                    // 白噪音点击成功次数（白噪音成功5次才算完成）
+                    static int _noiseSuccessCount = 1;
+                    DSLog(@"白噪音点击了%d次", _noiseSuccessCount);
                     if (_noiseSuccessCount >= 5) {
-                        _noiseSuccessCount = 0;
+                        _noiseSuccessCount = 1;
                         [self markTaskWithType:taskType taskItem:taskItem state:1];
                     }
                     _noiseSuccessCount++;
@@ -133,7 +129,7 @@ static int _noiseSuccessCount = 0;
     }
 }
 
-#pragma mark - 标记本地任务列表中任务状态
+#pragma mark - 标记本地任务列表中任务状态（state：0未完成，1待领取，2已领取）
 + (void)markTaskWithType:(TaskType)taskType taskItem:(TaskItem)taskItem state:(int)state {
     if (![self hasTaskListData]) {
         return;
@@ -156,11 +152,7 @@ static int _noiseSuccessCount = 0;
         }];
     }
     
-    for (DailyTaskModel *dModel in taskRequestModel.task_items) {
-        if (dModel.task_id == TaskItemCoax) {
-            DSLog(@"dModel333:%@", dModel.yy_modelDescription);
-        }
-    }
+    [DsTaskManager debugPrintWithDesc:@"标记任务"];
 }
 
 #pragma mark - lazy
@@ -174,4 +166,22 @@ static int _noiseSuccessCount = 0;
     return _taskTimerTool;
 }
 
+#pragma mark - debug
++ (void)debugPrintWithDesc:(NSString *)desc {
+    DsTaskManager *manager = [DsTaskManager sharedDsTaskManager];
+    if (manager.taskType == TaskTypeDaily) {
+        for (DailyTaskModel *dailyTaskModel in manager.taskRequestModel.task_items) {
+            if (dailyTaskModel.task_id == manager.taskItem) {
+                DSLog(@"%@-每日任务中的任务数据：%@", desc, dailyTaskModel.yy_modelDescription);
+            }
+        }
+    } else if (manager.taskType == TaskTypeNew) {
+        for (NewTaskModel *newTaskModel in manager.taskRequestModel.task_news) {
+            if (newTaskModel.task_id == manager.taskItem) {
+                DSLog(@"%@-新手任务中的任务数据：%@", desc, newTaskModel.yy_modelDescription);
+            }
+        }
+    }
+}
+
 @end

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/ScoreTaskRequestModel.h

@@ -45,7 +45,9 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - 做任务领取积分
 /// 当前项积分值
 @property (nonatomic, assign) int cur_point;
-/// 当日领取积分值
+/// 当日领取积分值（每日签到领积分）
+@property (nonatomic, assign) int date_point;
+/// 当日领取积分值（每日任务和新手任务）
 @property (nonatomic, assign) int date_points;
 /// 用户总积分
 @property (nonatomic, assign) int total_points;

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/ScoreTaskRequestModel.m

@@ -150,7 +150,7 @@
         requestModel.resCode = DSResCodeSuccess;
         NSDictionary *resultDic = apiDic[@"result"];
         requestModel.cur_point = [resultDic[@"cur_point"] intValue];
-        requestModel.date_points = [resultDic[@"date_points"] intValue];
+        requestModel.date_point = [resultDic[@"date_point"] intValue];
         requestModel.total_points = [resultDic[@"total_points"] intValue];
         completion(requestModel);
     } failure:^(id failureInfo) {

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/SignTaskView.h

@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-/// 签到成功block
+/// 签到成功更新今日积分block
 typedef void (^SignSuccessBlock)(int date_points);
 
 /// 签到任务视图
@@ -18,6 +18,8 @@ typedef void (^SignSuccessBlock)(int date_points);
 
 @property (nonatomic, copy) SignSuccessBlock signSuccessBlock;
 
+/// 更新签到视图
+/// @param requestModel requestModel
 - (void)updateSignView:(ScoreTaskRequestModel *)requestModel;
 
 @end

DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/SignTaskView.m

@@ -38,29 +38,34 @@
             make.bottom.equalTo(self.signBtn.mas_top).offset(-14);
         }];
         [self.signBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.size.mas_equalTo(CGSizeMake(155, 40));
             make.centerX.equalTo(self);
             make.bottom.equalTo(self).offset(-15);
         }];
-        [self.signBtn layoutIfNeeded];
-        
-        UIView *tmpV = [self.signBtn genGradientWithStart:CGPointMake(0, 0.5) end:CGPointMake(1, 0.5) colors:@[(__bridge id)ColorFromHex(0xFEA961).CGColor, (__bridge id)ColorFromHex(0xFC7032).CGColor] locations:@[@(0), @(1.0f)]];
-        UIImage *bgImg = [tmpV snapshotImage];
-        
-        UIView *dktmpV = [self.signBtn genGradientWithStart:CGPointMake(0, 0.5) end:CGPointMake(1, 0.5) colors:@[(__bridge id)ColorFromHex(0xB77C4E).CGColor, (__bridge id)ColorFromHex(0xB5552E).CGColor] locations:@[@(0), @(1.0f)]];
-        UIImage *dkbgImg = [dktmpV snapshotImage];
-        
-        [self.signBtn dk_setBackgroundImage:DKImagePickerWithImages(bgImg, dkbgImg, bgImg) forState:UIControlStateNormal];
     }
     return self;
 }
 
+#pragma mark - public
+- (void)updateSignView:(ScoreTaskRequestModel *)requestModel {
+    if (requestModel && requestModel.signList && requestModel.signList.count) {
+        self.requestModel = requestModel;
+        self.signList = requestModel.signList;
+        [self.signMainView reloadData];
+        
+        [self.signBtn setTitle:(requestModel.sign_flag == 0 ? @"签到领积分" : @"已签到") forState:UIControlStateNormal];
+        self.signBtn.userInteractionEnabled = requestModel.sign_flag == 0;
+    }
+}
+
+#pragma mark - Action
 - (void)signAction {
     [ScoreTaskRequestModel receiveUserDailySignPointWithCurDay:self.requestModel.cur_day completion:^(ScoreTaskRequestModel * _Nonnull requestModel) {
         if (requestModel.resCode == DSResCodeSuccess) {
+            [DSProgressHUD showDetailInfo:[NSString stringWithFormat:@"完成签到，获得%d积分", requestModel.date_point]];
+            
             // 回调数据到DailyTaskView
             if (self.signSuccessBlock) {
-                self.signSuccessBlock(requestModel.date_points);
+                self.signSuccessBlock(requestModel.date_point);
             }
             
             // 更新按钮状态
@@ -79,17 +84,6 @@
     }];
 }
 
-- (void)updateSignView:(ScoreTaskRequestModel *)requestModel {
-    if (requestModel && requestModel.signList && requestModel.signList.count) {
-        self.requestModel = requestModel;
-        self.signList = requestModel.signList;
-        [self.signMainView reloadData];
-        
-        [self.signBtn setTitle:(requestModel.sign_flag == 0 ? @"签到领积分" : @"已签到") forState:UIControlStateNormal];
-        self.signBtn.userInteractionEnabled = requestModel.sign_flag == 0;
-    }
-}
-
 #pragma mark - UICollectionViewDelegate && UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
     return self.signList.count;
@@ -132,10 +126,17 @@
 - (UIButton *)signBtn {
     if (!_signBtn) {
         _signBtn = [UIButton btnWithTitle:@"签到领积分" font:BoldFont(16)];
+        _signBtn.size = (CGSizeMake(155, 40));
         _signBtn.userInteractionEnabled = NO;
         [_signBtn dk_setTitleColorPicker:DKColorPickerWithColors(DSWhite, DkTitleColor, DSWhite) forState:UIControlStateNormal];
         [_signBtn addTarget:self action:@selector(signAction) forControlEvents:UIControlEventTouchUpInside];
         [_signBtn cornerRadius:20];
+        // 设置按钮背景渐变色
+        CGPoint start = CGPointMake(0, 0.5);
+        CGPoint end = CGPointMake(1, 0.5);
+        UIView *normal_tmp_view = [self.signBtn genGradientWithStart:start end:end colors:@[(__bridge id)ColorFromHex(0xFEA961).CGColor, (__bridge id)ColorFromHex(0xFC7032).CGColor] locations:@[@(0), @(1.0f)]];
+        UIView *dk_tmp_view = [self.signBtn genGradientWithStart:start end:end colors:@[(__bridge id)ColorFromHex(0xB77C4E).CGColor, (__bridge id)ColorFromHex(0xB5552E).CGColor] locations:@[@(0), @(1.0f)]];
+        [_signBtn dk_setBackgroundImage:DKImagePickerWithImages([normal_tmp_view snapshotImage], [dk_tmp_view snapshotImage], [normal_tmp_view snapshotImage]) forState:UIControlStateNormal];
     }
     return _signBtn;
 }

DreamSleep/Pods/Pods.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,77 +7,77 @@
 		<key>AFNetworking.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>13</integer>
 		</dict>
 		<key>DKNightVersion.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>7</integer>
 		</dict>
 		<key>DOUAudioStreamer.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>16</integer>
 		</dict>
 		<key>FreeStreamer.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>8</integer>
 		</dict>
 		<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>9</integer>
 		</dict>
 		<key>MBProgressHUD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 		<key>MJRefresh.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>11</integer>
 		</dict>
 		<key>Masonry.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>17</integer>
 		</dict>
 		<key>Pods-DreamSleep.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>15</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>18</integer>
+			<integer>4</integer>
 		</dict>
 		<key>YYImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>19</integer>
 		</dict>
 		<key>YYModel.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>18</integer>
 		</dict>
 		<key>YYWebImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>14</integer>
 		</dict>
 		<key>lottie-ios.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</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>13</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 </dict>