1.二级文件目录显示

创维盒子/双子星云手机/Assets.xcassets/Set/uploadFile_TXT.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "uploadFile_TXT@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "uploadFile_TXT@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Assets.xcassets/Set/uploadFile_doc.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "uploadFile_doc@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "uploadFile_doc@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Assets.xcassets/Set/uploadFile_other.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "uploadFile_other@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "uploadFile_other@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Assets.xcassets/Set/uploadFile_pdf.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "uploadFile_pdf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "uploadFile_pdf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Assets.xcassets/Set/uploadFile_xlsx.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "uploadFile_xlsx@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "uploadFile_xlsx@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Class/Set/previewFile/previewFileAndFolderSecondViewController.m

@@ -247,9 +247,13 @@
     if(row < _curNASFileAudioMod.data.list.count){
         NASFileAndFolderDataModel* dataModel = _curNASFileAudioMod.data.list[row];
         
-        previewFileAndFolderSecondViewController *vc =  [previewFileAndFolderSecondViewController new];
-        vc.curFolderDataModel = dataModel;
-        [self.navigationController pushViewController:vc animated:YES];
+        if([dataModel.type isEqualToString:@"dir"])
+        {
+            previewFileAndFolderSecondViewController *vc =  [previewFileAndFolderSecondViewController new];
+            vc.curFolderDataModel = dataModel;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+    
     }
 
 }

创维盒子/双子星云手机/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -367,9 +367,12 @@
     if(row < _curNASFileAudioMod.data.list.count){
         NASFileAndFolderDataModel* dataModel = _curNASFileAudioMod.data.list[row];
         
-        previewFileAndFolderSecondViewController *vc =  [previewFileAndFolderSecondViewController new];
-        vc.curFolderDataModel = dataModel;
-        [self.navigationController pushViewController:vc animated:YES];
+        if([dataModel.type isEqualToString:@"dir"])
+        {
+            previewFileAndFolderSecondViewController *vc =  [previewFileAndFolderSecondViewController new];
+            vc.curFolderDataModel = dataModel;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
     }
 
 }

创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/downLoadPreViewCell.m

@@ -7,6 +7,7 @@
 
 #import "downLoadPreViewCell.h"
 #import "downloadThumbnailManager.h"
+#import <SDWebImage/SDWebImage.h>
 
 @implementation downLoadPreViewCell
 @synthesize cellBgView;
@@ -259,12 +260,27 @@
     _curNASFileAndFolderDataModel = curNASFileAndFolderDataModel;
     
     checkButton.hidden = NO;
+    checkButton.selected = curNASFileAndFolderDataModel.isSelectType;
+    
+    NSString *filePath = _curNASFileAndFolderDataModel.path;
+    NSString *urlStr = ksharedAppDelegate.NASFileService;
+    NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
     
     mImageView.image = [UIImage imageNamed:@"uploadFile_image"];
     if([curNASFileAndFolderDataModel.type isEqualToString:@"video"])
     {
         mImageView.image = [UIImage imageNamed:@"uploadFile_Video"];
     }
+    else if([curNASFileAndFolderDataModel.type isEqualToString:@"jpg"])
+    {
+        mImageView.image = [UIImage imageNamed:@"uploadFile_image"];
+        
+        //iOS格式的图片 代理拿不到缩略图
+        if([filePath rangeOfString:@".HEIC"].location != NSNotFound
+           ||[filePath rangeOfString:@".heic"].location != NSNotFound){
+            fileUrl = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",urlStr,filePath];
+        }
+    }
     else if([curNASFileAndFolderDataModel.type isEqualToString:@"audio"])
     {
         mImageView.image = [UIImage imageNamed:@"uploadFile_audio"];
@@ -274,9 +290,52 @@
         checkButton.hidden = YES;
         mImageView.image = [UIImage imageNamed:@"uploadFile_dir"];
     }
+    else if([curNASFileAndFolderDataModel.type isEqualToString:@"doc"])
+    {
+       //uploadFile_TXT  uploadFile_pdf uploadFile_xlsx uploadFile_doc
+        NSArray *nameArr= [curNASFileAndFolderDataModel.name componentsSeparatedByString:@"."];
+        if (nameArr.count > 2) {
+            NSString *lastName = nameArr.lastObject;
+            
+            lastName = [lastName lowercaseString];
+            
+            if ([lastName rangeOfString:@"txt"].location != NSNotFound) {
+                mImageView.image = [UIImage imageNamed:@"uploadFile_TXT"];
+            }
+            else if ([lastName rangeOfString:@"pdf"].location != NSNotFound) {
+                     mImageView.image = [UIImage imageNamed:@"uploadFile_pdf"];
+            }
+            else if ([lastName rangeOfString:@"xlsx"].location != NSNotFound) {
+                     mImageView.image = [UIImage imageNamed:@"uploadFile_xlsx"];
+            }
+            else if ([lastName rangeOfString:@"doc"].location != NSNotFound) {
+                     mImageView.image = [UIImage imageNamed:@"uploadFile_doc"];
+            }
+            else{
+                mImageView.image = [UIImage imageNamed:@"uploadFile_other"];
+            }
+        }
         
-    checkButton.selected = curNASFileAndFolderDataModel.isSelectType;
+    }
+    else{
+        mImageView.image = [UIImage imageNamed:@"uploadFile_other"];
+    }
 
+    if([curNASFileAndFolderDataModel.type isEqualToString:@"video"]
+       ||([curNASFileAndFolderDataModel.type isEqualToString:@"jpg"])){
+        fileUrl = [fileUrl  stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        
+        [mImageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:mImageView.image completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+            if(image){
+                HLog(@"11图片1:%@",imageURL.absoluteString);
+            }
+            else{
+                HLog(@"11图片0:%@",imageURL.absoluteString);
+            }
+            
+        }];
+    }
+    
     
     //时间戳转换为日期
     NSString *timeStr = [[NSString alloc] initWithFormat:@"%ld",curNASFileAndFolderDataModel.time];