bugfix

wanghengheng · wanghengheng · commit 587936fc2f77 · 2017-12-28T10:46:55.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.201712061200</string>
+	<string>4.9.5.201712281100</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/Coding_iOS/Controllers/Login/LoginViewController.m b/Coding_iOS/Controllers/Login/LoginViewController.m
@@ -586,8 +586,12 @@ - (void)p_thridPlatformLogin:(UMSocialResponse *)resp{
         if (data) {
             [((AppDelegate *)[UIApplication sharedApplication].delegate) setupTabViewController];
             [weakSelf doSomethingAfterLogin];
-        }else{
-            [NSObject showError:error];
+        }else if (error){
+            if (error.userInfo[@"msg"][@"oauth_account_not_bound"]) {
+                kTipAlert(@"&#25265;&#27465;&#65292;&#20320;&#36824;&#26410;&#32465;&#23450;&#24494;&#20449;&#65292;&#35831;&#21069;&#24448; Coding &#20027;&#31449;&#23436;&#25104;&#24494;&#20449;&#32465;&#23450;&#25805;&#20316;");
+            }else{
+                [NSObject showError:error];
+            }
         }
     }];
 }
diff --git a/Coding_iOS/Controllers/MeSetting/SettingSkillsViewController.m b/Coding_iOS/Controllers/MeSetting/SettingSkillsViewController.m
@@ -53,7 +53,7 @@ - (void)refresh{
 
 - (void)setupContent{
     User *curUser = [Login curLoginUser];
-    self.skills = curUser.skills.mutableCopy;
+    self.skills = curUser.skills.mutableCopy ?: @[].mutableCopy;
     [self.navigationItem setRightBarButtonItem:[UIBarButtonItem itemWithBtnTitle:@"&#23436;&#25104;" target:self action:@selector(doneBtnClicked:)] animated:YES];
     
     __weak typeof(self) weakSelf = self;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -121,7 +121,7 @@ - (void)request_Login_With_UMSocialResponse:(UMSocialResponse *)resp andBlock:(v
     params[@"account"] = resp.unionId;
     params[@"oauth_access_token"] = resp.accessToken;
     params[@"response"] = [NSString stringWithFormat:@"{\"access_token\":\"%@\",\"openid\":\"%@\"}", resp.accessToken, resp.openid];
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/oauth/wechat/mobile/login" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/oauth/wechat/mobile/login" withParams:params withMethodType:Post autoShowError:NO andBlock:^(id data, NSError *error) {
         id resultData = [data valueForKeyPath:@"data"];
         if (resultData) {
             [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#30331;&#24405;_&#31532;&#19977;&#26041;&#30331;&#24405;"];
