bugfix

wanghengheng · wanghengheng · commit e2fa3a32f3f3 · 2017-12-28T17:16:39.000+08:00
diff --git a/Coding_iOS/Coding_iOS-Info.plist b/Coding_iOS/Coding_iOS-Info.plist
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.9.5.201712281100</string>
+	<string>4.9.5.201712281730</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/Coding_iOS/Controllers/MeSetting/SettingPhoneViewController.m b/Coding_iOS/Controllers/MeSetting/SettingPhoneViewController.m
@@ -220,6 +220,8 @@ - (void)doneBtnClicked:(id)sender{
             [weakSelf.navigationController popViewControllerAnimated:YES];
             if (![Login curLoginUser].is_phone_validated.boolValue) {//&#20043;&#21069;&#27809;&#26377;&#32465;&#23450;&#36807;&#25163;&#26426;&#21495;&#30340;&#65292;&#22870;&#21169;&#30721;&#24065;
                 [Login curLoginUser].is_phone_validated = @(YES);
+                [Login curLoginUser].phone = weakSelf.phone;
+                [Login curLoginUser].phone_country_code = weakSelf.phone_country_code;
                 [RewardTipManager showTipWithTitle:@"&#25104;&#21151;&#23436;&#25104;&#25163;&#26426;&#39564;&#35777; !" rewardPoint:@"0.1 MB"];
             }else{
                 [NSObject showHudTipStr:@"&#25163;&#26426;&#21495;&#30721;&#32465;&#23450;&#25104;&#21151;"];
diff --git a/Coding_iOS/Util/Manager/CodingVipTipManager.m b/Coding_iOS/Util/Manager/CodingVipTipManager.m
@@ -108,7 +108,7 @@ - (void)p_show{
     //&#21021;&#22987;&#29366;&#24577;
     _bgView.backgroundColor = [UIColor clearColor];
     _contentView.alpha = 0;
-    UIView *spV = [BaseViewController presentingVC].view;
+    UIView *spV = [BaseViewController presentingVC].navigationController.view;
     _bgView.frame = spV.bounds;
     [spV addSubview:_bgView];
     [UIView animateWithDuration:0.3 animations:^{
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -2308,9 +2308,9 @@ - (void)request_UserInfo_WithObj:(User *)curUser andBlock:(void (^)(id data, NSE
             id resultData = [data valueForKeyPath:@"data"];
             User *user = [NSObject objectOfClass:@"User" fromJSON:resultData];
             if (user.id.intValue == [Login curLoginUser].id.intValue) {
-                if (user.vip.integerValue == 2 && user.isUserInfoCompleted) {
+                if (user.vip.integerValue == 2) {
                     User *loginU = [Login curLoginUser];
-                    if (loginU.vip.integerValue < 2 && !loginU.isUserInfoCompleted) {
+                    if (loginU.vip.integerValue < 2) {
                         [CodingVipTipManager showTip];
                     }
                 }
@@ -2411,9 +2411,9 @@ - (void)request_UpdateUserInfo_WithObj:(User *)curUser andBlock:(void (^)(id dat
             id resultData = [data valueForKeyPath:@"data"];
             User *user = [NSObject objectOfClass:@"User" fromJSON:resultData];
             if (user) {
-                if (user.vip.integerValue == 2 && user.isUserInfoCompleted) {
+                if (user.vip.integerValue == 2) {
                     User *loginU = [Login curLoginUser];
-                    if (loginU.vip.integerValue < 2 && !loginU.isUserInfoCompleted) {
+                    if (loginU.vip.integerValue < 2) {
                         [CodingVipTipManager showTip];
                     }
                 }

-Original file line number
+Diff line change
             [weakSelf.navigationController popViewControllerAnimated:YES];
             if (![Login curLoginUser].is_phone_validated.boolValue) {//之前没有绑定过手机号的，奖励码币
                 [Login curLoginUser].is_phone_validated = @(YES);
 +                [Login curLoginUser].phone = weakSelf.phone;
 +                [Login curLoginUser].phone_country_code = weakSelf.phone_country_code;
                 [RewardTipManager showTipWithTitle:@"成功完成手机验证 !" rewardPoint:@"0.1 MB"];
             }else{
                 [NSObject showHudTipStr:@"手机号码绑定成功"];
Original file line number	Diff line number	Diff line change
`@@ -2308,9 +2308,9 @@ - (void)request_UserInfo_WithObj:(User *)curUser andBlock:(void (^)(id data, NSE`
`2308`	`2308`	`id resultData = [data valueForKeyPath:@"data"];`
`2309`	`2309`	`User *user = [NSObject objectOfClass:@"User" fromJSON:resultData];`
`2310`	`2310`	`if (user.id.intValue == [Login curLoginUser].id.intValue) {`
`2311`		`- if (user.vip.integerValue == 2 && user.isUserInfoCompleted) {`
	`2311`	`+ if (user.vip.integerValue == 2) {`
`2312`	`2312`	`User *loginU = [Login curLoginUser];`
`2313`		`- if (loginU.vip.integerValue < 2 && !loginU.isUserInfoCompleted) {`
	`2313`	`+ if (loginU.vip.integerValue < 2) {`
`2314`	`2314`	`[CodingVipTipManager showTip];`
`2315`	`2315`	`}`
`2316`	`2316`	`}`
`@@ -2411,9 +2411,9 @@ - (void)request_UpdateUserInfo_WithObj:(User *)curUser andBlock:(void (^)(id dat`
`2411`	`2411`	`id resultData = [data valueForKeyPath:@"data"];`
`2412`	`2412`	`User *user = [NSObject objectOfClass:@"User" fromJSON:resultData];`
`2413`	`2413`	`if (user) {`
`2414`		`- if (user.vip.integerValue == 2 && user.isUserInfoCompleted) {`
	`2414`	`+ if (user.vip.integerValue == 2) {`
`2415`	`2415`	`User *loginU = [Login curLoginUser];`
`2416`		`- if (loginU.vip.integerValue < 2 && !loginU.isUserInfoCompleted) {`
	`2416`	`+ if (loginU.vip.integerValue < 2) {`
`2417`	`2417`	`[CodingVipTipManager showTip];`
`2418`	`2418`	`}`
`2419`	`2419`	`}`