zw/keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2

Browse Source
This commit is contained in:
CodeST
2025-11-07 19:33:54 +08:00
parent c3acc11f6a
commit 450798c8bd
2 changed files with 71 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
keyBoard/Class/Home/V/KBPanModalView.m
View File

@@ -21,8 +21,6 @@
/// 人
@property (nonatomic, strong) UIImageView *personImageView;
@property (nonatomic, strong) UIImageView *leftImageView;
@property (nonatomic, strong) UIImageView *rightImageView;
@property (nonatomic, strong) UIImageView *leftBgImageView;
@property (nonatomic, strong) UIImageView *rightBgImageView;
@@ -173,7 +171,7 @@
[self.bigWhiteContentView addSubview:self.secWhiteContentView];
[self.secWhiteContentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self).inset(0);
make.top.equalTo(self.bigWhiteContentView).offset(47);
make.top.equalTo(self.bigWhiteContentView).offset(40);
make.bottom.equalTo(self.bigWhiteContentView);
}];
@@ -184,19 +182,26 @@
make.left.right.top.equalTo(self.secWhiteContentView);
make.bottom.equalTo(self.secWhiteContentView);
}];
// [self.rightBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.right.top.equalTo(self.secWhiteContentView);
// make.bottom.equalTo(self.secWhiteContentView);
// }];
[self.rightBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.secWhiteContentView);
make.bottom.equalTo(self.secWhiteContentView);
}];
// 顶部栏
[self.secWhiteContentView addSubview:self.topBar];
[self.secWhiteContentView addSubview:self.containerView];
// 调整层级：将人物与皇冠图添加到与 topBar 同一父视图，并放在 topBar 之下
[self.secWhiteContentView insertSubview:self.personImageView belowSubview:self.topBar];
[self.secWhiteContentView insertSubview:self.hgImageView belowSubview:self.topBar];
// 调整层级：将人物与皇冠图放到左右背景图的后面（z 轴更低）
[self.secWhiteContentView insertSubview:self.personImageView belowSubview:self.leftBgImageView];
[self.secWhiteContentView insertSubview:self.hgImageView belowSubview:self.rightBgImageView];
// 固定各层 zPosition，避免插入顺序导致的偶发层级问题（背景 < 人/皇冠 < 磨砂 < 顶部栏）
self.leftBgImageView.layer.zPosition = 0;
self.rightBgImageView.layer.zPosition = 0;
self.personImageView.layer.zPosition = 1;
self.hgImageView.layer.zPosition = 1;
self.topBar.layer.zPosition = 3;
// [self.topBar addSubview:self.leftImageView];
// [self.topBar addSubview:self.rightImageView];
@@ -233,18 +238,6 @@
make.height.mas_equalTo(54);
}];
// [self.leftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.right.equalTo(self.topBar);
// make.top.equalTo(self.topBar);
// make.height.mas_equalTo(54);
// }];
// [self.rightImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.right.equalTo(self.topBar);
// make.top.equalTo(self.topBar);
// make.height.equalTo(self.leftImageView);
//
// }];
[self.hotButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.topBar).offset(3);
make.left.equalTo(self.topBar);
@@ -273,16 +266,16 @@
[self.personImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// 仍按页面整体的左右边距定位，保持与改层级前的视觉一致
make.left.equalTo(self).offset(46);
make.bottom.equalTo(self.topBar.mas_top).offset(22);
make.width.mas_equalTo(70);
make.height.mas_equalTo(107);
make.bottom.equalTo(self.topBar.mas_top).offset(20);
make.width.mas_equalTo(53);
make.height.mas_equalTo(81);
}];
[self.hgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self).offset(-38);
make.bottom.equalTo(self.topBar.mas_top).offset(12);
make.width.mas_equalTo(97);
make.height.mas_equalTo(78);
make.bottom.equalTo(self.topBar.mas_top).offset(16);
make.width.mas_equalTo(82);
make.height.mas_equalTo(66);
}];
}
@@ -348,11 +341,24 @@
make.width.mas_equalTo(78);
}];
if (index == 0) {
self.leftImageView.hidden = false;
self.rightImageView.hidden = true;
}else{
self.leftImageView.hidden = true;
self.rightImageView.hidden = false;
self.leftBgImageView.hidden = NO;
self.rightBgImageView.hidden = YES;
self.personImageView.hidden = YES;
self.hgImageView.hidden = NO;
} else {
self.leftBgImageView.hidden = YES;
self.rightBgImageView.hidden = NO;
self.personImageView.hidden = NO;
self.hgImageView.hidden = YES;
}
// 确认层级：把可见的装饰图放到当前背景图后面
UIView *visibleBg = self.rightBgImageView.hidden ? self.leftBgImageView : self.rightBgImageView;
if (!self.hgImageView.hidden) {
[self.secWhiteContentView insertSubview:self.hgImageView belowSubview:visibleBg];
}
if (!self.personImageView.hidden) {
[self.secWhiteContentView insertSubview:self.personImageView belowSubview:visibleBg];
}
if (animated) {
@@ -382,25 +388,6 @@
return _secWhiteContentView;
}
- (UIImageView *)leftImageView{
if (!_leftImageView) {
_leftImageView = [[UIImageView alloc] init];
_leftImageView.image = [UIImage imageNamed:@"home_left_image"];
_leftImageView.contentMode = UIViewContentModeScaleToFill;
}
return _leftImageView;
}
- (UIImageView *)rightImageView{
if (!_rightImageView) {
_rightImageView = [[UIImageView alloc] init];
_rightImageView.image = [UIImage imageNamed:@"home_right_image"];
_rightImageView.contentMode = UIViewContentModeScaleAspectFit;
_rightImageView.hidden = true;
}
return _rightImageView;
}
- (UIImageView *)hgImageView{
if (!_hgImageView) {
_hgImageView = [[UIImageView alloc] init];