bugfix

wanghengheng · wanghengheng · commit ca5dd5684dcd · 2018-04-04T16:00:25.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>5.2.201804031430</string>
+	<string>5.2.201804041500</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/Coding_iOS/Controllers/Login/CannotLoginViewController.m b/Coding_iOS/Controllers/Login/CannotLoginViewController.m
@@ -265,7 +265,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender withCaptcha:(NSString *)ca
         params[@"j_captcha"] = captcha;
     }
     __weak typeof(self) weakSelf = self;
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {
         if (data) {
             [NSObject showHudTipStr:@"验证码发送成功"];
             [sender startUpTimer];
diff --git a/Coding_iOS/Controllers/Login/RegisterViewController.m b/Coding_iOS/Controllers/Login/RegisterViewController.m
@@ -399,7 +399,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender withCaptcha:(NSString *)ca
         params[@"j_captcha"] = captcha;
     }
     __weak typeof(self) weakSelf = self;
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/register/generate_phone_code" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/register/generate_phone_code" withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {
         if (data) {
             [NSObject showHudTipStr:@"验证码发送成功"];
             [sender startUpTimer];
diff --git a/Coding_iOS/Models/ResourceReference.h b/Coding_iOS/Models/ResourceReference.h
@@ -9,12 +9,12 @@
 #import <Foundation/Foundation.h>
 
 @interface ResourceReference : NSObject
-@property (strong, nonatomic) NSMutableArray *Task, *MergeRequestBean, *ProjectTopic, *ProjectFile, *itemList;
+@property (strong, nonatomic) NSMutableArray *Task, *MergeRequestBean, *ProjectTopic, *ProjectFile, *Release, *itemList;
 @property (readwrite, nonatomic, strong) NSDictionary *propertyArrayMap;
 
 @end
 
 @interface ResourceReferenceItem : NSObject
 @property (strong, nonatomic) NSString *target_type, *title, *link;
 @property (strong, nonatomic) NSNumber *code, *target_id;
-@end
+@end
diff --git a/Coding_iOS/Models/ResourceReference.m b/Coding_iOS/Models/ResourceReference.m
@@ -17,6 +17,7 @@ - (instancetype)init
                               @"MergeRequestBean": @"ResourceReferenceItem",
                               @"ProjectTopic": @"ResourceReferenceItem",
                               @"ProjectFile": @"ResourceReferenceItem",
+                              @"Release": @"ResourceReferenceItem",
                               };
 
     }
@@ -29,11 +30,12 @@ - (NSMutableArray *)itemList{
         [_itemList addObjectsFromArray:_ProjectTopic];
         [_itemList addObjectsFromArray:_ProjectFile];
         [_itemList addObjectsFromArray:_MergeRequestBean];
+        [_itemList addObjectsFromArray:_Release];
     }
     return _itemList;
 }
 @end
 
 @implementation ResourceReferenceItem
 
-@end
+@end
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -2665,7 +2665,7 @@ - (void)request_GeneratePhoneCodeToResetPhone:(NSString *)phone phoneCountryCode
     if (captcha.length > 0) {
         params[@"j_captcha"] = captcha;
     }
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {
         if (data) {
             [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"生成手机验证码_绑定手机号"];
         }
@@ -3227,7 +3227,7 @@ - (void)post_Close2FAGeneratePhoneCode:(NSString *)phone withCaptcha:(NSString *
     if (captcha.length > 0) {
         params[@"j_captcha"] = captcha;
     }
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/twofa/close/code" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/twofa/close/code" withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {
         block(data, error);
     }];
 }
