修改了动态的跳转问题

useropen · useropen · commit 7a4d4d48a50f · 2016-04-09T08:33:58.000+08:00
diff --git a/Coding_iOS/Controllers/ProjectMemberActivityListViewController.m b/Coding_iOS/Controllers/ProjectMemberActivityListViewController.m
@@ -12,6 +12,7 @@
 #import "TopicDetailViewController.h"
 #import "FileListViewController.h"
 #import "FileViewController.h"
+#import "MRDetailViewController.h"
 
 #import "ProjectCommitsViewController.h"
 #import "PRDetailViewController.h"
@@ -199,7 +200,16 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
             if ([proAct.line_note.noteable_type isEqualToString:@"Commit"]) {
                 vc = [CommitFilesViewController vcWithPath:request_path];
             }else{
-                vc = [PRDetailViewController vcWithPath:request_path];
+                if([request_path rangeOfString:@"merge"].location == NSNotFound)//_roaldSearchText
+                {
+                     vc = [PRDetailViewController vcWithPath:request_path];
+                }
+                else
+                {
+                     vc = [MRDetailViewController vcWithPath:request_path];
+
+                }
+                
             }
             if (vc) {
                 [self.navigationController pushViewController:vc animated:YES];
diff --git a/Coding_iOS/Controllers/ProjectViewController.m b/Coding_iOS/Controllers/ProjectViewController.m
@@ -29,6 +29,7 @@
 #import "FolderToMoveViewController.h"
 #import "FileViewController.h"
 #import "ProjectCommitsViewController.h"
+#import "MRDetailViewController.h"
 
 #import "ProjectCommitsViewController.h"
 #import "PRDetailViewController.h"
@@ -472,7 +473,15 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
             if ([proAct.line_note.noteable_type isEqualToString:@"Commit"]) {
                 vc = [CommitFilesViewController vcWithPath:request_path];
             }else{
-                vc = [PRDetailViewController vcWithPath:request_path];
+                if([request_path rangeOfString:@"merge"].location == NSNotFound)//_roaldSearchText
+                {
+                    vc = [PRDetailViewController vcWithPath:request_path];
+                }
+                else
+                {
+                    vc = [MRDetailViewController vcWithPath:request_path];
+                }
+               
             }
             if (vc) {
                 [self.navigationController pushViewController:vc animated:YES];
diff --git a/Coding_iOS/Controllers/RootControllers/BaseViewController.m b/Coding_iOS/Controllers/RootControllers/BaseViewController.m
@@ -235,7 +235,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
                 }
             }
             if (!analyseVC) {
-                if([path rangeOfString:@"qingjoin"].location !=NSNotFound)//_roaldSearchText
+                if([path rangeOfString:@"merge"].location == NSNotFound)//_roaldSearchText
                 {
                      analyseVC = [PRDetailViewController vcWithPath:path];
                 }

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ + (UIViewController )analyseVCFromLinkStr:(NSString )linkStr analyseMethod:(An`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`	`if (!analyseVC) {`
`238`		`- if([path rangeOfString:@"qingjoin"].location !=NSNotFound)//_roaldSearchText`
	`238`	`+ if([path rangeOfString:@"merge"].location == NSNotFound)//_roaldSearchText`
`239`	`239`	`{`
`240`	`240`	`analyseVC = [PRDetailViewController vcWithPath:path];`
`241`	`241`	`}`