diff --git a/keyBoard/Assets.xcassets/Home/home_left_image.imageset/微信图片_20251107154239_220_763 1.png b/keyBoard/Assets.xcassets/Home/home_left_image.imageset/微信图片_20251107154239_220_763 1.png deleted file mode 100644 index 3047877..0000000 Binary files a/keyBoard/Assets.xcassets/Home/home_left_image.imageset/微信图片_20251107154239_220_763 1.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Home/home_left_image.imageset/微信图片_20251107154239_220_763.png b/keyBoard/Assets.xcassets/Home/home_left_image.imageset/微信图片_20251107154239_220_763.png deleted file mode 100644 index 3047877..0000000 Binary files a/keyBoard/Assets.xcassets/Home/home_left_image.imageset/微信图片_20251107154239_220_763.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Home/home_left_image.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/Contents.json similarity index 68% rename from keyBoard/Assets.xcassets/Home/home_left_image.imageset/Contents.json rename to keyBoard/Assets.xcassets/Home/home_rank_1.imageset/Contents.json index 7f5eeab..dfad0fe 100644 --- a/keyBoard/Assets.xcassets/Home/home_left_image.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "微信图片_20251107154239_220_763.png", + "filename" : "home_rank_1@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "微信图片_20251107154239_220_763 1.png", + "filename" : "home_rank_1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/home_rank_1@2x.png b/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/home_rank_1@2x.png new file mode 100644 index 0000000..c47599a Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/home_rank_1@2x.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/home_rank_1@3x.png b/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/home_rank_1@3x.png new file mode 100644 index 0000000..6016a35 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_rank_1.imageset/home_rank_1@3x.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_right_image.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/Contents.json similarity index 68% rename from keyBoard/Assets.xcassets/Home/home_right_image.imageset/Contents.json rename to keyBoard/Assets.xcassets/Home/home_rank_2.imageset/Contents.json index 2f6b25b..90ba1f8 100644 --- a/keyBoard/Assets.xcassets/Home/home_right_image.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "微信图片_20251107154240_221_763.png", + "filename" : "home_rank_2@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "微信图片_20251107154240_221_763 1.png", + "filename" : "home_rank_2@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/home_rank_2@2x.png b/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/home_rank_2@2x.png new file mode 100644 index 0000000..68a37c1 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/home_rank_2@2x.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/home_rank_2@3x.png b/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/home_rank_2@3x.png new file mode 100644 index 0000000..f8b8958 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_rank_2.imageset/home_rank_2@3x.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/Contents.json new file mode 100644 index 0000000..2548fdc --- /dev/null +++ b/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_rank_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_rank_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/home_rank_3@2x.png b/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/home_rank_3@2x.png new file mode 100644 index 0000000..d9530bd Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/home_rank_3@2x.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/home_rank_3@3x.png b/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/home_rank_3@3x.png new file mode 100644 index 0000000..267bfff Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/home_rank_3.imageset/home_rank_3@3x.png differ diff --git a/keyBoard/Assets.xcassets/Home/home_right_image.imageset/微信图片_20251107154240_221_763 1.png b/keyBoard/Assets.xcassets/Home/home_right_image.imageset/微信图片_20251107154240_221_763 1.png deleted file mode 100644 index 4495623..0000000 Binary files a/keyBoard/Assets.xcassets/Home/home_right_image.imageset/微信图片_20251107154240_221_763 1.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Home/home_right_image.imageset/微信图片_20251107154240_221_763.png b/keyBoard/Assets.xcassets/Home/home_right_image.imageset/微信图片_20251107154240_221_763.png deleted file mode 100644 index 4495623..0000000 Binary files a/keyBoard/Assets.xcassets/Home/home_right_image.imageset/微信图片_20251107154240_221_763.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/Contents.json new file mode 100644 index 0000000..4494def --- /dev/null +++ b/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "recharge_now_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "recharge_now_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/recharge_now_icon@2x.png b/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/recharge_now_icon@2x.png new file mode 100644 index 0000000..f525fe2 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/recharge_now_icon@2x.png differ diff --git a/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/recharge_now_icon@3x.png b/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/recharge_now_icon@3x.png new file mode 100644 index 0000000..b244847 Binary files /dev/null and b/keyBoard/Assets.xcassets/Home/recharge_now_icon.imageset/recharge_now_icon@3x.png differ diff --git a/keyBoard/Class/Home/V/HomeHeadView.m b/keyBoard/Class/Home/V/HomeHeadView.m index 79fa200..b2f57c8 100644 --- a/keyBoard/Class/Home/V/HomeHeadView.m +++ b/keyBoard/Class/Home/V/HomeHeadView.m @@ -39,18 +39,6 @@ #pragma mark - Layout - (void)layoutSubviews { [super layoutSubviews]; - // 根据实际尺寸更新购买按钮背景的渐变图(避免在未布局前计算尺寸为0) - if (self.buyButton.currentBackgroundImage == nil) { - CGSize size = self.buyButton.bounds.size; - if (size.width > 0 && size.height > 0) { - UIImage *bg = [UIImage kb_gradientImageWithColors:@[[UIColor colorWithHex:0xE6FFF4], [UIColor colorWithHex:0xA6FFD8]] - locations:nil - size:size - direction:KBGradientDirectionLeftToRight - cornerRadius:size.height * 0.5]; - [self.buyButton setBackgroundImage:bg forState:UIControlStateNormal]; - } - } } #pragma mark - UI @@ -126,7 +114,7 @@ [self.buyButton mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(self.mas_left).offset(62); make.right.equalTo(self.mas_right).offset(-62); - make.bottom.equalTo(self.mas_bottom).offset(-5); + make.bottom.equalTo(self.mas_bottom).offset(0); make.height.mas_equalTo(56); }]; } @@ -240,7 +228,7 @@ [_buyButton setTitle:@"Recharge Now" forState:UIControlStateNormal]; [_buyButton setTitleColor:[UIColor colorWithHex:0x1B1F1A] forState:UIControlStateNormal]; _buyButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - + [_buyButton setBackgroundImage:[UIImage imageNamed:@"recharge_now_icon"] forState:UIControlStateNormal]; [_buyButton addTarget:self action:@selector(onTapBuyAction) forControlEvents:UIControlEventTouchUpInside]; } return _buyButton;