Skip to content

Commit 1785dcc

Browse files
dujiepengdujiepeng
authored
Merge pull request #466 from dujiepeng/flutter2
Flutter2
2 parents e90aa17 + 2ef663d commit 1785dcc

25 files changed

+283
-85
lines changed

‎android/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ version '1.0-SNAPSHOT'
44
buildscript {
55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.0'
11+
// classpath 'com.android.tools.build:gradle:3.5.0'
12+
classpath 'com.android.tools.build:gradle:4.2.0'
1213
}
1314
}
1415

1516
allprojects {
1617
repositories {
1718
google()
18-
jcenter()
19+
mavenCentral()
1920
}
2021
}
2122

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
# distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
7+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ public class EMChatManagerWrapper extends EMWrapper implements MethodCallHandler
3636

3737
private MethodChannel messageChannel;
3838

39-
EMChatManagerWrapper(Registrar registrar, String channelName) {
40-
super(registrar, channelName);
41-
messageChannel = new MethodChannel(registrar.messenger(), "com.easemob.im/em_message", JSONMethodCodec.INSTANCE);
42-
registerEaseListener();
43-
}
4439

4540
EMChatManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
4641
super(flutterPluginBinding, channelName);

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

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.json.JSONException;
1212
import org.json.JSONObject;
1313

14+
import java.lang.reflect.Method;
1415
import java.util.ArrayList;
1516
import java.util.HashMap;
1617
import java.util.List;
@@ -24,11 +25,6 @@
2425

2526
public class EMChatRoomManagerWrapper extends EMWrapper implements MethodChannel.MethodCallHandler {
2627

27-
EMChatRoomManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
28-
super(registrar, channelName);
29-
registerEaseListener();
30-
}
31-
3228
EMChatRoomManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
3329
super(flutterPluginBinding, channelName);
3430
registerEaseListener();
@@ -85,6 +81,18 @@ public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) {
8581
updateChatRoomAnnouncement(param, EMSDKMethod.updateChatRoomAnnouncement, result);
8682
} else if (EMSDKMethod.fetchChatRoomAnnouncement.equals(methodCall.method)) {
8783
fetchChatRoomAnnouncement(param, EMSDKMethod.fetchChatRoomAnnouncement, result);
84+
} else if (EMSDKMethod.addMembersToChatRoomWhiteList.equals(methodCall.method)) {
85+
addMembersToChatRoomWhiteList(param, EMSDKMethod.addMembersToChatRoomWhiteList, result);
86+
} else if (EMSDKMethod.removeMembersFromChatRoomWhiteList.equals(methodCall.method)) {
87+
removeMembersFromChatRoomWhiteList(param, EMSDKMethod.removeMembersFromChatRoomWhiteList, result);
88+
} else if (EMSDKMethod.isMemberInChatRoomWhiteListFromServer.equals(methodCall.method)) {
89+
isMemberInChatRoomWhiteListFromServer(param, EMSDKMethod.isMemberInChatRoomWhiteListFromServer, result);
90+
} else if (EMSDKMethod.fetchChatRoomWhiteListFromServer.equals(methodCall.method)) {
91+
fetchChatRoomWhiteListFromServer(param, EMSDKMethod.fetchChatRoomWhiteListFromServer, result);
92+
} else if (EMSDKMethod.muteAllChatRoomMembers.equals(methodCall.method)) {
93+
muteAllChatRoomsMembers(param, EMSDKMethod.fetchChatRoomWhiteListFromServer, result);
94+
} else if (EMSDKMethod.unMuteAllChatRoomMembers.equals(methodCall.method)) {
95+
unMuteAllChatRoomsMembers(param, EMSDKMethod.fetchChatRoomWhiteListFromServer, result);
8896
} else {
8997
super.onMethodCall(methodCall, result);
9098
}
@@ -459,6 +467,30 @@ private void fetchChatRoomAnnouncement(JSONObject param, String channelName, Met
459467
});
460468
}
461469

