easemob · dujiepeng · Dec 13, 2021 · Dec 8, 2021 · Dec 10, 2021 · Dec 10, 2021
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,18 +4,19 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        // classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+# distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMChatManagerWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMChatManagerWrapper.java
@@ -36,11 +36,6 @@ public class EMChatManagerWrapper extends EMWrapper implements MethodCallHandler
 
     private MethodChannel messageChannel;
 
-    EMChatManagerWrapper(Registrar registrar, String channelName) {
-        super(registrar, channelName);
-        messageChannel = new MethodChannel(registrar.messenger(), "com.easemob.im/em_message", JSONMethodCodec.INSTANCE);
-        registerEaseListener();
-    }
 
     EMChatManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMChatRoomManagerWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMChatRoomManagerWrapper.java
@@ -11,6 +11,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -24,11 +25,6 @@
 
 public class EMChatRoomManagerWrapper extends EMWrapper implements MethodChannel.MethodCallHandler {
 
-    EMChatRoomManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-        registerEaseListener();
-    }
-
     EMChatRoomManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
         registerEaseListener();
@@ -85,6 +81,18 @@ public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) {
                 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);
             } else {
                 super.onMethodCall(methodCall, result);
             }
@@ -459,6 +467,30 @@ private void fetchChatRoomAnnouncement(JSONObject param, String channelName, Met
         });
     }
 
+    private void addMembersToChatRoomWhiteList(JSONObject param, String channelName, MethodChannel.Result result) {
+
+    }
+
+    private void removeMembersFromChatRoomWhiteList(JSONObject param, String channelName, MethodChannel.Result result) {
+
+    }
+
+    private void isMemberInChatRoomWhiteListFromServer(JSONObject param, String channelName, MethodChannel.Result result) {
+
+    }
+
+    private void fetchChatRoomWhiteListFromServer(JSONObject param, String channelName, MethodChannel.Result result) {
+
+    }
+
+    private void muteAllChatRoomsMembers(JSONObject param, String channelName, MethodChannel.Result result) {
+
+    }
+
+    private void unMuteAllChatRoomsMembers(JSONObject param, String channelName, MethodChannel.Result result) {
+
+    }
+
     private void registerEaseListener() {
         EMClient.getInstance().chatroomManager().addChatRoomChangeListener(new EMChatRoomChangeListener() {
 

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMClientWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMClientWrapper.java
@@ -31,11 +31,6 @@ public class EMClientWrapper extends EMWrapper implements MethodCallHandler {
 
     static EMClientWrapper wrapper;
 
-    EMClientWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-        wrapper = this;
-    }
-
     EMClientWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
         wrapper = this;
@@ -265,15 +260,15 @@ private void getLoggedInDevicesFromServer(JSONObject param, String channelName,
         });
     }
 
-    private void registerManagers() {
-        new EMChatManagerWrapper(registrar, "em_chat_manager");
-        new EMContactManagerWrapper(registrar, "em_contact_manager");
-        new EMChatRoomManagerWrapper(registrar, "em_chat_room_manager");
-        new EMGroupManagerWrapper(registrar, "em_group_manager");
-        new EMConversationWrapper(registrar, "em_conversation");
-        new EMPushManagerWrapper(registrar, "em_push_manager");
-        new EMUserInfoManagerWrapper(registrar, "em_userInfo_manager");
-    }
+//    private void registerManagers() {
+//        new EMChatManagerWrapper(registrar, "em_chat_manager");
+//        new EMContactManagerWrapper(registrar, "em_contact_manager");
+//        new EMChatRoomManagerWrapper(registrar, "em_chat_room_manager");
+//        new EMGroupManagerWrapper(registrar, "em_group_manager");
+//        new EMConversationWrapper(registrar, "em_conversation");
+//        new EMPushManagerWrapper(registrar, "em_push_manager");
+//        new EMUserInfoManagerWrapper(registrar, "em_userInfo_manager");
+//    }
 
     private void bindingManagers() {
         new EMChatManagerWrapper(binging, "em_chat_manager");
@@ -288,11 +283,7 @@ private void init(JSONObject param, String channelName, Result result) throws JS
         EMOptions options = EMOptionsHelper.fromJson(param, this.context);
         EMClient.getInstance().init(this.context, options);
         EMClient.getInstance().setDebugMode(param.getBoolean("debugModel"));
-        if (binging != null){
-            bindingManagers();
-        }else {
-            registerManagers();
-        }
+        bindingManagers();
         addEMListener();
 
         Map<String, Object> data = new HashMap<>();

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMContactManagerWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMContactManagerWrapper.java
@@ -19,11 +19,6 @@
 
 public class EMContactManagerWrapper extends EMWrapper implements MethodCallHandler {
 
-    EMContactManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-        registerEaseListener();
-    }
-
     EMContactManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
         registerEaseListener();

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMConversationWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMConversationWrapper.java
@@ -22,10 +22,6 @@
 
 public class EMConversationWrapper extends EMWrapper implements MethodCallHandler{
 
-    EMConversationWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-    }
-
     EMConversationWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
     }

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMGroupManagerWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMGroupManagerWrapper.java
@@ -31,11 +31,6 @@
 
 public class EMGroupManagerWrapper extends EMWrapper implements MethodCallHandler {
 
-    EMGroupManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-        registerEaseListener();
-    }
-
     EMGroupManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
         registerEaseListener();
@@ -78,6 +73,8 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
                 getGroupBlockListFromServer(param, EMSDKMethod.getGroupBlockListFromServer, result);
             } else if (EMSDKMethod.addMembers.equals(call.method)) {
                 addMembers(param, EMSDKMethod.addMembers, result);
+            } else if (EMSDKMethod.inviterUser.equals(call.method)){
+                inviterUser(param, EMSDKMethod.inviterUser, result);
             } else if (EMSDKMethod.removeMembers.equals(call.method)) {
                 removeMembers(param, EMSDKMethod.removeMembers, result);
             } else if (EMSDKMethod.blockMembers.equals(call.method)) {
@@ -335,6 +332,22 @@ private void getGroupAnnouncementFromServer(JSONObject param, String channelName
                 new EMValueWrapperCallBack<String>(result, channelName));
     }
 
