|
|
@@ -289,10 +289,12 @@
|
|
|
[self.navBarBGView addSubview:selectTip];
|
|
|
self.selectTip = selectTip;
|
|
|
|
|
|
+ selectTip.hidden = YES;
|
|
|
+
|
|
|
tapBtn = [UIButton buttonWithType:UIButtonTypeCustom];
|
|
|
tapBtn.backgroundColor = [UIColor clearColor];
|
|
|
tapBtn.translatesAutoresizingMaskIntoConstraints = NO;
|
|
|
- [tapBtn addTarget:self action:@selector(selectDiskAction:) forControlEvents:UIControlEventTouchUpInside];
|
|
|
+ //[tapBtn addTarget:self action:@selector(selectDiskAction:) forControlEvents:UIControlEventTouchUpInside];
|
|
|
[self.navBarBGView addSubview:tapBtn];
|
|
|
|
|
|
[tapBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
@@ -846,7 +848,8 @@
|
|
|
//name = [name stringByReplacingOccurrencesOfString:@"sdcard" withString:NSLocalizedString(@"disk_phone_default_tip",nil)];
|
|
|
name = [iTools changePathToShowPathBy:name];
|
|
|
|
|
|
- title = [[NSString alloc] initWithFormat:@"[%@]%@",name,title];
|
|
|
+ //
|
|
|
+ //title = [[NSString alloc] initWithFormat:@"[%@]%@",name,title];
|
|
|
|
|
|
//判断是否为云机
|
|
|
if([name isEqualToString:NSLocalizedString(@"disk_phone_default_tip",nil)]){
|
|
|
@@ -1139,17 +1142,17 @@
|
|
|
{
|
|
|
NSMutableDictionary*paraDict = [NSMutableDictionary new];
|
|
|
|
|
|
- NSArray *diskNameArr = [_defaultDiskPath componentsSeparatedByString:@"/"];
|
|
|
- if(diskNameArr && diskNameArr.count >= 2){
|
|
|
-
|
|
|
- NSString *name = diskNameArr.lastObject;
|
|
|
- if(name.length == 0)
|
|
|
- {
|
|
|
- name = diskNameArr[diskNameArr.count -2];
|
|
|
- }
|
|
|
-
|
|
|
- [paraDict setValue:name forKey:@"path"];
|
|
|
- }
|
|
|
+// NSArray *diskNameArr = [_defaultDiskPath componentsSeparatedByString:@"/"];
|
|
|
+// if(diskNameArr && diskNameArr.count >= 2){
|
|
|
+//
|
|
|
+// NSString *name = diskNameArr.lastObject;
|
|
|
+// if(name.length == 0)
|
|
|
+// {
|
|
|
+// name = diskNameArr[diskNameArr.count -2];
|
|
|
+// }
|
|
|
+//
|
|
|
+// [paraDict setValue:name forKey:@"path"];
|
|
|
+// }
|
|
|
|
|
|
// if(_defaultDiskPath){
|
|
|
// [paraDict setValue:_defaultDiskPath forKey:@"path"];
|