Skip to content

Commit a799f26

Browse files
committed
fix bugs involved by refactor.
1 parent 5fde862 commit a799f26

File tree

5 files changed

+57
-6
lines changed

5 files changed

+57
-6
lines changed

im_flutter_sdk/lib/src/managers/chat_manager.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,13 @@ class EMChatManager {
415415
///
416416
/// **Throws** 如果有异常会在这里抛出,包含错误码和错误描述,详见 [EMError]
417417
/// ~end
418-
Future<void> sendMessageReadAck(EMMessage message) async {
418+
Future<bool> sendMessageReadAck(EMMessage message) async {
419419
try {
420420
Map req = {"to": message.from, "msgId": message.msgId};
421421
Map result = await Client.instance.chatManager
422422
.callNativeMethod(ChatMethodKeys.ackMessageRead, req);
423423
EMError.hasErrorFromResult(result);
424+
return result.boolValue(ChatMethodKeys.ackMessageRead);
424425
} catch (e) {
425426
rethrow;
426427
}
@@ -1908,7 +1909,7 @@ class EMChatManager {
19081909
rethrow;
19091910
}
19101911
}
1911-
}
1912+
19121913

19131914
/// ~english
19141915
/// Gets all languages supported by the translation service.
@@ -2418,6 +2419,7 @@ Future<List<EMMessage>> searchMsgsByOptions(
24182419
rethrow;
24192420
}
24202421
}
2422+
}
24212423

24222424
Future<int> getAllMessageCount() async {
24232425
try {

im_flutter_sdk/lib/src/managers/chat_room_manager.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ class EMChatRoomManager {
256256
257257
Future<void> joinChatRoom(
258258
String roomId, {
259+
@Deprecated('') bool? leaveOther,
259260
bool leaveOtherRooms = false,
260261
String? ext,
261262
}) async {

im_flutter_sdk/lib/src/managers/client.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ class EMClient {
212212

213213
EMChatManager get chatManager => _chatManager ??= EMChatManager();
214214
EMContactManager get contactManager => _contactManager ??= EMContactManager();
215-
EMChatRoomManager get roomManager => _roomManager ??= EMChatRoomManager();
215+
EMChatRoomManager get chatRoomManager => _roomManager ??= EMChatRoomManager();
216216
EMGroupManager get groupManager => _groupManager ??= EMGroupManager();
217217
EMPushManager get pushManager => _pushManager ??= EMPushManager();
218218
EMPresenceManager get presenceManager =>
219219
_presenceManager ??= EMPresenceManager();
220220
EMUserInfoManager get userInfoManager =>
221221
_userInfoManager ??= EMUserInfoManager();
222222

223-
EMChatThreadManager get threadManager =>
223+
EMChatThreadManager get chatThreadManager =>
224224
_threadManager ??= EMChatThreadManager();
225225

226226
String? get currentUserId => _currentUserId;
@@ -237,12 +237,12 @@ class EMClient {
237237
void _updataHandler() {
238238
chatManager;
239239
contactManager;
240-
roomManager;
240+
chatRoomManager;
241241
groupManager;
242242
pushManager;
243243
presenceManager;
244244
userInfoManager;
245-
threadManager;
245+
chatThreadManager;
246246
}
247247

248248
/// ~english

im_flutter_sdk_android/lib/src/client_android.dart

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class ClientAndroid extends Client {
1515
final PresenceManager _presenceManager = PresenceManagerAndroid();
1616
final PushManager _pushManager = PushManagerAndroid();
1717
final UserInfoManager _userInfoManager = UserInfoManagerAndroid();
18+
final ConversationManager _conversationManager = ConversationManagerAndroid();
19+
final MessageManager _messageManager = MessageManagerAndroid();
1820
// ignore: unused_field
1921
ProgressManager? _progressManager;
2022

@@ -42,6 +44,12 @@ class ClientAndroid extends Client {
4244
@override
4345
UserInfoManager get userInfoManager => _userInfoManager;
4446

47+
@override
48+
ConversationManager get conversationManager => _conversationManager;
49+
50+
@override
51+
MessageManager get messageManager => _messageManager;
52+
4553
@override
4654
Future<dynamic> callNativeMethod(String method, [dynamic params]) async {
4755
return ClientChannel.invokeMethod(method, params);
@@ -110,3 +118,19 @@ class UserInfoManagerAndroid extends UserInfoManager {
110118
return UserInfoChannel.invokeMethod(method, params);
111119
}
112120
}
121+
122+
class ConversationManagerAndroid extends ConversationManager {
123+
ConversationManagerAndroid() : super();
124+
@override
125+
Future<dynamic> callNativeMethod(String method, [dynamic params]) async {
126+
return ConversationChannel.invokeMethod(method, params);
127+
}
128+
}
129+
130+
class MessageManagerAndroid extends MessageManager {
131+
MessageManagerAndroid() : super();
132+
@override
133+
Future<dynamic> callNativeMethod(String method, [dynamic params]) async {
134+
return MessageChannel.invokeMethod(method, params);
135+
}
136+
}

im_flutter_sdk_ios/lib/src/client_ios.dart

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class ClientIOS extends Client {
1515
final PresenceManager _presenceManager = PresenceManagerIOS();
1616
final PushManager _pushManager = PushManagerIOS();
1717
final UserInfoManager _userInfoManager = UserInfoManagerIOS();
18+
final ConversationManager _conversationManager = ConversationManagerIOS();
19+
final MessageManager _messageManager = MessageManagerIOS();
1820
// ignore: unused_field
1921
ProgressManager? _progressManager;
2022

@@ -42,6 +44,12 @@ class ClientIOS extends Client {
4244
@override
4345
UserInfoManager get userInfoManager => _userInfoManager;
4446

47+
@override
48+
ConversationManager get conversationManager => _conversationManager;
49+
50+
@override
51+
MessageManager get messageManager => _messageManager;
52+
4553
@override
4654
Future<dynamic> callNativeMethod(String method, [dynamic params]) async {
4755
return ClientChannel.invokeMethod(method, params);
@@ -111,3 +119,19 @@ class UserInfoManagerIOS extends UserInfoManager {
111119
return UserInfoChannel.invokeMethod(method, params);
112120
}
113121
}
122+
123+
class ConversationManagerIOS extends ConversationManager {
124+
ConversationManagerIOS() : super();
125+
@override
126+
Future<dynamic> callNativeMethod(String method, [dynamic params]) async {
127+
return ConversationChannel.invokeMethod(method, params);
128+
}
129+
}
130+
131+
class MessageManagerIOS extends MessageManager {
132+
MessageManagerIOS() : super();
133+
@override
134+
Future<dynamic> callNativeMethod(String method, [dynamic params]) async {
135+
return MessageChannel.invokeMethod(method, params);
136+
}
137+
}

0 commit comments

Comments
 (0)