Skip to content

陈高翔 / DreamSleep-iOS

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

修复我的进入每日积分领取积分后，我的页面积分显示没刷新

1 个父辈 378fcf69
内嵌 并排
正在显示 19 个修改的文件 包含 38 行增加 和 29 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -2436,7 +2436,7 @@ ...@@ -2436,7 +2436,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
...@@ -2517,7 +2517,7 @@ ...@@ -2517,7 +2517,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
...@@ -2657,7 +2657,7 @@ ...@@ -2657,7 +2657,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
......
DreamSleep/DreamSleep/Class/AISleepModule/Controller/AISleepCoachController.m
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#import <WebKit/WebKit.h> #import <WebKit/WebKit.h>
#import "SomeProxy.h" #import "SomeProxy.h"
#import "DsMaskView.h" #import "DsMaskView.h"
#import "UserRequestModel.h"
#import "RelaxTrainController.h" #import "RelaxTrainController.h"
#import "UnityGameController.h" #import "UnityGameController.h"
......
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#import "DSHomeView.h" #import "DSHomeView.h"
#import "RescuePlanView.h" #import "RescuePlanView.h"
#import "FirstLeadAlertView.h" #import "FirstLeadAlertView.h"
#import "UserRequestModel.h"
#import "HomeRequestModel.h" #import "HomeRequestModel.h"
#import "UnityGameController.h" #import "UnityGameController.h"
#import "SafeSleepRequestModel.h" #import "SafeSleepRequestModel.h"
...@@ -207,7 +206,7 @@ ...@@ -207,7 +206,7 @@
#pragma mark - 获取最新数据请求 #pragma mark - 获取最新数据请求
- (void)getLatestDataRequest { - (void)getLatestDataRequest {
if ([LoginUtils getUserLoginData]) { if ([LoginUtils getUserLoginData]) {
// 自动登录请求（每次APP首页显示的时候调用） // 自动登录请求（每次APP首页及我的页面显示的时候调用）
[UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) { [UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
// 自动登录失败，清除本地用户信息并且跳转到登录页面 // 自动登录失败，清除本地用户信息并且跳转到登录页面
if (requestModel.resCode == DSResCodeFail) { if (requestModel.resCode == DSResCodeFail) {
......
DreamSleep/DreamSleep/Class/ProfileModule/Account/Controller/AccountController.m
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#import "AccountController.h" #import "AccountController.h"
#import "CloseAlertView.h" #import "CloseAlertView.h"
#import "UserInfoView.h" #import "UserInfoView.h"
#import "UserRequestModel.h"
@interface AccountController () <UserInfoViewDelegate, CloseAlertViewDelegate> @interface AccountController () <UserInfoViewDelegate, CloseAlertViewDelegate>
@property (nonatomic, strong) CloseAlertView *closeAlertView; @property (nonatomic, strong) CloseAlertView *closeAlertView;
......
DreamSleep/DreamSleep/Class/ProfileModule/Account/Controller/NickNameController.h
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "UserRequestModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
DreamSleep/DreamSleep/Class/ProfileModule/Account/View/UserInfoView.m
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#import "UserInfoTableView.h" #import "UserInfoTableView.h"
#import "DSImagePickerController.h" #import "DSImagePickerController.h"
#import "RSKImageCropper.h" #import "RSKImageCropper.h"
#import "UserRequestModel.h"
@interface UserInfoView () <InfoModifyAlertViewDelegate, DSImagePickerControllerDelegate, RSKImageCropViewControllerDelegate> @interface UserInfoView () <InfoModifyAlertViewDelegate, DSImagePickerControllerDelegate, RSKImageCropViewControllerDelegate>
@property (nonatomic, strong) UIImageView *portraitIV; @property (nonatomic, strong) UIImageView *portraitIV;
......
DreamSleep/DreamSleep/Class/ProfileModule/Me/ProfileController.m
...@@ -31,6 +31,21 @@ ...@@ -31,6 +31,21 @@
[super viewDidLoad]; [super viewDidLoad];
} }
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if ([LoginUtils getUserLoginData]) {
// 自动登录请求（每次APP首页及我的页面显示的时候调用）
[UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
// 自动登录失败，清除本地用户信息并且跳转到登录页面
if (requestModel.resCode == DSResCodeFail) {
[LoginUtils clearUserLoginData];
[LoginUtils jumpToLoginControllerWithTarget:self];
}
}];
}
}
#pragma mark - ProfileTableViewDelegate #pragma mark - ProfileTableViewDelegate
- (void)didSelectedIndexPath:(NSIndexPath *)indexPath { - (void)didSelectedIndexPath:(NSIndexPath *)indexPath {
if (indexPath.section == 0) { if (indexPath.section == 0) {
......
DreamSleep/DreamSleep/Class/ProfileModule/UserLogin/LoginController.m
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#import "LoginController.h" #import "LoginController.h"
#import "LoginView.h" #import "LoginView.h"
#import <AuthenticationServices/AuthenticationServices.h> #import <AuthenticationServices/AuthenticationServices.h>
#import "UserRequestModel.h"
@interface LoginController () <LoginViewDelegate, ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding> @interface LoginController () <LoginViewDelegate, ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding>
@property (strong, nonatomic) LoginView *loginView; @property (strong, nonatomic) LoginView *loginView;
......
DreamSleep/DreamSleep/Class/ProfileModule/UserLogin/LoginUtils.h
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "UserModel.h" #import "UserModel.h"
#import "UserRequestModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
DreamSleep/DreamSleep/Class/Start/Root/AppDelegate.m
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#import <UMCommonLog/UMCommonLogHeaders.h> #import <UMCommonLog/UMCommonLogHeaders.h>
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <IQKeyboardManager/IQKeyboardManager.h> #import <IQKeyboardManager/IQKeyboardManager.h>
#import "UserRequestModel.h"
@interface AppDelegate () <WXApiDelegate> @interface AppDelegate () <WXApiDelegate>
@end @end
......
DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/Contents.json
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "bg_card_jifen@2x.png", "filename" : "bg_card_jifen@2.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "bg_card_jifen@3x.png", "filename" : "bg_card_jifen@3.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png

21.9 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png

43.1 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/ScoreTask/bg_card_jifen.imageset/bg_card_jifen.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
DreamSleep/Pods/Pods.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,77 +7,77 @@ ...@@ -7,77 +7,77 @@
<key>AFNetworking.xcscheme_^#shared#^_</key> <key>AFNetworking.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>9</integer> <integer>14</integer>
</dict> </dict>
<key>DKNightVersion.xcscheme_^#shared#^_</key> <key>DKNightVersion.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>11</integer> <integer>13</integer>
</dict> </dict>
<key>DOUAudioStreamer.xcscheme_^#shared#^_</key> <key>DOUAudioStreamer.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>5</integer> <integer>12</integer>
</dict> </dict>
<key>FreeStreamer.xcscheme_^#shared#^_</key> <key>FreeStreamer.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>17</integer> <integer>6</integer>
</dict> </dict>
<key>IQKeyboardManager.xcscheme_^#shared#^_</key> <key>IQKeyboardManager.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>6</integer> <integer>4</integer>
</dict> </dict>
<key>MBProgressHUD.xcscheme_^#shared#^_</key> <key>MBProgressHUD.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>13</integer> <integer>19</integer>
</dict> </dict>
<key>MJRefresh.xcscheme_^#shared#^_</key> <key>MJRefresh.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>15</integer> <integer>17</integer>
</dict> </dict>
<key>Masonry.xcscheme_^#shared#^_</key> <key>Masonry.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>10</integer> <integer>18</integer>
</dict> </dict>
<key>Pods-DreamSleep.xcscheme_^#shared#^_</key> <key>Pods-DreamSleep.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>14</integer> <integer>16</integer>
</dict> </dict>
<key>Reachability.xcscheme_^#shared#^_</key> <key>Reachability.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>7</integer> <integer>10</integer>
</dict> </dict>
<key>YYCache.xcscheme_^#shared#^_</key> <key>YYCache.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>12</integer> <integer>7</integer>
</dict> </dict>
<key>YYImage.xcscheme_^#shared#^_</key> <key>YYImage.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>16</integer> <integer>11</integer>
</dict> </dict>
<key>YYModel.xcscheme_^#shared#^_</key> <key>YYModel.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>19</integer> <integer>8</integer>
</dict> </dict>
<key>YYWebImage.xcscheme_^#shared#^_</key> <key>YYWebImage.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>18</integer> <integer>9</integer>
</dict> </dict>
<key>lottie-ios.xcscheme_^#shared#^_</key> <key>lottie-ios.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>8</integer> <integer>15</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
DreamSleep/TapiOS/Unity-iPhone.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>UnityFramework.xcscheme_^#shared#^_</key> <key>UnityFramework.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>4</integer> <integer>5</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!