实现了取消的功能

useropen · useropen · commit e491978ca1ae · 2016-04-16T00:28:37.000+08:00
diff --git a/Coding_iOS/Controllers/MRDetailViewController.m b/Coding_iOS/Controllers/MRDetailViewController.m
@@ -128,7 +128,7 @@ - (void)configBottomView{
     BOOL canAction = self.curPreMRPRInfo.can_edit.boolValue ||(canCancel && self.curPreMRPRInfo.mrpr.granted.boolValue);//&#26377;&#26435;&#38480; || &#65288;&#20316;&#32773;&#36523;&#20221; && &#34987;&#25480;&#26435;&#65289;
     BOOL canAuthorization  = self.curPreMRPRInfo.can_edit.boolValue &&!canCancel &&!self.curPreMRPRInfo.author_can_edit.boolValue && !self.curPreMRPRInfo.mrpr.granted.boolValue;
     BOOL canCancelAuthorization = self.curPreMRPRInfo.can_edit.boolValue &&!canCancel &&!self.curPreMRPRInfo.author_can_edit.boolValue && self.curPreMRPRInfo.mrpr.granted.boolValue;
-    BOOL hasBottomView = self.curPreMRPRInfo.mrpr.status <= MRPRStatusCannotMerge && (canAction || canCancel);
+    BOOL hasBottomView = self.curMRPRInfo.mrpr.status <= MRPRStatusCannotMerge && (canAction || canCancel);
     if (!hasBottomView) {
         [_bottomView removeFromSuperview];
     }else if (!_bottomView){
diff --git a/Coding_iOS/Models/MRPR.h b/Coding_iOS/Models/MRPR.h
@@ -49,6 +49,7 @@ typedef NS_ENUM(NSInteger, MRPRStatus) {
 - (NSDictionary *)toAcceptParams;
 - (NSString *)toRefusePath;
 - (NSString *)toCancelPath;
+- (NSString *)toCancelMRPath;
 - (NSString *)toAuthorizationPath;
 
 @end
diff --git a/Coding_iOS/Models/MRPR.m b/Coding_iOS/Models/MRPR.m
@@ -104,6 +104,10 @@ - (NSString *)toCancelPath{
     return [[self p_prePath] stringByAppendingString:@"cancel"];
 }
 
+- (NSString *)toCancelMRPath{
+    return [[self path] stringByAppendingString:@"cancel"];
+}
+
 - (NSString *)toAuthorizationPath{
     return [[self p_prePath] stringByAppendingString:@"grant"];
 }
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -839,6 +839,19 @@ - (void)request_MRPRAuthorization:(MRPR *)curMRPR andBlock:(void (^)(id data, NS
     }];
 }
 
+- (void)request_MRPRCancel:(MRPR *)curMRPR andBlock:(void (^)(id data, NSError *error))block {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[curMRPR toCancelPath] withParams:nil withMethodType:Post andBlock:^(id data, NSError *error) {
+        if (data) {
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"MRPR_&#21462;&#28040;&#21512;&#24182;"];
+            
+            block(data, nil);
+        }else{
+            block(nil, error);
+        }
+    }];
+
+}
+
 - (void)request_MRPRCancelAuthorization:(MRPR *)curMRPR andBlock:(void (^)(id data, NSError *error))block{
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[curMRPR toAuthorizationPath] withParams:nil withMethodType:Delete andBlock:^(id data, NSError *error) {
         if (data) {

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,10 @@ - (NSString *)toCancelPath{`
`104`	`104`	`return [[self p_prePath] stringByAppendingString:@"cancel"];`
`105`	`105`	`}`
`106`	`106`
	`107`	`+- (NSString *)toCancelMRPath{`
	`108`	`+ return [[self path] stringByAppendingString:@"cancel"];`
	`109`	`+}`
	`110`	`+`
`107`	`111`	`- (NSString *)toAuthorizationPath{`
`108`	`112`	`return [[self p_prePath] stringByAppendingString:@"grant"];`
`109`	`113`	`}`