diff --git a/Coding_iOS/Views/Cell/TaskResourceReferenceCell.m b/Coding_iOS/Views/Cell/TaskResourceReferenceCell.m
@@ -66,7 +66,7 @@ - (void)setItem:(ResourceReferenceItem *)item{
     if (!_item) {
         return;
     }
-    [_imgView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"task_resource_reference_%@", _item.target_type]]];
+    [_imgView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"task_resource_reference_%@", _item.target_type]] ?: [UIImage imageNamed:@"task_resource_reference_ProjectFile"]];
     _codeL.text = [NSString stringWithFormat:@"# %@ ", _item.code.stringValue];
     _titleL.text = _item.title;
 }

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton )sender withCaptcha:(NSString )ca`
`265`	`265`	`params[@"j_captcha"] = captcha;`
`266`	`266`	`}`
`267`	`267`	`__weak typeof(self) weakSelf = self;`
`268`		`- [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {`
	`268`	`+ [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {`
`269`	`269`	`if (data) {`
`270`	`270`	`[NSObject showHudTipStr:@"验证码发送成功"];`
`271`	`271`	`[sender startUpTimer];`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton )sender withCaptcha:(NSString )ca`
`399`	`399`	`params[@"j_captcha"] = captcha;`
`400`	`400`	`}`
`401`	`401`	`__weak typeof(self) weakSelf = self;`
`402`		`- [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/register/generate_phone_code" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {`
	`402`	`+ [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/register/generate_phone_code" withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {`
`403`	`403`	`if (data) {`
`404`	`404`	`[NSObject showHudTipStr:@"验证码发送成功"];`
`405`	`405`	`[sender startUpTimer];`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ - (instancetype)init`
`17`	`17`	`@"MergeRequestBean": @"ResourceReferenceItem",`
`18`	`18`	`@"ProjectTopic": @"ResourceReferenceItem",`
`19`	`19`	`@"ProjectFile": @"ResourceReferenceItem",`
	`20`	`+ @"Release": @"ResourceReferenceItem",`
`20`	`21`	`};`
`21`	`22`
`22`	`23`	`}`
`@@ -29,11 +30,12 @@ - (NSMutableArray *)itemList{`
`29`	`30`	`[_itemList addObjectsFromArray:_ProjectTopic];`
`30`	`31`	`[_itemList addObjectsFromArray:_ProjectFile];`
`31`	`32`	`[_itemList addObjectsFromArray:_MergeRequestBean];`
	`33`	`+ [_itemList addObjectsFromArray:_Release];`
`32`	`34`	`}`
`33`	`35`	`return _itemList;`
`34`	`36`	`}`
`35`	`37`	`@end`
`36`	`38`
`37`	`39`	`@implementation ResourceReferenceItem`
`38`	`40`
`39`		`-@end`
	`41`	`+@end`
Original file line number	Diff line number	Diff line change
`@@ -2665,7 +2665,7 @@ - (void)request_GeneratePhoneCodeToResetPhone:(NSString *)phone phoneCountryCode`
`2665`	`2665`	`if (captcha.length > 0) {`
`2666`	`2666`	`params[@"j_captcha"] = captcha;`
`2667`	`2667`	`}`
`2668`		`- [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {`
	`2668`	`+ [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {`
`2669`	`2669`	`if (data) {`
`2670`	`2670`	`[MobClick event:kUmeng_Event_Request_ActionOfServer label:@"生成手机验证码_绑定手机号"];`
`2671`	`2671`	`}`
`@@ -3227,7 +3227,7 @@ - (void)post_Close2FAGeneratePhoneCode:(NSString )phone withCaptcha:(NSString `
`3227`	`3227`	`if (captcha.length > 0) {`
`3228`	`3228`	`params[@"j_captcha"] = captcha;`
`3229`	`3229`	`}`
`3230`		`- [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/twofa/close/code" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {`
	`3230`	`+ [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/twofa/close/code" withParams:params withMethodType:Post autoShowError:captcha.length > 0 andBlock:^(id data, NSError *error) {`
`3231`	`3231`	`block(data, error);`
`3232`	`3232`	`}];`
`3233`	`3233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ - (void)setItem:(ResourceReferenceItem *)item{`
`66`	`66`	`if (!_item) {`
`67`	`67`	`return;`
`68`	`68`	`}`
`69`		`- [_imgView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"task_resource_reference_%@", _item.target_type]]];`
	`69`	`+ [_imgView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"task_resource_reference_%@", _item.target_type]] ?: [UIImage imageNamed:@"task_resource_reference_ProjectFile"]];`
`70`	`70`	`_codeL.text = [NSString stringWithFormat:@"# %@ ", _item.code.stringValue];`
`71`	`71`	`_titleL.text = _item.title;`
`72`	`72`	`}`