1.修复文件相关bug

创维盒子/code/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -118,10 +118,22 @@
         [weakSelf didClickSelectAllButton:but];
     };
     
+    CGFloat tableViewAdjust = 0.0;
+    CGFloat bigAddbuttonAdjust = 0.0;
+    
+    if(isFirstPageType){
+        tableViewAdjust = TABBARHEIGHT;
+        bigAddbuttonAdjust = TABBARHEIGHT;
+    }
     
     _curEditTypeBottomView = [[editTypeBottomView alloc] init];
     _curEditTypeBottomView.hidden = YES;
-    [self.view addSubview:_curEditTypeBottomView];
+    if(!isFirstPageType){
+        [self.view addSubview:_curEditTypeBottomView];
+    }
+    else{
+        [ksharedAppDelegate.window addSubview:_curEditTypeBottomView];
+    }
     
     [_curEditTypeBottomView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(0);
@@ -143,13 +155,6 @@
         }
     };
     
-    CGFloat tableViewAdjust = 0.0;
-    CGFloat bigAddbuttonAdjust = 0.0;
-    
-    if(isFirstPageType){
-        tableViewAdjust = TABBARHEIGHT;
-        bigAddbuttonAdjust = TABBARHEIGHT;
-    }
     
     
     [self.view addSubview:self.tableView];
@@ -614,10 +619,16 @@
     _curEditTypeBottomView.hidden = YES;
     _uploadFileButton.hidden = NO;
     
+    CGFloat tableViewAdjust = 0.0;
+    
+    if(isFirstPageType){
+        tableViewAdjust = TABBARHEIGHT;
+    }
+    
     [self.tableView  mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
+        make.bottom.mas_equalTo(-tableViewAdjust);
         make.top.equalTo(self.navBarBGView.mas_bottom).offset(10.f);
     }];
 }
@@ -720,7 +731,7 @@
 - (void)userDidClickUploadViewFun
 {
     previewToUploadFileView *previewToUploadFileV = [[previewToUploadFileView alloc] init];
-    [self.view addSubview:previewToUploadFileV];
+    [ksharedAppDelegate.window addSubview:previewToUploadFileV];
     
     [previewToUploadFileV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(0);
@@ -850,6 +861,10 @@
         [self getFileListFun:NO];
         [self queryShareSwitchFunFun];
     }
+    
+    if(isFirstPageType){
+        [self showTabbarFun];
+    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated{

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -5812,7 +5812,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5891,7 +5891,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",