merge with develop

erxes · Nov 16, 2018 · c0de5d1 · c0de5d1
2 parents bf2b272 + bfa5744
commit c0de5d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/ErxesSDK.podspec b/ErxesSDK.podspec
@@ -1,7 +1,8 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ErxesSDK'
-  s.version          = '0.1.1'
+  s.version          = '0.1.3'
+
   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/'

diff --git a/ErxesSDK/Classes/Views/ChatVCMessage.swift b/ErxesSDK/Classes/Views/ChatVCMessage.swift
@@ -46,9 +46,14 @@ public class ChatVCMessage:UIViewController {
         }
 
         var mutation  = InsertMessageMutation(integrationId: integrationId, customerId: erxesCustomerId, message: msg)
-
+        
         if conversationId != nil {
-            mutation  = InsertMessageMutation(integrationId: integrationId, customerId: erxesCustomerId, message: msg, conversationId: conversationId, attachments:attachments)
+            mutation.conversationId = conversationId
+        }
+
+        if attachments.count > 0 {
+            mutation.attachments = attachments
+            mutation.message = "attachment"
         }
 
         apollo.perform(mutation: mutation) { [weak self] result,error in

diff --git a/Example/ErxesSDK/Info.plist b/Example/ErxesSDK/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.5</string>
+	<string>0.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.1</string>
+	<string>1.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>