line_note - bug fix (路径问题)

wanghengheng · wanghengheng · commit fee292c18798 · 2015-08-28T17:10:48.000+08:00
diff --git a/Coding_iOS/Controllers/FileChangeDetailViewController.m b/Coding_iOS/Controllers/FileChangeDetailViewController.m
@@ -148,6 +148,7 @@ - (void)handleURL:(NSURL *)curURL{
 
 - (NSMutableDictionary *)getParamsFromURLStr:(NSString *)urlStr{
     urlStr = [[urlStr componentsSeparatedByString:@"?"] lastObject];
+    urlStr = [urlStr stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     NSMutableDictionary *params = [NSMutableDictionary new];
     for (NSString *param in [urlStr componentsSeparatedByString:@"&"]) {
         NSArray *elts = [param componentsSeparatedByString:@"="];
diff --git a/Coding_iOS/Controllers/MRPRDetailViewController.m b/Coding_iOS/Controllers/MRPRDetailViewController.m
@@ -185,7 +185,7 @@ - (UIButton *)buttonWithType:(MRPRAction)actionType{
         title = @"&#21512;&#24182;";
         colorStr = @"0x4E90BF";
         if (_curMRPRInfo.mrpr.status == MRPRStatusCannotMerge) {
-            curButton.alpha = 0.7;
+            curButton.alpha = 0.5;
         }
     }else if (actionType == MRPRActionRefuse){
         title = @"&#25298;&#32477;";
diff --git a/Coding_iOS/Images/file_activity_icon/file_activity_icon_move_file@2x.png b/Coding_iOS/Images/file_activity_icon/file_activity_icon_move_file@2x.png
diff --git a/Coding_iOS/Util/Manager/CodingNetAPIClient.m b/Coding_iOS/Util/Manager/CodingNetAPIClient.m
@@ -62,8 +62,8 @@ - (void)requestJsonDataWithPath:(NSString *)aPath
     //log&#35831;&#27714;&#25968;&#25454;
     DebugLog(@"\n===========request===========:%@\n%@:\n%@", kNetworkMethodName[method], aPath, params);
     aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    
-    //&#21457;&#36215;&#35831;&#27714;
+    aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+//    &#21457;&#36215;&#35831;&#27714;
     switch (method) {
         case Get:{
             //&#25152;&#26377; Get &#35831;&#27714;&#65292;&#22686;&#21152;&#32531;&#23384;&#26426;&#21046;

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ - (UIButton *)buttonWithType:(MRPRAction)actionType{`
`185`	`185`	`title = @"合并";`
`186`	`186`	`colorStr = @"0x4E90BF";`
`187`	`187`	`if (_curMRPRInfo.mrpr.status == MRPRStatusCannotMerge) {`
`188`		`- curButton.alpha = 0.7;`
	`188`	`+ curButton.alpha = 0.5;`
`189`	`189`	`}`
`190`	`190`	`}else if (actionType == MRPRActionRefuse){`
`191`	`191`	`title = @"拒绝";`
-Original file line number
+Diff line change
     //log请求数据
     DebugLog(@"\n===========request===========:%@\n%@:\n%@", kNetworkMethodName[method], aPath, params);
     aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+-
 -    //发起请求
 +    aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 +//    发起请求
     switch (method) {
         case Get:{
             //所有 Get 请求，增加缓存机制