文件 - bug fix

Author: wanghengheng

Coding_iOS/Controllers/FileViewController.m

@@ -93,26 +93,28 @@ - (void)requestFileData{
 - (void)configContent{
     self.title = [self titleStr];
     NSURL *fileUrl = [self hasBeenDownload];
-    if (!fileUrl || self.curVersion) {
+    if (!fileUrl) {
         [self showDownloadView];
         _myToolBar.hidden = YES;
-        return;
-    }
-    
-    self.fileUrl = fileUrl;
-    [self setupDocumentControllerWithURL:fileUrl];
-    
-    if ([self.curFile.fileType isEqualToString:@"md"]
-        || [self.curFile.fileType isEqualToString:@"html"]
-        || [self.curFile.fileType isEqualToString:@"txt"]
-        || [self.curFile.fileType isEqualToString:@"plist"]){
-        [self loadWebView:fileUrl];
-    }else if ([QLPreviewController canPreviewItem:fileUrl]) {
-        [self showDiskFile:fileUrl];
-    }else {
-        [self showDownloadView];
+    }else{
+        self.fileUrl = fileUrl;
+        [self setupDocumentControllerWithURL:fileUrl];
+        if ([self.curFile.fileType isEqualToString:@"md"]
+            || [self.curFile.fileType isEqualToString:@"html"]
+            || [self.curFile.fileType isEqualToString:@"txt"]
+            || [self.curFile.fileType isEqualToString:@"plist"]){
+            [self loadWebView:fileUrl];
+        }else if ([QLPreviewController canPreviewItem:fileUrl]) {
+            [self showDiskFile:fileUrl];
+        }else {
+            [self showDownloadView];
+        }
+        if (_curVersion) {
+            _myToolBar.hidden = YES;
+        }else{
+            self.myToolBar.hidden = NO;
+        }
     }
-    self.myToolBar.hidden = NO;
 }
 
 

Coding_iOS/Models/FileVersion.h

@@ -11,7 +11,7 @@
 
 @interface FileVersion : NSObject
 @property (strong, nonatomic) NSNumber *file_id, *history_id, *owner_id, *parent_id, *size, *type, *version, *action, *project_id;
-@property (strong, nonatomic) NSString *action_msg, *name, *remark, *storage_key, *storage_type, *fileType, *preview;
+@property (strong, nonatomic) NSString *action_msg, *name, *remark, *storage_key, *storage_type, *fileType, *preview, *owner_preview;
 @property (strong, nonatomic) NSDate *created_at;
 @property (readwrite, nonatomic, strong) User *owner;
 

Coding_iOS/Views/FileDownloadView.m

@@ -70,7 +70,11 @@ - (NSString *)storage_key{
     return [self.curData valueForKey:@"storage_key"];
 }
 - (NSString *)name{
-    return [self.curData valueForKey:@"name"];
+    if (_version) {
+        return _version.remark;
+    }else{
+        return _file.name;
+    }
 }
 - (NSNumber *)project_id{
     return [self.curData valueForKey:@"project_id"];