Skip to content

Commit 7e7be75

Browse files
committed
Merge branch 'fixBuild'
2 parents c27cc16 + c496d4b commit 7e7be75

16 files changed

+165
-145
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ iOS
1414
- add to PodFile
1515
```
1616
use_frameworks!
17-
pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :tag => '3.29.0'
17+
pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :tag => '3.34.4'
1818
```
1919
- pod install
2020

ios/Department.swift

100755100644
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ public final class _ObjCDepartment: NSObject {
5757
@objc(getDepartmentOnlineStatus)
5858
func getDepartmentOnlineStatus() -> _ObjCDepartmentOnlineStatus {
5959
switch department.getDepartmentOnlineStatus() {
60-
case .BUSY_OFFLINE:
60+
case .busyOffline:
6161
return .BUSY_OFFLINE
62-
case .BUSY_ONLINE:
62+
case .busyOnline:
6363
return .BUSY_ONLINE
64-
case .OFFLINE:
64+
case .offline:
6565
return .OFFLINE
66-
case .ONLINE:
66+
case .online:
6767
return .ONLINE
68-
case .UNKNOWN:
68+
case .unknown:
6969
return .UNKNOWN
7070
}
7171
}

ios/FatalErrorHandler.swift

100755100644
File mode changed.

ios/Message.swift

100755100644
Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public final class _ObjCMessage: NSObject {
4646

4747
@objc(getAttachment)
4848
public func getAttachment() -> _ObjCMessageAttachment? {
49-
if let attachment = message.getAttachment() {
49+
if let attachment = message.getData()?.getAttachment() {
5050
return _ObjCMessageAttachment(messageAttachment: attachment)
5151
}
5252

@@ -55,7 +55,7 @@ public final class _ObjCMessage: NSObject {
5555

5656
@objc(getData)
5757
public func getData() -> [String: Any]? {
58-
if let data = message.getData() {
58+
if let data = message.getRawData() {
5959
var objCData = [String: Any]()
6060
for key in data.keys {
6161
if let value = data[key] {
@@ -92,9 +92,9 @@ public final class _ObjCMessage: NSObject {
9292
@objc(getSendStatus)
9393
public func getSendStatus() -> _ObjCMessageSendStatus {
9494
switch message.getSendStatus() {
95-
case .SENDING:
95+
case .sending:
9696
return .SENDING
97-
case .SENT:
97+
case .sent:
9898
return .SENT
9999
}
100100
}
@@ -112,26 +112,28 @@ public final class _ObjCMessage: NSObject {
112112
@objc(getType)
113113
public func getType() -> _ObjCMessageType {
114114
switch message.getType() {
115-
case .ACTION_REQUEST:
115+
case .actionRequest:
116116
return .ACTION_REQUEST
117-
case .CONTACTS_REQUEST:
117+
case .contactInformationRequest:
118118
return .CONTACTS_REQUEST
119-
case .FILE_FROM_OPERATOR:
119+
case .fileFromOperator:
120120
return .FILE_FROM_OPERATOR
121-
case .FILE_FROM_VISITOR:
121+
case .fileFromVisitor:
122122
return .FILE_FROM_VISITOR
123-
case .INFO:
123+
case .info:
124124
return .INFO
125-
case .OPERATOR:
125+
case .operatorMessage:
126126
return .OPERATOR
127-
case .OPERATOR_BUSY:
127+
case .operatorBusy:
128128
return .OPERATOR_BUSY
129-
case .VISITOR:
129+
case .visitorMessage:
130130
return .VISITOR
131-
case .KEYBOARD:
131+
case .keyboard:
132132
return .KEYBOARD
133-
case .KEYBOARD_RESPONSE:
133+
case .keyboardResponse:
134134
return .KEYBOARD_RESPONSE
135+
case .stickerVisitor:
136+
return .STICKER_VISITOR
135137
}
136138
}
137139

@@ -169,18 +171,18 @@ public final class _ObjCMessageAttachment: NSObject {
169171
// MARK: - Methods
170172

171173
@objc(getContentType)
172-
public func getContentType() -> String {
173-
return messageAttachment.getContentType()
174+
public func getContentType() -> String? {
175+
return messageAttachment.getFileInfo().getContentType()
174176
}
175177

176178
@objc(getFileName)
177179
public func getFileName() -> String {
178-
return messageAttachment.getFileName()
180+
return messageAttachment.getFileInfo().getFileName()
179181
}
180182

181183
@objc(getImageInfo)
182184
public func getImageInfo() -> _ObjCImageInfo? {
183-
if let imageInfo = messageAttachment.getImageInfo() {
185+
if let imageInfo = messageAttachment.getFileInfo().getImageInfo() {
184186
return _ObjCImageInfo(imageInfo: imageInfo)
185187
}
186188

@@ -189,12 +191,12 @@ public final class _ObjCMessageAttachment: NSObject {
189191

190192
@objc(getSize)
191193
public func getSize() -> NSNumber? {
192-
return messageAttachment.getSize() as NSNumber?
194+
return messageAttachment.getFileInfo().getSize() as NSNumber?
193195
}
194196

195197
@objc(getURL)
196-
public func getURL() -> URL {
197-
return messageAttachment.getURL()
198+
public func getURL() -> URL? {
199+
return messageAttachment.getFileInfo().getURL()
198200
}
199201

200202
}
@@ -241,11 +243,12 @@ public enum _ObjCMessageType: Int {
241243
case FILE_FROM_OPERATOR
242244
case FILE_FROM_VISITOR
243245
case INFO
246+
case KEYBOARD
247+
case KEYBOARD_RESPONSE
244248
case OPERATOR
245249
case OPERATOR_BUSY
246250
case VISITOR
247-
case KEYBOARD
248-
case KEYBOARD_RESPONSE
251+
case STICKER_VISITOR
249252
}
250253

251254
// MARK: - MessageSendStatus

ios/MessageListener.swift

100755100644
File mode changed.

0 commit comments

Comments
 (0)