Flutter2 dev

CHANGELOG.md

@@ -1,6 +1,21 @@
 ## NEXT
 
 
+## 3.8.3+6
+
+- 修改EMImPushConfig为EMPushConfigs;
+- 删除EMOptions中的EMPushConfig.设置推送证书时直接调用EMOptions即可;
+- EMGroup中移除ShareFiles，如果需要获取共享文件，请调用Api:
+  `EMClient.getInstance.groupManager.getGroupFileListFromServer(groupId)` 
+- 将isConnected和isLoginBefore、Token改为从原生获取；
+- 修复安卓设置群组免打扰失效的问题；
+- 修复获取公开群crash的问题；
+- 修改throw error的逻辑；
+- 修改构造文本消息时的方法，需要传入参数名；
+- 修改部分原生方法逻辑；
+- 调整项目目录结构；
+- 将`onConversationRead`回调方法参数改为必选；
+- 
 
 ## 3.8.3+5
 

android/src/main/java/com/easemob/im_flutter_sdk/EMChatManagerWrapper.java

@@ -48,45 +48,45 @@ public void onMethodCall(MethodCall call, Result result) {
         JSONObject param = (JSONObject) call.arguments;
         try {
             if (EMSDKMethod.sendMessage.equals(call.method)) {
-                sendMessage(param, EMSDKMethod.sendMessage, result);
+                sendMessage(param, call.method, result);
             } else if (EMSDKMethod.resendMessage.equals(call.method)) {
-                resendMessage(param, EMSDKMethod.resendMessage, result);
+                resendMessage(param, call.method, result);
             } else if (EMSDKMethod.ackMessageRead.equals(call.method)) {
-                ackMessageRead(param, EMSDKMethod.ackMessageRead, result);
+                ackMessageRead(param, call.method, result);
             } else if (EMSDKMethod.ackGroupMessageRead.equals(call.method)) {
-                ackGroupMessageRead(param, EMSDKMethod.ackGroupMessageRead, result);
+                ackGroupMessageRead(param, call.method, result);
             } else if (EMSDKMethod.ackConversationRead.equals(call.method)) {
-                ackConversationRead(param, EMSDKMethod.ackConversationRead, result);
+                ackConversationRead(param, call.method, result);
             } else if (EMSDKMethod.recallMessage.equals(call.method)) {
-                recallMessage(param, EMSDKMethod.recallMessage, result);
+                recallMessage(param, call.method, result);
             } else if (EMSDKMethod.getConversation.equals(call.method)) {
-                getConversation(param, EMSDKMethod.getConversation, result);
+                getConversation(param, call.method, result);
             } else if (EMSDKMethod.markAllChatMsgAsRead.equals(call.method)) {
-                markAllChatMsgAsRead(param, EMSDKMethod.markAllChatMsgAsRead, result);
+                markAllChatMsgAsRead(param, call.method, result);
             } else if (EMSDKMethod.getUnreadMessageCount.equals(call.method)) {
-                getUnreadMessageCount(param, EMSDKMethod.getUnreadMessageCount, result);
+                getUnreadMessageCount(param, call.method, result);
             } else if (EMSDKMethod.updateChatMessage.equals(call.method)) {
-                updateChatMessage(param, EMSDKMethod.updateChatMessage, result);
+                updateChatMessage(param, call.method, result);
             } else if (EMSDKMethod.downloadAttachment.equals(call.method)) {
-                downloadAttachment(param, EMSDKMethod.downloadAttachment, result);
+                downloadAttachment(param, call.method, result);
             } else if (EMSDKMethod.downloadThumbnail.equals(call.method)) {
-                downloadThumbnail(param, EMSDKMethod.downloadThumbnail, result);
+                downloadThumbnail(param, call.method, result);
             } else if (EMSDKMethod.importMessages.equals(call.method)) {
-                importMessages(param, EMSDKMethod.importMessages, result);
+                importMessages(param, call.method, result);
             } else if (EMSDKMethod.loadAllConversations.equals(call.method)) {
-                loadAllConversations(param, EMSDKMethod.loadAllConversations, result);
+                loadAllConversations(param, call.method, result);
             } else if (EMSDKMethod.getConversationsFromServer.equals(call.method)) {
-                getConversationsFromServer(param, EMSDKMethod.getConversationsFromServer, result);
+                getConversationsFromServer(param, call.method, result);
             } else if (EMSDKMethod.deleteConversation.equals(call.method)) {
-                deleteConversation(param, EMSDKMethod.deleteConversation, result);
+                deleteConversation(param, call.method, result);
             } else if (EMSDKMethod.fetchHistoryMessages.equals(call.method)) {
-                fetchHistoryMessages(param, EMSDKMethod.fetchHistoryMessages, result);
+                fetchHistoryMessages(param, call.method, result);
             } else if (EMSDKMethod.searchChatMsgFromDB.equals(call.method)) {
-                searchChatMsgFromDB(param, EMSDKMethod.searchChatMsgFromDB, result);
+                searchChatMsgFromDB(param, call.method, result);
             } else if (EMSDKMethod.getMessage.equals(call.method)) {
-                getMessage(param, EMSDKMethod.getMessage, result);
+                getMessage(param, call.method, result);
             } else if (EMSDKMethod.asyncFetchGroupAcks.equals(call.method)){
-                asyncFetchGroupMessageAckFromServer(param, EMSDKMethod.asyncFetchGroupAcks, result);
+                asyncFetchGroupMessageAckFromServer(param, call.method, result);
             } else {
                 super.onMethodCall(call, result);
             }

android/src/main/java/com/easemob/im_flutter_sdk/EMChatRoomManagerWrapper.java

@@ -31,70 +31,70 @@ public class EMChatRoomManagerWrapper extends EMWrapper implements MethodChannel
     }
 
     @Override
-    public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) {
+    public void onMethodCall(MethodCall call, MethodChannel.Result result) {
 
-        JSONObject param = (JSONObject) methodCall.arguments;
+        JSONObject param = (JSONObject) call.arguments;
         try {
-            if (EMSDKMethod.joinChatRoom.equals(methodCall.method)) {
-                joinChatRoom(param, EMSDKMethod.joinChatRoom, result);
-            } else if (EMSDKMethod.leaveChatRoom.equals(methodCall.method)) {
-                leaveChatRoom(param, EMSDKMethod.joinChatRoom, result);
-            } else if (EMSDKMethod.fetchPublicChatRoomsFromServer.equals(methodCall.method)) {
-                fetchPublicChatRoomsFromServer(param, EMSDKMethod.fetchPublicChatRoomsFromServer, result);
-            } else if (EMSDKMethod.fetchChatRoomInfoFromServer.equals(methodCall.method)) {
-                fetchChatRoomInfoFromServer(param, EMSDKMethod.fetchChatRoomInfoFromServer, result);
-            } else if (EMSDKMethod.getChatRoom.equals(methodCall.method)) {
-                getChatRoom(param, EMSDKMethod.getChatRoom, result);
-            } else if (EMSDKMethod.getAllChatRooms.equals(methodCall.method)) {
-                getAllChatRooms(param, EMSDKMethod.getAllChatRooms, result);
-            } else if (EMSDKMethod.createChatRoom.equals(methodCall.method)) {
-                createChatRoom(param, EMSDKMethod.createChatRoom, result);
-            } else if (EMSDKMethod.destroyChatRoom.equals(methodCall.method)) {
-                destroyChatRoom(param, EMSDKMethod.destroyChatRoom, result);
-            } else if (EMSDKMethod.changeChatRoomSubject.equals(methodCall.method)) {
-                changeChatRoomSubject(param, EMSDKMethod.changeChatRoomSubject, result);
-            } else if (EMSDKMethod.changeChatRoomDescription.equals(methodCall.method)) {
-                changeChatRoomDescription(param, EMSDKMethod.changeChatRoomDescription, result);
-            } else if (EMSDKMethod.fetchChatRoomMembers.equals(methodCall.method)) {
-                fetchChatRoomMembers(param, EMSDKMethod.fetchChatRoomMembers, result);
-            } else if (EMSDKMethod.muteChatRoomMembers.equals(methodCall.method)) {
-                muteChatRoomMembers(param, EMSDKMethod.muteChatRoomMembers, result);
-            } else if (EMSDKMethod.unMuteChatRoomMembers.equals(methodCall.method)) {
-                unMuteChatRoomMembers(param, EMSDKMethod.unMuteChatRoomMembers, result);
-            } else if (EMSDKMethod.changeChatRoomOwner.equals(methodCall.method)) {
-                changeChatRoomOwner(param, EMSDKMethod.changeChatRoomOwner, result);
-            } else if (EMSDKMethod.addChatRoomAdmin.equals(methodCall.method)) {
-                addChatRoomAdmin(param, EMSDKMethod.addChatRoomAdmin, result);
-            } else if (EMSDKMethod.removeChatRoomAdmin.equals(methodCall.method)) {
-                removeChatRoomAdmin(param, EMSDKMethod.removeChatRoomAdmin, result);
-            } else if (EMSDKMethod.fetchChatRoomMuteList.equals(methodCall.method)) {
-                fetchChatRoomMuteList(param, EMSDKMethod.fetchChatRoomMuteList, result);
-            } else if (EMSDKMethod.removeChatRoomMembers.equals(methodCall.method)) {
-                removeChatRoomMembers(param, EMSDKMethod.removeChatRoomMembers, result);
-            } else if (EMSDKMethod.blockChatRoomMembers.equals(methodCall.method)) {
-                blockChatRoomMembers(param, EMSDKMethod.blockChatRoomMembers, result);
-            } else if (EMSDKMethod.unBlockChatRoomMembers.equals(methodCall.method)) {
-                unBlockChatRoomMembers(param, EMSDKMethod.unBlockChatRoomMembers, result);
-            } else if (EMSDKMethod.fetchChatRoomBlockList.equals(methodCall.method)) {
-                fetchChatRoomBlockList(param, EMSDKMethod.fetchChatRoomBlockList, result);
-            } else if (EMSDKMethod.updateChatRoomAnnouncement.equals(methodCall.method)) {
-                updateChatRoomAnnouncement(param, EMSDKMethod.updateChatRoomAnnouncement, result);
-            } else if (EMSDKMethod.fetchChatRoomAnnouncement.equals(methodCall.method)) {
-                fetchChatRoomAnnouncement(param, EMSDKMethod.fetchChatRoomAnnouncement, result);
-            } else if (EMSDKMethod.addMembersToChatRoomWhiteList.equals(methodCall.method)) {
-                addMembersToChatRoomWhiteList(param, EMSDKMethod.addMembersToChatRoomWhiteList, result);
-            } else if (EMSDKMethod.removeMembersFromChatRoomWhiteList.equals(methodCall.method)) {
-                removeMembersFromChatRoomWhiteList(param, EMSDKMethod.removeMembersFromChatRoomWhiteList, result);
-            } else if (EMSDKMethod.isMemberInChatRoomWhiteListFromServer.equals(methodCall.method)) {
-                isMemberInChatRoomWhiteListFromServer(param, EMSDKMethod.isMemberInChatRoomWhiteListFromServer, result);
-            } else if (EMSDKMethod.fetchChatRoomWhiteListFromServer.equals(methodCall.method)) {
-                fetchChatRoomWhiteListFromServer(param, EMSDKMethod.fetchChatRoomWhiteListFromServer, result);
-            } else if (EMSDKMethod.muteAllChatRoomMembers.equals(methodCall.method)) {
-                muteAllChatRoomsMembers(param, EMSDKMethod.fetchChatRoomWhiteListFromServer, result);
-            } else if (EMSDKMethod.unMuteAllChatRoomMembers.equals(methodCall.method)) {
-                unMuteAllChatRoomsMembers(param, EMSDKMethod.fetchChatRoomWhiteListFromServer, result);
+            if (EMSDKMethod.joinChatRoom.equals(call.method)) {
+                joinChatRoom(param, call.method, result);
+            } else if (EMSDKMethod.leaveChatRoom.equals(call.method)) {
+                leaveChatRoom(param, call.method, result);
+            } else if (EMSDKMethod.fetchPublicChatRoomsFromServer.equals(call.method)) {
+                fetchPublicChatRoomsFromServer(param, call.method, result);
+            } else if (EMSDKMethod.fetchChatRoomInfoFromServer.equals(call.method)) {
+                fetchChatRoomInfoFromServer(param, call.method, result);
+            } else if (EMSDKMethod.getChatRoom.equals(call.method)) {
+                getChatRoom(param, call.method, result);
+            } else if (EMSDKMethod.getAllChatRooms.equals(call.method)) {
+                getAllChatRooms(param, call.method, result);
+            } else if (EMSDKMethod.createChatRoom.equals(call.method)) {
+                createChatRoom(param, call.method, result);
+            } else if (EMSDKMethod.destroyChatRoom.equals(call.method)) {
+                destroyChatRoom(param, call.method, result);
+            } else if (EMSDKMethod.changeChatRoomSubject.equals(call.method)) {
+                changeChatRoomSubject(param, call.method, result);
+            } else if (EMSDKMethod.changeChatRoomDescription.equals(call.method)) {
+                changeChatRoomDescription(param, call.method, result);
+            } else if (EMSDKMethod.fetchChatRoomMembers.equals(call.method)) {
+                fetchChatRoomMembers(param, call.method, result);
+            } else if (EMSDKMethod.muteChatRoomMembers.equals(call.method)) {
+                muteChatRoomMembers(param, call.method, result);
+            } else if (EMSDKMethod.unMuteChatRoomMembers.equals(call.method)) {
+                unMuteChatRoomMembers(param, call.method, result);
+            } else if (EMSDKMethod.changeChatRoomOwner.equals(call.method)) {
+                changeChatRoomOwner(param, call.method, result);
+            } else if (EMSDKMethod.addChatRoomAdmin.equals(call.method)) {
+                addChatRoomAdmin(param, call.method, result);
+            } else if (EMSDKMethod.removeChatRoomAdmin.equals(call.method)) {
+                removeChatRoomAdmin(param, call.method, result);
+            } else if (EMSDKMethod.fetchChatRoomMuteList.equals(call.method)) {
+                fetchChatRoomMuteList(param, call.method, result);
+            } else if (EMSDKMethod.removeChatRoomMembers.equals(call.method)) {
+                removeChatRoomMembers(param, call.method, result);
+            } else if (EMSDKMethod.blockChatRoomMembers.equals(call.method)) {
+                blockChatRoomMembers(param, call.method, result);
+            } else if (EMSDKMethod.unBlockChatRoomMembers.equals(call.method)) {
+                unBlockChatRoomMembers(param, call.method, result);
+            } else if (EMSDKMethod.fetchChatRoomBlockList.equals(call.method)) {
+                fetchChatRoomBlockList(param, call.method, result);
+            } else if (EMSDKMethod.updateChatRoomAnnouncement.equals(call.method)) {
+                updateChatRoomAnnouncement(param, call.method, result);
+            } else if (EMSDKMethod.fetchChatRoomAnnouncement.equals(call.method)) {
+                fetchChatRoomAnnouncement(param, call.method, result);
+            } else if (EMSDKMethod.addMembersToChatRoomWhiteList.equals(call.method)) {
+                addMembersToChatRoomWhiteList(param, call.method, result);
+            } else if (EMSDKMethod.removeMembersFromChatRoomWhiteList.equals(call.method)) {
+                removeMembersFromChatRoomWhiteList(param, call.method, result);
+            } else if (EMSDKMethod.isMemberInChatRoomWhiteListFromServer.equals(call.method)) {
+                isMemberInChatRoomWhiteListFromServer(param, call.method, result);
+            } else if (EMSDKMethod.fetchChatRoomWhiteListFromServer.equals(call.method)) {
+                fetchChatRoomWhiteListFromServer(param, call.method, result);
+            } else if (EMSDKMethod.muteAllChatRoomMembers.equals(call.method)) {
+                muteAllChatRoomsMembers(param, call.method, result);
+            } else if (EMSDKMethod.unMuteAllChatRoomMembers.equals(call.method)) {
+                unMuteAllChatRoomsMembers(param, call.method, result);
             } else {
-                super.onMethodCall(methodCall, result);
+                super.onMethodCall(call, result);
             }
         } catch (JSONException ignored) {