// 动态

galaxy/galaxy/Classes/Modules/Community(社区)/Circle(下属社区)/C/YHCirclePublishViewController.swift

@@ -9,12 +9,13 @@
 import UIKit
 import SnapKit
 
+class UserInfo {
+    var userName: String = ""
+    var userTitle: String = ""
+    var avatar: String = ""
+}
+
 class YHCirclePublishViewController: YHBaseViewController {
-    struct UserInfo {
-        var userName: String = ""
-        var userTitle: String = ""
-        var avatar: String = ""
-    }
     
     // MARK: - Properties
     private var mediaItems: [YHSelectMediaItem] = []
@@ -31,6 +32,8 @@ class YHCirclePublishViewController: YHBaseViewController {
     private var currentUser: UserInfo?
     
     private var circleId: String?
+    private var titleText: String = ""
+    private var content: String = ""
     
     lazy var viewModel: YHDynamicViewModel = YHDynamicViewModel()
     
@@ -168,10 +171,10 @@ class YHCirclePublishViewController: YHBaseViewController {
             self.mediaItems = mediaItems
         }
         if let title = title {
-            //
+            self.titleText = title
         }
         if let content = content {
-            //
+            self.content = content
         }
         super.init(nibName: nil, bundle: nil)
     }
@@ -294,6 +297,11 @@ class YHCirclePublishViewController: YHBaseViewController {
     }
     
     private func updateUserInfo() {
+        textView.text = self.titleText
+        detailTextView.text = self.content
+        placeholderLabel.isHidden = !self.titleText.isEmpty
+        detailPlaceholderLabel.isHidden = !self.content.isEmpty
+        
         if let currentUser = currentUser {
             usernameLabel.text = currentUser.userName
             subtitleLabel.text = currentUser.userTitle

galaxy/galaxy/Classes/Modules/Mine（我的）/NameCard(名片)/C/YHNameCardContainerViewController.swift

@@ -13,6 +13,11 @@ import UIKit
 class YHNameCardContainerViewController: YHBaseViewController {
     
     var userId: String = ""
+    var userInfo: YHUserNameCardInfo? {
+        didSet {
+            dynamicVC.userInfo = userInfo
+        }
+    }
 
     var canScroll: Bool = false {
         didSet {

galaxy/galaxy/Classes/Modules/Mine（我的）/NameCard(名片)/C/YHNameCardDynamicViewController.swift

@@ -21,6 +21,8 @@ class YHNameCardDynamicViewController: YHBaseViewController {
            return (!self.userId.isEmpty && self.userId == YHLoginManager.shared.userModel?.id)
         }
     }
+    
+    var userInfo: YHUserNameCardInfo?
 
     lazy var tableView: YHGestureTableView = {
         let tableView = YHGestureTableView(frame: .zero, style: .grouped)
@@ -108,7 +110,27 @@ extension YHNameCardDynamicViewController: UITableViewDelegate, UITableViewDataS
             let model = self.arr[indexPath.row]
             cell.updateModel(model)
             cell.rePublishClick = {
-                // model.id
+                let user = UserInfo()
+                if let userModel = self.userInfo {
+                    user.userName = userModel.username
+                    user.userTitle = userModel.position
+                    user.avatar = userModel.avatar
+                }
+                
+                var arr: [YHSelectMediaItem] = []
+                for url in model.resource_urls {
+                    let item = YHSelectMediaItem()
+                    item.type = YHMediaType.image
+                    item.resourceURL = url
+                    arr.append(item)
+                }
+                let publishVC = YHCirclePublishViewController(currentUser: user, id: model.id, mediaItems: arr, title: model.title, content: model.content)
+                publishVC.completion = { [weak self] in
+                    self?.requestList(true)
+                }
+                let nav = YHNavigationController(rootViewController: publishVC)
+                nav.modalPresentationStyle = .fullScreen
+                UIViewController.current?.present(nav, animated: true)
             }
         }
         return cell

galaxy/galaxy/Classes/Modules/Mine（我的）/NameCard(名片)/C/YHNewNameCardViewController.swift

@@ -446,11 +446,16 @@ class YHNewNameCardViewController: YHBaseViewController {
     
     func requestNameCardInfo() {
         containerVC.refreshData()
-        self.viewModel.getUserNameCardInfo(uid: self.userId) {
+        var userId = self.userId
+        if self.isCurrentUser {
+            userId = ""
+        }
+        self.viewModel.getUserNameCardInfo(uid: userId) {
             _, _ in
             self.updateModel()
             self.tableView.reloadData()
             self.updateBottomButton()
+            self.containerVC.userInfo = self.viewModel.nameCardInfo
         }
     }