From 694f876acb5876548c1bc3adf69e844dc9bae07a Mon Sep 17 00:00:00 2001
From: fengshuo <963787902@qq.com>
Date: Thu, 18 Aug 2022 17:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xplan-ios/Base/MVP/Model/UserInfoModel.h         |  3 +++
 xplan-ios/Base/MVP/Model/UserInfoModel.m         |  3 ++-
 .../View/MineInfo/XPMineUserInfoViewController.m | 16 ++++++++++++++--
 .../Monents/View/XPMonentsMineViewController.h   |  4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/xplan-ios/Base/MVP/Model/UserInfoModel.h b/xplan-ios/Base/MVP/Model/UserInfoModel.h
index b6320a86..c6bee9c5 100644
--- a/xplan-ios/Base/MVP/Model/UserInfoModel.h
+++ b/xplan-ios/Base/MVP/Model/UserInfoModel.h
@@ -13,6 +13,7 @@
 #import "UserPhoto.h"
 #import "UserGiftWallInfoModel.h"
 #import "XPEnum.h"
+#import "MonentsInfoModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 
@@ -129,6 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,assign) BOOL fromSayHelloChannel;
 ///是否是封号用户
 @property (nonatomic,assign) BOOL banAccount;
+///用户的动态
+@property (nonatomic,strong) NSArray<MonentsInfoModel *> *dynamicInfo;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/xplan-ios/Base/MVP/Model/UserInfoModel.m b/xplan-ios/Base/MVP/Model/UserInfoModel.m
index 8a5e9d55..84fcd3e8 100644
--- a/xplan-ios/Base/MVP/Model/UserInfoModel.m
+++ b/xplan-ios/Base/MVP/Model/UserInfoModel.m
@@ -13,7 +13,8 @@
 	return @{
 		@"privatePhoto":UserPhoto.class,
 		@"userGiftWall":UserGiftWallInfoModel.class,
-		@"userLuckyBagGiftWall":UserGiftWallInfoModel.class
+		@"userLuckyBagGiftWall":UserGiftWallInfoModel.class,
+		@"dynamicInfo":MonentsInfoModel.class
 	};
 }
 
diff --git a/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m b/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m
index 55fec9b5..deb53b4d 100644
--- a/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m
+++ b/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m
@@ -40,6 +40,7 @@
 #import "SessionViewController.h"
 #import "XPRoomViewController.h"
 #import "XPMineUserDataViewController.h"
+#import "XPMonentsMineViewController.h"
 
 @interface XPMineUserInfoViewController ()<XPMineCustomNavViewDelegate, XPMineUserInfoProtocol, XPMineUserInfoHeaderViewDelegate, JXCategoryViewDelegate,JXPagerViewDelegate, XPMineUserDataViewControllerDelegate, JXPagerMainTableViewGestureDelegate>
 @property (nonatomic, strong) JXCategoryTitleView *titleView;
@@ -60,6 +61,8 @@
 @property (nonatomic,strong) UIButton *attentionButton;
 ///资料
 @property (nonatomic,strong) XPMineUserDataViewController *userDataVC;
+///动态
+@property (nonatomic,strong) XPMonentsMineViewController *monentsVC;
 ///声音秀
 @property (nonatomic,strong) XPMineUserInfoVoiceCardView *voiceView;
 @end
@@ -234,6 +237,8 @@
 	UIViewController *viewController;
 	if (index == 0) {
 		return self.userDataVC;
+	} else {
+		return self.monentsVC;
 	}
 	return (id <JXPagerViewListViewDelegate>)viewController;
 }
@@ -295,7 +300,7 @@
 
 - (void)ongetDetailInfoSuccess:(UserInfoModel *)userInfo {
 	self.userDataVC.userInfo = userInfo;
-
+	self.monentsVC.dynamicInfo = userInfo.dynamicInfo;
 	self.headView.roomUid = userInfo.roomUid;
 }
 
@@ -444,7 +449,7 @@
 
 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[@"资料"];
+		_titles = @[@"资料", @"动态"];
 	}
 	return _titles;
 }
@@ -464,5 +469,12 @@
 	return _voiceView;
 }
 
+- (XPMonentsMineViewController *)monentsVC {
+	if (!_monentsVC) {
+		_monentsVC = [[XPMonentsMineViewController alloc] init];
+	}
+	return _monentsVC;
+}
+
 
 @end
diff --git a/xplan-ios/Main/Monents/View/XPMonentsMineViewController.h b/xplan-ios/Main/Monents/View/XPMonentsMineViewController.h
index 77a69e4a..fa126f08 100644
--- a/xplan-ios/Main/Monents/View/XPMonentsMineViewController.h
+++ b/xplan-ios/Main/Monents/View/XPMonentsMineViewController.h
@@ -6,10 +6,10 @@
 //
 
 #import "MvpViewController.h"
-
+#import <JXPagingView/JXPagerView.h>
 NS_ASSUME_NONNULL_BEGIN
 @class MonentsInfoModel;
-@interface XPMonentsMineViewController : MvpViewController
+@interface XPMonentsMineViewController : MvpViewController<JXPagerViewListViewDelegate>
 @property (nonatomic,strong) NSArray<MonentsInfoModel *>*dynamicInfo;
 @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
 @end