From df0a0f3b51c62a60e87b8c708c18b2fdfe65efc2 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Tue, 2 Jan 2024 10:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/Mew/MewHomeApi/Api+MewHomeApi.h | 2 ++ .../Home/View/Mew/MewHomeApi/Api+MewHomeApi.m | 4 ++++ .../View/Mew/MewHomeManager/MewHomeManager.h | 4 +++- .../View/Mew/MewHomeManager/MewHomeManager.m | 15 +++++++++++-- .../Mew/MewHomeProtocol/MewMainHomeProtocol.h | 6 +++++- .../Mew/MewHomeView/MewMainHomeMoreGameVC.m | 11 +++++++++- .../MewHomeView/MewMainHomeViewController.m | 21 ++++++++++++++++--- .../Noble/View/SubViews/XPNobleRechargeView.m | 4 ++-- .../Presenter/XPMonentsRecommendPresenter.m | 2 +- .../View/XPMonentsAttentionPresenter.m | 2 +- .../Monents/View/XPMonentsLatestPresenter.m | 2 +- 11 files changed, 60 insertions(+), 13 deletions(-) diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.h b/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.h index c00cae47..c764fa90 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.h +++ b/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.h @@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN +(void)mew_RequsetMainHomeGameFriend:(HttpRequestHelperCompletion)completion; ///大神推荐 +(void)mew_RequestMainHomeFriendMahogany:(HttpRequestHelperCompletion)completion; +///请求用户信息 ++ (void)mew_RequestMainHomeUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.m b/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.m index dfaf3a19..b4242e3d 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.m +++ b/xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.m @@ -84,4 +84,8 @@ [self makeRequest:@"home/mahogany" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; } +///请求用户信息 ++ (void)mew_RequestMainHomeUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { + [self makeRequest:@"user/get" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; +} @end diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.h b/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.h index dad83e45..e7b975a6 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.h +++ b/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.h @@ -6,7 +6,7 @@ // #import "BaseMvpPresenter.h" - +#import "UserInfoModel.h" NS_ASSUME_NONNULL_BEGIN @interface MewHomeManager : BaseMvpPresenter @@ -29,6 +29,8 @@ NS_ASSUME_NONNULL_BEGIN -(void)mew_getMainHomeGameFriendList; ///大神推荐 -(void)mew_RequestMainHomeFriendMahoganyList; +///请求用户信息 +- (void)mew_getMainHomeUserInfo; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.m b/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.m index 9dec173a..10266359 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.m +++ b/xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.m @@ -114,8 +114,8 @@ NSArray *list = [MewMainHomeHotRoomModel modelsWithArray:data.data[@"playRooms"]]; [[self getView]mew_getMainHomeGameFriendListSuccess:list]; } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES]]; + [[self getView]mew_getMainHomeGameFriendListFail]; + } errorToast:YES]]; } ///大神推荐 -(void)mew_RequestMainHomeFriendMahoganyList{ @@ -126,4 +126,15 @@ }]]; } +///请求用户信息 +- (void)mew_getMainHomeUserInfo{ + NSString * uid = [[AccountInfoStorage instance] getUid]; + if (!uid.length) { + return; + } + [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; + [[self getView] mew_RequestMainHomeUserInfoSuccess:infoModel]; + }] uid:uid]; +} @end diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeProtocol/MewMainHomeProtocol.h b/xplan-ios/Main/Home/View/Mew/MewHomeProtocol/MewMainHomeProtocol.h index 0cf6c591..28ad10bf 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeProtocol/MewMainHomeProtocol.h +++ b/xplan-ios/Main/Home/View/Mew/MewHomeProtocol/MewMainHomeProtocol.h @@ -6,7 +6,7 @@ // #import - +@class UserInfoModel; NS_ASSUME_NONNULL_BEGIN @protocol MewMainHomeProtocol @@ -37,10 +37,14 @@ NS_ASSUME_NONNULL_BEGIN -(void)mew_getMainHomeLittleGameListSuccess:(NSArray *)list; ///获取游戏列表用户成功 -(void)mew_getMainHomeGameFriendListSuccess:(NSArray *)list; +///获取游戏列表失败 +-(void)mew_getMainHomeGameFriendListFail; ///获取大神推荐成功 -(void)mew_RequestMainHomeFriendMahoganyListSuccess:(NSArray *)list; ///得到轮播图 -(void)mew_getMainHomeBannerListSuccess:(NSArray *)list; +///请求用户信息成功 +-(void)mew_RequestMainHomeUserInfoSuccess:(UserInfoModel *)userInfo; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMoreGameVC.m b/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMoreGameVC.m index 0e15241d..e9fc5ddb 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMoreGameVC.m +++ b/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMoreGameVC.m @@ -38,14 +38,19 @@ [super viewDidLoad]; [self installUI]; [self installConstraints]; - [self mew_headerRefresh]; + [self initHeaderAndFooterRrfresh]; } -(void)installUI{ [self.view addSubview:self.mewBgImageView]; [self.view addSubview:self.mewBackBtn]; [self.view addSubview:self.mewCollectionView]; } +- (void)initHeaderAndFooterRrfresh { + MewRefreshSvgaHeader *header = [MewRefreshSvgaHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)]; + self.mewCollectionView.mj_header = header; + [self.mewCollectionView.mj_header beginRefreshing]; +} -(void)mew_headerRefresh{ [self.presenter mew_getMainHomeLittleGameList]; [self.presenter mew_getMainHomeGameFriendList]; @@ -76,9 +81,13 @@ } ///获取游戏列表用户成功 -(void)mew_getMainHomeGameFriendListSuccess:(NSArray *)list{ + [self.mewCollectionView.mj_header endRefreshing]; self.mewRoomList = [NSMutableArray arrayWithArray:list]; [self.mewCollectionView reloadData]; } +-(void)mew_getMainHomeGameFriendListFail{ + [self.mewCollectionView.mj_header endRefreshing]; +} #pragma mark - MewMainHomeMoreGameHeadViewDelegate - (void)mew_selectGameAction:(MewMainHomeLittleGameInfoModel *)gameInfo{ [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventRecent_homepage_moregame_tab_click eventAttributes:@{@"name":gameInfo.name}]; diff --git a/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeViewController.m b/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeViewController.m index 91b8e515..a4b2b851 100644 --- a/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeViewController.m +++ b/xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeViewController.m @@ -19,7 +19,8 @@ #import "XPLittleGameRoomOpenView.h" #import "XPTeenagerHomeView.h" #import "XPWeakTimer.h" - +#import "MewHomeManager.h" +#import "UserInfoModel.h" @interface MewMainHomeViewController () { NSTimer * _mewTimer; @@ -39,12 +40,15 @@ @property(nonatomic,strong) MewMainHomeMakeFriendVC *mewMakeFriendVC; ///青少年空白view @property (nonatomic, strong) XPTeenagerHomeView *mewTeenagerView; +@property(nonatomic,strong) UserInfoModel *mewInfoModel; @end @implementation MewMainHomeViewController @synthesize parentMode = _parentMode; - +- (MewHomeManager *)createPresenter { + return [[MewHomeManager alloc] init]; +} - (void)setParentMode:(BOOL)parentMode { _parentMode = parentMode; if (parentMode) { @@ -134,8 +138,13 @@ - (void)initHeaderAndFooterRrfresh { MewRefreshSvgaHeader *header = [MewRefreshSvgaHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)]; self.mewPagingView.mainTableView.mj_header = header; + + [self.presenter mew_getMainHomeUserInfo]; - +} +///请求用户信息成功 +-(void)mew_RequestMainHomeUserInfoSuccess:(UserInfoModel *)userInfo{ + self.mewInfoModel = userInfo; } -(void)mew_headerRefresh{ if(self.mewTopTitleView.selectedIndex == 1){ @@ -232,6 +241,12 @@ [XPRoomViewController openRoom:roomUid viewController:self]; } } else { + if(code == 10108 && self.mewInfoModel){ + if(self.mewInfoModel.isCertified == NO){ + [self showRealNameAuthenticationTipsAlertView]; + } + return; + } [self showErrorToast:msg]; } } uid:roomUid intoUid:roomUid]; diff --git a/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRechargeView.m b/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRechargeView.m index f3ab3414..af75c781 100644 --- a/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRechargeView.m +++ b/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRechargeView.m @@ -212,7 +212,7 @@ NSString * signedStr = [infoData objectForKey:@"orderData"]; NSString * scheme = @"daeplayapp"; [[AlipaySDK defaultService] payOrder:signedStr fromScheme:scheme callback:^(NSDictionary *resultDic) { - + NSLog(@"%@",resultDic); }]; } } @@ -221,7 +221,7 @@ NSString * scheme = @"daeplayapp"; NSString * signedStr = [infoData objectForKey:@"orderData"]; [[AlipaySDK defaultService] payOrder:signedStr fromScheme:scheme callback:^(NSDictionary *resultDic) { - + NSLog(@"%@",resultDic); }]; } }else if ([payChannel isEqualToString:@"wx"]){ diff --git a/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m b/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m index ddf69fc8..6794572f 100644 --- a/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m +++ b/xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m @@ -26,7 +26,7 @@ [[self getView] getMonentsRecommendListSuccess:array state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsRecommendListFail:msg state:state]; - } showLoading:YES] page:pageStr pageSize:pageSizeStr types:@"0,2"]; + } showLoading:NO] page:pageStr pageSize:pageSizeStr types:@"0,2"]; } diff --git a/xplan-ios/Main/Monents/View/XPMonentsAttentionPresenter.m b/xplan-ios/Main/Monents/View/XPMonentsAttentionPresenter.m index 3c039f46..691b21d0 100644 --- a/xplan-ios/Main/Monents/View/XPMonentsAttentionPresenter.m +++ b/xplan-ios/Main/Monents/View/XPMonentsAttentionPresenter.m @@ -26,7 +26,7 @@ [[self getView] getMonentsAttentionListSuccess:listInfo state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsAttentionListFail:msg state:state]; - } showLoading:YES] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"]; + } showLoading:NO] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"]; } /// 动态点赞 diff --git a/xplan-ios/Main/Monents/View/XPMonentsLatestPresenter.m b/xplan-ios/Main/Monents/View/XPMonentsLatestPresenter.m index b4c76714..9d065593 100644 --- a/xplan-ios/Main/Monents/View/XPMonentsLatestPresenter.m +++ b/xplan-ios/Main/Monents/View/XPMonentsLatestPresenter.m @@ -26,7 +26,7 @@ [[self getView] getMonentsLatestListSuccess:listInfo state:state]; } fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView] getMonentsLatestListFail:msg state:state]; - } showLoading:YES] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"]; + } showLoading:NO] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"]; } /// 动态点赞