Merge branch 'develop'

ErxesSDK.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ErxesSDK'
-  s.version          = '0.1.6'
+  s.version          = '0.1.7'
   s.summary          = 'A short description of erxes-ios-sdk.'
   s.swift_version = '4.0'
   s.description      = 'erxes for IOS SDK, for integrating erxes into your iOS application https://erxes.io/'

ErxesSDK/Classes/Global/Erxes.swift

@@ -108,7 +108,11 @@ var isOnline = true
         }
 
         if data.keys.count > 0 {
-            erxesUserData = data
+            var processed = [String:Any]()
+            for (key, value) in data {
+                processed[key] = forceBridgeFromObjectiveC(value)
+            }
+            erxesUserData = processed
         }
 
         if var topController = UIApplication.shared.keyWindow?.rootViewController {
@@ -119,6 +123,34 @@ var isOnline = true
         }
     }
 
+    static func forceBridgeFromObjectiveC(_ value: Any) -> Any {
+
+        if value == nil {
+            return value
+        }
+
+        switch value {
+
+        case is NSString:
+            return value as! String
+
+        case is Bool:
+            return value as! Bool
+        case is Int:
+            return value as! Int
+        case is Int64:
+            return value as! Int64
+        case is Double:
+            return value as! Double
+        case is NSDictionary:
+            return Dictionary(uniqueKeysWithValues: (value as! NSDictionary).map { ($0.key as! AnyHashable, forceBridgeFromObjectiveC($0.value)) })
+        case is NSArray:
+            return (value as? NSArray).map { forceBridgeFromObjectiveC($0) }
+        default:
+            return value
+        }
+    }
+
     @objc public static func setDeviceToken(token:String){
     }
 

ErxesSDK/Classes/Views/RegisterVC.swift

@@ -145,10 +145,12 @@ public class RegisterVC: UIViewController {
 
         if erxesEmail.count > 0 {
             mutation.email = erxesEmail
+            mutation.isUser = true
         }
 
         if erxesPhone.count > 0 {
             mutation.phone = erxesPhone
+            mutation.isUser = true
         }
 
         if erxesUserData.keys.count > 0 {

Example/ErxesSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.6</string>
+	<string>0.1.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>