diff --git a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/Contents.json b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/Contents.json index bf66ad0..89ff223 100644 --- a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/Contents.json +++ b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "ai_key_icon@2x.png", + "filename" : "切图 270@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "ai_key_icon@3x.png", + "filename" : "切图 270@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/ai_key_icon@2x.png b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/ai_key_icon@2x.png deleted file mode 100644 index 6cf190c..0000000 Binary files a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/ai_key_icon@2x.png and /dev/null differ diff --git a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/ai_key_icon@3x.png b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/ai_key_icon@3x.png deleted file mode 100644 index 7cd9601..0000000 Binary files a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/ai_key_icon@3x.png and /dev/null differ diff --git a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/切图 270@2x.png b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/切图 270@2x.png new file mode 100644 index 0000000..41a34f1 Binary files /dev/null and b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/切图 270@2x.png differ diff --git a/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/切图 270@3x.png b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/切图 270@3x.png new file mode 100644 index 0000000..cc81982 Binary files /dev/null and b/CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/切图 270@3x.png differ diff --git a/CustomKeyboard/View/KBFunctionView.m b/CustomKeyboard/View/KBFunctionView.m index 4bee11f..70d07ca 100644 --- a/CustomKeyboard/View/KBFunctionView.m +++ b/CustomKeyboard/View/KBFunctionView.m @@ -162,15 +162,12 @@ [self.rightButtonContainer addSubview:self.clearButtonInternal]; [self.rightButtonContainer addSubview:self.sendButtonInternal]; - // 竖向排布:粘贴、删除、清空为等高;发送优先更高,但允许在空间不足时压缩 + // 竖向排布:容器内四个按钮等高分配,间距为 8px(按设计稿等比缩放) CGFloat smallH = KBFit(41.0f); - CGFloat bigH = KBFit(56.0f); - // 竖向/横向间距按设计稿等比缩放,避免大屏出现过大空隙 - CGFloat vSpace = KBFit(4.0f); + CGFloat vSpace = KBFit(8.0f); [self.pasteButtonInternal mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.rightButtonContainer.mas_top); make.left.right.equalTo(self.rightButtonContainer); - make.height.mas_equalTo(smallH); }]; [self.deleteButtonInternal mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.pasteButtonInternal.mas_bottom).offset(vSpace); @@ -185,10 +182,8 @@ [self.sendButtonInternal mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.clearButtonInternal.mas_bottom).offset(vSpace); make.left.right.equalTo(self.rightButtonContainer); - // 允许在空间不足时缩短到 smallH,避免产生约束冲突 - make.height.greaterThanOrEqualTo(@(smallH)); - make.height.lessThanOrEqualTo(@(bigH)); - make.bottom.lessThanOrEqualTo(self.rightButtonContainer.mas_bottom); + make.height.equalTo(self.pasteButtonInternal); + make.bottom.equalTo(self.rightButtonContainer.mas_bottom); }]; // 2. 粘贴区(位于右侧按钮左侧)