From 58da4adb2f5dfe1f5e29755b6fb42723bf5202a2 Mon Sep 17 00:00:00 2001
From: fengshuo <963787902@qq.com>
Date: Fri, 26 Aug 2022 22:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Base/UI/ShareView/Model/XPShareInfoModel.h     |  8 ++++++++
 .../SessionContent/ContentShareMonentsModel.h      | 14 +++++++++++---
 xplan-ios/Main/Message/View/Session/MessageCell.m  |  8 ++++----
 .../Mine/View/Friend/XPMineShareViewController.m   |  7 ++++---
 .../Monents/View/SubViews/XPMonentsTooBarView.m    |  3 +++
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/xplan-ios/Base/UI/ShareView/Model/XPShareInfoModel.h b/xplan-ios/Base/UI/ShareView/Model/XPShareInfoModel.h
index 16e5df16..5dd880a0 100644
--- a/xplan-ios/Base/UI/ShareView/Model/XPShareInfoModel.h
+++ b/xplan-ios/Base/UI/ShareView/Model/XPShareInfoModel.h
@@ -41,6 +41,14 @@ typedef NS_ENUM(NSUInteger, ShareType) {
 @property (nonatomic,copy) NSString *dynamicId;
 ///话题id
 @property (nonatomic,copy) NSString *worldId;
+///封面
+@property (nonatomic,copy) NSString *imageUrl;
+///名称
+@property (nonatomic,copy) NSString *nick;
+///发布者的uid
+@property (nonatomic,copy) NSString *publishUid;
+///内容
+@property (nonatomic,copy) NSString *content;
 
 @end
 
diff --git a/xplan-ios/Main/Message/Model/SessionContent/ContentShareMonentsModel.h b/xplan-ios/Main/Message/Model/SessionContent/ContentShareMonentsModel.h
index 2df8e6b0..1909e77b 100644
--- a/xplan-ios/Main/Message/Model/SessionContent/ContentShareMonentsModel.h
+++ b/xplan-ios/Main/Message/Model/SessionContent/ContentShareMonentsModel.h
@@ -10,10 +10,18 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ContentShareMonentsModel : NSObject
-///动态内容
-@property (nonatomic,copy) NSString *content;
-///动态id
+///动态分享
 @property (nonatomic,copy) NSString *dynamicId;
+///话题id
+@property (nonatomic,copy) NSString *worldId;
+///封面
+@property (nonatomic,copy) NSString *imageUrl;
+///名称
+@property (nonatomic,copy) NSString *nick;
+///发布者的uid
+@property (nonatomic,copy) NSString *publishUid;
+///内容
+@property (nonatomic,copy) NSString *content;
 ///头像
 @property (nonatomic,copy) NSString *avatar;
 ///标题
diff --git a/xplan-ios/Main/Message/View/Session/MessageCell.m b/xplan-ios/Main/Message/View/Session/MessageCell.m
index 7e4dc4fe..af018a5d 100644
--- a/xplan-ios/Main/Message/View/Session/MessageCell.m
+++ b/xplan-ios/Main/Message/View/Session/MessageCell.m
@@ -262,10 +262,10 @@
 			return @"MessageContentMonentsView";
 		}else if(attachment.first == CustomMessageType_Monents && (attachment.second == Custom_Message_Sub_Monents_Approved | attachment.second == Custom_Message_Sub_Monents_Ban_Delete)) {
 			return @"MessageContentMonentsAutoView";
-	 } else if(attachment.first == CustomMessageType_Message_Handle && attachment.second == Custom_Message_Sub_Message_Handle_Content) {
-		 return @"MessageContentMonentsAutoView";
-	 }else {
-			return @"MessageContentOpenLiveView";
+		} else if(attachment.first == CustomMessageType_Message_Handle && attachment.second == Custom_Message_Sub_Message_Handle_Content) {
+			return @"MessageContentMonentsAutoView";
+		}else {
+			return @"MessageContentUnSupportView";
 		}
 	} else {
 		return @"MessageContentUnSupportView";
diff --git a/xplan-ios/Main/Mine/View/Friend/XPMineShareViewController.m b/xplan-ios/Main/Mine/View/Friend/XPMineShareViewController.m
index 0b9eddb4..153094db 100644
--- a/xplan-ios/Main/Mine/View/Friend/XPMineShareViewController.m
+++ b/xplan-ios/Main/Mine/View/Friend/XPMineShareViewController.m
@@ -91,9 +91,10 @@
 			attachment.first = CustomMessageType_Monents;
 			attachment.second = Custom_Message_Sub_Monents_Share;
 			ContentShareMonentsModel * shareInfo = [[ContentShareMonentsModel alloc] init];
-			shareInfo.avatar = self.shareInfo.shareImageUrl;
-			shareInfo.title = self.shareInfo.shareTitle;
-			shareInfo.content = self.shareInfo.shareContent;
+			shareInfo.imageUrl = self.shareInfo.imageUrl;
+			shareInfo.nick = self.shareInfo.nick;
+			shareInfo.content = self.shareInfo.content;
+			shareInfo.dynamicId= self.shareInfo.dynamicId;
 			shareInfo.routerValue = self.shareInfo.dynamicId;
 			shareInfo.routerType = 50;
 			attachment.data = shareInfo.model2dictionary;
diff --git a/xplan-ios/Main/Monents/View/SubViews/XPMonentsTooBarView.m b/xplan-ios/Main/Monents/View/SubViews/XPMonentsTooBarView.m
index 323acf30..b0ca8270 100644
--- a/xplan-ios/Main/Monents/View/SubViews/XPMonentsTooBarView.m
+++ b/xplan-ios/Main/Monents/View/SubViews/XPMonentsTooBarView.m
@@ -177,6 +177,9 @@
 	if (self.monentsInfo.nick.length > 6) {
 		title = [title substringToIndex:6];
 	}
+	shareInfo.nick = title;
+	shareInfo.content = self.monentsInfo.content;
+	shareInfo.imageUrl = self.monentsInfo.avatar;
 	shareInfo.shareTitle = [NSString stringWithFormat:@"%@发布了一条动态", title];
 	shareInfo.shareContent = self.monentsInfo.content;
 	shareInfo.shareImageUrl = self.monentsInfo.avatar;