소스 검색

1.去掉下载模块的ws下载缩略图相关

huangxiaodong 1 년 전
부모
커밋
c1d3fcad06

+ 0 - 1
创维盒子/双子星云手机/Class/Set/previewFile/addAudioToPlayListViewController.m

@@ -8,7 +8,6 @@
 #import "addAudioToPlayListViewController.h"
 
 #import "couldPhoneFileListModel.h"
-#import "downloadThumbnailManager.h"
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"

+ 0 - 1
创维盒子/双子星云手机/Class/Set/previewFile/previewAudioOrDocumentViewController.m

@@ -8,7 +8,6 @@
 #import "previewAudioOrDocumentViewController.h"
 
 #import "couldPhoneFileListModel.h"
-#import "downloadThumbnailManager.h"
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"

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

@@ -8,7 +8,6 @@
 #import "previewFileAndFolderSecondViewController.h"
 
 #import "couldPhoneFileListModel.h"
-#import "downloadThumbnailManager.h"
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"

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

@@ -8,7 +8,6 @@
 #import "previewFileAndFolderViewController.h"
 
 #import "couldPhoneFileListModel.h"
-#import "downloadThumbnailManager.h"
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"

+ 0 - 1
创维盒子/双子星云手机/Class/Set/previewFile/previewImageOrVideoViewController.m

@@ -8,7 +8,6 @@
 #import "previewImageOrVideoViewController.h"
 
 #import "couldPhoneFileListModel.h"
-#import "downloadThumbnailManager.h"
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"

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

