diff --git a/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/Contents.json new file mode 100644 index 0000000..0e45910 --- /dev/null +++ b/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "my_svip_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "my_svip_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/my_svip_icon@2x.png b/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/my_svip_icon@2x.png new file mode 100644 index 0000000..a671c7b Binary files /dev/null and b/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/my_svip_icon@2x.png differ diff --git a/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/my_svip_icon@3x.png b/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/my_svip_icon@3x.png new file mode 100644 index 0000000..d039fb2 Binary files /dev/null and b/keyBoard/Assets.xcassets/My/my_svip_icon.imageset/my_svip_icon@3x.png differ diff --git a/keyBoard/Class/Login/M/KBUser.h b/keyBoard/Class/Login/M/KBUser.h index 2849ed9..b058f11 100644 --- a/keyBoard/Class/Login/M/KBUser.h +++ b/keyBoard/Class/Login/M/KBUser.h @@ -28,6 +28,9 @@ typedef NS_ENUM(NSInteger, UserSex) { /// 是否是 VIP @property (nonatomic, assign) BOOL isVip; +/// 1: vip 2:svip +@property (nonatomic, assign) NSInteger vipLevel; + // token @property (nonatomic, copy, nullable) NSString *token; // token/access_token/accessToken diff --git a/keyBoard/Class/Me/V/KBMyHeaderView.m b/keyBoard/Class/Me/V/KBMyHeaderView.m index c69122a..ca8677c 100644 --- a/keyBoard/Class/Me/V/KBMyHeaderView.m +++ b/keyBoard/Class/Me/V/KBMyHeaderView.m @@ -136,9 +136,17 @@ [self kb_applyVipLayout:isVip]; self.vipIconView.hidden = !isVip; self.vipExpiryLabel.hidden = !isVip; + if (isVip) { + self.vipIconView.image = [UIImage imageNamed:[self kb_vipIconNameFromVipLevel:user.vipLevel]]; + } self.vipExpiryLabel.text = isVip ? [self vipExpiryDisplayTextFrom:user.vipExpiry] : nil; } +- (NSString *)kb_vipIconNameFromVipLevel:(NSInteger)vipLevel { + if (vipLevel == 2) { return @"my_svip_icon"; } + return @"my_vip_icon"; +} + - (void)kb_applyVipLayout:(BOOL)isVip { NSInteger state = isVip ? 1 : 0; if (self.kb_vipLayoutState == state) { return; }