yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开通贵族折扣

Browse Source
This commit is contained in:
fengshuo
2022-10-26 18:41:49 +08:00
parent 79cf03a5f8
commit 8715dfd968
21 changed files with 523 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xplan-ios.xcodeproj/project.pbxproj
View File

@@ -677,6 +677,8 @@
E83ABF00280EC45700322EE4 /* MessageContentApplicationShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABEFF280EC45700322EE4 /* MessageContentApplicationShareView.m */; };
E83ABF03280EC90C00322EE4 /* ContentApplicationShareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABF02280EC90C00322EE4 /* ContentApplicationShareModel.m */; };
E83ABF06280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */; };
E83CD1982908D2FF00920A94 /* NobleRankListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83CD1972908D2FF00920A94 /* NobleRankListModel.m */; };
E83CD19E2909171900920A94 /* XPNobleDiscountView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83CD19D2909171900920A94 /* XPNobleDiscountView.m */; };
E83DB47A27462C4500D8CBD1 /* XPGiftBigPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */; };
E83DB47D2746372300D8CBD1 /* XPRoomGiftBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */; };
E83DB481274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */; };
@@ -2404,6 +2406,10 @@
E83ABF02280EC90C00322EE4 /* ContentApplicationShareModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentApplicationShareModel.m; sourceTree = "<group>"; };
E83ABF04280EDE2B00322EE4 /* MessageContentLevelUpgradeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentLevelUpgradeView.h; sourceTree = "<group>"; };
E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentLevelUpgradeView.m; sourceTree = "<group>"; };
E83CD1962908D2FF00920A94 /* NobleRankListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NobleRankListModel.h; sourceTree = "<group>"; };
E83CD1972908D2FF00920A94 /* NobleRankListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NobleRankListModel.m; sourceTree = "<group>"; };
E83CD19C2909171900920A94 /* XPNobleDiscountView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNobleDiscountView.h; sourceTree = "<group>"; };
E83CD19D2909171900920A94 /* XPNobleDiscountView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNobleDiscountView.m; sourceTree = "<group>"; };
E83DB47827462C4500D8CBD1 /* XPGiftBigPrizeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBigPrizeModel.h; sourceTree = "<group>"; };
E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBigPrizeModel.m; sourceTree = "<group>"; };
E83DB47B2746372300D8CBD1 /* XPRoomGiftBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftBannerView.h; sourceTree = "<group>"; };
@@ -4826,6 +4832,8 @@
E8A1F7A429068F500099C952 /* XPNobleMyInfoView.m */,
E8A1F7A6290690E00099C952 /* XPNobleRankUpdateView.h */,
E8A1F7A7290690E00099C952 /* XPNobleRankUpdateView.m */,
E83CD19C2909171900920A94 /* XPNobleDiscountView.h */,
E83CD19D2909171900920A94 /* XPNobleDiscountView.m */,
);
path = SubViews;
sourceTree = "<group>";
@@ -4864,6 +4872,8 @@
9BB549612782EA1D0090CD26 /* NobleInfo.m */,
9B2A12E227846D7100CED41B /* NobleRechargeModel.h */,
9B2A12E327846D7100CED41B /* NobleRechargeModel.m */,
E83CD1962908D2FF00920A94 /* NobleRankListModel.h */,
E83CD1972908D2FF00920A94 /* NobleRankListModel.m */,
);
path = Model;
sourceTree = "<group>";
@@ -9452,6 +9462,7 @@
E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */,
9B2F72D328E45C5A0000E4FA /* XPRoomQuidkMessageCell.m in Sources */,
E8A86E0527BA38DB001C21F9 /* NSString+RW.m in Sources */,
E83CD1982908D2FF00920A94 /* NobleRankListModel.m in Sources */,
E800162C2803FE4900D6D17A /* GuildIncomeRecordModel.m in Sources */,
9BE01ACE28925F7D00B50299 /* XPMineNewUserRechargeView.m in Sources */,
E83ABF03280EC90C00322EE4 /* ContentApplicationShareModel.m in Sources */,
@@ -9702,6 +9713,7 @@
9B1B72B828003772003FACE9 /* XPAnchorPKPresenter.m in Sources */,
E8EE827D272B9A2300A17217 /* XPRoomSendTextView.m in Sources */,
E8AB631928ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m in Sources */,
E83CD19E2909171900920A94 /* XPNobleDiscountView.m in Sources */,
9BD63FAE277EE97A006EB744 /* XPReleaseRadioPresenter.m in Sources */,
9B1FC3D827E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.m in Sources */,
9BE01AEA2893CB4400B50299 /* XPDressSearchViewController.m in Sources */,