@@ -140,9 +140,7 @@
 {
     _curFileModel = curFileModel;
     
-    //[[downloadThumbnailManager shareInstance] handlToDownloadOneThumbnailWith:_curFileModel];
-    
-    [[downloadThumbnailManager shareInstance] handlToDownloadThumbnailInDownTableViewWith:@[_curFileModel]];
+    //[[downloadThumbnailManager shareInstance] handlToDownloadThumbnailInDownTableViewWith:@[_curFileModel]];
     
     mImageView.image = [UIImage imageNamed:@"uploadFile_image"];
     if([curFileModel.fileType isEqualToString:@"video"])

+ 0 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/receiveView/boxDownloadFileRecordCell.m

@@ -9,7 +9,6 @@
 
 #import "cachesFileManager.h"
 #import <SDWebImage/SDWebImage.h>
-#import "downloadThumbnailManager.h"
 #import "customDownloadManager.h"
 
 @interface boxDownloadFileRecordCell ()

+ 0 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/receiveView/boxReceiveFileRecordCell.m

@@ -9,7 +9,6 @@
 
 #import "cachesFileManager.h"
 #import <SDWebImage/SDWebImage.h>
-#import "downloadThumbnailManager.h"
 
 @interface boxReceiveFileRecordCell ()
 @property(nonatomic,strong) UIImageView *fileImageView;

+ 78 - 13
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/downloadFileRecordCell.m

@@ -223,27 +223,92 @@
     
     _curCouldPhoneFileModel = curCouldPhoneFileModel;
     
-    //[[downloadThumbnailManager shareInstance] handlToDownloadOneThumbnailWith:_curCouldPhoneFileModel];
-    [[downloadThumbnailManager shareInstance] handlToDownloadThumbnailInDownTableViewWith:@[_curCouldPhoneFileModel]];
+    //[[downloadThumbnailManager shareInstance] handlToDownloadThumbnailInDownTableViewWith:@[_curCouldPhoneFileModel]];
     
     if(_curCouldPhoneFileModel.curDownloadStateType != downloadStateDone){
         //HLog(@"hhhhhhh2  %@ %ld ",_curCouldPhoneFileModel.name,_curCouldPhoneFileModel.didDownloadBytes);
     }
     
-//    NSString*pathStr = [cachesFileManager getFilePathWithName:curUploadFileDataModel.filename type:curUploadFileDataModel.curUploadFileType];
-//    UIImage *image = [UIImage imageWithContentsOfFile:pathStr];
-//
-//    if(image){
-//        _fileImageView.image = image;
-//    }
-//    else
+    NSString *filePath = _curCouldPhoneFileModel.path;
+    NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
+    NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
+    
+    UIImage *placeholderImage = nil;
+    
+    if([curCouldPhoneFileModel.fileType isEqualToString:@"video"])
+    {
+        placeholderImage = [UIImage imageNamed:@"uploadFile_Video"];
+    }
+    else if([curCouldPhoneFileModel.fileType containsString:@"jpg"])
+    {
+        placeholderImage = [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([curCouldPhoneFileModel.fileType isEqualToString:@"audio"])
+    {
+        _fileImageView.image = [UIImage imageNamed:@"uploadFile_audio"];
+    }
+    else if([curCouldPhoneFileModel.fileType isEqualToString:@"dir"])
     {
-        _fileImageView.image = [UIImage imageNamed:@"uploadFile_image"];
-        if([curCouldPhoneFileModel.fileType isEqualToString:@"video"])
-        {
-            _fileImageView.image = [UIImage imageNamed:@"uploadFile_Video"];
+        _fileImageView.image = [UIImage imageNamed:@"uploadFile_dir"];
+    }
+    else if([curCouldPhoneFileModel.fileType isEqualToString:@"doc"])
+    {
+       //uploadFile_TXT  uploadFile_pdf uploadFile_xlsx uploadFile_doc
+        NSArray *nameArr= [curCouldPhoneFileModel.fileType componentsSeparatedByString:@"."];
+        if (nameArr.count >= 2) {
+            NSString *lastName = nameArr.lastObject;
+            
+            lastName = [lastName lowercaseString];
+            
+            if ([lastName rangeOfString:@"txt"].location != NSNotFound) {
+                _fileImageView.image = [UIImage imageNamed:@"uploadFile_TXT"];
+            }
+            else if ([lastName rangeOfString:@"pdf"].location != NSNotFound) {
+                _fileImageView.image = [UIImage imageNamed:@"uploadFile_pdf"];
+            }
+            else if ([lastName rangeOfString:@"xlsx"].location != NSNotFound) {
+                _fileImageView.image = [UIImage imageNamed:@"uploadFile_xlsx"];
+            }
+            else if ([lastName rangeOfString:@"doc"].location != NSNotFound) {
+                _fileImageView.image = [UIImage imageNamed:@"uploadFile_doc"];
+            }
+            else{
+                _fileImageView.image = [UIImage imageNamed:@"uploadFile_other"];
+            }
         }
+        
+    }
+    else{
+        _fileImageView.image = [UIImage imageNamed:@"uploadFile_other"];
     }
+
+    if([curCouldPhoneFileModel.fileType isEqualToString:@"video"]
+       ||([curCouldPhoneFileModel.fileType containsString:@"jpg"])){
+        fileUrl = [fileUrl  stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        
+        [_fileImageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:placeholderImage 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);
+            }
+        }];
+    }
+
+//    {
+//        _fileImageView.image = [UIImage imageNamed:@"uploadFile_image"];
+//        if([curCouldPhoneFileModel.fileType isEqualToString:@"video"])
+//        {
+//            _fileImageView.image = [UIImage imageNamed:@"uploadFile_Video"];
+//        }
+//    }
     
     NSString *fileName = [_curCouldPhoneFileModel getFileNameFun];
     NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadThumbnail];

+ 0 - 1
创维盒子/双子星云手机/NAS/NasPreviewVideoViewController.m

@@ -8,7 +8,6 @@
 #import "NasPreviewVideoViewController.h"
 
 #import "couldPhoneFileListModel.h"
-#import "downloadThumbnailManager.h"
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"

+ 1 - 1
创维盒子/双子星云手机/cloudPhone/websocket/webSocketManager.m

@@ -419,7 +419,7 @@ static webSocketManager *webSocketManagerInstance = nil;
     [[uploadFileManager shareInstance] checkReUploadFileFun];
     [[downloadManager shareInstance] checkReDownloadFileFun];
     
-    [[downloadThumbnailManager shareInstance] checkReDownloadThumbnailFileFun];
+    //[[downloadThumbnailManager shareInstance] checkReDownloadThumbnailFileFun];
     
     [self checkCommandSendTaskFun];