新老发布，切换，全部切换到老版发布

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -93,10 +93,11 @@ class BaseTabbarViewController: UITabBarController {
         if !AliyunVodUpToyoPublishManager.shared.isUploading { // 是否正在上传中
             PublishNewPopView.show(imageStrs: ["publish_btn_picture","publish_btn_video","publish_btn_photo","publish_btn_article"], titles: ["相册","视频","拍照","文章"], columnCount: 4) { [weak self] (index) in
                 if index != 3 {
-//                    let pickVc = PublishViewController()
-//                    pickVc.index = index
-                    let  pickVc = PublishNewViewController()
+                    let pickVc = PublishViewController()
                     pickVc.index = index
+                    // 新发布
+//                    let  pickVc = PublishNewViewController()
+//                    pickVc.index = index
                     let nav = BaseNavigationViewController.init(rootViewController: pickVc)
                     nav.modalPresentationStyle = .fullScreen
                     self?.present(nav, animated: true, completion: nil)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -65,10 +65,11 @@ class CommunityViewController: BaseViewController {
         navigationBar.isHidden = true
         view.addSubview(segmentedView)
         view.addSubview(listContainerView)
-//        listContainerView.addSubview(publishUploadProgressView)
-//        listContainerView.bringSubviewToFront(publishUploadProgressView)
-        listContainerView.addSubview(publishManagerUploadView)
-        listContainerView.bringSubviewToFront(publishManagerUploadView)
+        listContainerView.addSubview(publishUploadProgressView)
+        listContainerView.bringSubviewToFront(publishUploadProgressView)
+        // 最新发布
+//        listContainerView.addSubview(publishManagerUploadView)
+//        listContainerView.bringSubviewToFront(publishManagerUploadView)
 
         view.addSubview(communityNavigationBarView)
         
@@ -93,15 +94,15 @@ class CommunityViewController: BaseViewController {
             make.left.right.bottom.equalToSuperview()
         }
         
-//        publishUploadProgressView.snp.makeConstraints { (make) in
-//            make.top.left.right.equalToSuperview()
-//             make.height.equalTo(62)
-//        }
-        
-        publishManagerUploadView.snp.makeConstraints { (make) in
+        publishUploadProgressView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
              make.height.equalTo(62)
         }
+        // 最新发布
+//        publishManagerUploadView.snp.makeConstraints { (make) in
+//            make.top.left.right.equalToSuperview()
+//             make.height.equalTo(62)
+//        }
 
 
     }
@@ -214,10 +215,11 @@ class CommunityViewController: BaseViewController {
         // 待发布
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("DismissFromPublishEditVc"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             self?.reloadSegmentedFollowView()
-//            let aliyunVodUpToYoPublishModel = notification.object as? AliyunVodUpToYoPublishModel
-//            self?.publishUploadProgressView.aliyunVodUpToYoPublishModel = aliyunVodUpToYoPublishModel
-            let publishManagerModel = notification.object as? PublishManagerModel
-            self?.publishManagerUploadView.publishManagerModel = publishManagerModel
+            let aliyunVodUpToYoPublishModel = notification.object as? AliyunVodUpToYoPublishModel
+            self?.publishUploadProgressView.aliyunVodUpToYoPublishModel = aliyunVodUpToYoPublishModel
+            // 最新发布
+//            let publishManagerModel = notification.object as? PublishManagerModel
+//            self?.publishManagerUploadView.publishManagerModel = publishManagerModel
 
         }