对请求地址中的 ref、path 做一下特殊处理

Author: wanghengheng

Coding_iOS/Coding_iOS-Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3.2.201508271530</string>
+	<string>3.2.201508282030</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Coding_iOS/Controllers/CodeViewController.m

@@ -100,7 +100,7 @@ - (void)doSomethingWithResponse:(id)data andError:(NSError *)error{
 
 - (void)refreshCodeViewData{
     if ([_myCodeFile.file.mode isEqualToString:@"image"]) {
-        NSURL *imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, _myCodeFile.ref, _myCodeFile.file.path]];
+        NSURL *imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@u/%@/p/%@/git/raw/%@/%@", [NSObject baseURLStr], _myProject.owner_user_name, _myProject.name, [_myCodeFile.ref URLEncoding_Coding], [_myCodeFile.file.path URLEncoding_Coding]]];
         DebugLog(@"imageUrl: %@", imageUrl);
         [self.webContentView loadRequest:[NSURLRequest requestWithURL:imageUrl]];
     }else if ([_myCodeFile.file.mode isEqualToString:@"file"]){

Coding_iOS/Controllers/CommitFilesViewController.m

@@ -274,7 +274,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         FileChange *curFileChange = [curList objectAtIndex:indexPath.row];
 
         FileChangeDetailViewController *vc = [FileChangeDetailViewController new];
-        vc.linkUrlStr = [NSString stringWithFormat:@"api/user/%@/project/%@/git/commitDiffContent/%@/%@", _ownerGK, _projectName, _commitId, curFileChange.path];
+        vc.linkUrlStr = [NSString stringWithFormat:@"api/user/%@/project/%@/git/commitDiffContent/%@/%@", _ownerGK, _projectName, _commitId, [curFileChange.path URLEncoding_Coding]];
 
         vc.curProject = _curProject;
         vc.commitId = curFileChange.commitId;

Coding_iOS/Controllers/MRPRFilesViewController.m

@@ -170,7 +170,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         FileChange *curFileChange = [curList objectAtIndex:indexPath.row];
 
         FileChangeDetailViewController *vc = [FileChangeDetailViewController new];
-        vc.linkUrlStr = [NSString stringWithFormat:@"%@?path=%@", [_curMRPR toFileLineChangesPath], curFileChange.path];
+        vc.linkUrlStr = [NSString stringWithFormat:@"%@?path=%@", [_curMRPR toFileLineChangesPath], [curFileChange.path URLEncoding_Coding]];
         vc.curProject = _curProject;
         vc.commitId = curFileChange.commitId;
         vc.filePath = curFileChange.path;

Coding_iOS/Util/Manager/CodingNetAPIClient.m

@@ -62,7 +62,6 @@ - (void)requestJsonDataWithPath:(NSString *)aPath
     //log请求数据
     DebugLog(@"\n===========request===========:%@\n%@:\n%@", kNetworkMethodName[method], aPath, params);
     aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 //    发起请求
     switch (method) {
         case Get:{

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -908,8 +908,8 @@ - (void)request_CloseShareHash:(NSString *)hashStr andBlock:(void (^)(id data, N
 
 #pragma mark Code
 - (void)request_CodeTree:(CodeTree *)codeTree withPro:(Project *)project codeTreeBlock:(void (^)(id codeTreeData, NSError *codeTreeError))block{
-    NSString *treePath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/tree/%@/%@", project.owner_user_name, project.name, codeTree.ref, codeTree.path];
-    NSString *treeinfoPath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/treeinfo/%@/%@", project.owner_user_name, project.name, codeTree.ref, codeTree.path];
+    NSString *treePath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/tree/%@/%@", project.owner_user_name, project.name, [codeTree.ref URLEncoding_Coding], [codeTree.path URLEncoding_Coding]];
+    NSString *treeinfoPath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/treeinfo/%@/%@", project.owner_user_name, project.name, [codeTree.ref URLEncoding_Coding], [codeTree.path URLEncoding_Coding]];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:treePath withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
             id resultData = [data valueForKeyPath:@"data"];
@@ -936,7 +936,7 @@ - (void)request_CodeTree:(CodeTree *)codeTree withPro:(Project *)project codeTre
 }
 
 - (void)request_CodeFile:(CodeFile *)codeFile withPro:(Project *)project andBlock:(void (^)(id data, NSError *error))block{
-    NSString *filePath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/blob/%@/%@", project.owner_user_name, project.name, codeFile.ref, codeFile.path];
+    NSString *filePath = [NSString stringWithFormat:@"api/user/%@/project/%@/git/blob/%@/%@", project.owner_user_name, project.name, [codeFile.ref URLEncoding_Coding], [codeFile.path URLEncoding_Coding]];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:filePath withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
             [MobClick event:kUmeng_Event_Request_Get label:@"代码文件内容"];
@@ -966,7 +966,7 @@ - (void)request_CodeBranchOrTagWithPath:(NSString *)path withPro:(Project *)proj
 }
 
 - (void)request_Commits:(Commits *)curCommits withPro:(Project *)project andBlock:(void (^)(id data, NSError *error))block{
-    NSString *path = [NSString stringWithFormat:@"api/user/%@/project/%@/git/commits/%@/%@", project.owner_user_name, project.name, curCommits.ref, curCommits.path];
+    NSString *path = [NSString stringWithFormat:@"api/user/%@/project/%@/git/commits/%@/%@", project.owner_user_name, project.name, [curCommits.ref URLEncoding_Coding], [curCommits.path URLEncoding_Coding]];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:[curCommits toParams] withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
             [MobClick event:kUmeng_Event_Request_Get label:@"提交记录_列表"];

Coding_iOS/Util/OC_Category/NSString+Common.h

@@ -14,6 +14,7 @@
 + (NSString *)userAgentStr;
 
 - (NSString *)URLEncoding;
+- (NSString *)URLEncoding_Coding;
 - (NSString *)URLDecoding;
 - (NSString *)md5Str;
 - (NSString*) sha1Str;

Coding_iOS/Util/OC_Category/NSString+Common.m

@@ -30,7 +30,11 @@ - (NSString *)URLEncoding
                                                                                               kCFStringEncodingUTF8 ));
     return result;
 }
-
+- (NSString *)URLEncoding_Coding{
+    NSString *result = [self stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    result = [result stringByReplacingOccurrencesOfString: @"%2F" withString: @"/"];
+    return result;
+}
 - (NSString *)URLDecoding
 {
     NSMutableString * string = [NSMutableString stringWithString:self];