22
xplan-ios/Assets.xcassets/Mine/Noble/Rank/noble_first_open_bg.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "noble_first_open_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "noble_first_open_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
xplan-ios/Assets.xcassets/Mine/Noble/Rank/noble_first_open_bg.imageset/noble_first_open_bg@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
xplan-ios/Assets.xcassets/Mine/Noble/Rank/noble_first_open_bg.imageset/noble_first_open_bg@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

9
xplan-ios/Main/Mine/View/Noble/Api/Api+NobleCenter.h
View File

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
+ (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion;
///获取开通贵族产品列表
+ (void)getChargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType;
+ (void)getChargeList:(HttpRequestHelperCompletion)completion;
/// 苹果下单
/// @param completion 完成
@@ -43,6 +43,13 @@ NS_ASSUME_NONNULL_BEGIN
/// @param open 是否打开
+ (void)changeEnterHidCompletion:(HttpRequestHelperCompletion)complection open:(NSString *)open;
/// 获取贵族升级轮播表
/// @param complection 完成回调
+ (void)vipUpgradeList:(HttpRequestHelperCompletion)complection;
/// 获取贵族排行榜
/// @param complection 完成回调
+ (void)vipRankList:(HttpRequestHelperCompletion)complection;
@end
NS_ASSUME_NONNULL_END

18
xplan-ios/Main/Mine/View/Noble/Api/Api+NobleCenter.m
View File

@@ -16,8 +16,8 @@
}
///获取开通贵族产品列表
+ (void)getChargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType {
[self makeRequest:@"chargeprod/listV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, channelType, nil];
+ (void)getChargeList:(HttpRequestHelperCompletion)completion{
[self makeRequest:@"vip/getOpenVipProd" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
}
/// 苹果下单
@@ -54,4 +54,18 @@
[self makeRequest:@"vip/changeInvisibleInRoom" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__,open, nil];
}
/// 获取贵族升级轮播表
/// @param complection 完成回调
+ (void)vipUpgradeList:(HttpRequestHelperCompletion)complection {
[self makeRequest:@"vip/listUpgrade" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil];
}
/// 获取贵族排行榜
/// @param complection 完成回调
+ (void)vipRankList:(HttpRequestHelperCompletion)complection {
[self makeRequest:@"vip/listRank" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil];
}
@end

42
xplan-ios/Main/Mine/View/Noble/Model/NobleRankListModel.h Normal file
View File

@@ -0,0 +1,42 @@
//
// NobleRankListModel.h
// xplan-ios
//
// Created by 冯硕 on 2022/10/26.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@class NObleRankUserModel;
@interface NobleRankListModel : NSObject
///我的排名
@property (nonatomic,strong) NObleRankUserModel *myRank;
///排行
@property (nonatomic,strong) NSArray<NObleRankUserModel *> *ranks;
@end
@interface NObleRankUserModel : NSObject
///头像
@property (nonatomic,copy) NSString *avatar;
///uid
@property (nonatomic,copy) NSString *uid;
///id
@property (nonatomic,copy) NSString *erbanNo;
///姓名
@property (nonatomic,copy) NSString *nick;
///贵族等级
@property (nonatomic,copy) NSString *vipLogo;
///权利值
@property (nonatomic,copy) NSString *score;
///排名
@property (nonatomic,assign) NSInteger rankNo;
///贵族的名称
@property (nonatomic,copy) NSString *vipName;
@end
NS_ASSUME_NONNULL_END

21
xplan-ios/Main/Mine/View/Noble/Model/NobleRankListModel.m Normal file
View File

@@ -0,0 +1,21 @@
//
// NobleRankListModel.m
// xplan-ios
//
// Created by 冯硕 on 2022/10/26.
//
#import "NobleRankListModel.h"
@implementation NobleRankListModel
@end
@implementation NObleRankUserModel
@end

7
xplan-ios/Main/Mine/View/Noble/Model/NobleRechargeModel.h
View File

@@ -17,6 +17,13 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger defaultPayH5;
@property (nonatomic, assign) NSInteger defaultPay;
///产品id
@property (nonatomic,strong) NSString *chargeProdId;
///现价
@property (nonatomic,assign) CGFloat money;
///原价
@property (nonatomic,assign) CGFloat oriPrice;
@end
NS_ASSUME_NONNULL_END

5
xplan-ios/Main/Mine/View/Noble/Presenter/XPNobleCenterPresenter.h
View File

@@ -38,6 +38,11 @@ NS_ASSUME_NONNULL_BEGIN
/// @param enterHide 隐身进房
- (void)changeEnterHide:(BOOL)enterHide;
///获取贵族排行
- (void)getNobleRankList;
///获取贵族升级列表
- (void)getNobleUpgradeList;
@end
NS_ASSUME_NONNULL_END

19
xplan-ios/Main/Mine/View/Noble/Presenter/XPNobleCenterPresenter.m
View File

@@ -17,6 +17,7 @@
#import "NobleCenterModel.h"
#import "UserInfoModel.h"
#import "NobleRechargeModel.h"
#import "NobleRankListModel.h"
///P
#import "XPNobleCenterProtocol.h"
@@ -46,7 +47,7 @@
[Api getChargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
NobleRechargeModel *model = [NobleRechargeModel modelWithDictionary:data.data];
[[self getView] onGetNobleRechargeDataSuccess:model];
}] channelType:channelType];
}]];
}
/// 生成贵族充值的订单
@@ -95,4 +96,20 @@
}] open:[NSString stringWithFormat:@"%d", enterHide]];
}
///获取贵族排行
- (void)getNobleRankList {
[Api vipRankList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
NobleRankListModel * listInfo = [NobleRankListModel modelWithDictionary:data.data];
[[self getView] getNobleRankListSuccess:listInfo];
}]];
}
///获取贵族升级列表
- (void)getNobleUpgradeList {
[Api vipUpgradeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
NSArray * list= [NObleRankUserModel modelsWithArray:data.data];
[[self getView] getNobleUpgradeListSuccess:list];
}]];
}
@end

