Merge branch 'develop' into feature/jeremy

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

@@ -392,12 +392,22 @@ extension PublishEditController {
         SwiftMoyaNetWorkServiceCommunity.shared().communityPublishApi(type: typeStr, img: majorImageUrl ?? "", topic_ids: topicJsonStr, video: paraVideo, title: pubTitle, content: pubContent, location: locationStr, imgs: imgsJsonStr) {
             [weak self] (communityPublishModel) -> (Void) in
             let communityPublishModel = communityPublishModel as? CommunityPublishModel
-            
             self?.publishSuccessAction(communityPublishModel!)
         }
     }
     
     func publishSuccessAction(_ pubModel: CommunityPublishModel) {
+        var typeStr: String = ""
+        if mediaType == .image {
+            typeStr = "image"
+        } else {
+            typeStr = "video"
+        }
+        
+        
+        VirusViewModel.shared.publishVirueRecordAddApi(postId: pubModel.postId, postType: typeStr, title: pubTitle, content: pubContent, postCover: majorImageUrl)
+        
+        
         let sucVc = PublishSuccessController()
         sucVc.postId   = pubModel.postId
         sucVc.bean     = pubModel.bean
@@ -412,12 +422,6 @@ extension PublishEditController {
         sucVc.nameStr = userMdl?.username
         sucVc.avatarStr = userMdl?.avatarurl
         sucVc.uid = userMdl?.uid
-        var typeStr: String = ""
-        if mediaType == .image {
-            typeStr = "image"
-        } else {
-            typeStr = "video"
-        }
         sucVc.type = typeStr
         
         self.navigationController?.pushViewController(sucVc, animated: true)

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -660,15 +660,24 @@ extension VirusViewModel {
 
 extension VirusViewModel {
     // 发布
-    func publishVirueRecordAddApi(postId:Int?,postType:String?,postAuthorUid:String?,title:String?,content:String?,postCover:String?) {
+    func publishVirueRecordAddApi(postId:Int?,postType: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)"
+        virueRecordAddParameterModel.targetId = "\((UserModel.shared().getModel()?.uid)!)"
         
-        
+        virueRecordAddParameterModel.postId = postId
+        virueRecordAddParameterModel.actionId = "\(postId ?? 0)"
+        if title == "" {
+            virueRecordAddParameterModel.postDesc = String(describing: content?.prefix(20))
+        }else {
+            virueRecordAddParameterModel.postDesc = title
+        }
+        virueRecordAddParameterModel.postType = postType
+        virueRecordAddParameterModel.postCover = postCover
         
         SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
         })