fixed:首页&消息页面&看看页面&服务等页面的适配
This commit is contained in:
+1
-1
@@ -169,7 +169,7 @@ typedef NS_ENUM(NSInteger, IfishDoctorPayType){
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
self.tableView.scrollEnabled = YES;
|
self.tableView.scrollEnabled = YES;
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
self.tableView.scrollEnabled = YES;
|
self.tableView.scrollEnabled = YES;
|
||||||
|
|||||||
+1
-1
@@ -175,7 +175,7 @@
|
|||||||
}
|
}
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
|
|||||||
+1
-1
@@ -87,7 +87,7 @@ const float ActivityPageSize = 20;
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
self.tableView.scrollEnabled = YES;
|
self.tableView.scrollEnabled = YES;
|
||||||
|
|||||||
+1
-9
@@ -178,7 +178,7 @@
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
self.tableView.scrollEnabled = YES;
|
self.tableView.scrollEnabled = YES;
|
||||||
@@ -278,14 +278,6 @@
|
|||||||
return 70.0f;
|
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{
|
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||||
|
|
||||||
[tableView deselectRowAtIndexPath:indexPath animated:YES];
|
[tableView deselectRowAtIndexPath:indexPath animated:YES];
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@
|
|||||||
-(void)setUI{
|
-(void)setUI{
|
||||||
|
|
||||||
self.tableView = [[UITableView alloc] init ];
|
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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
|
|
||||||
|
|||||||
+2
-5
@@ -54,7 +54,8 @@
|
|||||||
-(void)viewWillAppear:(BOOL)animated{
|
-(void)viewWillAppear:(BOOL)animated{
|
||||||
|
|
||||||
[super viewWillAppear: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];
|
NSInteger count = [[[NIMSDK sharedSDK] conversationManager] allUnreadCount];
|
||||||
|
|
||||||
count ==0 ? (self.navigationController.tabBarItem.badgeValue =nil):(self.navigationController.tabBarItem.badgeValue = [NSString stringWithFormat:@"%ld",(long)count]);
|
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];
|
UIBarButtonItem *backTem=[[UIBarButtonItem alloc] initWithCustomView:bakbutton];
|
||||||
self.navigationItem.leftBarButtonItem=backTem;
|
self.navigationItem.leftBarButtonItem=backTem;
|
||||||
[self addTitleViewWithTitle:@"消息"];
|
[self addTitleViewWithTitle:@"消息"];
|
||||||
|
|
||||||
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
|
|
||||||
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)addTitleViewWithTitle:(NSString *)title{
|
- (void)addTitleViewWithTitle:(NSString *)title{
|
||||||
|
|||||||
@@ -675,7 +675,7 @@
|
|||||||
[self.tableView registerNib:[UINib nibWithNibName:@"TabBarDeviceShouYeCell" bundle:nil] forCellReuseIdentifier:@"TabBarDeviceShouYeCell"];
|
[self.tableView registerNib:[UINib nibWithNibName:@"TabBarDeviceShouYeCell" bundle:nil] forCellReuseIdentifier:@"TabBarDeviceShouYeCell"];
|
||||||
[self.tableView registerNib:[UINib nibWithNibName:@"TabbarDeiceSecdCell" bundle:nil] forCellReuseIdentifier:@"TabbarDeiceSecdCell"];
|
[self.tableView registerNib:[UINib nibWithNibName:@"TabbarDeiceSecdCell" bundle:nil] forCellReuseIdentifier:@"TabbarDeiceSecdCell"];
|
||||||
//CGFloat sapce=TabContentHeaght*0.011;//20/1776
|
//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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
@@ -730,7 +730,7 @@
|
|||||||
|
|
||||||
-(void)viewWillAppear:(BOOL)animated{
|
-(void)viewWillAppear:(BOOL)animated{
|
||||||
[super viewWillAppear:animated];
|
[super viewWillAppear:animated];
|
||||||
self.navigationController.navigationBar.hidden = YES;
|
self.navigationController.navigationBar.translucent = YES;
|
||||||
//设置透明导航栏
|
//设置透明导航栏
|
||||||
[self.navigationController
|
[self.navigationController
|
||||||
.navigationBar setClearNav];
|
.navigationBar setClearNav];
|
||||||
@@ -1206,9 +1206,8 @@
|
|||||||
-(void)viewWillDisappear:(BOOL)animated{
|
-(void)viewWillDisappear:(BOOL)animated{
|
||||||
[super viewWillDisappear:animated];
|
[super viewWillDisappear:animated];
|
||||||
[self.view hideToastActivity];
|
[self.view hideToastActivity];
|
||||||
self.navigationController.navigationBar.hidden = NO;
|
self.navigationController.navigationBar.translucent = NO;
|
||||||
[self.navigationController.navigationBar cnReset];
|
[self.navigationController.navigationBar cnReset];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark 未绑定设备或添加设备 跳转
|
#pragma mark 未绑定设备或添加设备 跳转
|
||||||
|
|||||||
+1
-6
@@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.dataSource = self;
|
||||||
_tableView.delegate = self;
|
_tableView.delegate = self;
|
||||||
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
||||||
@@ -140,11 +140,6 @@
|
|||||||
return 95;
|
return 95;
|
||||||
}
|
}
|
||||||
|
|
||||||
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
|
|
||||||
|
|
||||||
return 0.01f;
|
|
||||||
}
|
|
||||||
|
|
||||||
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
|
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||||
|
|
||||||
[tableView deselectRowAtIndexPath:indexPath animated:YES];
|
[tableView deselectRowAtIndexPath:indexPath animated:YES];
|
||||||
|
|||||||
+3
-5
@@ -122,7 +122,7 @@
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
||||||
@@ -132,7 +132,7 @@
|
|||||||
UIButton *qiandaoBtn = [UIButton buttonWithType:UIButtonTypeCustom];
|
UIButton *qiandaoBtn = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||||
CGFloat btnH = self.view.frame.size.width * 0.13;
|
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];
|
IfishUserAsset *asset = [dataContorl getAllIfishUserAsset];
|
||||||
|
|
||||||
qiandaoBtn.backgroundColor = asset.toDaySignin ? RGB(221, 221,221):RGB(0, 184, 329);
|
qiandaoBtn.backgroundColor = asset.toDaySignin ? RGB(221, 221,221):RGB(0, 184, 329);
|
||||||
@@ -149,9 +149,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
[qiandaoBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
|
[qiandaoBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
|
||||||
[self.view addSubview:qiandaoBtn];
|
self.tableView.tableFooterView = qiandaoBtn;
|
||||||
[self.view bringSubviewToFront:qiandaoBtn];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-6
@@ -136,7 +136,7 @@
|
|||||||
|
|
||||||
-(void)creatTab{
|
-(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.delegate = self;
|
||||||
self.tableView.dataSource = self;
|
self.tableView.dataSource = self;
|
||||||
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
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{
|
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
|
||||||
|
|
||||||
if(section ==1){
|
if(section ==1){
|
||||||
|
|||||||
Reference in New Issue
Block a user