第三方库修复

    /// 单击隐藏
    private var tapGest: UITapGestureRecognizer?

    /// 1、当外部没有传入该参数时，默认为UIWindow的根控制器的视图，即表示弹窗放在FWPopupWindow上，此时若FWPopupWindow.sharedInstance.touchWildToHide = true表示弹窗视图外部可点击；2、当外部传入该参数时，该视图为传入的UIView，即表示弹窗放在传入的UIView上；
    @objc public var attachedView = FWPopupWindow.sharedInstance.attachView() {
        willSet {
            if newValue != nil {
                newValue?.fwMaskView.addSubview(self)
                if newValue!.isKind(of: UIScrollView.self) {
                    self.originScrollEnabled = (newValue! as! UIScrollView).isScrollEnabled
                }
            }
        }
    }

RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -50,7 +50,7 @@ class ATAuthSDKManager: NSObject {
                 modelNew.privacyOne = ["由你用户协议",kH5ContentId6Url];
                 modelNew.privacyTwo = ["隐私条款",kH5ContentId11Url];
                 modelNew.checkBoxIsChecked = true
-                modelNew.privacyBottomOffetY = 46.5 - kSafeTabBarHeight
+                modelNew.privacyBottomOffetY = 46.5
                 modelNew.privacyColors = [kbbbbbbColor,k333333Color];
                 
                 

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

@@ -305,10 +305,11 @@ extension PublishEditController {
             aliyunVodUpToYoPublishModel.publishType = .image
             aliyunVodUpToYoPublishModel.images = self.imageArr
         }
-        
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: aliyunVodUpToYoPublishModel)
-        BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
-        self.dismissToWindowRootViewController(animated: false) {}
+        self.dismissToRootViewController(animated: false) {
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: aliyunVodUpToYoPublishModel)
+            BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
+        }
+//        self.dismissToWindowRootViewController(animated: false) {}
 
 
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -11,14 +11,14 @@ import Foundation
 /// Service
 let kPersonalService = false
 let kDevelopSever = false
-let kBetaSever = false
-let kProductSever = true
+let kBetaSever = true
+let kProductSever = false
 
 /// h5Service
 let kH5PersonalService = false
 let kH5DevelopSever = false
-let kH5BetaSever = false
-let kH5ProductSever = true
+let kH5BetaSever = true
+let kH5ProductSever = false
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {