发布动态强制要求填写用户信息

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

@@ -9,14 +9,14 @@
 import UIKit
 import SnapKit
 
-class UserInfo {
-    var userName: String = ""
-    var userTitle: String = ""
-    var avatar: String = ""
-}
-
 class YHCirclePublishViewController: YHBaseViewController {
     
+    class UserInfo {
+        var userName: String = ""
+        var userTitle: String = ""
+        var avatar: String = ""
+    }
+    
     // MARK: - Properties
     private var mediaItems: [YHSelectMediaItem] = []
     private let maxMediaCount = 9

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

@@ -13,6 +13,7 @@ import JXSegmentedView
 class YHCircleViewController: YHBaseViewController {
     
     lazy var viewModel: YHDynamicViewModel = YHDynamicViewModel()
+    lazy var userInfoViewModel: YHInformationAuthorizeViewModel = YHInformationAuthorizeViewModel()
     var arr: [YHDynamicItem] = []
     
     lazy var circleCollectView: UICollectionView = {
@@ -137,13 +138,36 @@ private extension YHCircleViewController {
             return
         }
         
-        let publishVC = YHCirclePublishViewController()
-        publishVC.completion = { [weak self] in
-            self?.requestList(true)
+        YHHUD.show(.progress(message: ""))
+        userInfoViewModel.requestUserInfo { [weak self] _, _ in
+            YHHUD.hide()
+            guard let self = self else {
+                return
+            }
+            if self.userInfoViewModel.model.username.isEmpty {
+                YHGrayCommonAlertView.show("", "请先完善个人信息后再来发布动态", "返回", "前往完善", fullGuestureEnable: false) {
+                } callBack: { [weak self] in
+                    guard let self = self else {
+                        return
+                    }
+                    let userInfoPage = YHInformationAuthorizationStepOneViewController()
+                    self.navigationController?.pushViewController(userInfoPage)
+                }
+            } else {
+                let user = YHCirclePublishViewController.UserInfo()
+                user.userName = self.userInfoViewModel.model.username
+                user.userTitle = self.userInfoViewModel.model.position
+                user.avatar = self.userInfoViewModel.model.avatar
+                let publishVC = YHCirclePublishViewController(currentUser: user)
+                publishVC.completion = { [weak self] in
+                    self?.requestList(true)
+                }
+                let nav = YHNavigationController(rootViewController: publishVC)
+                nav.modalPresentationStyle = .fullScreen
+                present(nav, animated: true)
+            }
         }
-        let nav = YHNavigationController(rootViewController: publishVC)
-        nav.modalPresentationStyle = .fullScreen
-        present(nav, animated: true)
+        
     }
     
     // MARK: - 头部按钮处理方法

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

@@ -110,7 +110,7 @@ extension YHNameCardDynamicViewController: UITableViewDelegate, UITableViewDataS
             let model = self.arr[indexPath.row]
             cell.updateModel(model)
             cell.rePublishClick = {
-                let user = UserInfo()
+                let user = YHCirclePublishViewController.UserInfo()
                 if let userModel = self.userInfo {
                     user.userName = userModel.username
                     user.userTitle = userModel.position

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

@@ -232,13 +232,35 @@ class YHNewNameCardViewController: YHBaseViewController {
         }()
     
     @objc func publishBtnClicked() {
-        let publishVC = YHCirclePublishViewController()
-        publishVC.completion = { [weak self] in
-            self?.requestNameCardInfo()
+        YHHUD.show(.progress(message: ""))
+        authorModel.requestUserInfo { [weak self] _, _ in
+            YHHUD.hide()
+            guard let self = self else {
+                return
+            }
+            if self.authorModel.model.username.isEmpty {
+                YHGrayCommonAlertView.show("", "请先完善个人信息后再来发布动态", "返回", "前往完善", fullGuestureEnable: false) {
+                } callBack: { [weak self] in
+                    guard let self = self else {
+                        return
+                    }
+                    let userInfoPage = YHInformationAuthorizationStepOneViewController()
+                    self.navigationController?.pushViewController(userInfoPage)
+                }
+            } else {
+                let user = YHCirclePublishViewController.UserInfo()
+                user.userName = self.authorModel.model.username
+                user.userTitle = self.authorModel.model.position
+                user.avatar = self.authorModel.model.avatar
+                let publishVC = YHCirclePublishViewController(currentUser: user)
+                publishVC.completion = { [weak self] in
+                    self?.requestNameCardInfo()
+                }
+                let nav = YHNavigationController(rootViewController: publishVC)
+                nav.modalPresentationStyle = .fullScreen
+                present(nav, animated: true)
+            }
         }
-        let nav = YHNavigationController(rootViewController: publishVC)
-        nav.modalPresentationStyle = .fullScreen
-        present(nav, animated: true)
     }
     
     @objc func cooperationBtnClicked() {