diff --git a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/Contents.json index 2351fcf..b3629a3 100644 --- a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/Contents.json +++ b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "placeholder_image_icon@2x.png", + "filename" : "切图 232@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "placeholder_image_icon@3x.png", + "filename" : "切图 232@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/placeholder_image_icon@2x.png b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/placeholder_image_icon@2x.png deleted file mode 100644 index c533f08..0000000 Binary files a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/placeholder_image_icon@2x.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/placeholder_image_icon@3x.png b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/placeholder_image_icon@3x.png deleted file mode 100644 index e260b42..0000000 Binary files a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/placeholder_image_icon@3x.png and /dev/null differ diff --git a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/切图 232@2x.png b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/切图 232@2x.png new file mode 100644 index 0000000..3009043 Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/切图 232@2x.png differ diff --git a/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/切图 232@3x.png b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/切图 232@3x.png new file mode 100644 index 0000000..8bc8f98 Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/placeholder_image_icon.imageset/切图 232@3x.png differ diff --git a/keyBoard/Class/Categories/UIImageView+KBWebImage.m b/keyBoard/Class/Categories/UIImageView+KBWebImage.m index 7b3a98e..26d819e 100644 --- a/keyBoard/Class/Categories/UIImageView+KBWebImage.m +++ b/keyBoard/Class/Categories/UIImageView+KBWebImage.m @@ -15,6 +15,12 @@ static inline SDWebImageOptions KBWebImageDefaultOptions(void) { SDWebImageProgressiveLoad; // 渐进式 } +static inline void KBWebImageEnsureIndicator(UIImageView *imageView) { + if (!imageView.sd_imageIndicator) { + imageView.sd_imageIndicator = SDWebImageActivityIndicator.mediumIndicator; + } +} + static inline NSURL *_KBURL(id url) { if (!url) return nil; if ([url isKindOfClass:NSURL.class]) return url; @@ -32,6 +38,7 @@ static inline NSURL *_KBURL(id url) { NSURL *u = _KBURL(url); // 默认渐隐动画 __weak typeof(self) weakSelf = self; + KBWebImageEnsureIndicator(self); [self sd_setImageWithURL:u placeholderImage:placeholder options:options @@ -66,6 +73,7 @@ static inline NSURL *_KBURL(id url) { } __weak typeof(self) weakSelf = self; + KBWebImageEnsureIndicator(self); [self sd_setImageWithURL:u placeholderImage:placeholder options:options @@ -106,6 +114,7 @@ static inline NSURL *_KBURL(id url) { NSDictionary *context = @{ SDWebImageContextImageTransformer : pipeline }; __weak typeof(self) weakSelf = self; + KBWebImageEnsureIndicator(self); [self sd_setImageWithURL:u placeholderImage:placeholder options:options diff --git a/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.h b/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.h index 16337e8..9db7184 100644 --- a/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.h +++ b/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.h @@ -12,9 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @class KBShopThemeDetailModel; @interface KBSkinDetailHeaderCell : UICollectionViewCell -@property (nonatomic, strong) UIImageView *coverView; // 顶部大图 -@property (nonatomic, strong) UILabel *leftLabel; // 下方左侧文案（#1B1F1A） -@property (nonatomic, strong) UILabel *rightLabel; // 下方右侧文案（#02BEAC） + - (void)configWithDetail:(nullable KBShopThemeDetailModel *)detail; @end diff --git a/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.m b/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.m index c2d2b91..3992989 100644 --- a/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.m +++ b/keyBoard/Class/Me/V/KBSkinDetailHeaderCell.m @@ -8,7 +8,11 @@ #import "KBSkinDetailHeaderCell.h" #import "UIImageView+KBWebImage.h" #import "KBShopThemeDetailModel.h" - +@interface KBSkinDetailHeaderCell() +@property (nonatomic, strong) UIImageView *coverView; // 顶部大图 +@property (nonatomic, strong) UILabel *leftLabel; // 下方左侧文案（#1B1F1A） +@property (nonatomic, strong) UILabel *rightLabel; // 下方右侧文案（#02BEAC） +@end @implementation KBSkinDetailHeaderCell - (instancetype)initWithFrame:(CGRect)frame { if (self = [super initWithFrame:frame]) { diff --git a/keyBoard/Class/Search/V/KBTagCell.m b/keyBoard/Class/Search/V/KBTagCell.m index 778586e..6c25aca 100644 --- a/keyBoard/Class/Search/V/KBTagCell.m +++ b/keyBoard/Class/Search/V/KBTagCell.m @@ -5,6 +5,8 @@ #import "KBTagCell.h" +static const CGFloat kKBTagMinWidth = 50.0; + @interface KBTagCell () @property (nonatomic, strong) UILabel *titleLabel; @end @@ -29,10 +31,11 @@ } + (CGSize)sizeForText:(NSString *)text { - if (text.length == 0) { return CGSizeMake(40, 32); } + if (text.length == 0) { return CGSizeMake(kKBTagMinWidth, 32); } CGSize s = [text sizeWithAttributes:@{NSFontAttributeName:[KBFont regular:13]}]; // 两侧内边距 12 + 12，高度固定 32 - return CGSizeMake(ceil(s.width) + 24, 32); + CGFloat width = ceil(s.width) + 24; + return CGSizeMake(MAX(width, kKBTagMinWidth), 32); } #pragma mark - Lazy @@ -42,9 +45,9 @@ _titleLabel = [[UILabel alloc] init]; _titleLabel.font = [KBFont regular:13]; _titleLabel.textColor = [UIColor colorWithHex:0x1B1F1A]; + _titleLabel.textAlignment = NSTextAlignmentCenter; } return _titleLabel; } @end -