470+
private void addMembersToChatRoomWhiteList(JSONObject param, String channelName, MethodChannel.Result result) {
471+
472+
}
473+
474+
private void removeMembersFromChatRoomWhiteList(JSONObject param, String channelName, MethodChannel.Result result) {
475+
476+
}
477+
478+
private void isMemberInChatRoomWhiteListFromServer(JSONObject param, String channelName, MethodChannel.Result result) {
479+
480+
}
481+
482+
private void fetchChatRoomWhiteListFromServer(JSONObject param, String channelName, MethodChannel.Result result) {
483+
484+
}
485+
486+
private void muteAllChatRoomsMembers(JSONObject param, String channelName, MethodChannel.Result result) {
487+
488+
}
489+
490+
private void unMuteAllChatRoomsMembers(JSONObject param, String channelName, MethodChannel.Result result) {
491+
492+
}
493+
462494
private void registerEaseListener() {
463495
EMClient.getInstance().chatroomManager().addChatRoomChangeListener(new EMChatRoomChangeListener() {
464496

‎android/src/main/java/com/easemob/im_flutter_sdk/EMClientWrapper.java‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ public class EMClientWrapper extends EMWrapper implements MethodCallHandler {
3131

3232
static EMClientWrapper wrapper;
3333

34-
EMClientWrapper(PluginRegistry.Registrar registrar, String channelName) {
35-
super(registrar, channelName);
36-
wrapper = this;
37-
}
38-
3934
EMClientWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
4035
super(flutterPluginBinding, channelName);
4136
wrapper = this;
@@ -265,15 +260,15 @@ private void getLoggedInDevicesFromServer(JSONObject param, String channelName,
265260
});
266261
}
267262

268-
private void registerManagers() {
269-
new EMChatManagerWrapper(registrar, "em_chat_manager");
270-
new EMContactManagerWrapper(registrar, "em_contact_manager");
271-
new EMChatRoomManagerWrapper(registrar, "em_chat_room_manager");
272-
new EMGroupManagerWrapper(registrar, "em_group_manager");
273-
new EMConversationWrapper(registrar, "em_conversation");
274-
new EMPushManagerWrapper(registrar, "em_push_manager");
275-
new EMUserInfoManagerWrapper(registrar, "em_userInfo_manager");
276-
}
263+
// private void registerManagers() {
264+
// new EMChatManagerWrapper(registrar, "em_chat_manager");
265+
// new EMContactManagerWrapper(registrar, "em_contact_manager");
266+
// new EMChatRoomManagerWrapper(registrar, "em_chat_room_manager");
267+
// new EMGroupManagerWrapper(registrar, "em_group_manager");
268+
// new EMConversationWrapper(registrar, "em_conversation");
269+
// new EMPushManagerWrapper(registrar, "em_push_manager");
270+
// new EMUserInfoManagerWrapper(registrar, "em_userInfo_manager");
271+
// }
277272

278273
private void bindingManagers() {
279274
new EMChatManagerWrapper(binging, "em_chat_manager");
@@ -288,11 +283,7 @@ private void init(JSONObject param, String channelName, Result result) throws JS
288283
EMOptions options = EMOptionsHelper.fromJson(param, this.context);
289284
EMClient.getInstance().init(this.context, options);
290285
EMClient.getInstance().setDebugMode(param.getBoolean("debugModel"));
291-
if (binging != null){
292-
bindingManagers();
293-
}else {
294-
registerManagers();
295-
}
286+
bindingManagers();
296287
addEMListener();
297288

298289
Map<String, Object> data = new HashMap<>();

‎android/src/main/java/com/easemob/im_flutter_sdk/EMContactManagerWrapper.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919

2020
public class EMContactManagerWrapper extends EMWrapper implements MethodCallHandler {
2121

22-
EMContactManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
23-
super(registrar, channelName);
24-
registerEaseListener();
25-
}
26-
2722
EMContactManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
2823
super(flutterPluginBinding, channelName);
2924
registerEaseListener();

‎android/src/main/java/com/easemob/im_flutter_sdk/EMConversationWrapper.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222

2323
public class EMConversationWrapper extends EMWrapper implements MethodCallHandler{
2424

25-
EMConversationWrapper(PluginRegistry.Registrar registrar, String channelName) {
26-
super(registrar, channelName);
27-
}
28-
2925
EMConversationWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
3026
super(flutterPluginBinding, channelName);
3127
}

‎android/src/main/java/com/easemob/im_flutter_sdk/EMGroupManagerWrapper.java‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131

3232
public class EMGroupManagerWrapper extends EMWrapper implements MethodCallHandler {
3333

34-
EMGroupManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
35-
super(registrar, channelName);
36-
registerEaseListener();
37-
}
38-
3934
EMGroupManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
4035
super(flutterPluginBinding, channelName);
4136
registerEaseListener();
@@ -78,6 +73,8 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
7873
getGroupBlockListFromServer(param, EMSDKMethod.getGroupBlockListFromServer, result);
7974
} else if (EMSDKMethod.addMembers.equals(call.method)) {
8075
addMembers(param, EMSDKMethod.addMembers, result);
76+
} else if (EMSDKMethod.inviterUser.equals(call.method)){
77+
inviterUser(param, EMSDKMethod.inviterUser, result);
8178
} else if (EMSDKMethod.removeMembers.equals(call.method)) {
8279
removeMembers(param, EMSDKMethod.removeMembers, result);
8380
} else if (EMSDKMethod.blockMembers.equals(call.method)) {
@@ -335,6 +332,22 @@ private void getGroupAnnouncementFromServer(JSONObject param, String channelName
335332
new EMValueWrapperCallBack<String>(result, channelName));
336333
}
337334

335+
private void inviterUser(JSONObject param, String channelName, Result result) throws JSONException {
336+
String groupId = param.getString("groupId");
337+
String reason = null;
338+
if (param.has("reason")) {
339+
reason = param.getString("reason");
340+
}
341+
JSONArray array = param.getJSONArray("members");
342+
String[] members = new String[array.length()];
343+
for (int i = 0; i < array.length(); i++) {
344+
members[i] = array.getString(i);
345+
}
346+
347+
EMClient.getInstance().groupManager().asyncInviteUser(groupId, members, reason,
348+
new EMWrapperCallBack(result, channelName, true));
349+
}
350+
338351
private void addMembers(JSONObject param, String channelName, Result result) throws JSONException {
339352
String groupId = param.getString("groupId");
340353
JSONArray array = param.getJSONArray("members");
@@ -344,6 +357,7 @@ private void addMembers(JSONObject param, String channelName, Result result) thr
344357
members[i] = array.getString(i);
345358
}
346359

360+
347361
EMClient.getInstance().groupManager().asyncAddUsersToGroup(groupId, members,
348362
new EMWrapperCallBack(result, channelName, true));
349363
}

‎android/src/main/java/com/easemob/im_flutter_sdk/EMPushManagerWrapper.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323

2424
public class EMPushManagerWrapper extends EMWrapper implements MethodCallHandler {
2525

26-
EMPushManagerWrapper(PluginRegistry.Registrar registrar, String channelName) {
27-
super(registrar, channelName);
28-
}
29-
3026
EMPushManagerWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
3127
super(flutterPluginBinding, channelName);
3228
}

‎android/src/main/java/com/easemob/im_flutter_sdk/EMSDKMethod.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public class EMSDKMethod {
5757
static final String fetchHistoryMessages = "fetchHistoryMessages";
5858
static final String searchChatMsgFromDB = "searchChatMsgFromDB";
5959
static final String getMessage = "getMessage";
60+
static final String asyncFetchGroupAcks = "asyncFetchGroupAcks";
6061

6162
/// EMChatManager listener
6263
static final String onMessagesReceived = "onMessagesReceived";
@@ -126,7 +127,15 @@ public class EMSDKMethod {
126127
static final String fetchChatRoomBlockList = "fetchChatRoomBlockList";
127128
static final String updateChatRoomAnnouncement = "updateChatRoomAnnouncement";
128129
static final String fetchChatRoomAnnouncement = "fetchChatRoomAnnouncement";
129-
static final String asyncFetchGroupAcks = "asyncFetchGroupAck";
130+
131+
static final String addMembersToChatRoomWhiteList = "addMembersToChatRoomWhiteList";
132+
static final String removeMembersFromChatRoomWhiteList = "removeMembersFromChatRoomWhiteList";
133+
static final String fetchChatRoomWhiteListFromServer = "fetchChatRoomWhiteListFromServer";
134+
static final String isMemberInChatRoomWhiteListFromServer = "isMemberInChatRoomWhiteListFromServer";
135+
136+
static final String muteAllChatRoomMembers = "muteAllChatRoomMembers";
137+
static final String unMuteAllChatRoomMembers = "umMuteAllChatRoomMembers";
138+
130139

131140
// EMChatRoomManagerListener
132141
static final String chatRoomChange = "onChatRoomChanged";
@@ -147,6 +156,7 @@ public class EMSDKMethod {
147156
static final String getGroupFileListFromServer = "getGroupFileList";
148157
static final String getGroupAnnouncementFromServer = "getGroupAnnouncementFromServer";
149158
static final String addMembers = "addMembers";
159+
static final String inviterUser = "inviterUser";
150160
static final String removeMembers = "removeMembers";
151161
static final String blockMembers = "blockMembers";
152162
static final String unblockMembers = "unblockMembers";

0 commit comments

Comments
 (0)