From a493030e3def890b86dd6b755b3963582e08d2c4 Mon Sep 17 00:00:00 2001
From: chenshuanglin <1273934588@qq.com>
Date: Thu, 16 Mar 2023 19:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A1=B6=E9=83=A8=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8E=9F=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Monents/View/XPNewMomentsViewController.m | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/xplan-ios/Main/Monents/View/XPNewMomentsViewController.m b/xplan-ios/Main/Monents/View/XPNewMomentsViewController.m
index 9a117ac8..c35665cc 100644
--- a/xplan-ios/Main/Monents/View/XPNewMomentsViewController.m
+++ b/xplan-ios/Main/Monents/View/XPNewMomentsViewController.m
@@ -21,23 +21,27 @@
 /// View
 #import "XPMomentTopicHeaderView.h"
 #import "XPTeenagerHomeView.h"
+#import "XPMonentsRecommendHeaderView.h"
 /// VC
 #import "XPMomentListViewController.h"
 #import "XPMonentsPublishViewController.h"
 #import "XPMonentTopicContainerViewController.h"
 #import "XPMonentsInteractiveViewController.h"
+#import "XPMoentsTopicListViewController.h"
 ///P
 #import "XPMonentsRecommendPresenter.h"
 #import "XPMonentsRecommendProtocol.h"
 
-@interface XPNewMomentsViewController ()<JXCategoryViewDelegate,JXPagerViewDelegate,XPMonentsRecommendProtocol,XPMomentTopicHeaderViewDelegate,NIMSystemNotificationManagerDelegate>
+@interface XPNewMomentsViewController ()<JXCategoryViewDelegate,JXPagerViewDelegate,XPMonentsRecommendProtocol,XPMomentTopicHeaderViewDelegate,NIMSystemNotificationManagerDelegate,XPMonentsRecommendHeaderViewDelegate>
 
 ///分页控制器
 @property (nonatomic, strong) JXCategoryTitleView *titleView;
 @property (nonatomic, strong) JXPagerListRefreshView *pagingView;
 @property (nonatomic, strong) NSArray<NSString *> *titles;
 ///分页控制器头部
-@property (nonatomic,strong) XPMomentTopicHeaderView *headerView;
+//@property (nonatomic,strong) XPMomentTopicHeaderView *headerView;
+@property (nonatomic, strong) XPMonentsRecommendHeaderView *headerView;
+
 /// 发布
 @property (nonatomic, strong) UIButton *publishBtn;
 ///显示小红点
@@ -89,6 +93,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
+    self.view.backgroundColor = UIColor.whiteColor;
     [self.view addSubview:self.pagingView];
     [self.view addSubview:self.publishBtn];
     
@@ -173,6 +178,18 @@
     [self.navigationController pushViewController:topicVC animated:YES];
 }
 
+#pragma mark - XPMonentsRecommendHeaderViewDelegate
+- (void)xPMonentsRecommendHeaderView:(XPMonentsRecommendHeaderView *)view didSelectItem:(MonentsTopicModel *)info {
+    XPMonentTopicContainerViewController * topicVC = [[XPMonentTopicContainerViewController alloc] init];
+    topicVC.worldId = info.tId;
+    [self.navigationController pushViewController:topicVC animated:YES];
+}
+
+- (void)xPMonentsRecommendHeaderView:(XPMonentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender {
+    XPMoentsTopicListViewController * topicListVC = [[XPMoentsTopicListViewController alloc] init];
+    [self.navigationController pushViewController:topicListVC animated:YES];
+}
+
 #pragma mark - XPMonentsRecommendProtocol
 
 - (void)monentsTopicListSuccess:(NSArray *)array {
@@ -181,7 +198,7 @@
 
 #pragma mark - JXCategoryViewDelegate
 - (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView {
-    return [XPMomentTopicHeaderView getTopicHeaderViewHeight];
+    return 120;
 }
 
 - (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView {
@@ -263,9 +280,17 @@
     return _titles;
 }
 
-- (XPMomentTopicHeaderView *)headerView {
+//- (XPMomentTopicHeaderView *)headerView {
+//    if (!_headerView) {
+//        _headerView = [[XPMomentTopicHeaderView alloc] init];
+//        _headerView.delegate = self;
+//    }
+//    return _headerView;
+//}
+
+- (XPMonentsRecommendHeaderView *)headerView {
     if (!_headerView) {
-        _headerView = [[XPMomentTopicHeaderView alloc] init];
+        _headerView = [[XPMonentsRecommendHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 120)];
         _headerView.delegate = self;
     }
     return _headerView;