From f99cf1d5cc50407394501853be06cb39f38a092c Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Wed, 28 Mar 2018 14:09:19 +0800
Subject: [PATCH] 界面更换与适配调整
---
pregnancy_guard/BaseProject/Controller/Login/LoginPage.m | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/pregnancy_guard/BaseProject/Controller/Login/LoginPage.m b/pregnancy_guard/BaseProject/Controller/Login/LoginPage.m
index b792bf4..dfa6b07 100644
--- a/pregnancy_guard/BaseProject/Controller/Login/LoginPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Login/LoginPage.m
@@ -40,7 +40,7 @@
if([UserDefault stringForKey:@"isLogin"] != nil && [[UserDefault stringForKey:@"isLogin"] intValue] == 1 )
{
// ���������������
- //[GetAppDelegate getUserInfo];
+ [GetAppDelegate getUserInfo];
}
}
@@ -60,22 +60,22 @@
[self.view addSubview:loginBk];
// ��������� pagecontrol
- CGFloat logoHeight = 77;
- CGFloat logoWidth = 152;
+ CGFloat logoHeight = 134;
+ CGFloat logoWidth = 113;
CGFloat tipsLabelHeight = NavBarHeight7+75+30;
CGFloat textFieldW = 292;
CGFloat textFieldH = 56;
if( IsiPhone4 || IsiPhone5)
{
- logoWidth = 120;
- logoHeight = 70;
+ logoWidth = 80;
+ logoHeight = 90;
tipsLabelHeight = NavBarHeight7+70+10;
textFieldH = 50;
}
- UIImageView * logoPic = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-logoWidth)/2, NavBarHeight7+22, logoWidth, logoHeight)];
+ UIImageView * logoPic = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-logoWidth)/2, NavBarHeight7, logoWidth, logoHeight)];
logoPic.image = [UIImage imageNamed:@"login_logo"];
[self.view addSubview:logoPic];
@@ -150,7 +150,7 @@
registBtn.frame = CGRectMake((SCREEN_WIDTH-120)/2, SCREEN_HEIGHT/2+225, 120, 40);
[registBtn setTitle:@"���������������" forState:UIControlStateNormal];
registBtn.titleLabel.font = [UIFont systemFontOfSize: 16.0];
- [registBtn setTitleColor:RgbColor(241, 0, 39) forState:UIControlStateNormal];
+ [registBtn setTitleColor:kUIColorFromRGB(0x269af4) forState:UIControlStateNormal];
[registBtn addTarget:self action:@selector(registAction) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:registBtn];
@@ -181,14 +181,14 @@
// YES������������������������
HUD.dimBackground = YES;
- NSString *path = [[NSString alloc] initWithFormat:LOGIN];
+ NSString *path = [[NSString alloc] initWithFormat:USER_LOGIN];
CommonReqModel * model = [[CommonReqModel alloc] init];
- [model setUsername:userPhoneTextField.text];
+ [model setPhone:userPhoneTextField.text];
[model setPassword:userPwdTextFeild.text];
MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:model.toDic urlName:path success:^(id responseBody)
+ [NetworkSingleton networkingGetMethod:model.toDic urlName:path success:^(id responseBody)
{
HUD.hidden = YES;
MPStrongSelf(self);
@@ -206,14 +206,12 @@
// ������������������
[UserDefault setObject:@"1" forKey:@"isLogin"];
[UserDefault setObject:userModel._id forKey:@"user_id"];
- [UserDefault setObject:userModel.username forKey:@"username"];
+ [UserDefault setObject:userModel.phone forKey:@"phone"];
[UserDefault setObject:userModel.password forKey:@"password"];
[UserDefault setObject:userModel.nickname forKey:@"nickname"];
- if(userModel.opt == 2)
- {
- [UserDefault setObject:userModel.hotel_id forKey:@"hotel_id"];
- }
- [UserDefault setObject:[NSString stringWithFormat:@"%d",userModel.opt] forKey:@"opt"];//opt=1���������������������opt=2������������������
+ [UserDefault setObject:userModel.video forKey:@"video"];
+ [UserDefault setObject:userModel.refresh_frequency forKey:@"refresh_frequency"];
+ [UserDefault setObject:userModel.is_open_upload forKey:@"is_open_upload"];
[UserDefault synchronize];//������synchronize���������������������������������,���������������NSUserDefaults������������������������������������
// ���������������
--
Gitblit v1.8.0