Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* 支持gcm推送点击

## 3.8.3+2
增加群组已读回执;
不在提供EMContact类,直接返回String类型username;
* 增加群组已读回执;
* 不在提供EMContact类,直接返回String类型username;

## 3.8.3
* 增加用户属性;
Expand Down
3 changes: 3 additions & 0 deletions ios/Classes/EMMessage+Flutter.m
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ + (EMMessage *)fromJson:(NSDictionary *)aJson
msg.isDeliverAcked = [aJson[@"hasDeliverAck"] boolValue];
msg.isRead = [aJson[@"hasRead"] boolValue];
msg.isNeedGroupAck = [aJson[@"needGroupAck"] boolValue];
// read only
// msg.groupAckCount = [aJson[@"groupAckCount"] intValue]
msg.ext = aJson[@"attributes"];
return msg;
}
Expand All @@ -65,6 +67,7 @@ - (NSDictionary *)toJson
ret[@"hasReadAck"] = @(self.isReadAcked);
ret[@"needGroupAck"] = @(self.isNeedGroupAck);
ret[@"serverTime"] = @(self.timestamp);
ret[@"groupAckCount"] = @(self.groupAckCount);
ret[@"attributes"] = self.ext ?: @{};
ret[@"localTime"] = @(self.localTime);
ret[@"status"] = @([self statusToInt:self.status]);
Expand Down
4 changes: 2 additions & 2 deletions lib/src/em_chat_room_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class EMChatRoomManager {
}

/// @nodoc 获取聊天室成员列表,[roomId] [cursor] [pageSize]
Future<EMCursorResult<EMChatRoom>> fetchChatRoomMembers(
Future<EMCursorResult<String?>> fetchChatRoomMembers(
String roomId, {
String cursor = '',
int pageSize = 200,
Expand All @@ -229,7 +229,7 @@ class EMChatRoomManager {
Map result =
await _channel.invokeMethod(EMSDKMethod.fetchChatRoomMembers, req);
EMError.hasErrorFromResult(result);
return EMCursorResult<EMChatRoom>.fromJson(
return EMCursorResult<String?>.fromJson(
result[EMSDKMethod.fetchChatRoomMembers],
dataItemCallback: (obj) => obj);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/models/em_message.dart
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ class EMMessage {
..hasRead = map.boolValue('hasRead')
..hasReadAck = map.boolValue('hasReadAck')
..needGroupAck = map.boolValue('needGroupAck')
..groupAckCount = map["groupAckCount"] as int
..groupAckCount = map["groupAckCount"] as int? ?? 0
..hasDeliverAck = map.boolValue('hasDeliverAck')
.._msgId = map['msgId'] as String?
..conversationId = map['conversationId'] as String?
Expand Down