9
xplan-ios/Main/Mine/View/Noble/Protocol/XPNobleCenterProtocol.h
View File

@@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
@class NobleCenterModel, UserInfoModel, NobleRechargeModel;
@class NobleCenterModel, UserInfoModel, NobleRechargeModel, NobleRankListModel;
@protocol XPNobleCenterProtocol <NSObject>
@optional
///获取贵族信息成功
- (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model;
@@ -35,4 +35,9 @@
///开关隐身进房失败
- (void)changeEnterHideFail;
///获取升级信息
- (void)getNobleUpgradeListSuccess:(NSArray *)array;
///获取排行
- (void)getNobleRankListSuccess:(NobleRankListModel *)rankInfo;
@end

16
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleDiscountView.h Normal file
View File

@@ -0,0 +1,16 @@
//
// XPNobleDiscountView.h
// xplan-ios
//
// Created by 冯硕 on 2022/10/26.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@class NobleRechargeModel;
@interface XPNobleDiscountView : UIView
@property (nonatomic,strong) NobleRechargeModel *info;
@end
NS_ASSUME_NONNULL_END

217
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleDiscountView.m Normal file
View File

@@ -0,0 +1,217 @@
//
// XPNobleDiscountView.m
// xplan-ios
//
// Created by 冯硕 on 2022/10/26.
//
#import "XPNobleDiscountView.h"
///Third
#import <Masonry/Masonry.h>
///Tool
#import "ThemeColor.h"
///Model
#import "NobleRechargeModel.h"
@interface XPNobleDiscountView ()
///首次开通
@property (nonatomic,strong) UIImageView *firstOpenImgView;
///背景
@property (nonatomic,strong) UIImageView *backImagView;
///花费
@property (nonatomic,strong) UILabel *moneyLabel;
///折扣
@property (nonatomic,strong) UILabel *discountLabel;
///即可体验
@property (nonatomic,strong) UILabel *titleLabel;
///开通的容器
@property (nonatomic,strong) UIStackView *openStackView;
///金币
@property (nonatomic,strong) UIImageView *coinImageView;
///开通大鹅贵族
@property (nonatomic,strong) UILabel *coinLabe;;
@end
@implementation XPNobleDiscountView
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self initSubViews];
[self initSubViewConstraints];
}
return self;
}
#pragma mark - Private Method
- (void)initSubViews {
[self addSubview:self.backImagView];
[self addSubview:self.firstOpenImgView];
[self.openStackView addArrangedSubview:self.coinImageView];
[self.openStackView addArrangedSubview:self.coinLabe];
[self.backImagView addSubview:self.moneyLabel];
[self.backImagView addSubview:self.discountLabel];
[self.backImagView addSubview:self.titleLabel];
[self.backImagView addSubview:self.openStackView];
}
- (void)initSubViewConstraints {
[self.firstOpenImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(80, 23));
make.left.mas_equalTo(self.backImagView.mas_left).offset(21);
make.top.mas_equalTo(self);
}];
[self.backImagView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(300, 44));
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self.firstOpenImgView.mas_bottom).offset(-4);
}];
[self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.backImagView.mas_centerY).offset(-1);
make.centerX.mas_equalTo(self.backImagView);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.backImagView);
make.top.mas_equalTo(self.backImagView.mas_centerY).offset(1);
}];
[self.discountLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.moneyLabel.mas_right).offset(7);
make.centerY.mas_equalTo(self.moneyLabel);
make.size.mas_equalTo(CGSizeMake(20, 16));
}];
[self.openStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.backImagView);
make.height.mas_equalTo(18);
make.centerY.mas_equalTo(self.backImagView);
}];
[self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(18);
}];
}
#pragma mark - Getters And Setters
- (void)setInfo:(NobleRechargeModel *)info {
_info = info;
if (_info) {
if(_info.oriPrice > 0 && _info.oriPrice != _info.money) {
self.firstOpenImgView.hidden = NO;
self.moneyLabel.hidden = NO;
self.discountLabel.hidden = NO;
self.titleLabel.hidden = NO;
self.openStackView.hidden = YES;
self.moneyLabel.text = [NSString stringWithFormat:@"仅需%0.f￥", _info.money];
self.discountLabel.text = [NSString stringWithFormat:@"%0.f", _info.oriPrice];
} else {
self.firstOpenImgView.hidden = YES;
self.moneyLabel.hidden = YES;
self.discountLabel.hidden = YES;
self.titleLabel.hidden = YES;
self.openStackView.hidden = NO;
NSString *title = [NSString stringWithFormat:@"%.0f立刻成为魔力贵族", _info.money];
self.coinLabe.text = title;
}
}
}
- (UIImageView *)firstOpenImgView {
if (!_firstOpenImgView) {
_firstOpenImgView = [[UIImageView alloc] init];
_firstOpenImgView.userInteractionEnabled = YES;
_firstOpenImgView.image = [UIImage imageNamed:@"noble_first_open_bg"];
_firstOpenImgView.hidden = YES;
}
return _firstOpenImgView;
}
- (UIImageView *)backImagView {
if (!_backImagView) {
_backImagView = [[UIImageView alloc] init];
_backImagView.userInteractionEnabled = YES;
_backImagView.image = [UIImage imageNamed:@"noble_open_btn_bg"];
}
return _backImagView;
}
- (UILabel *)moneyLabel {
if (!_moneyLabel) {
_moneyLabel = [[UILabel alloc] init];
_moneyLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold];
_moneyLabel.textColor = [ThemeColor colorWithHexString:@"#EA2B0D"];
}
return _moneyLabel;
}
- (UILabel *)discountLabel {
if (!_discountLabel) {
_discountLabel = [[UILabel alloc] init];
_discountLabel.font = [UIFont systemFontOfSize:16];
_discountLabel.textColor = [ThemeColor colorWithHexString:@"#BABBCD"];
UIBezierPath *path = [UIBezierPath bezierPath];
[path moveToPoint:CGPointMake(0, 5)];
[path addLineToPoint:CGPointMake(20, 12)];
CAShapeLayer * shapeLayer = [CAShapeLayer layer];
shapeLayer.strokeColor = [ThemeColor colorWithHexString:@"#BABBCD"].CGColor;
shapeLayer.fillColor = [UIColor clearColor].CGColor;
shapeLayer.path = path.CGPath;
shapeLayer.lineWidth = 1;
[_discountLabel.layer addSublayer:shapeLayer];
}
return _discountLabel;
}
- (UILabel *)titleLabel {
if (!_titleLabel) {
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
_titleLabel.textColor = [ThemeColor mainTextColor];
_titleLabel.text = @"即刻体验魔力贵族";
}
return _titleLabel;
}
- (UIStackView *)openStackView {
if (!_openStackView) {
_openStackView = [[UIStackView alloc] init];
_openStackView.axis = UILayoutConstraintAxisHorizontal;
_openStackView.distribution = UIStackViewDistributionFill;
_openStackView.alignment = UIStackViewAlignmentFill;
_openStackView.spacing = 4;
_openStackView.hidden = YES;
}
return _openStackView;
}
- (UIImageView *)coinImageView {
if (!_coinImageView) {
_coinImageView = [[UIImageView alloc] init];
_coinImageView.userInteractionEnabled = YES;
_coinImageView.image = [UIImage imageNamed:@"noble_open_btn"];
}
return _coinImageView;
}
- (UILabel *)coinLabe {
if (!_coinLabe) {
_coinLabe = [[UILabel alloc] init];
_coinLabe.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
_coinLabe.textColor = [ThemeColor mainTextColor];
}
return _coinLabe;
}
@end

