Merge branch 'develop' into feature/jeremy

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/Controller/PublishEditController.swift

@@ -405,13 +405,20 @@ extension PublishEditController {
         sucVc.imgUrl   = majorImageUrl
         sucVc.titleStr = pubTitle
         sucVc.contentStr = pubContent
-//        var topicStr : String = ""
+        // 暂给已选首个
+        sucVc.topicStr = selTopicModelArr[0].name ?? ""
         
         let userMdl = UserModel.shared().getModel()
         sucVc.nameStr = userMdl?.username
         sucVc.avatarStr = userMdl?.avatarurl
         sucVc.uid = userMdl?.uid
-//        var type : String?
+        var typeStr: String = ""
+        if mediaType == .image {
+            typeStr = "image"
+        } else {
+            typeStr = "video"
+        }
+        sucVc.type = typeStr
         
         self.navigationController?.pushViewController(sucVc, animated: true)
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishSuccess/PublishSuccessController.swift

@@ -40,6 +40,11 @@ class PublishSuccessController: BaseViewController {
         navigationBar.title = "分享动态卡片"
         navigationBar.titleLabelColor = kffffffColor
         navigationBar.wr_setLeftButton(image: kImage(name: "navbar_back_white")!)
+        navigationBar.onClickLeftButton = {
+            [weak self] in
+           NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: nil)
+        }
+        
         view.addSubview(shareCommunityContentView)
         view.addSubview(scrollView)
         scrollView.addSubview(bgImageView)

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -638,4 +638,19 @@ extension VirusViewModel {
     }
 }
 
-
+extension VirusViewModel {
+    // 发布
+    func publishVirueRecordAddApi(postId:Int?,postType:String?,postAuthorUid:String?,title:String?,content:String?,postCover:String?) {
+        
+        let virueRecordAddParameterModel = VirueRecordAddParameterModel()
+        virueRecordAddParameterModel.behaviorId = (ConfigModel.shared.object()?.virus?.publish ?? "")
+        virueRecordAddParameterModel.behaviorFlag =
+            BehaviorFlagType.publish.rawValue
+        virueRecordAddParameterModel.sourceId = "\(UserModel.shared().getModel()?.inviteUid ?? 0)"
+        
+        
+        
+        SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
+        })
+    }
+}