From f338bb377a9e2f87f876cf8c5f0124d84da85bea Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 15 三月 2023 14:18:40 +0800
Subject: [PATCH] 1.引入自定义button和scrollview 2.引入时间选择器组件 3.完善临时密码功能 4.修改部分类名
---
EZSDK/EZSDK/EZ/Base/HDLEZTopBarView.m | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/Base/HDLEZTopBarView.m b/EZSDK/EZSDK/EZ/Base/HDLEZTopBarView.m
index 4f16694..df59c22 100755
--- a/EZSDK/EZSDK/EZ/Base/HDLEZTopBarView.m
+++ b/EZSDK/EZSDK/EZ/Base/HDLEZTopBarView.m
@@ -24,7 +24,10 @@
[self addSubview:self.titleLabel];
[self addSubview:self.bottomLine];
[self addSubview:self.rightButton];
+ [self addSubview:self.leftButton];
[self.rightButton setHidden:YES];
+ [self.leftButton setHidden:YES];
+ [self.bottomLine setHidden:YES];
}
return self;
}
@@ -32,13 +35,32 @@
- (UIButton*)backButton{
if(!_backButton){
//buttonWithType UIButtonTypeSystem 璁剧疆tintColor 灏卞彲浠ユ敼鍙樺浘鐗囩殑棰滆壊
- _backButton = [UIButton buttonWithType:UIButtonTypeSystem];
- _backButton.frame = CGRectMake(16, HDLEZ_APP_STATUS_BAR_HEIGHT+(40-20)/2, 12, 20);
+ _backButton = [HDLEZButton buttonWithType:UIButtonTypeSystem];
+ _backButton.frame = CGRectMake(16, HDLEZ_APP_STATUS_BAR_HEIGHT+(44-20)/2, 12, 20);
[_backButton setImage:[UIImage imageNamed:@"hdl_ez_ic_nav_back"] forState:UIControlStateNormal];
+ _backButton.tapHeight=40;
+ _backButton.tapWidth=80;
+
//鎸夐挳鍥炬爣棰滆壊
_backButton.tintColor = HDLEZ_COLOR_TEXT;
}
return _backButton;
+}
+
+/*宸﹁竟鎸夐挳
+ */
+-(UIButton*)leftButton{
+ if(!_leftButton){
+ //buttonWithType UIButtonTypeSystem 璁剧疆tintColor 灏卞彲浠ユ敼鍙樺浘鐗囩殑棰滆壊
+ _leftButton = [HDLEZButton buttonWithType:UIButtonTypeSystem];
+ _leftButton.frame = CGRectMake(16, HDLEZ_APP_STATUS_BAR_HEIGHT+(44-20)/2, 80, 20);
+ [_leftButton setTitleColor:HDLEZ_COLOR_TEXT_TITLE_GRAY forState:UIControlStateNormal];
+ _leftButton.titleLabel.font=HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_14);
+ _leftButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
+ _leftButton.tapHeight=40;
+ _leftButton.tapWidth=80;
+ }
+ return _leftButton;
}
- (UILabel *)titleLabel{
@@ -63,10 +85,13 @@
if(!_rightButton){
//buttonWithType UIButtonTypeSystem 璁剧疆tintColor 灏卞彲浠ユ敼鍙樺浘鐗囩殑棰滆壊
// _rightButton = [UIButton buttonWithType:UIButtonTypeSystem];
- _rightButton=[[UIButton alloc] init];
- _rightButton.frame = CGRectMake(HDLEZ_APP_SCREEN_WIDTH-16-60, HDLEZ_APP_STATUS_BAR_HEIGHT, 60, 44);
+ _rightButton=[[HDLEZButton alloc] init];
+ _rightButton.frame = CGRectMake(HDLEZ_APP_SCREEN_WIDTH-12-32, HDLEZ_APP_STATUS_BAR_HEIGHT+(44-32)/2, 32, 32);
[_rightButton setTitleColor:HDLEZ_COLOR_TEXT_LIGHT_BLUE forState:UIControlStateNormal];
_rightButton.titleLabel.font=HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_14);
+ _rightButton.tapHeight=44;
+ _rightButton.tapWidth=44;
+
//鎸夐挳鍥炬爣棰滆壊
// _backButton.tintColor = HDLEZ_COLOR_TEXT;
}
@@ -94,7 +119,15 @@
}
-//璁剧疆鍙宠竟鎸夐挳鏍囬
+/*璁剧疆宸﹁竟鎸夐挳鏍囬
+ */
+-(void)setLeftBtnTitle:(NSString *)leftBtnTitle{
+ _leftBtnTitle=leftBtnTitle;
+ [_leftButton setHidden:NO];
+ [_leftButton setTitle:leftBtnTitle forState:UIControlStateNormal];
+}
+/*璁剧疆鍙宠竟鎸夐挳鏍囬
+ */
-(void)setRightBtnTitle:(NSString *)rightBtnTitle{
_rightBtnTitle=rightBtnTitle;
[_rightButton setHidden:NO];
--
Gitblit v1.8.0