Merge branch 'develop' into feature/circle

RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -28,8 +28,10 @@ class ATAuthSDKManager: NSObject {
 
                 /// navigationbara
                 modelNew.navColor = kffffffColor
-                modelNew.navBackImage = kImage(name: "navbar_back_white")!
-                
+                modelNew.navBackImage = kImage(name: "navbar_back_black")!
+                WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kffffffColor)
+                UINavigationBar.appearance().tintColor = UIColor.black
+                WRNavigationBar.defaultStatusBarStyle = .default
                 //Moblie
                 modelNew.numberFont = kRegularFont36!
                 modelNew.numberColor = UIColor.black

RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -35,6 +35,8 @@ public class UserModel : NSObject, NSCoding, Mappable{
     
     var rongCloudToken : String?
     var rcIMUid : String?
+    
+    var version : String?
 
 
 	class func newInstance(map: Map) -> Mappable?{
@@ -60,6 +62,7 @@ public class UserModel : NSObject, NSCoding, Mappable{
         bindWeixinUserModel <- map["bind_weixin"]
         bindQQUserModel <- map["bind_qq"]
         rongCloudToken <- map["rongcloud_token"]
+        version <- map["version"]
 		
 	}
 
@@ -85,6 +88,7 @@ public class UserModel : NSObject, NSCoding, Mappable{
         bindWeixinUserModel = aDecoder.decodeObject(forKey: "bind_weixin") as? BindThirdPartyUserModel
         bindQQUserModel = aDecoder.decodeObject(forKey: "bind_qq") as? BindThirdPartyUserModel
         rongCloudToken = aDecoder.decodeObject(forKey: "rongcloud_token") as? String
+        version = aDecoder.decodeObject(forKey: "version") as? String
 
 	}
 
@@ -143,6 +147,10 @@ public class UserModel : NSObject, NSCoding, Mappable{
         if rongCloudToken != nil{
             aCoder.encode(rongCloudToken, forKey: "rongcloud_token")
         }
+        
+        if version != nil{
+            aCoder.encode(version, forKey: "version")
+        }
 
 	}
 
@@ -191,9 +199,9 @@ public class UserModel : NSObject, NSCoding, Mappable{
     func getH5UserInfo() -> Dictionary<String,Any> {
         //获取当前时间
         let userModel = getModel()
+        userModel?.version = AppInfo.clientVersion
         var userInfoDic = Dictionary<String,Any>()
         userInfoDic.updateValue("userInfo", forKey: "type")
-        userInfoDic.updateValue(AppInfo.clientVersion, forKey: "version")
         userInfoDic.updateValue(userModel?.toJSON() as Any, forKey: "params")
         return userInfoDic
     }

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

@@ -15,8 +15,8 @@ let kBetaSever = false
 let kProductSever = false
 
 /// H5Service
-let kH5PersonalService = true
-let kH5DevelopSever = false
+let kH5PersonalService = false
+let kH5DevelopSever = true
 let kH5BetaSever = false
 let kH5ProductSever = false