瀏覽代碼

1.修复文件相关bug

huangxiaodong 1 周之前
父節點
當前提交
0b5c696144
共有 1 個文件被更改,包括 18 次插入3 次删除
  1. 18 3
      创维盒子/code/Class/Set/previewFile/previewFileAndFolderViewController.m

+ 18 - 3
创维盒子/code/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -122,7 +122,12 @@
     
     _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);
@@ -657,10 +662,16 @@
     _uploadFileButton.hidden = NO;
     self.searchBarThridTypeV.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);
         make.top.equalTo(self.searchBarThridTypeV.mas_bottom).offset(10.f);
     }];
@@ -764,7 +775,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);
@@ -891,6 +902,10 @@
         [self getFileListFun:NO];
         [self queryShareSwitchFunFun];
     }
+    
+    if(isFirstPageType){
+        [self showTabbarFun];
+    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated{