添加键盘功能viewUI改动

CustomKeyboard/View/KBFunctionBarView.m

@@ -22,8 +22,9 @@
 - (instancetype)initWithFrame:(CGRect)frame{
     if (self = [super initWithFrame:frame]) {
         self.backgroundColor = [UIColor clearColor];
-        _leftTitles = @[@"ABC"];
-        _rightTitles = @[@"Upgrade VIP"];
+        // 标题字段暂时不用，预留给后续可能的文案按钮
+        _leftTitles = @[];
+        _rightTitles = @[];
         [self buildUI];
     }
     return self;
@@ -38,91 +39,60 @@
 #pragma mark - UI
 
 - (void)buildUI {
-    // 左右两个容器，方便分别布局
-    [self addSubview:self.leftContainer];
+    // 左右容器 + 可选地球键
     [self addSubview:self.globeButtonInternal];
+    [self addSubview:self.leftContainer];
     [self addSubview:self.rightContainer];
 
+    // 右侧：升级 VIP 按钮（使用资源图 upgrad_vip_icon，设计尺寸 115x35）
     [self.rightContainer mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.mas_right).offset(-12);
+        make.right.equalTo(self.mas_right).offset(-6);
         make.centerY.equalTo(self.mas_centerY);
-        make.height.mas_equalTo(36);
+        make.width.mas_equalTo(115);
+        make.height.mas_equalTo(35);
     }];
 
-    // 左侧地球键（按需显示）
+    UIButton *vipButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    vipButton.tag = 200; // 右侧 index = 0
+    UIImage *vipImage = [UIImage imageNamed:@"upgrad_vip_icon"];
+    [vipButton setImage:vipImage forState:UIControlStateNormal];
+    vipButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    vipButton.adjustsImageWhenHighlighted = YES;
+    [vipButton addTarget:self action:@selector(onRightTap:) forControlEvents:UIControlEventTouchUpInside];
+    [self.rightContainer addSubview:vipButton];
+    [vipButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.rightContainer);
+    }];
+    self.rightButtonsInternal = @[vipButton];
+
+    // 左侧地球键（按需显示，由 kb_refreshGlobeVisibility 控制是否展示）
     [self.globeButtonInternal mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.mas_left).offset(12);
         make.centerY.equalTo(self.mas_centerY);
         make.width.height.mas_equalTo(32);
     }];
 
+    // 左侧：App 图标按钮（使用资源图 App_icon，图标 34x34，按钮容器 36x36）
     [self.leftContainer mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.globeButtonInternal.mas_right).offset(8);
-        make.right.equalTo(self.rightContainer.mas_left).offset(-12);
         make.centerY.equalTo(self.mas_centerY);
+        make.width.mas_equalTo(36);
         make.height.mas_equalTo(36);
+        make.left.equalTo(self.mas_left).offset(12); // 具体偏移在 kb_refreshGlobeVisibility 中会根据地球键重新设置
     }];
 
-    // 左侧4个等宽按钮
-    NSMutableArray<UIButton *> *leftBtns = [NSMutableArray arrayWithCapacity:4];
-    UIView *prev = nil;
-    for (NSInteger i = 0; i < self.leftTitles.count; i++) {
-        UIButton *btn = [self buildButtonWithTitle:(i < self.leftTitles.count ? self.leftTitles[i] : [NSString stringWithFormat:@"L%ld", (long)i])];
-        btn.tag = 100 + i;
-        [btn addTarget:self action:@selector(onLeftTap:) forControlEvents:UIControlEventTouchUpInside];
-        [self.leftContainer addSubview:btn];
-        [btn mas_makeConstraints:^(MASConstraintMaker *make) {
-            if (prev) {
-                make.left.equalTo(prev.mas_right).offset(8);
-                make.width.equalTo(prev);
-            } else {
-                make.left.equalTo(self.leftContainer.mas_left);
-            }
-            make.top.bottom.equalTo(self.leftContainer);
-        }];
-        prev = btn;
-        [leftBtns addObject:btn];
-    }
-    [prev mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.leftContainer.mas_right);
+    UIButton *appButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    appButton.tag = 100; // 左侧 index = 0
+    UIImage *appImage = [UIImage imageNamed:@"App_icon"];
+    [appButton setImage:appImage forState:UIControlStateNormal];
+    appButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    appButton.adjustsImageWhenHighlighted = YES;
+    [appButton addTarget:self action:@selector(onLeftTap:) forControlEvents:UIControlEventTouchUpInside];
+    [self.leftContainer addSubview:appButton];
+    [appButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.center.equalTo(self.leftContainer);
+        make.width.height.mas_equalTo(34); // 设计图尺寸
     }];
-    self.leftButtonsInternal = leftBtns.copy;
-
-    // 右侧N个按钮（靠右、两两等宽）
-    NSMutableArray<UIButton *> *rightBtns = [NSMutableArray arrayWithCapacity:3];
-    for (NSInteger i = 0; i < self.rightTitles.count; i++) {
-        UIButton *btn = [self buildButtonWithTitle:(i < self.rightTitles.count ? self.rightTitles[i] : [NSString stringWithFormat:@"R%ld", (long)i])];
-        btn.tag = 200 + i;
-        [self.rightContainer addSubview:btn];
-        [btn addTarget:self action:@selector(onRightTap:) forControlEvents:UIControlEventTouchUpInside];
-        [rightBtns addObject:btn];
-    }
-
-    // 从右往左链式布局，保证整体靠右；支持 1/2/3... 任意数量
-    UIView *prevRight = nil; // 指向右侧已布局的按钮
-    for (NSInteger i = rightBtns.count - 1; i >= 0; i--) {
-        UIButton *btn = rightBtns[i];
-        [btn mas_makeConstraints:^(MASConstraintMaker *make) {
-            if (!prevRight) {
-                // 最右侧按钮贴右
-                make.right.equalTo(self.rightContainer.mas_right);
-            } else {
-                // 其余按钮紧挨左侧兄弟，且与其等宽
-                make.right.equalTo(prevRight.mas_left).offset(-8);
-                make.width.equalTo(prevRight);
-            }
-            make.top.bottom.equalTo(self.rightContainer);
-        }];
-        prevRight = btn;
-    }
-    // 最左侧一个不超出容器左边（允许根据内容自然宽度收缩）
-    if (prevRight) {
-        [prevRight mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.greaterThanOrEqualTo(self.rightContainer.mas_left);
-        }];
-    }
-
-    self.rightButtonsInternal = rightBtns.copy;
+    self.leftButtonsInternal = @[appButton];
 
     // 初始刷新地球键可见性与事件绑定
     [self kb_refreshGlobeVisibility];
@@ -144,17 +114,6 @@
     }
 }
 
-- (UIButton *)buildButtonWithTitle:(NSString *)title {
-    UIButton *btn = [UIButton buttonWithType:UIButtonTypeSystem];
-    btn.layer.cornerRadius = 18;
-    btn.layer.masksToBounds = YES;
-    btn.backgroundColor = [UIColor colorWithWhite:1 alpha:0.9];
-    btn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
-    [btn setTitle:title forState:UIControlStateNormal];
-    [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-    return btn;
-}
-
 #pragma mark - Lazy
 
 - (UIView *)leftContainer {
@@ -201,8 +160,8 @@
         } else {
             make.left.equalTo(self.mas_left).offset(12);
         }
-        make.right.equalTo(self.rightContainer.mas_left).offset(-12);
         make.centerY.equalTo(self.mas_centerY);
+        make.width.mas_equalTo(36);
         make.height.mas_equalTo(36);
     }];