Merge branch 'fixBuild'

volga-volga · Jun 22, 2021 · 7e7be75 · 7e7be75
2 parents c27cc16 + c496d4b
commit 7e7be75
Show file tree

Hide file tree

Showing 16 changed files with 165 additions and 145 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ iOS
 - add to PodFile
  ```
     use_frameworks!
-    pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :tag => '3.29.0'
+    pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :tag => '3.34.4'
 ```
 - pod install 
 

diff --git a/ios/Department.swift b/ios/Department.swift
@@ -57,15 +57,15 @@ public final class _ObjCDepartment: NSObject {
     @objc(getDepartmentOnlineStatus)
     func getDepartmentOnlineStatus() -> _ObjCDepartmentOnlineStatus {
         switch department.getDepartmentOnlineStatus() {
-        case .BUSY_OFFLINE:
+        case .busyOffline:
             return .BUSY_OFFLINE
-        case .BUSY_ONLINE:
+        case .busyOnline:
             return .BUSY_ONLINE
-        case .OFFLINE:
+        case .offline:
             return .OFFLINE
-        case .ONLINE:
+        case .online:
             return .ONLINE
-        case .UNKNOWN:
+        case .unknown:
             return .UNKNOWN
         }
     }

diff --git a/ios/FatalErrorHandler.swift b/ios/FatalErrorHandler.swift
diff --git a/ios/Message.swift b/ios/Message.swift
@@ -46,7 +46,7 @@ public final class _ObjCMessage: NSObject {
 
     @objc(getAttachment)
     public func getAttachment() -> _ObjCMessageAttachment? {
-        if let attachment = message.getAttachment() {
+        if let attachment = message.getData()?.getAttachment() {
             return _ObjCMessageAttachment(messageAttachment: attachment)
         }
 
@@ -55,7 +55,7 @@ public final class _ObjCMessage: NSObject {
 
     @objc(getData)
     public func getData() -> [String: Any]? {
-        if let data = message.getData() {
+        if let data = message.getRawData() {
             var objCData = [String: Any]()
             for key in data.keys {
                 if let value = data[key] {
@@ -92,9 +92,9 @@ public final class _ObjCMessage: NSObject {
     @objc(getSendStatus)
     public func getSendStatus() -> _ObjCMessageSendStatus {
         switch message.getSendStatus() {
-        case .SENDING:
+        case .sending:
             return .SENDING
-        case .SENT:
+        case .sent:
             return .SENT
         }
     }
@@ -112,26 +112,28 @@ public final class _ObjCMessage: NSObject {
     @objc(getType)
     public func getType() -> _ObjCMessageType {
         switch message.getType() {
-        case .ACTION_REQUEST:
+        case .actionRequest:
             return .ACTION_REQUEST
-        case .CONTACTS_REQUEST:
+        case .contactInformationRequest:
             return .CONTACTS_REQUEST
-        case .FILE_FROM_OPERATOR:
+        case .fileFromOperator:
             return .FILE_FROM_OPERATOR
-        case .FILE_FROM_VISITOR:
+        case .fileFromVisitor:
             return .FILE_FROM_VISITOR
-        case .INFO:
+        case .info:
             return .INFO
-        case .OPERATOR:
+        case .operatorMessage:
             return .OPERATOR
-        case .OPERATOR_BUSY:
+        case .operatorBusy:
             return .OPERATOR_BUSY
-        case .VISITOR:
+        case .visitorMessage:
             return .VISITOR
-        case .KEYBOARD:
+        case .keyboard:
             return .KEYBOARD
-        case .KEYBOARD_RESPONSE:
+        case .keyboardResponse:
             return .KEYBOARD_RESPONSE
+        case .stickerVisitor:
+            return .STICKER_VISITOR
         }
     }
 
@@ -169,18 +171,18 @@ public final class _ObjCMessageAttachment: NSObject {
     // MARK: - Methods
 
     @objc(getContentType)
-    public func getContentType() -> String {
-        return messageAttachment.getContentType()
+    public func getContentType() -> String? {
+        return messageAttachment.getFileInfo().getContentType()
     }
 
     @objc(getFileName)
     public func getFileName() -> String {
-        return messageAttachment.getFileName()
+        return messageAttachment.getFileInfo().getFileName()
     }
 
     @objc(getImageInfo)
     public func getImageInfo() -> _ObjCImageInfo? {
-        if let imageInfo = messageAttachment.getImageInfo() {
+        if let imageInfo = messageAttachment.getFileInfo().getImageInfo() {
             return _ObjCImageInfo(imageInfo: imageInfo)
         }
 
@@ -189,12 +191,12 @@ public final class _ObjCMessageAttachment: NSObject {
 
     @objc(getSize)
     public func getSize() -> NSNumber? {
-        return messageAttachment.getSize() as NSNumber?
+        return messageAttachment.getFileInfo().getSize() as NSNumber?
     }
 
     @objc(getURL)
-    public func getURL() -> URL {
-        return messageAttachment.getURL()
+    public func getURL() -> URL? {
+        return messageAttachment.getFileInfo().getURL()
     }
 
 }
@@ -241,11 +243,12 @@ public enum _ObjCMessageType: Int {
     case FILE_FROM_OPERATOR
     case FILE_FROM_VISITOR
     case INFO
+    case KEYBOARD
+    case KEYBOARD_RESPONSE
     case OPERATOR
     case OPERATOR_BUSY
     case VISITOR
-    case KEYBOARD
-    case KEYBOARD_RESPONSE
+    case STICKER_VISITOR
 }
 
 // MARK: - MessageSendStatus

diff --git a/ios/MessageListener.swift b/ios/MessageListener.swift