diff --git a/android/build.gradle b/android/build.gradle index 1621fbd..c4ebcf1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,6 +3,10 @@ version '1.0' buildscript { repositories { + maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' } + maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' } + maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' } maven { allowInsecureProtocol = true url 'http://121.37.25.71:8081/repository/maven-releases/' @@ -18,6 +22,10 @@ buildscript { rootProject.allprojects { repositories { + maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' } + maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' } + maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' } maven { allowInsecureProtocol = true url 'http://121.37.25.71:8081/repository/maven-releases/' @@ -41,5 +49,5 @@ android { } } dependencies { - implementation 'io.openim:client-sdk:2.0.47@aar' + implementation 'io.openim:client-sdk:2.0.50@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnBaseListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnBaseListener.java index 7ab282b..9420dd8 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnBaseListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnBaseListener.java @@ -1,6 +1,8 @@ package io.openim.flutter_openim_sdk.listener; +import io.flutter.Log; +import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.openim.flutter_openim_sdk.util.CommonUtil; import open_im_sdk_callback.Base; @@ -8,18 +10,22 @@ import open_im_sdk_callback.Base; public class OnBaseListener implements Base { MethodChannel.Result result; + MethodCall call; - public OnBaseListener(MethodChannel.Result result) { + public OnBaseListener(MethodChannel.Result result, MethodCall call) { this.result = result; + this.call = call; } @Override public void onError(int l, String s) { + Log.i("OnBaseListener", "method: " + call.method + ", onError: { code:" + l + ", message:" + s + "}"); CommonUtil.runMainThreadReturnError(result, l, s, null); } @Override public void onSuccess(String s) { + Log.i("OnBaseListener", "method: " + call.method + ", onSuccess: " + s); CommonUtil.runMainThreadReturn(result, s); } } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java index e23efc8..142303a 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java @@ -16,14 +16,14 @@ public class ConversationManager extends BaseManager { public void getAllConversationList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getAllConversationList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void getConversationListSplit(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getConversationListSplit( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), int2long(methodCall, "offset"), int2long(methodCall, "count") @@ -32,7 +32,7 @@ public class ConversationManager extends BaseManager { public void getOneConversation(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getOneConversation( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), int2long(methodCall, "sessionType"), value(methodCall, "sourceID") @@ -41,7 +41,7 @@ public class ConversationManager extends BaseManager { public void getMultipleConversation(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getMultipleConversation( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "conversationIDList") ); @@ -49,7 +49,7 @@ public class ConversationManager extends BaseManager { public void deleteConversation(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteConversation( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID") ); @@ -57,7 +57,7 @@ public class ConversationManager extends BaseManager { public void setConversationDraft(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setConversationDraft( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID"), value(methodCall, "draftText") @@ -66,7 +66,7 @@ public class ConversationManager extends BaseManager { public void pinConversation(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.pinConversation( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID"), value(methodCall, "isPinned") @@ -75,7 +75,7 @@ public class ConversationManager extends BaseManager { // public void markSingleMessageHasRead(MethodCall methodCall, MethodChannel.Result result) { // Open_im_sdk.markSingleMessageHasRead( -// new OnBaseListener(result), +// new OnBaseListener(result, methodCall), // value(methodCall, "operationID"), // value(methodCall, "userID") // ); @@ -83,7 +83,7 @@ public class ConversationManager extends BaseManager { public void markGroupMessageHasRead(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.markGroupMessageHasRead( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "groupID") ); @@ -91,7 +91,7 @@ public class ConversationManager extends BaseManager { public void getTotalUnreadMsgCount(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getTotalUnreadMsgCount( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } @@ -104,7 +104,7 @@ public class ConversationManager extends BaseManager { public void setConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setConversationRecvMessageOpt( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "conversationIDList"), int2long(methodCall, "status") @@ -113,7 +113,7 @@ public class ConversationManager extends BaseManager { public void getConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getConversationRecvMessageOpt( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "conversationIDList") ); @@ -121,7 +121,7 @@ public class ConversationManager extends BaseManager { public void setOneConversationPrivateChat(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setOneConversationPrivateChat( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID"), value(methodCall, "isPrivate") @@ -130,7 +130,7 @@ public class ConversationManager extends BaseManager { public void deleteConversationFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteConversationFromLocalAndSvr( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID") ); @@ -138,14 +138,14 @@ public class ConversationManager extends BaseManager { public void deleteAllConversationFromLocal(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteAllConversationFromLocal( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void resetConversationGroupAtType(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.resetConversationGroupAtType( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID") ); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java index f862e75..60fac3d 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java @@ -15,7 +15,7 @@ public class FriendshipManager extends BaseManager { public void getFriendsInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getDesignatedFriendsInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "uidList") ); @@ -23,7 +23,7 @@ public class FriendshipManager extends BaseManager { public void addFriend(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.addFriend( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); @@ -31,28 +31,28 @@ public class FriendshipManager extends BaseManager { public void getRecvFriendApplicationList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getRecvFriendApplicationList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void getSendFriendApplicationList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getSendFriendApplicationList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void getFriendList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getFriendList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void setFriendRemark(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setFriendRemark( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); @@ -60,7 +60,7 @@ public class FriendshipManager extends BaseManager { public void addBlacklist(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.addBlack( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "uid") ); @@ -68,14 +68,14 @@ public class FriendshipManager extends BaseManager { public void getBlacklist(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getBlackList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void removeBlacklist(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.removeBlack( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "uid") ); @@ -83,7 +83,7 @@ public class FriendshipManager extends BaseManager { public void checkFriend(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.checkFriend( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "uidList") ); @@ -91,7 +91,7 @@ public class FriendshipManager extends BaseManager { public void deleteFriend(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteFriend( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "uid") ); @@ -99,7 +99,7 @@ public class FriendshipManager extends BaseManager { public void acceptFriendApplication(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.acceptFriendApplication( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); @@ -107,7 +107,7 @@ public class FriendshipManager extends BaseManager { public void refuseFriendApplication(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.refuseFriendApplication( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java index 7b9f89f..3a580c4 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java @@ -14,7 +14,7 @@ public class GroupManager extends BaseManager { public void inviteUserToGroup(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.inviteUserToGroup( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "reason"), @@ -24,7 +24,7 @@ public class GroupManager extends BaseManager { public void kickGroupMember(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.kickGroupMember( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "reason"), @@ -34,7 +34,7 @@ public class GroupManager extends BaseManager { public void getGroupMembersInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getGroupMembersInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), jsonValue(methodCall, "uidList") @@ -43,7 +43,7 @@ public class GroupManager extends BaseManager { public void getGroupMemberList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getGroupMemberList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "filter"), @@ -55,14 +55,14 @@ public class GroupManager extends BaseManager { public void getJoinedGroupList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getJoinedGroupList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void createGroup(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.createGroup( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "gInfo"), jsonValue(methodCall, "memberList") @@ -71,7 +71,7 @@ public class GroupManager extends BaseManager { public void setGroupInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setGroupInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), jsonValue(methodCall, "gInfo") @@ -80,7 +80,7 @@ public class GroupManager extends BaseManager { public void getGroupsInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getGroupsInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "gidList") ); @@ -88,7 +88,7 @@ public class GroupManager extends BaseManager { public void joinGroup(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.joinGroup( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "reason") @@ -97,7 +97,7 @@ public class GroupManager extends BaseManager { public void quitGroup(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.quitGroup( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid") ); @@ -105,7 +105,7 @@ public class GroupManager extends BaseManager { public void transferGroupOwner(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.transferGroupOwner( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "uid") @@ -114,21 +114,21 @@ public class GroupManager extends BaseManager { public void getRecvGroupApplicationList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getRecvGroupApplicationList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void getSendGroupApplicationList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getSendGroupApplicationList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void acceptGroupApplication(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.acceptGroupApplication( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "uid"), @@ -139,7 +139,7 @@ public class GroupManager extends BaseManager { public void refuseGroupApplication(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.refuseGroupApplication( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "uid"), @@ -150,7 +150,7 @@ public class GroupManager extends BaseManager { public void dismissGroup(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.dismissGroup( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid") ); @@ -158,7 +158,7 @@ public class GroupManager extends BaseManager { public void changeGroupMute(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.changeGroupMute( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "mute") @@ -167,7 +167,7 @@ public class GroupManager extends BaseManager { public void changeGroupMemberMute(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.changeGroupMemberMute( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "uid"), @@ -176,7 +176,7 @@ public class GroupManager extends BaseManager { } public void setGroupMemberNickname(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.setGroupMemberNickname(new OnBaseListener(result), + Open_im_sdk.setGroupMemberNickname(new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "gid"), value(methodCall, "uid"), @@ -185,7 +185,7 @@ public class GroupManager extends BaseManager { } public void searchGroups(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.searchGroups(new OnBaseListener(result), + Open_im_sdk.searchGroups(new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "searchParam") ); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java index 34e8d30..9db2c87 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java @@ -19,7 +19,7 @@ public class IMManager extends BaseManager { public void login(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.login( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "uid"), value(methodCall, "token") @@ -28,7 +28,7 @@ public class IMManager extends BaseManager { public void logout(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.logout( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } @@ -39,7 +39,7 @@ public class IMManager extends BaseManager { public void wakeUp(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.wakeUp( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java index ccc33c0..8030dd7 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java @@ -97,7 +97,7 @@ public class MessageManager extends BaseManager { public void getHistoryMessageList(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getHistoryMessageList( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); @@ -105,7 +105,7 @@ public class MessageManager extends BaseManager { public void revokeMessage(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.revokeMessage( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); @@ -113,19 +113,19 @@ public class MessageManager extends BaseManager { public void deleteMessageFromLocalStorage(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteMessageFromLocalStorage( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); } // public void deleteMessages(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.deleteMessages(new OnBaseListener(result), CommonUtil.getSDKJsonParam(methodCall)); +// Open_im_sdk.deleteMessages(new OnBaseListener(result, methodCall), CommonUtil.getSDKJsonParam(methodCall)); // } public void insertSingleMessageToLocalStorage(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.insertSingleMessageToLocalStorage( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "message"), value(methodCall, "receiverID"), @@ -135,7 +135,7 @@ public class MessageManager extends BaseManager { public void insertGroupMessageToLocalStorage(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.insertGroupMessageToLocalStorage( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "message"), value(methodCall, "groupID"), @@ -145,7 +145,7 @@ public class MessageManager extends BaseManager { public void markC2CMessageAsRead(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.markC2CMessageAsRead( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "userID"), jsonValue(methodCall, "messageIDList") @@ -154,7 +154,7 @@ public class MessageManager extends BaseManager { public void markGroupMessageAsRead(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.markGroupMessageAsRead( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "groupID"), jsonValue(methodCall, "messageIDList") @@ -163,7 +163,7 @@ public class MessageManager extends BaseManager { public void typingStatusUpdate(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.typingStatusUpdate( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "userID"), value(methodCall, "msgTip") @@ -313,7 +313,7 @@ public class MessageManager extends BaseManager { public void clearC2CHistoryMessage(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.clearC2CHistoryMessage( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "userID") ); @@ -321,7 +321,7 @@ public class MessageManager extends BaseManager { public void clearGroupHistoryMessage(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.clearGroupHistoryMessage( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "groupID") ); @@ -329,7 +329,7 @@ public class MessageManager extends BaseManager { public void searchLocalMessages(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.searchLocalMessages( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "filter") ); @@ -337,7 +337,7 @@ public class MessageManager extends BaseManager { public void deleteMessageFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteMessageFromLocalAndSvr( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); @@ -345,21 +345,21 @@ public class MessageManager extends BaseManager { public void deleteAllMsgFromLocal(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteAllMsgFromLocal( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void deleteAllMsgFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.deleteAllMsgFromLocalAndSvr( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } public void markMessageAsReadByConID(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.markMessageAsReadByConID( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "conversationID"), jsonValue(methodCall, "messageIDList") @@ -368,7 +368,7 @@ public class MessageManager extends BaseManager { public void clearC2CHistoryMessageFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.clearC2CHistoryMessageFromLocalAndSvr( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "userID") ); @@ -376,7 +376,7 @@ public class MessageManager extends BaseManager { public void clearGroupHistoryMessageFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.clearGroupHistoryMessageFromLocalAndSvr( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "groupID") ); @@ -384,7 +384,7 @@ public class MessageManager extends BaseManager { public void getHistoryMessageListReverse(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getHistoryMessageListReverse( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall) ); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java index 966ca75..e8ebc2a 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java @@ -14,42 +14,42 @@ public class SignalingManager extends BaseManager { public void signalingInvite(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.signalingInvite( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "signalingInfo")); } public void signalingInviteInGroup(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.signalingInviteInGroup( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "signalingInfo")); } public void signalingAccept(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.signalingAccept( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "signalingInfo")); } public void signalingReject(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.signalingReject( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "signalingInfo")); } public void signalingCancel(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.signalingCancel( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "signalingInfo")); } public void signalingHungUp(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.signalingHungUp( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "signalingInfo")); } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java index c5223f1..da66bdf 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java @@ -14,21 +14,21 @@ public class UserManager extends BaseManager { public void getUsersInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getUsersInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "uidList")); } public void setSelfInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setSelfInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall)); } public void getSelfUserInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getSelfUserInfo( - new OnBaseListener(result), + new OnBaseListener(result, methodCall), value(methodCall, "operationID") ); } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java index bc30a4b..e142cb6 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java @@ -13,19 +13,19 @@ public class WorkMomentsManager extends BaseManager { } public void getWorkMomentsUnReadCount(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getWorkMomentsUnReadCount(new OnBaseListener(result), + Open_im_sdk.getWorkMomentsUnReadCount(new OnBaseListener(result, methodCall), value(methodCall, "operationID")); } public void getWorkMomentsNotification(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getWorkMomentsNotification(new OnBaseListener(result), + Open_im_sdk.getWorkMomentsNotification(new OnBaseListener(result, methodCall), value(methodCall, "operationID"), int2long(methodCall, "offset"), int2long(methodCall, "count")); } public void clearWorkMomentsNotification(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.clearWorkMomentsNotification(new OnBaseListener(result), + Open_im_sdk.clearWorkMomentsNotification(new OnBaseListener(result, methodCall), value(methodCall, "operationID")); } }