From eb8a41ace96cb81060aefef13e2257ea80d83a12 Mon Sep 17 00:00:00 2001 From: jiangxuefei718 Date: Thu, 14 Mar 2019 14:34:24 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E9=A6=96=E9=A1=B5&=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2&=E7=9C=8B=E7=9C=8B=E9=A1=B5=E9=9D=A2&?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AD=89=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes .../VController/FishDoctorViewController.m | 2 +- .../IfishGoldCoastViewController.m | 2 +- .../MineKankan/MineKankanEditViewController.m | 2 +- .../IfishUsersActivityListController.m | 2 +- .../KanHuFuWuXInRuKou/KanHuFuWuViewController.m | 10 +--------- .../ShopCertificationIntroduceController.m | 2 +- .../NTESSessionListViewController.m | 7 ++----- .../设备/IfishDeviceViewController.m | 7 +++---- .../IfishInformationViewController.m | 7 +------ .../ViewControlller/QianDaoViewController.m | 8 +++----- .../ViewControlller/WoDeRenWuViewController.m | 7 +------ 12 files changed, 16 insertions(+), 40 deletions(-) diff --git a/.DS_Store b/.DS_Store index fee307ee41cc668e9945d5ef8b20fdcea45c99a7..8028446410dd7176d53a18f312c9dda36d77523b 100644 GIT binary patch delta 25 hcmZoMXfc?un^{dvcj7*MCUt?0AH~==vvU0B2LNvP2xI^N delta 25 hcmZoMXfc?un_2ax`ow+uOllW4eiUQh%*yef9{_{?3GV;^ diff --git a/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m b/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m index a40f5fd..834276c 100644 --- a/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m @@ -169,7 +169,7 @@ typedef NS_ENUM(NSInteger, IfishDoctorPayType){ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStylePlain]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; diff --git a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m index c95d360..b85aa42 100644 --- a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m @@ -57,7 +57,7 @@ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/MineKankan/MineKankanEditViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishLive/MineKankan/MineKankanEditViewController.m index 9c26787..ed756b1 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/MineKankan/MineKankanEditViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/MineKankan/MineKankanEditViewController.m @@ -175,7 +175,7 @@ } -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height ) style:UITableViewStylePlain]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m index 81d0b80..1cfce20 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m @@ -87,7 +87,7 @@ const float ActivityPageSize = 20; -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; diff --git a/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m b/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m index e591725..e33fad9 100644 --- a/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m @@ -178,7 +178,7 @@ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; @@ -278,14 +278,6 @@ return 70.0f; } --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - return 0.01f; -} - --(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.01f; -} - -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ [tableView deselectRowAtIndexPath:indexPath animated:YES]; diff --git a/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationIntroduceController.m b/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationIntroduceController.m index 46a0bee..ccf5ae3 100644 --- a/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationIntroduceController.m +++ b/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationIntroduceController.m @@ -32,7 +32,7 @@ -(void)setUI{ self.tableView = [[UITableView alloc] init ]; - self.tableView.frame =CGRectMake(0,0, self.view.frame.size.width,self.view.frame.size.height); + self.tableView.frame =CGRectMake(0,0, self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT); self.tableView.delegate = self; self.tableView.dataSource = self; diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m index 3daad60..640b525 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m @@ -54,7 +54,8 @@ -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - + [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; + [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; NSInteger count = [[[NIMSDK sharedSDK] conversationManager] allUnreadCount]; count ==0 ? (self.navigationController.tabBarItem.badgeValue =nil):(self.navigationController.tabBarItem.badgeValue = [NSString stringWithFormat:@"%ld",(long)count]); @@ -99,10 +100,6 @@ UIBarButtonItem *backTem=[[UIBarButtonItem alloc] initWithCustomView:bakbutton]; self.navigationItem.leftBarButtonItem=backTem; [self addTitleViewWithTitle:@"消息"]; - - [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; - [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; - } - (void)addTitleViewWithTitle:(NSString *)title{ diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 26c55af..f069c66 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -675,7 +675,7 @@ [self.tableView registerNib:[UINib nibWithNibName:@"TabBarDeviceShouYeCell" bundle:nil] forCellReuseIdentifier:@"TabBarDeviceShouYeCell"]; [self.tableView registerNib:[UINib nibWithNibName:@"TabbarDeiceSecdCell" bundle:nil] forCellReuseIdentifier:@"TabbarDeiceSecdCell"]; //CGFloat sapce=TabContentHeaght*0.011;//20/1776 - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height - 44) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView.delegate = self; self.tableView.dataSource = self; @@ -730,7 +730,7 @@ -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - self.navigationController.navigationBar.hidden = YES; + self.navigationController.navigationBar.translucent = YES; //设置透明导航栏 [self.navigationController .navigationBar setClearNav]; @@ -1206,9 +1206,8 @@ -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; [self.view hideToastActivity]; - self.navigationController.navigationBar.hidden = NO; + self.navigationController.navigationBar.translucent = NO; [self.navigationController.navigationBar cnReset]; - } #pragma mark 未绑定设备或添加设备 跳转 diff --git a/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m b/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m index 6f20838..2634c0d 100644 --- a/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m @@ -62,7 +62,7 @@ -(void)creatTab{ - _tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; + _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight-TOP_HEIGHT) style:UITableViewStylePlain]; _tableView.dataSource = self; _tableView.delegate = self; _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; @@ -140,11 +140,6 @@ return 95; } --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - - return 0.01f; -} - -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ [tableView deselectRowAtIndexPath:indexPath animated:YES]; diff --git a/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m b/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m index ccc6512..e9e151a 100644 --- a/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m @@ -122,7 +122,7 @@ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; @@ -132,7 +132,7 @@ UIButton *qiandaoBtn = [UIButton buttonWithType:UIButtonTypeCustom]; CGFloat btnH = self.view.frame.size.width * 0.13; - qiandaoBtn.frame = CGRectMake(0,self.view.frame.size.height - btnH, self.view.frame.size.width, btnH); + qiandaoBtn.frame = CGRectMake(0,0, self.view.frame.size.width, btnH); IfishUserAsset *asset = [dataContorl getAllIfishUserAsset]; qiandaoBtn.backgroundColor = asset.toDaySignin ? RGB(221, 221,221):RGB(0, 184, 329); @@ -149,9 +149,7 @@ } [qiandaoBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.view addSubview:qiandaoBtn]; - [self.view bringSubviewToFront:qiandaoBtn]; - + self.tableView.tableFooterView = qiandaoBtn; } diff --git a/Ifish/controllers/IfishTabControllers/设备/QianDao/WodeTask/ViewControlller/WoDeRenWuViewController.m b/Ifish/controllers/IfishTabControllers/设备/QianDao/WodeTask/ViewControlller/WoDeRenWuViewController.m index c9c0995..eb1cc77 100644 --- a/Ifish/controllers/IfishTabControllers/设备/QianDao/WodeTask/ViewControlller/WoDeRenWuViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/QianDao/WodeTask/ViewControlller/WoDeRenWuViewController.m @@ -136,7 +136,7 @@ -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; @@ -230,11 +230,6 @@ } } --(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - - return 0.01f; -} - -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ if(section ==1){