Merge branch 'feature/1.0.2' into feature/RongCloudIM

# Conflicts:
#	RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -62,10 +62,9 @@ func tabBarTotalHeight() -> CGFloat {
 func safeTabBarHeight() -> CGFloat {
     return isIphoneX() ? 34.0 : 0.0
 }
-///是不是.iPhoneX,.iPhoneXr,.iPhoneXs,.iPhoneXsMax
+///是不是.iPhoneX系列
 private func isIphoneX() -> Bool {
-    
-    let groupOfAllowedDevices: [Device] = [.iPhoneX,.iPhoneXR,.iPhoneXS,.iPhoneXSMax,.simulator(.iPhoneX),.simulator(.iPhoneXR),.simulator(.iPhoneXS),.simulator(.iPhoneXSMax)]
+    let groupOfAllowedDevices: [Device] = (Device.allXSeriesDevices + Device.allSimulatorXSeriesDevices)
     let device = Device.current
     if device.isOneOf(groupOfAllowedDevices) {
         return true

RainbowPlanet/RainbowPlanet/Tools/WRNavigationBar/WRCustomNavigationBar.swift

@@ -151,9 +151,7 @@ class WRCustomNavigationBar: UIView
      ///是不是.iPhoneX,.iPhoneXr,.iPhoneXs,.iPhoneXsMax
     fileprivate static var isIphoneX:Bool {
         get {
-            let groupOfAllowedDevices: [Device] = [.iPhoneX,.iPhoneXR,.iPhoneXS,.iPhoneXSMax,.simulator(.iPhoneX),.simulator(.iPhoneXR),.simulator(.iPhoneXS),.simulator(.iPhoneXSMax)]
-            let device = Device.current
-            if device.isOneOf(groupOfAllowedDevices) {
+            if kIsIphoneX {
                 return true
             }else {
                 return false

RainbowPlanet/RainbowPlanet/Tools/WRNavigationBar/WRNavigationBar.swift

@@ -931,14 +931,11 @@ class WRNavigationBar
 
 extension WRNavigationBar
 {
-    class func isIphoneX() -> Bool {
-        return UIScreen.main.bounds.equalTo(CGRect(x: 0, y: 0, width: 375, height: 812))
-    }
     class func navBarBottom() -> Int {
-        return self.isIphoneX() ? 88 : 64;
+        return kIsIphoneX ? 88 : 64;
     }
     class func tabBarHeight() -> Int {
-        return self.isIphoneX() ? 83 : 49;
+        return kIsIphoneX ? 83 : 49;
     }
     class func screenWidth() -> Int {
         return Int(UIScreen.main.bounds.size.width)