文件资源的跳转

Author: wanghengheng

Coding_iOS/Controllers/FileViewController.h

@@ -13,4 +13,5 @@
 
 @interface FileViewController : BaseViewController
 @property (strong, nonatomic) ProjectFile *curFile;
+- (void)requestFileData;
 @end

Coding_iOS/Controllers/RootControllers/BaseViewController.m

@@ -27,6 +27,7 @@
 #import "ProjectCommitsViewController.h"
 #import "MRPRDetailViewController.h"
 #import "CommitFilesViewController.h"
+#import "FileViewController.h"
 
 #import "UnReadManager.h"
 
@@ -154,6 +155,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
     NSString *ppRegexStr = @"/u/([^/]+)/pp/([0-9]+)$";
     NSString *topicRegexStr = @"/u/([^/]+)/p/([^/]+)/topic/(\\d+)";
     NSString *taskRegexStr = @"/u/([^/]+)/p/([^/]+)/task/(\\d+)";
+    NSString *fileRegexStr = @"/u/([^/]+)/p/([^/]+)/attachment/([^/]+)/preview/(\\d+)";
     NSString *gitMRPRCommitRegexStr = @"/u/([^/]+)/p/([^/]+)/git/(merge|pull|commit)/([^/#]+)";
     NSString *conversionRegexStr = @"/user/messages/history/([^/]+)$";
     NSString *projectRegexStr = @"/u/([^/]+)/p/([^/]+)";
@@ -249,7 +251,24 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
             };
             analyseVC = vc;
         }
-
+    }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:fileRegexStr]).count > 0){
+        NSString *user_global_key = matchedCaptures[1];
+        NSString *project_name = matchedCaptures[2];
+        NSString *fileId = matchedCaptures[4];
+        if ([presentingVC isKindOfClass:[FileViewController class]]) {
+            FileViewController *vc = (FileViewController *)presentingVC;
+            if (vc.curFile.file_id.integerValue == fileId.integerValue) {
+                [vc requestFileData];
+                analyseVCIsNew = NO;
+                analyseVC = vc;
+            }
+        }
+        if (!analyseVC) {
+            FileViewController *vc = [FileViewController new];
+            ProjectFile *curFile = [[ProjectFile alloc] initWithFileId:@(fileId.integerValue) inProject:project_name ofUser:user_global_key];
+            vc.curFile = curFile;
+            analyseVC = vc;
+        }
     }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:conversionRegexStr]).count > 0) {
         //私信
         NSString *user_global_key = matchedCaptures[1];

Coding_iOS/Models/ProjectFile.h

@@ -27,6 +27,7 @@ typedef NS_ENUM(NSInteger, DownloadState){
 @property (readwrite, nonatomic, strong) NSString *diskFileName;
 
 +(ProjectFile *)fileWithFileId:(NSNumber *)fileId andProjectId:(NSNumber *)project_id;
+- (instancetype)initWithFileId:(NSNumber *)fileId inProject:(NSString *)project_name ofUser:(NSString *)project_owner_name;
 
 - (BOOL)isEmpty;
 

Coding_iOS/Models/ProjectFile.m

@@ -9,6 +9,10 @@
 #import "ProjectFile.h"
 #import "Coding_FileManager.h"
 
+@interface ProjectFile ()
+@property (strong, nonatomic) NSString *project_name, *project_owner_name;
+@end
+
 @implementation ProjectFile
 
 +(ProjectFile *)fileWithFileId:(NSNumber *)fileId andProjectId:(NSNumber *)project_id{
@@ -17,6 +21,27 @@ +(ProjectFile *)fileWithFileId:(NSNumber *)fileId andProjectId:(NSNumber *)proje
     file.project_id = project_id;
     return file;
 }
+
+- (instancetype)initWithFileId:(NSNumber *)fileId inProject:(NSString *)project_name ofUser:(NSString *)project_owner_name{
+    self = [super init];
+    if (self) {
+        _file_id = fileId;
+        _project_id = nil;
+        _project_name = project_name;
+        _project_owner_name = project_owner_name;
+    }
+    return self;
+}
+
+- (void)setOwner_preview:(NSString *)owner_preview{
+    _owner_preview = owner_preview;
+    if (!_project_id && owner_preview.length > 0) {
+        NSString *project_id;
+        project_id = [[[[owner_preview componentsSeparatedByString:@"project/"] lastObject] componentsSeparatedByString:@"/"] firstObject];
+        _project_id = @(project_id.integerValue);
+    }
+}
+
 - (BOOL)isEmpty{
     return !(self.storage_key && self.storage_key.length > 0);
 }
@@ -142,7 +167,15 @@ - (NSDictionary *)toMoveToParams{
 }
 
 - (NSString *)toDetailPath{
-    return [NSString stringWithFormat:@"api/project/%@/files/%@/view", _project_id.stringValue, _file_id.stringValue];
+    NSString *path;
+    if (!_project_id) {
+        path = [NSString stringWithFormat:@"api/user/%@/project/%@/files/%@/view", _project_owner_name, _project_name, _file_id.stringValue];
+    }else{
+        path = [NSString stringWithFormat:@"api/project/%@/files/%@/view", _project_id.stringValue, _file_id.stringValue];
+    }
+    return path;
 }
+
+
 @end
 

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -755,7 +755,9 @@ - (void)request_FileDetail:(ProjectFile *)file andBlock:(void (^)(id data, NSErr
             id resultData = [data valueForKeyPath:@"data"];
             resultData = [resultData valueForKeyPath:@"file"];
             ProjectFile *detailFile = [NSObject objectOfClass:@"ProjectFile" fromJSON:resultData];
-            detailFile.project_id = file.project_id;
+            if (file.project_id) {
+                detailFile.project_id = file.project_id;
+            }
             block(detailFile, nil);
         }else{
             block(nil, error);

Coding_iOS/Views/FileDownloadView.m

@@ -246,7 +246,10 @@ - (void)clickedByUser{
                     break;
             }
         }else{//新建下载
-            
+            if (!self.file.project_id) {
+                [self showHudTipStr:@"下载失败~"];
+                return;
+            }
             __weak typeof(self) weakSelf = self;
             Coding_DownloadTask *cDownloadTask = [manager addDownloadTaskForFile:self.file completionHandler:^(NSURLResponse *response, NSURL *filePath, NSError *error) {
                 if (error) {