diff --git a/keyBoard/Class/Manager/KBSkinService.m b/keyBoard/Class/Manager/KBSkinService.m index 2b8dbcf..49481e1 100644 --- a/keyBoard/Class/Manager/KBSkinService.m +++ b/keyBoard/Class/Manager/KBSkinService.m @@ -107,11 +107,11 @@ // key_icons 逻辑与远程模式保持一致 NSDictionary *iconShortNames = nil; - if ([skin[@"key_icons"] isKindOfClass:NSDictionary.class]) { - iconShortNames = skin[@"key_icons"]; - } else { +// if ([skin[@"key_icons"] isKindOfClass:NSDictionary.class]) { +// iconShortNames = skin[@"key_icons"]; +// } else { iconShortNames = [KBSkinInstallBridge defaultIconShortNames]; - } +// } NSURL *containerURL = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:AppGroup]; if (!containerURL) { diff --git a/keyBoard/Class/Me/V/KBSkinTagsContainerCell.m b/keyBoard/Class/Me/V/KBSkinTagsContainerCell.m index 746f594..7f378bc 100644 --- a/keyBoard/Class/Me/V/KBSkinTagsContainerCell.m +++ b/keyBoard/Class/Me/V/KBSkinTagsContainerCell.m @@ -67,8 +67,8 @@ static NSString * const kInnerTagCellId = @"kInnerTagCellId"; } } } - // 行高固定 32;行间距 8;上下额外增加 8 视觉留白 - return rows * 32 + (rows - 1) * 8 + 16; + static const CGFloat kTagHeight = 24.0; + return rows * kTagHeight + (rows - 1) * 8; } #pragma mark - Lazy diff --git a/keyBoard/Class/Shop/M/KBShopThemeDetailModel.h b/keyBoard/Class/Shop/M/KBShopThemeDetailModel.h index 02a211e..c1c8ea5 100644 --- a/keyBoard/Class/Shop/M/KBShopThemeDetailModel.h +++ b/keyBoard/Class/Shop/M/KBShopThemeDetailModel.h @@ -17,11 +17,13 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy, nullable) NSString *themeDownload; @property (nonatomic, assign) NSInteger themeStyle; @property (nonatomic, copy, nullable) NSString *themePreviewImageUrl; -@property (nonatomic, assign) BOOL themeStatus; @property (nonatomic, assign) NSInteger themePurchasesNumber; @property (nonatomic, assign) NSInteger sort; @property (nonatomic, assign) BOOL isFree; +/// 是否购买 @property (nonatomic, assign) BOOL isPurchased; +/// 下载ZIP +@property (nonatomic, copy, nullable) NSString *themeDownloadUrl; @end NS_ASSUME_NONNULL_END diff --git a/keyBoard/Class/Shop/M/KBShopThemeModel.h b/keyBoard/Class/Shop/M/KBShopThemeModel.h index f1936c2..238bfb8 100644 --- a/keyBoard/Class/Shop/M/KBShopThemeModel.h +++ b/keyBoard/Class/Shop/M/KBShopThemeModel.h @@ -22,8 +22,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy, nullable) NSString *themeDownload; /// 风格类型(接口返回 themeStyle) @property (nonatomic, assign) NSInteger themeStyle; -/// 是否上架 -@property (nonatomic, assign, getter=isThemeStatus) BOOL themeStatus; +/// 是否购买 +@property (nonatomic, assign) BOOL isPurchased; /// 购买次数 @property (nonatomic, assign) NSInteger themePurchasesNumber; /// 预览图