Procházet zdrojové kódy

下载路径默认显示相册,未按实际显示

huangxiaodong před 1 rokem
rodič
revize
4b88ce0fea

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

@@ -344,7 +344,13 @@
     
     
     if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateDone){
-        NSString*tipStr = NSLocalizedString(@"File_download_Path_default_done",nil);
+        NSString*tipStr = NSLocalizedString(@"File_download_Path_other_done",nil);
+        
+        if([iTools canSaveFileToAlbumByPhoto:YES withName:curShareFileDataModel.fileName]
+           ||[iTools canSaveFileToAlbumByPhoto:NO withName:curShareFileDataModel.fileName]){
+            tipStr = NSLocalizedString(@"File_download_Path_default_done",nil);
+        }
+        
         _fileProgresslabel.text = [[NSString alloc] initWithFormat:@"%@  %@",totalSizeStr,tipStr];
     }
     else if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateFail){

+ 3 - 20
创维盒子/双子星云手机/Class/Set/uploadFile/receiveView/receiveDownloadRecordTableView.m

@@ -804,32 +804,15 @@
         
         lastName = [lastName lowercaseString];
         
-        if ([lastName rangeOfString:@"jpg"].location != NSNotFound
-                 ||[lastName rangeOfString:@"jpeg"].location != NSNotFound
-                 ||[lastName rangeOfString:@"png"].location != NSNotFound
-                 ||[lastName rangeOfString:@"gif"].location != NSNotFound
-                 ||[lastName rangeOfString:@"bmp"].location != NSNotFound
-                 ||[lastName rangeOfString:@"svg"].location != NSNotFound
-                 ||[lastName rangeOfString:@"tiff"].location != NSNotFound
-                 ||[lastName rangeOfString:@"heic"].location != NSNotFound
-                 ) {//可以保持到相册
-            
-            
+        if([iTools canSaveFileToAlbumByPhoto:YES withName:lastName])
+        {//可以保持到相册
             UIImage *image = [UIImage imageWithContentsOfFile:pathStr];
             if(image){
                 [self loadImageFinished:image with:pathStr];
             }
                 
         }
-        else if ([lastName rangeOfString:@"mp4"].location != NSNotFound
-                 ||[lastName rangeOfString:@"avi"].location != NSNotFound
-                 ||[lastName rangeOfString:@"flv"].location != NSNotFound
-                 ||[lastName rangeOfString:@"wmv"].location != NSNotFound
-                 ||[lastName rangeOfString:@"wkm"].location != NSNotFound
-                 ||[lastName rangeOfString:@"ts"].location != NSNotFound
-                 ||[lastName rangeOfString:@"mov"].location != NSNotFound
-                 ||[lastName rangeOfString:@"rmvb"].location != NSNotFound
-                 ) {//可以保持到相册
+        else if([iTools canSaveFileToAlbumByPhoto:NO withName:lastName]){//可以保持到相册
             [self loadVideoFinishedBy:pathStr];
             
         }

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

@@ -359,7 +359,13 @@
     
     
     if(curCouldPhoneFileModel.curDownloadStateType == downloadStateDone){
-        NSString*tipStr = NSLocalizedString(@"File_download_Path_default_done",nil);
+        NSString*tipStr = NSLocalizedString(@"File_download_Path_other_done",nil);
+        
+        if([iTools canSaveFileToAlbumByPhoto:YES withName:curCouldPhoneFileModel.name]
+           ||[iTools canSaveFileToAlbumByPhoto:NO withName:curCouldPhoneFileModel.name]){
+            tipStr = NSLocalizedString(@"File_download_Path_default_done",nil);
+        }
+        
         _fileProgresslabel.text = [[NSString alloc] initWithFormat:@"%@  %@",totalSizeStr,tipStr];
     }
     else if(curCouldPhoneFileModel.curDownloadStateType == downloadStateFail){

+ 1 - 0
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -524,3 +524,4 @@
 "get_sn_msg_201_content" = "请提供SN联系客服查询设备信息!";
 "get_sn_msg_202_title" = "设备激活失败";
 "get_sn_msg_202_content" = "检查盒子是否通电通网,若还不能解决,请提供SN联系客服处理!";
+"File_download_Path_other_done"   = "下载到:文件";