From 19cb29616f94111dc65f89a3226bcd1862f7a33b Mon Sep 17 00:00:00 2001 From: CodeST <694468528@qq.com> Date: Mon, 2 Feb 2026 21:25:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E9=80=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 22 ++++ .../ai_sendmessage_icon@2x.png | Bin 0 -> 2351 bytes .../ai_sendmessage_icon@3x.png | Bin 0 -> 4299 bytes .../Class/AiTalk/V/Chat/KBPersonaChatCell.m | 2 +- .../AiTalk/V/Comment/KBAICommentInputView.m | 109 ++++++++++++------ .../Class/AiTalk/V/Comment/KBAICommentView.m | 9 +- keyBoard/Class/AiTalk/VC/KBAIHomeVC.m | 2 +- keyBoard/Class/AiTalk/VC/KBAIMessageVC.m | 44 +++---- keyBoard/Class/Categories/UIColor+Extension.h | 1 + 9 files changed, 126 insertions(+), 63 deletions(-) create mode 100644 keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/Contents.json create mode 100644 keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/ai_sendmessage_icon@2x.png create mode 100644 keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/ai_sendmessage_icon@3x.png diff --git a/keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/Contents.json new file mode 100644 index 0000000..f4d1e94 --- /dev/null +++ b/keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ai_sendmessage_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ai_sendmessage_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/ai_sendmessage_icon@2x.png b/keyBoard/Assets.xcassets/AI/ai_sendmessage_icon.imageset/ai_sendmessage_icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0577af0f697801616f3a14b69a4b95d79562b667 GIT binary patch literal 2351 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 t?D;1E00960kl%4V00006Nkl @property(nonatomic, strong) UIView *containerView; -@property(nonatomic, strong) UIImageView *avatarImageView; +//@property(nonatomic, strong) UIImageView *avatarImageView; @property(nonatomic, strong) UITextField *textField; +@property(nonatomic, strong) UILabel *placeholderLabel; @property(nonatomic, strong) UIButton *sendButton; @property(nonatomic, strong) UIView *topLine; @@ -31,12 +32,13 @@ #pragma mark - UI Setup - (void)setupUI { - self.backgroundColor = [UIColor whiteColor]; + self.backgroundColor = [UIColor colorWithHex:0x797979 alpha:0.49]; [self addSubview:self.topLine]; - [self addSubview:self.avatarImageView]; +// [self addSubview:self.avatarImageView]; [self addSubview:self.containerView]; [self.containerView addSubview:self.textField]; + [self addSubview:self.placeholderLabel]; [self addSubview:self.sendButton]; [self.topLine mas_makeConstraints:^(MASConstraintMaker *make) { @@ -44,17 +46,17 @@ make.height.mas_equalTo(0.5); }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self).offset(12); - make.centerY.equalTo(self); - make.width.height.mas_equalTo(32); - }]; +// [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.equalTo(self).offset(12); +// make.centerY.equalTo(self); +// make.width.height.mas_equalTo(32); +// }]; [self.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.avatarImageView.mas_right).offset(10); - make.right.equalTo(self.sendButton.mas_left).offset(-10); + make.left.equalTo(self).offset(12); + make.right.equalTo(self.sendButton.mas_left).offset(-12); make.centerY.equalTo(self); - make.height.mas_equalTo(36); + make.height.mas_equalTo(52); }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { @@ -69,17 +71,23 @@ make.width.mas_equalTo(50); make.height.mas_equalTo(30); }]; + + [self.placeholderLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.equalTo(self); + }]; } #pragma mark - Public Methods - (void)setPlaceholder:(NSString *)placeholder { _placeholder = placeholder; - self.textField.placeholder = placeholder; + self.placeholderLabel.text = placeholder; + [self updatePlaceholderVisibility]; } - (void)clearText { self.textField.text = @""; + [self updatePlaceholderVisibility]; [self updateSendButtonState]; } @@ -97,13 +105,14 @@ } - (void)textFieldDidChange:(UITextField *)textField { + [self updatePlaceholderVisibility]; [self updateSendButtonState]; } - (void)updateSendButtonState { BOOL hasText = self.textField.text.length > 0; self.sendButton.enabled = hasText; - self.sendButton.alpha = hasText ? 1.0 : 0.5; +// self.sendButton.alpha = hasText ? 1.0 : 0.5; } #pragma mark - UITextFieldDelegate @@ -113,6 +122,15 @@ return YES; } +- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField { + [self updatePlaceholderVisibility]; + return YES; +} + +- (void)textFieldDidEndEditing:(UITextField *)textField { + [self updatePlaceholderVisibility]; +} + #pragma mark - Lazy Loading - (UIView *)topLine { @@ -123,25 +141,24 @@ return _topLine; } -- (UIImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[UIImageView alloc] init]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.cornerRadius = 16; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.backgroundColor = [UIColor systemGray5Color]; - _avatarImageView.image = [UIImage systemImageNamed:@"person.circle.fill"]; - _avatarImageView.tintColor = [UIColor systemGray3Color]; - } - return _avatarImageView; -} +//- (UIImageView *)avatarImageView { +// if (!_avatarImageView) { +// _avatarImageView = [[UIImageView alloc] init]; +// _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; +// _avatarImageView.layer.cornerRadius = 16; +// _avatarImageView.layer.masksToBounds = YES; +// _avatarImageView.backgroundColor = [UIColor systemGray5Color]; +// _avatarImageView.image = [UIImage systemImageNamed:@"person.circle.fill"]; +// _avatarImageView.tintColor = [UIColor systemGray3Color]; +// } +// return _avatarImageView; +//} - (UIView *)containerView { if (!_containerView) { _containerView = [[UIView alloc] init]; - _containerView.backgroundColor = [UIColor systemGray6Color]; - _containerView.layer.cornerRadius = 18; - _containerView.layer.masksToBounds = YES; +// _containerView.layer.cornerRadius = 26; +// _containerView.layer.masksToBounds = YES; } return _containerView; } @@ -149,27 +166,42 @@ - (UITextField *)textField { if (!_textField) { _textField = [[UITextField alloc] init]; - _textField.placeholder = @"说点什么..."; + _textField.textColor = [UIColor whiteColor]; + _textField.textAlignment = NSTextAlignmentLeft; _textField.font = [UIFont systemFontOfSize:14]; _textField.delegate = self; _textField.returnKeyType = UIReturnKeySend; [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; + [self updatePlaceholderVisibility]; } return _textField; } +- (UILabel *)placeholderLabel { + if (!_placeholderLabel) { + _placeholderLabel = [[UILabel alloc] init]; + _placeholderLabel.text = @"Send A Message"; + _placeholderLabel.textColor = [UIColor whiteColor]; + _placeholderLabel.font = [UIFont systemFontOfSize:14]; + _placeholderLabel.textAlignment = NSTextAlignmentCenter; + _placeholderLabel.userInteractionEnabled = NO; + } + return _placeholderLabel; +} + - (UIButton *)sendButton { if (!_sendButton) { _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:@"发送" forState:UIControlStateNormal]; - [_sendButton setTitleColor:[UIColor systemBlueColor] - forState:UIControlStateNormal]; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:15 - weight:UIFontWeightMedium]; +// [_sendButton setTitle:@"发送" forState:UIControlStateNormal]; +// [_sendButton setTitleColor:[UIColor systemBlueColor] +// forState:UIControlStateNormal]; +// _sendButton.titleLabel.font = [UIFont systemFontOfSize:15 +// weight:UIFontWeightMedium]; + [_sendButton setImage:[UIImage imageNamed:@"ai_sendmessage_icon"] forState:UIControlStateNormal]; _sendButton.enabled = NO; - _sendButton.alpha = 0.5; +// _sendButton.alpha = 0.5; [_sendButton addTarget:self action:@selector(sendButtonTapped) forControlEvents:UIControlEventTouchUpInside]; @@ -177,4 +209,11 @@ return _sendButton; } +#pragma mark - Private + +- (void)updatePlaceholderVisibility { + BOOL hasText = self.textField.text.length > 0; + self.placeholderLabel.hidden = hasText; +} + @end diff --git a/keyBoard/Class/AiTalk/V/Comment/KBAICommentView.m b/keyBoard/Class/AiTalk/V/Comment/KBAICommentView.m index f8fa9f1..040f052 100644 --- a/keyBoard/Class/AiTalk/V/Comment/KBAICommentView.m +++ b/keyBoard/Class/AiTalk/V/Comment/KBAICommentView.m @@ -189,8 +189,8 @@ static NSString *const kCommentFooterIdentifier = @"CommentFooter"; }]; [self.inputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self); - make.height.mas_equalTo(50); + make.left.right.equalTo(self).inset(12); + make.height.mas_equalTo(52); self.inputBottomConstraint = make.bottom.equalTo(self).offset(-KB_SafeAreaBottom()); }]; @@ -846,8 +846,9 @@ static NSInteger const kRepliesLoadCount = 5; - (KBAICommentInputView *)inputView { if (!_inputView) { _inputView = [[KBAICommentInputView alloc] init]; - _inputView.placeholder = @"说点什么..."; - + _inputView.placeholder = @"Send A Message"; + _inputView.layer.cornerRadius = 26; + _inputView.clipsToBounds = true; __weak typeof(self) weakSelf = self; _inputView.onSend = ^(NSString *text) { [weakSelf sendCommentWithText:text]; diff --git a/keyBoard/Class/AiTalk/VC/KBAIHomeVC.m b/keyBoard/Class/AiTalk/VC/KBAIHomeVC.m index 30e724f..de1adfe 100644 --- a/keyBoard/Class/AiTalk/VC/KBAIHomeVC.m +++ b/keyBoard/Class/AiTalk/VC/KBAIHomeVC.m @@ -791,7 +791,7 @@ - (UIButton *)sendButton { if (!_sendButton) { _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:KBLocalized(@"发送") forState:UIControlStateNormal]; + [_sendButton setTitle:KBLocalized(@"send") forState:UIControlStateNormal]; [_sendButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; _sendButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; _sendButton.backgroundColor = [UIColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:1.0]; diff --git a/keyBoard/Class/AiTalk/VC/KBAIMessageVC.m b/keyBoard/Class/AiTalk/VC/KBAIMessageVC.m index 1f48937..c6de732 100644 --- a/keyBoard/Class/AiTalk/VC/KBAIMessageVC.m +++ b/keyBoard/Class/AiTalk/VC/KBAIMessageVC.m @@ -23,7 +23,7 @@ @property (nonatomic, strong) JXCategoryListContainerView *listContainerView; /// 右侧搜索按钮 -@property (nonatomic, strong) UIButton *searchButton; +//@property (nonatomic, strong) UIButton *searchButton; /// 标题数组 @property (nonatomic, strong) NSArray *titles; @@ -42,7 +42,7 @@ [self setupUI]; /// 2：绑定事件 - [self bindActions]; +// [self bindActions]; } #pragma mark - 1：控件初始化 @@ -69,12 +69,12 @@ }]; // 添加搜索按钮 - [self.kb_navView addSubview:self.searchButton]; - [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.kb_navView).offset(-16); - make.centerY.equalTo(self.kb_backButton); - make.width.height.mas_equalTo(24); - }]; +// [self.kb_navView addSubview:self.searchButton]; +// [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { +// make.right.equalTo(self.kb_navView).offset(-16); +// make.centerY.equalTo(self.kb_backButton); +// make.width.height.mas_equalTo(24); +// }]; // 添加列表容器 [self.view addSubview:self.listContainerView]; @@ -94,9 +94,9 @@ #pragma mark - 2：绑定事件 -- (void)bindActions { - [self.searchButton addTarget:self action:@selector(searchButtonTapped) forControlEvents:UIControlEventTouchUpInside]; -} +//- (void)bindActions { +// [self.searchButton addTarget:self action:@selector(searchButtonTapped) forControlEvents:UIControlEventTouchUpInside]; +//} #pragma mark - Actions @@ -189,16 +189,16 @@ return _listContainerView; } -- (UIButton *)searchButton { - if (!_searchButton) { - _searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; - if (@available(iOS 13.0, *)) { - UIImage *searchImage = [UIImage systemImageNamed:@"magnifyingglass"]; - [_searchButton setImage:searchImage forState:UIControlStateNormal]; - _searchButton.tintColor = [UIColor colorWithHex:0x1B1F1A]; - } - } - return _searchButton; -} +//- (UIButton *)searchButton { +// if (!_searchButton) { +// _searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; +// if (@available(iOS 13.0, *)) { +// UIImage *searchImage = [UIImage systemImageNamed:@"magnifyingglass"]; +// [_searchButton setImage:searchImage forState:UIControlStateNormal]; +// _searchButton.tintColor = [UIColor colorWithHex:0x1B1F1A]; +// } +// } +// return _searchButton; +//} @end diff --git a/keyBoard/Class/Categories/UIColor+Extension.h b/keyBoard/Class/Categories/UIColor+Extension.h index 170bb4d..383aa24 100644 --- a/keyBoard/Class/Categories/UIColor+Extension.h +++ b/keyBoard/Class/Categories/UIColor+Extension.h @@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN @interface UIColor (Extension) + (UIColor *)colorWithHex:(int)hexValue; ++ (UIColor *)colorWithHex:(int)hexValue alpha:(CGFloat)alpha; + (nullable UIColor *)colorWithHexString:(NSString *)hexString; + (UIColor *)kb_dynamicColorWithLightColor:(UIColor *)lightColor darkColor:(UIColor *)darkColor;