+    private void inviterUser(JSONObject param, String channelName, Result result) throws JSONException {
+        String groupId = param.getString("groupId");
+        String reason = null;
+        if (param.has("reason")) {
+            reason = param.getString("reason");
+        }
+        JSONArray array = param.getJSONArray("members");
+        String[] members = new String[array.length()];
+        for (int i = 0; i < array.length(); i++) {
+            members[i] = array.getString(i);
+        }
+
+        EMClient.getInstance().groupManager().asyncInviteUser(groupId, members, reason,
+                new EMWrapperCallBack(result, channelName, true));
+    }
+
     private void addMembers(JSONObject param, String channelName, Result result) throws JSONException {
         String groupId = param.getString("groupId");
         JSONArray array = param.getJSONArray("members");
@@ -344,6 +357,7 @@ private void addMembers(JSONObject param, String channelName, Result result) thr
             members[i] = array.getString(i);
         }
 
+
         EMClient.getInstance().groupManager().asyncAddUsersToGroup(groupId, members,
                 new EMWrapperCallBack(result, channelName, true));
     }

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMPushManagerWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMPushManagerWrapper.java
@@ -23,10 +23,6 @@
 
 public class EMPushManagerWrapper extends EMWrapper implements MethodCallHandler {
 
-    EMPushManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-    }
-
     EMPushManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
     }

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMSDKMethod.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMSDKMethod.java
@@ -57,6 +57,7 @@ public class EMSDKMethod {
     static final String fetchHistoryMessages = "fetchHistoryMessages";
     static final String searchChatMsgFromDB = "searchChatMsgFromDB";
     static final String getMessage = "getMessage";
+    static final String asyncFetchGroupAcks = "asyncFetchGroupAcks";
 
     /// EMChatManager listener
     static final String onMessagesReceived = "onMessagesReceived";
@@ -126,7 +127,15 @@ public class EMSDKMethod {
     static final String fetchChatRoomBlockList = "fetchChatRoomBlockList";
     static final String updateChatRoomAnnouncement = "updateChatRoomAnnouncement";
     static final String fetchChatRoomAnnouncement = "fetchChatRoomAnnouncement";
-    static final String asyncFetchGroupAcks = "asyncFetchGroupAck";
+
+    static final String addMembersToChatRoomWhiteList = "addMembersToChatRoomWhiteList";
+    static final String removeMembersFromChatRoomWhiteList = "removeMembersFromChatRoomWhiteList";
+    static final String fetchChatRoomWhiteListFromServer = "fetchChatRoomWhiteListFromServer";
+    static final String isMemberInChatRoomWhiteListFromServer = "isMemberInChatRoomWhiteListFromServer";
+
+    static final String muteAllChatRoomMembers = "muteAllChatRoomMembers";
+    static final String unMuteAllChatRoomMembers = "umMuteAllChatRoomMembers";
+
 
     // EMChatRoomManagerListener
     static final String chatRoomChange = "onChatRoomChanged";
@@ -147,6 +156,7 @@ public class EMSDKMethod {
     static final String getGroupFileListFromServer = "getGroupFileList";
     static final String getGroupAnnouncementFromServer = "getGroupAnnouncementFromServer";
     static final String addMembers = "addMembers";
+    static final String inviterUser = "inviterUser";
     static final String removeMembers = "removeMembers";
     static final String blockMembers = "blockMembers";
     static final String unblockMembers = "unblockMembers";

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/EMUserInfoManagerWrapper.java b/android/src/main/java/com/easemob/im_flutter_sdk/EMUserInfoManagerWrapper.java
@@ -27,9 +27,6 @@
 
 
 public class EMUserInfoManagerWrapper extends EMWrapper implements MethodCallHandler {
-    EMUserInfoManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
-        super(registrar, channelName);
-    }
 
     EMUserInfoManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);

diff --git a/android/src/main/java/com/easemob/im_flutter_sdk/ImFlutterSdkPlugin.java b/android/src/main/java/com/easemob/im_flutter_sdk/ImFlutterSdkPlugin.java
@@ -27,16 +27,10 @@ public class ImFlutterSdkPlugin implements FlutterPlugin, MethodChannel.MethodCa
     public ImFlutterSdkPlugin() {
     }
 
-    /**
-     * Plugin registration.
-     */
-    public static void registerWith(Registrar registrar) {
-        new EMClientWrapper(registrar, "em_client");
-    }
 
     @Override
     public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding flutterPluginBinding) {
-        final MethodChannel channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "em_client");
+        final MethodChannel channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "em_client");
         channel.setMethodCallHandler(new EMClientWrapper(flutterPluginBinding, "em_client"));
     }
 

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -2,19 +2,19 @@ buildscript {
     ext.kotlin_version = '1.3.50'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/ios/Classes/EMChatroomManagerWrapper.h b/ios/Classes/EMChatroomManagerWrapper.h
@@ -8,7 +8,6 @@
 #import "EMWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
-
 @interface EMChatroomManagerWrapper : EMWrapper
 
 @end
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     #import "EMWrapper.h"
     NS_ASSUME_NONNULL_BEGIN
     @interface EMChatroomManagerWrapper : EMWrapper
     @end
@@ Expand Down @@