Merge branch 'develop' into feature/jeremy

# Conflicts:
#	RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishManager/PublishUploadManager.swift

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -55,7 +55,9 @@ class WebViewJavascriptBridgeManager: NSObject {
         if wvjbModel?.modelType  == .view {
             // 发布
             if wvjbModel?.params?.paramsModelPage == .publist {
-                Mediator.present(H5RouterModuleType.presentPublish)
+                let pickVc = PublishViewController()
+                let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                kAppDelegate.window?.rootViewController?.present(nav, animated: true, completion: nil)
             }
             // 推荐
             if wvjbModel?.params?.paramsModelPage == .join {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishManager/PublishUploadManager.swift

@@ -231,11 +231,10 @@ extension PublishUploadManager {
         }
         
         VirusViewModel.shared.publishVirueRecordAddApi(postId: pubModel.postId, postType: typeStr, title: pubTitle, content: pubContent, postCover: majorImageUrl)
-        
-        print("\n----------发布成功！！！！！")
-//        isPublishFinished = true
-//        progressView?.hide()
-        
-        progressView?.curUploadStatus = UploadStatus.failure
+        // 发布成功
+        isPublishFinished = true
+        progressView?.hide()
+        progressView?.attachedView?.isHidden = true
+//        progressView?.curUploadStatus = UploadStatus.failure
     }
 }

RainbowPlanet/RainbowPlanet/Router/H5RouterModuleType.swift

@@ -25,7 +25,6 @@ import SwiftyMediator
 
 public enum H5RouterModuleType: MediatorTargetType {
     case pushWeb(URLString: String)
-    case presentPublish
     case pushCategory
     case pushContentId4
     case pushContentId6
@@ -43,10 +42,7 @@ extension H5RouterModuleType: MediatorSourceType {
         case .pushWeb(let URLString): //公共的h5
             let vc = H5CommonViewController()
             vc.URLString = URLString
-            return vc
-        case .presentPublish: //发布页面
-            let vc = PublishViewController()
-            return vc
+            return vc        
         case .pushCategory: //兑换商品分类页面
             let vc = H5CommonViewController()
             vc.URLString = kH5CategoryUrl