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-08-18 17:14:35 +08:00
parent 0ac8ac5b51
commit 694f876acb
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xplan-ios/Base/MVP/Model/UserInfoModel.h
View File

@@ -13,6 +13,7 @@
#import "UserPhoto.h" #import "UserPhoto.h"
#import "UserGiftWallInfoModel.h" #import "UserGiftWallInfoModel.h"
#import "XPEnum.h" #import "XPEnum.h"
#import "MonentsInfoModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@@ -129,6 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,assign) BOOL fromSayHelloChannel; @property (nonatomic,assign) BOOL fromSayHelloChannel;
///是否是封号用户 ///是否是封号用户
@property (nonatomic,assign) BOOL banAccount; @property (nonatomic,assign) BOOL banAccount;
///用户的动态
@property (nonatomic,strong) NSArray<MonentsInfoModel *> *dynamicInfo;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

3
xplan-ios/Base/MVP/Model/UserInfoModel.m
View File

@@ -13,7 +13,8 @@
return @{ return @{
@"privatePhoto":UserPhoto.class, @"privatePhoto":UserPhoto.class,
@"userGiftWall":UserGiftWallInfoModel.class, @"userGiftWall":UserGiftWallInfoModel.class,
@"userLuckyBagGiftWall":UserGiftWallInfoModel.class @"userLuckyBagGiftWall":UserGiftWallInfoModel.class,
@"dynamicInfo":MonentsInfoModel.class
}; };
} }

16
xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m
View File

@@ -40,6 +40,7 @@
#import "SessionViewController.h" #import "SessionViewController.h"
#import "XPRoomViewController.h" #import "XPRoomViewController.h"
#import "XPMineUserDataViewController.h" #import "XPMineUserDataViewController.h"
#import "XPMonentsMineViewController.h"
@interface XPMineUserInfoViewController ()<XPMineCustomNavViewDelegate, XPMineUserInfoProtocol, XPMineUserInfoHeaderViewDelegate, JXCategoryViewDelegate,JXPagerViewDelegate, XPMineUserDataViewControllerDelegate, JXPagerMainTableViewGestureDelegate> @interface XPMineUserInfoViewController ()<XPMineCustomNavViewDelegate, XPMineUserInfoProtocol, XPMineUserInfoHeaderViewDelegate, JXCategoryViewDelegate,JXPagerViewDelegate, XPMineUserDataViewControllerDelegate, JXPagerMainTableViewGestureDelegate>
@property (nonatomic, strong) JXCategoryTitleView *titleView; @property (nonatomic, strong) JXCategoryTitleView *titleView;
@@ -60,6 +61,8 @@
@property (nonatomic,strong) UIButton *attentionButton; @property (nonatomic,strong) UIButton *attentionButton;
///资料 ///资料
@property (nonatomic,strong) XPMineUserDataViewController *userDataVC; @property (nonatomic,strong) XPMineUserDataViewController *userDataVC;
///动态
@property (nonatomic,strong) XPMonentsMineViewController *monentsVC;
///声音秀 ///声音秀
@property (nonatomic,strong) XPMineUserInfoVoiceCardView *voiceView; @property (nonatomic,strong) XPMineUserInfoVoiceCardView *voiceView;
@end @end
@@ -234,6 +237,8 @@
UIViewController *viewController; UIViewController *viewController;
if (index == 0) { if (index == 0) {
return self.userDataVC; return self.userDataVC;
} else {
return self.monentsVC;
} }
return (id <JXPagerViewListViewDelegate>)viewController; return (id <JXPagerViewListViewDelegate>)viewController;
} }
@@ -295,7 +300,7 @@
- (void)ongetDetailInfoSuccess:(UserInfoModel *)userInfo { - (void)ongetDetailInfoSuccess:(UserInfoModel *)userInfo {
self.userDataVC.userInfo = userInfo; self.userDataVC.userInfo = userInfo;
self.monentsVC.dynamicInfo = userInfo.dynamicInfo;
self.headView.roomUid = userInfo.roomUid; self.headView.roomUid = userInfo.roomUid;
} }
@@ -444,7 +449,7 @@
- (NSArray<NSString *> *)titles { - (NSArray<NSString *> *)titles {
if (!_titles) { if (!_titles) {
_titles = @[@"资料"]; _titles = @[@"资料", @"动态"];
} }
return _titles; return _titles;
} }
@@ -464,5 +469,12 @@
return _voiceView; return _voiceView;
} }
- (XPMonentsMineViewController *)monentsVC {
if (!_monentsVC) {
_monentsVC = [[XPMonentsMineViewController alloc] init];
}
return _monentsVC;
}
@end @end

4
xplan-ios/Main/Monents/View/XPMonentsMineViewController.h
View File

@@ -6,10 +6,10 @@
// //
#import "MvpViewController.h" #import "MvpViewController.h"
#import <JXPagingView/JXPagerView.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class MonentsInfoModel; @class MonentsInfoModel;
@interface XPMonentsMineViewController : MvpViewController @interface XPMonentsMineViewController : MvpViewController<JXPagerViewListViewDelegate>
@property (nonatomic,strong) NSArray<MonentsInfoModel *>*dynamicInfo; @property (nonatomic,strong) NSArray<MonentsInfoModel *>*dynamicInfo;
@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
@end @end