5
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleMyInfoView.h
View File

@@ -6,11 +6,12 @@
//
#import <UIKit/UIKit.h>
#import "NobleRankListModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface XPNobleMyInfoView : UIView
///用户信息
@property (nonatomic,strong) NObleRankUserModel *userInfo;
@end
NS_ASSUME_NONNULL_END

10
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleMyInfoView.m
View File

@@ -98,6 +98,16 @@
}
#pragma mark - Getters And Setters
- (void)setUserInfo:(NObleRankUserModel *)userInfo {
_userInfo = userInfo;
if (_userInfo) {
self.avatarImageView.imageUrl = _userInfo.avatar;
self.nickLabel.text = _userInfo.nick;
self.rightsValueLabel.text = _userInfo.score;
}
}
- (UIView *)contentView {
if (!_contentView) {
_contentView = [[UIView alloc] init];

5
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankTableViewCell.h
View File

@@ -6,11 +6,12 @@
//
#import <UIKit/UIKit.h>
#import "NobleRankListModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface XPNobleRankTableViewCell : UITableViewCell
///用户信息
@property (nonatomic,strong) NObleRankUserModel *userInfo;
@end
NS_ASSUME_NONNULL_END

24
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankTableViewCell.m
View File

@@ -12,6 +12,7 @@
#import "ThemeColor.h"
#import "NetImageView.h"
@interface XPNobleRankTableViewCell ()
///排行版
@property (nonatomic,strong) UIButton *rankButton;
@@ -88,6 +89,29 @@
}
#pragma mark - Getters And Setters
- (void)setUserInfo:(NObleRankUserModel *)userInfo {
_userInfo = userInfo;
if (_userInfo) {
self.avatarImageView.imageUrl = _userInfo.avatar;
self.nickLabel.text = _userInfo.nick;
self.rightsValueLabel.text = _userInfo.score;
if (_userInfo.rankNo == 1) {
[self.rankButton setTitle:@"" forState:UIControlStateNormal];
[self.rankButton setImage:[UIImage imageNamed:@"nobel_rank_first"] forState:UIControlStateNormal];
} else if(_userInfo.rankNo == 2) {
[self.rankButton setTitle:@"" forState:UIControlStateNormal];
[self.rankButton setImage:[UIImage imageNamed:@"nobel_rank_second"] forState:UIControlStateNormal];
} else if(_userInfo.rankNo == 3) {
[self.rankButton setTitle:@"" forState:UIControlStateNormal];
[self.rankButton setImage:[UIImage imageNamed:@"nobel_rank_third"] forState:UIControlStateNormal];
} else {
[self.rankButton setTitle:[NSString stringWithFormat:@"%ld", _userInfo.rankNo] forState:UIControlStateNormal];
[self.rankButton setImage:nil forState:UIControlStateNormal];
}
}
}
- (UIButton *)rankButton {
if (!_rankButton) {
_rankButton = [UIButton buttonWithType:UIButtonTypeCustom];

59
xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankUpdateView.m
View File

@@ -12,13 +12,14 @@
#import <YYText.h>
///Tool
#import "ThemeColor.h"
#import "NetImageView.h"
///Model
#import "GiftLuckyBroadcastModel.h"
#import "NobleRankListModel.h"
@interface XPNobleRankUpdateViewCell : UICollectionViewCell
@property (nonatomic,strong) YYLabel *titleLabel;
@property (nonatomic,strong) GiftLuckyBroadcastModel *giftInfo;
@property (nonatomic,strong) NObleRankUserModel *userInfo;
@end
@implementation XPNobleRankUpdateViewCell
@@ -53,24 +54,40 @@
return attribute;
}
#pragma mark - Getters And Setters
- (void)setGiftInfo:(GiftLuckyBroadcastModel *)giftInfo {
_giftInfo = giftInfo;
if (_giftInfo) {
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createTextAttribute:@"恭喜 " color:[UIColor whiteColor]]];
NSString * nick = _giftInfo.nick;
if (nick.length > 6) {
nick = [nick substringToIndex:6];
}
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@ " , nick] color:[ThemeColor colorWithHexString:@"#FFD436"]]];
[attribute appendAttributedString:[self createTextAttribute:@"开出幸运福袋获得 " color:[UIColor whiteColor]]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@ " , _giftInfo.luckyBagName] color:[ThemeColor colorWithHexString:@"#6FE3FF"]]];
self.titleLabel.attributedText = attribute;
- (NSMutableAttributedString *)createUrlImageAttribute:(NSString *)imageUrl cornerRadius:(CGFloat)cornerRadius {
NetImageConfig *config = [[NetImageConfig alloc]init];
///先这样吧
config.autoLoad = YES;
NetImageView *imageView = [[NetImageView alloc]initWithUrl:imageUrl config:config];
UIImage* image = imageView.image;
if (image) {
CGFloat scale = image.size.width / image.size.height;
imageView.bounds = CGRectMake(0, 0, 20 * scale, 20);
} else {
imageView.bounds = CGRectMake(0, 0, 20, 20);
}
imageView.layer.masksToBounds = YES;
imageView.layer.cornerRadius = cornerRadius;
imageView.contentMode = UIViewContentModeScaleAspectFit;
NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:[UIFont systemFontOfSize:15.0] alignment:YYTextVerticalAlignmentCenter];
return attrString;
}
#pragma mark - Getters And Setters
- (void)setUserInfo:(NObleRankUserModel *)userInfo {
_userInfo = userInfo;
if (_userInfo) {
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createTextAttribute:@"恭喜贵族" color:[UIColor whiteColor]]];
[attribute appendAttributedString:[self createUrlImageAttribute:_userInfo.avatar cornerRadius:10]];
[attribute appendAttributedString:[self createTextAttribute:_userInfo.nick color:[ThemeColor colorWithHexString:@"#F7DA94"]]];
[attribute appendAttributedString:[self createTextAttribute:@"升级为" color:[UIColor whiteColor]]];
[attribute appendAttributedString:[self createUrlImageAttribute:_userInfo.vipLogo cornerRadius:0]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@!", _userInfo.vipName] color:[UIColor whiteColor]]];
self.titleLabel.attributedText = attribute;
self.titleLabel.textAlignment = NSTextAlignmentCenter;
}
}
- (YYLabel *)titleLabel {
if (!_titleLabel) {
@@ -125,8 +142,8 @@
- (void)setupCustomCell:(UICollectionViewCell *)cell forIndex:(NSInteger)index cycleScrollView:(SDCycleScrollView *)view {
XPNobleRankUpdateViewCell *myCell = (XPNobleRankUpdateViewCell *)cell;
GiftLuckyBroadcastModel * info = [self.nobleList objectAtIndex:index];
myCell.giftInfo = info;
NObleRankUserModel * info = [self.nobleList objectAtIndex:index];
myCell.userInfo = info;
}
#pragma mark - Getters And Setters
@@ -134,8 +151,8 @@
_nobleList = nobleList;
if (_nobleList.count > 0) {
NSMutableArray * array = [NSMutableArray array];
for (GiftLuckyBroadcastModel * item in _nobleList) {
[array addObject:item.giftName];
for (NObleRankUserModel * item in _nobleList) {
[array addObject:item.avatar];
}
if (array.count > 0) {
self.cycleScrollView.imageURLStringsGroup = array;

43
xplan-ios/Main/Mine/View/Noble/View/XPNobleCenterViewController.m
View File

@@ -32,6 +32,7 @@
#import "XPWebViewController.h"
#import "XPNobleSettingViewController.h"
#import "XPNobleRankViewController.h"
#import "XPNobleDiscountView.h"
///P
#import "XPNobleCenterPresenter.h"
///model
@@ -39,6 +40,7 @@
#import "UserInfoModel.h"
#import "NobleRechargeModel.h"
#import "AttachmentModel.h"
#import "XPNobleDiscountView.h"
@interface XPNobleCenterViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate,XPNobleCenterNavViewDelegate, XPIAPHelperDelegate, NIMSystemNotificationManagerDelegate>
///分页标题
@@ -59,13 +61,12 @@
@property (nonatomic, strong) NobleCenterModel *model;
///用户信息
@property (nonatomic, strong) UserInfoModel *userInfo;
///开通贵族
@property (nonatomic, strong) UIButton *openNobleButton;
///当前用户贵族信息-开通了贵族才显示
@property (nonatomic, strong) XPNobleCenterMyNobleView *myNobleView;
///更新用户信息
@property (nonatomic, assign) BOOL needUpdateUserInfo;
///开通的view
@property (nonatomic,strong) XPNobleDiscountView *openView;
///充值-----
@property (nonatomic, strong) NobleRechargeModel *rechargeModel;
///订单编号
@@ -121,7 +122,7 @@
[self.view addSubview:self.navView];
[self.view addSubview:self.titleView];
[self.view addSubview:self.lineView];
[self.view addSubview:self.openNobleButton];
[self.view addSubview:self.openView];
[self.view addSubview:self.myNobleView];
[self.view addSubview:self.nobleRankButton];
}
@@ -147,11 +148,11 @@
make.left.right.bottom.mas_equalTo(self.view);
make.top.mas_equalTo(self.titleView.mas_bottom);
}];
[self.openNobleButton mas_makeConstraints:^(MASConstraintMaker *make) {
[self.openView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.view);
make.bottom.mas_equalTo(-kSafeAreaBottomHeight - 5);
make.width.mas_equalTo(300);
make.height.mas_equalTo(44);
make.height.mas_equalTo(63);
}];
[self.myNobleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(91+kSafeAreaBottomHeight);
@@ -202,7 +203,7 @@
}
self.titles = names.copy;
self.titleView.titles = self.titles;
self.openNobleButton.hidden = self.userInfo.userVipInfoVO.vipLevel;
self.openView.hidden = self.userInfo.userVipInfoVO.vipLevel;
self.myNobleView.hidden = !self.userInfo.userVipInfoVO.vipLevel;
if (self.userInfo.userVipInfoVO) {
self.myNobleView.model = model;
@@ -216,9 +217,7 @@
///获取贵族充值信息成功
- (void)onGetNobleRechargeDataSuccess:(NobleRechargeModel *)rechargeInfo {
self.rechargeModel = rechargeInfo;
RechargeListModel *rechargeModel = [self.rechargeModel.list objectAtIndex:0];
NSString *title = [NSString stringWithFormat:@"%@立刻成为魔力贵族", rechargeModel.money];
[self.openNobleButton setTitle:title forState:UIControlStateNormal];
self.openView.info = rechargeInfo;
}
///请求充值id的状态成功
@@ -368,7 +367,7 @@
}
#pragma mark - events
- (void)onOpenNobleButtonClick:(UIButton *)button {
- (void)onOpenNobleButtonClick:(UITapGestureRecognizer *)button {
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventVipOpenClick];
RechargeListModel *rechargeModel = [self.rechargeModel.list objectAtIndex:0];
[self showLoading];
@@ -445,19 +444,6 @@
return _navView;
}
- (UIButton *)openNobleButton {
if (!_openNobleButton) {
_openNobleButton = [[UIButton alloc] init];
[_openNobleButton setImage:[UIImage imageNamed:@"noble_open_btn"] forState:UIControlStateNormal];
[_openNobleButton setBackgroundImage:[UIImage imageNamed:@"noble_open_btn_bg"] forState:UIControlStateNormal];
_openNobleButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
[_openNobleButton setTitleColor:[ThemeColor mainTextColor] forState:UIControlStateNormal];
[_openNobleButton addTarget:self action:@selector(onOpenNobleButtonClick:) forControlEvents:UIControlEventTouchUpInside];
_openNobleButton.hidden = YES;
}
return _openNobleButton;
}
- (XPNobleCenterMyNobleView *)myNobleView {
if (!_myNobleView) {
_myNobleView = [[XPNobleCenterMyNobleView alloc] init];
@@ -485,4 +471,13 @@
return _nobleRankButton;
}
- (XPNobleDiscountView *)openView {
if(!_openView) {
_openView = [[XPNobleDiscountView alloc] init];
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onOpenNobleButtonClick:)];
[_openView addGestureRecognizer:tap];
}
return _openView;
}
@end

38
xplan-ios/Main/Mine/View/Noble/View/XPNobleRankViewController.m
View File

@@ -15,7 +15,10 @@
#import "XPNobleRankTableViewCell.h"
#import "XPNobleMyInfoView.h"
#import "XPNobleRankUpdateView.h"
@interface XPNobleRankViewController ()<UITableViewDelegate, UITableViewDataSource>
///P
#import "XPNobleCenterPresenter.h"
#import "XPNobleCenterProtocol.h"
@interface XPNobleRankViewController ()<UITableViewDelegate, UITableViewDataSource,XPNobleCenterProtocol>
///返回按钮
@property (nonatomic,strong) UIButton *backButton;
///顶部的
@@ -29,7 +32,7 @@
///底部的用户信息
@property (nonatomic,strong) XPNobleMyInfoView *myInfoView;
///数据源
@property (nonatomic,strong) NSMutableArray *datasource;
@property (nonatomic,strong) NSArray *datasource;
@end
@implementation XPNobleRankViewController
@@ -38,14 +41,24 @@
return YES;
}
- (__kindof id)createPresenter {
return [[XPNobleCenterPresenter alloc] init];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self initNobelRankData];
[self initSubViews];
[self initSubViewConstraints];
}
#pragma mark - Private Method
- (void)initNobelRankData {
[self.presenter getNobleRankList];
[self.presenter getNobleUpgradeList];
}
- (void)initSubViews {
self.view.backgroundColor = [ThemeColor colorWithHexString:@"#151515"];
[self.view addSubview:self.topImageView];
@@ -73,7 +86,8 @@
[self.updateView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.topImageView.mas_bottom).offset(8);
make.centerX.mas_equalTo(self.view);
make.size.mas_equalTo(CGSizeMake(335, 40));
make.width.mas_equalTo(335);
make.height.mas_equalTo(40);;
}];
[self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -107,6 +121,8 @@
if (cell == nil) {
cell = [[XPNobleRankTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPNobleRankTableViewCell class])];
}
NObleRankUserModel * userInfo = self.datasource[indexPath.row];
cell.userInfo = userInfo;
return cell;
}
@@ -114,6 +130,22 @@
[tableView deselectRowAtIndexPath:indexPath animated:YES];
}
#pragma mark - XPNobleCenterProtocol
- (void)getNobleRankListSuccess:(NobleRankListModel *)rankInfo {
self.datasource = rankInfo.ranks;
self.myInfoView.userInfo = rankInfo.myRank;
[self.tableView reloadData];
}
- (void)getNobleUpgradeListSuccess:(NSArray *)array {
self.updateView.nobleList = array;
if (array.count <= 0) {
[self.updateView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(0);
}];
}
}
#pragma mark - Event Response
- (void)backButtonAction:(UIButton *)sender {
[self.navigationController popViewControllerAnimated:YES];