huangxiaodong 1 рік тому
батько
коміт
5daa5e7de6

+ 16 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m

@@ -229,7 +229,8 @@
 - (void)didCheckDiskFunByPath:(NSString*)pathStr
 {
     self.defaultDiskPath = pathStr;
-    [self searchFileListFun];
+    //[self searchFileListFun];
+    [self setTitleAfterGetdiskFun];
     [self hideDiskListVieFun];
 }
 
@@ -331,6 +332,20 @@
 #pragma mark 设置标题
 - (void)setTitleLabelText:(NSString*)title
 {
+    NSArray *diskNameArr = [_defaultDiskPath componentsSeparatedByString:@"/"];
+    if(diskNameArr && diskNameArr.count >= 2){
+        
+        NSString *name = diskNameArr.lastObject;
+        if(name.length == 0)
+        {
+            name = diskNameArr[diskNameArr.count -2];
+        }
+        
+        title = [[NSString alloc] initWithFormat:@"[%@]%@",name,title];
+    }
+    
+    
+    
     self.MytitleLabel.text = title;
     
     CGFloat curWidth = [title boundingRectWithSize:CGSizeMake(SCREEN_W, 30) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:18.f]} context:nil].size.width;

+ 6 - 2
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.m

@@ -261,10 +261,14 @@
 - (void)didGetFolderName:(NSString*)folderName withDiskPath:(NSString*)diskPathStr
 {
     _createFolderNameStr = folderName;
-    
-    //NSString *curbackupsDefaultPath = [[NSString alloc] initWithFormat:@"sdcard/%@",_createFolderNameStr];
     NSString *curbackupsDefaultPath = [[NSString alloc] initWithFormat:@"%@/%@",diskPathStr,_createFolderNameStr];
     
+    NSString *lastStr = [diskPathStr substringFromIndex:diskPathStr.length -1];
+    if([lastStr isEqualToString:@"/"]){
+        curbackupsDefaultPath = [[NSString alloc] initWithFormat:@"%@%@",diskPathStr,_createFolderNameStr];
+    }
+   
+    
     if(_curType == 2){
         [HWDataManager setStringWithKey:Const_photo_backups_default_path value:curbackupsDefaultPath];
     }