pro-1.0.2-12

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -64,10 +64,8 @@ func safeTabBarHeight() -> CGFloat {
 }
 ///是不是.iPhoneX,.iPhoneXr,.iPhoneXs,.iPhoneXsMax
 private func isIphoneX() -> Bool {
-    
-    let groupOfAllowedDevices: [Device] = [.iPhoneX,.iPhoneXR,.iPhoneXS,.iPhoneXSMax,.simulator(.iPhoneX),.simulator(.iPhoneXR),.simulator(.iPhoneXS),.simulator(.iPhoneXSMax)]
     let device = Device.current
-    if device.isOneOf(groupOfAllowedDevices) {
+    if device.isOneOf(Device.allXSeriesDevices) {
         return true
     }else {
         return false

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

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