Browse Source

1、文件上传:剩余空间展示对应的磁盘剩余空间;
2、外挂磁盘拔出:选择文件后点击上传,toast提示“磁盘路径不存在,请检查磁盘是否正常连接”。该批文件不进行传输,不做跳转;

huangxiaodong 1 year ago
parent
commit
ec8a846dc6

+ 50 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/PhotoPreviewViewController.m

@@ -228,7 +228,56 @@
     [self.view addSubview:bottomView];
     self.photoPreViewBottomV = bottomView;
     
-    self.photoPreViewBottomV.availableStorage = _availableStorage;
+    NSString * uploadDefaultPath = [HWDataManager getStringWithKey:Const_photo_upload_default_path];
+    
+    BOOL isExtraFileType = NO;
+    BOOL isExtraPathFind = NO;
+    if(uploadDefaultPath){
+        if(![uploadDefaultPath containsString:@"sdcard/"]){
+            isExtraFileType = YES;
+        }
+    }
+    
+    if(uploadDefaultPath && ksharedAppDelegate.cloudPhoneExtraFileListMod){
+        NSArray*arr =  ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
+        
+        for (cloudPhoneExtraFileModel*model in arr) {
+            if([uploadDefaultPath containsString:model.extraPath]){
+                
+                NSString * availableStorage = @"";
+                NSInteger totalSize_k = model.extraAvableSize / 1024;
+                if(totalSize_k < 1024){
+                    availableStorage = [[NSString alloc] initWithFormat:@"%ldKB",totalSize_k];
+                }
+                else if( totalSize_k >= 1024 && totalSize_k < 1024*1024){
+                    availableStorage = [[NSString alloc] initWithFormat:@"%.1fMB",totalSize_k/1024.0];
+                    
+                }
+                else{
+                    availableStorage = [[NSString alloc] initWithFormat:@"%.2fG",totalSize_k/1024.0/1024.0];
+                }
+                
+                
+                self.photoPreViewBottomV.availableStorage = availableStorage;
+                //self.photoPreViewBottomV.available =  model.extraAvableSize;
+                isExtraPathFind = YES;
+                break;
+            }
+        }
+        
+        
+    }
+    
+    if(!isExtraFileType){
+        self.photoPreViewBottomV.availableStorage = _availableStorage;
+        //self.photoPreViewBottomV.available =  baseInfoModel.data.available;
+    }
+    
+    if(isExtraFileType && !isExtraPathFind){
+        self.photoPreViewBottomV.isExtraFileAndNotFindPathType = YES;
+    }
+    
+    //self.photoPreViewBottomV.availableStorage = _availableStorage;
     [self setDataToBottomViewFun];
     
     [bottomView mas_makeConstraints:^(MASConstraintMaker *make) {

+ 1 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/photoPreViewBottomView.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 //选中的项
 @property (nonatomic, strong) NSMutableArray *indexPathsForSelectedItems;
 @property (nonatomic,copy) NSString *availableStorage;
+@property (nonatomic,assign) BOOL isExtraFileAndNotFindPathType;
 //点击上传
 @property (nonatomic,copy) void (^didClickUploadFile)(void);
 @end

+ 5 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/photoPreViewBottomView.m

@@ -173,6 +173,11 @@
 #pragma mark 按钮点击
 - (void)didClickButFun:(UIButton*)but
 {
+    if(_isExtraFileAndNotFindPathType){
+        [[iToast makeAttrText:NSLocalizedString(@"upload_file_and_not_path_tip",nil)] show];
+        return;
+    }
+    
     if(_didClickUploadFile)
     {
         _didClickUploadFile();

+ 2 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.h

@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) NSMutableArray *indexPathsForSelectedItems;
 @property (nonatomic,copy) NSString *availableStorage;
 @property (nonatomic,assign) long available;
+
+@property (nonatomic,assign) BOOL isExtraFileAndNotFindPathType;
 //点击上传
 @property (nonatomic,copy) void (^didClickUploadFile)(void);
 @end

+ 5 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.m

@@ -204,6 +204,11 @@
 #pragma mark 按钮点击
 - (void)didClickButFun:(UIButton*)but
 {
+    if(_isExtraFileAndNotFindPathType){
+        [[iToast makeAttrText:NSLocalizedString(@"upload_file_and_not_path_tip",nil)] show];
+        return;
+    }
+    
     if(_didClickUploadFile)
     {
         _didClickUploadFile();

+ 49 - 2
创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m

@@ -564,8 +564,55 @@
         return;
     }
     
-    self.uploadFileBottomV.availableStorage = baseInfoModel.data.availableStorage;
-    self.uploadFileBottomV.available =  baseInfoModel.data.available;
+    NSString * uploadDefaultPath = [HWDataManager getStringWithKey:Const_photo_upload_default_path];
+    
+    BOOL isExtraFileType = NO;
+    BOOL isExtraPathFind = NO;
+    if(uploadDefaultPath){
+        if(![uploadDefaultPath containsString:@"sdcard/"]){
+            isExtraFileType = YES;
+        }
+    }
+    
+    if(uploadDefaultPath && ksharedAppDelegate.cloudPhoneExtraFileListMod){
+        NSArray*arr =  ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
+        
+        for (cloudPhoneExtraFileModel*model in arr) {
+            if([uploadDefaultPath containsString:model.extraPath]){
+                
+                NSString * availableStorage = @"";
+                NSInteger totalSize_k = model.extraAvableSize / 1024;
+                if(totalSize_k < 1024){
+                    availableStorage = [[NSString alloc] initWithFormat:@"%ldKB",totalSize_k];
+                }
+                else if( totalSize_k >= 1024 && totalSize_k < 1024*1024){
+                    availableStorage = [[NSString alloc] initWithFormat:@"%.1fMB",totalSize_k/1024.0];
+                    
+                }
+                else{
+                    availableStorage = [[NSString alloc] initWithFormat:@"%.2fG",totalSize_k/1024.0/1024.0];
+                }
+                
+                
+                self.uploadFileBottomV.availableStorage = availableStorage;
+                self.uploadFileBottomV.available =  model.extraAvableSize;
+                isExtraPathFind = YES;
+                break;
+            }
+        }
+        
+        
+    }
+    
+    if(!isExtraFileType){
+        self.uploadFileBottomV.availableStorage = baseInfoModel.data.availableStorage;
+        self.uploadFileBottomV.available =  baseInfoModel.data.available;
+    }
+    
+    if(isExtraFileType && !isExtraPathFind){
+        self.uploadFileBottomV.isExtraFileAndNotFindPathType = YES;
+    }
+    
     [self setDataToBottomViewFun];
 }
 @end