diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme index d258e3d3..9e3921f5 100644 --- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme +++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme @@ -31,7 +31,7 @@ -#import "UserVipInfoVo.h" +#import "NobleInfo.h" #import "NobleCenterModel.h" NS_ASSUME_NONNULL_BEGIN @interface XPNobleCenterEntranceView : UIView -@property (nonatomic, strong) UserVipInfoVo *vipInfo; +@property (nonatomic, strong) NobleInfo *vipInfo; @property (nonatomic, strong) NobleCenterModel *nobleInfo; @end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m index c46f3869..08c5d0b4 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m @@ -90,7 +90,7 @@ }]; } -- (void)setVipInfo:(UserVipInfoVo *)vipInfo { +- (void)setVipInfo:(NobleInfo *)vipInfo { _vipInfo = vipInfo; if (vipInfo) { [self addSubview:self.nobleIconImage]; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h index acdd29a9..22d8b579 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h @@ -6,7 +6,7 @@ // #import - +#import "NobleInfo.h" NS_ASSUME_NONNULL_BEGIN typedef void(^CompletionHandler)(NSMutableAttributedString *); @class UserInfoModel,XPMineHeadView, WalletInfoModel,NobleCenterModel; @@ -27,6 +27,7 @@ typedef void(^CompletionHandler)(NSMutableAttributedString *); @property (nonatomic,strong) UserInfoModel *userInfo; @property (nonatomic, strong) WalletInfoModel *walletInfo; @property (nonatomic, strong) NobleCenterModel *nobleInfo; +@property(nonatomic,strong) NobleInfo *vipInfo; ///代理 @property (nonatomic,assign) id delegate; ///访客未读数量 diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m index 2cd86d82..82fd5b57 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m @@ -414,7 +414,7 @@ self.levelLabel.attributedText = _userInfo.levelAtt; self.fansView.number = [NSString stringWithFormat:@"%ld",_userInfo.fansNum]; self.attentionView.number = [NSString stringWithFormat:@"%ld",_userInfo.followNum]; - self.nobleEntranceView.vipInfo = userInfo.userVipInfoVO; + } } @@ -423,6 +423,11 @@ } - (void)setNobleInfo:(NobleCenterModel *)nobleInfo { self.nobleEntranceView.nobleInfo = nobleInfo; + +} +- (void)setVipInfo:(NobleInfo *)vipInfo{ + _vipInfo = vipInfo; + self.nobleEntranceView.vipInfo = _vipInfo; } - (NetImageView *)avatarImageView { diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index 3b1620ab..9ee2a5de 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -15,9 +15,12 @@ #import "StatisticsServiceHelper.h" #import "YUMIConstant.h" #import "Api+Room.h" +#import "Api+NobleCenter.h" #import "Api+RoomSetting.h" #import "AccountInfoStorage.h" #import "ClientConfig.h" +#import "NobleCenterModel.h" +#import "NobleInfo.h" ///Model #import "XPMineItemModel.h" #import "UserInfoModel.h" @@ -26,6 +29,7 @@ #import "HomeBannerInfoModel.h" #import "XPMineFuntionItemModel.h" #import "WalletInfoModel.h" + ///P #import "XPMineProtocol.h" #import "XPMinePresent.h" @@ -129,6 +133,24 @@ UIKIT_EXTERN NSString *kRequestRicket; [super viewDidAppear:animated]; if([AccountInfoStorage instance].isRequestRicket == YES)return; [self.presenter getUserInfo]; + [Api nobleCenterLevelList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + if (code == 200){ + NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; + NobleInfo *vipInfo ; + for (int index = 0; index < model.vipInfos.count; index++) { + NobleInfo *tagInfo = [model.vipInfos safeObjectAtIndex1:index]; + + if (model.currLevel > 0){ + if (tagInfo.vipLevel == model.currLevel) { + vipInfo = tagInfo; + break; + } + } + } + self.headView.vipInfo = vipInfo; + } + + }]; } #pragma mark- 检查是否有转赠钻石权限