From 80c79d0fc6902e294637f4ed7d0198423258a566 Mon Sep 17 00:00:00 2001 From: hrxiang Date: Tue, 16 May 2023 15:08:41 +0800 Subject: [PATCH] test-3.0 --- android/build.gradle | 3 +- .../listener/OnSignalingListener.java | 16 +-- .../manager/ConversationManager.java | 16 +-- .../flutter_openim_sdk/manager/IMManager.java | 6 +- .../manager/MessageManager.java | 86 ++++++------- .../manager/OrganizationManager.java | 118 +++++++++--------- .../manager/SignalingManager.java | 104 +++++++-------- 7 files changed, 175 insertions(+), 174 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a3f27ac..44abd03 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -52,5 +52,6 @@ android { dependencies { // 本地依赖，现将aar复制到libs/io/openim/core-sdk/0.0.1/ 下，命名core-sdk-0.0.1.aar // implementation 'io.openim:core-sdk:0.0.1@aar' - api 'io.openim:core-sdk:2.3.5-t44@aar' +// api 'io.openim:core-sdk:2.3.5-t44@aar' + api 'io.openim:core-sdk:3.0.0-t4@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java index b70384b..6f32b81 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java @@ -34,10 +34,10 @@ public class OnSignalingListener implements open_im_sdk_callback.OnSignalingList CommonUtil.emitEvent("signalingListener", "onInviteeRejectedByOtherDevice", s); } - @Override - public void onReceiveCustomSignal(String s) { - CommonUtil.emitEvent("signalingListener", "onReceiveCustomSignal", s); - } +// @Override +// public void onReceiveCustomSignal(String s) { +// CommonUtil.emitEvent("signalingListener", "onReceiveCustomSignal", s); +// } @Override public void onReceiveNewInvitation(String s) { @@ -54,10 +54,10 @@ public class OnSignalingListener implements open_im_sdk_callback.OnSignalingList CommonUtil.emitEvent("signalingListener", "onRoomParticipantDisconnected", s); } - @Override - public void onStreamChange(String s) { - CommonUtil.emitEvent("signalingListener", "onStreamChange", s); - } +// @Override +// public void onStreamChange(String s) { +// CommonUtil.emitEvent("signalingListener", "onStreamChange", s); +// } @Override public void onHangUp(String 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 df29c52..a5aac52 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 @@ -98,11 +98,11 @@ public class ConversationManager extends BaseManager { ); } - public void getConversationIDBySessionType(MethodCall methodCall, MethodChannel.Result result) { - CommonUtil.runMainThreadReturn(result, Open_im_sdk.getConversationIDBySessionType( - value(methodCall, "sourceID"), - int2long(methodCall, "sessionType"))); - } +// public void getConversationIDBySessionType(MethodCall methodCall, MethodChannel.Result result) { +// CommonUtil.runMainThreadReturn(result, Open_im_sdk.getConversationIDBySessionType( +// value(methodCall, "sourceID"), +// int2long(methodCall, "sessionType"))); +// } public void setConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setConversationRecvMessageOpt( @@ -153,9 +153,9 @@ public class ConversationManager extends BaseManager { ); } - public void getAtAllTag(MethodCall methodCall, MethodChannel.Result result) { - CommonUtil.runMainThreadReturn(result, Open_im_sdk.getAtAllTag()); - } +// public void getAtAllTag(MethodCall methodCall, MethodChannel.Result result) { +// CommonUtil.runMainThreadReturn(result, Open_im_sdk.getAtAllTag()); +// } public void setGlobalRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.setGlobalRecvMessageOpt( 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 02f4406..7838f06 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 @@ -34,9 +34,9 @@ public class IMManager extends BaseManager { ); } - public void getLoginStatus(MethodCall methodCall, MethodChannel.Result result) { - CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginStatus()); - } +// public void getLoginStatus(MethodCall methodCall, MethodChannel.Result result) { +// CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginStatus()); +// } public void wakeUp(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.wakeUp( 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 3767fda..abd2658 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 @@ -492,47 +492,47 @@ public class MessageManager extends BaseManager { result.success(null); } - public void setMessageReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.setMessageReactionExtensions( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "message"), - jsonValue(methodCall, "list") - ); - } - - public void deleteMessageReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.deleteMessageReactionExtensions( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "message"), - jsonValue(methodCall, "list") - ); - } - - public void getMessageListReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getMessageListReactionExtensions( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "messageList") - ); - } - - public void addMessageReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.addMessageReactionExtensions( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "message"), - jsonValue(methodCall, "list") - ); - } - - public void getMessageListSomeReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getMessageListSomeReactionExtensions( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "messageList"), - jsonValue(methodCall, "list") - ); - } +// public void setMessageReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.setMessageReactionExtensions( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "message"), +// jsonValue(methodCall, "list") +// ); +// } +// +// public void deleteMessageReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.deleteMessageReactionExtensions( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "message"), +// jsonValue(methodCall, "list") +// ); +// } +// +// public void getMessageListReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getMessageListReactionExtensions( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "messageList") +// ); +// } +// +// public void addMessageReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.addMessageReactionExtensions( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "message"), +// jsonValue(methodCall, "list") +// ); +// } +// +// public void getMessageListSomeReactionExtensions(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getMessageListSomeReactionExtensions( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "messageList"), +// jsonValue(methodCall, "list") +// ); +// } } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java index c579065..b1192cf 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java @@ -8,63 +8,63 @@ import open_im_sdk.Open_im_sdk; public class OrganizationManager extends BaseManager { - public void setOrganizationListener(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.setOrganizationListener(new OnOrganizationListener()); - - result.success(null); - } - - public void getSubDepartment(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getSubDepartment( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "departmentID"), - int2long(methodCall, "offset"), - int2long(methodCall, "count") - ); - } - - public void getDepartmentMember(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getDepartmentMember( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "departmentID"), - int2long(methodCall, "offset"), - int2long(methodCall, "count") - ); - } - - public void getUserInDepartment(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getUserInDepartment( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "userID") - ); - } - - public void getDepartmentMemberAndSubDepartment(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getDepartmentMemberAndSubDepartment( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "departmentID") - ); - } - - public void getDepartmentInfo(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getDepartmentInfo( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "departmentID") - ); - } - - public void searchOrganization(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.searchOrganization( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "searchParam"), - int2long(methodCall, "offset"), - int2long(methodCall, "count") - ); - } +// public void setOrganizationListener(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.setOrganizationListener(new OnOrganizationListener()); +// +// result.success(null); +// } +// +// public void getSubDepartment(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getSubDepartment( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "departmentID"), +// int2long(methodCall, "offset"), +// int2long(methodCall, "count") +// ); +// } +// +// public void getDepartmentMember(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getDepartmentMember( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "departmentID"), +// int2long(methodCall, "offset"), +// int2long(methodCall, "count") +// ); +// } +// +// public void getUserInDepartment(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getUserInDepartment( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "userID") +// ); +// } +// +// public void getDepartmentMemberAndSubDepartment(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getDepartmentMemberAndSubDepartment( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "departmentID") +// ); +// } +// +// public void getDepartmentInfo(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.getDepartmentInfo( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "departmentID") +// ); +// } +// +// public void searchOrganization(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.searchOrganization( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "searchParam"), +// int2long(methodCall, "offset"), +// int2long(methodCall, "count") +// ); +// } } 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 9b691c6..a3ff7a6 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 @@ -70,56 +70,56 @@ public class SignalingManager extends BaseManager { value(methodCall, "roomID")); } - public void signalingUpdateMeetingInfo(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingUpdateMeetingInfo( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "info")); - } - - public void signalingCreateMeeting(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingCreateMeeting( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "info")); - } - - public void signalingJoinMeeting(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingJoinMeeting( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - jsonValue(methodCall, "info")); - } - - public void signalingOperateStream(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingOperateStream( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "streamType"), - value(methodCall, "roomID"), - value(methodCall, "userID"), - value(methodCall, "mute"), - value(methodCall, "muteAll")); - } - - public void signalingGetMeetings(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingGetMeetings( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID")); - } - - public void signalingCloseRoom(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingCloseRoom( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "roomID")); - } - - public void signalingSendCustomSignal(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.signalingSendCustomSignal( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID"), - value(methodCall, "customInfo"), - value(methodCall, "roomID")); - } +// public void signalingUpdateMeetingInfo(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingUpdateMeetingInfo( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "info")); +// } +// +// public void signalingCreateMeeting(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingCreateMeeting( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "info")); +// } +// +// public void signalingJoinMeeting(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingJoinMeeting( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// jsonValue(methodCall, "info")); +// } +// +// public void signalingOperateStream(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingOperateStream( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "streamType"), +// value(methodCall, "roomID"), +// value(methodCall, "userID"), +// value(methodCall, "mute"), +// value(methodCall, "muteAll")); +// } +// +// public void signalingGetMeetings(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingGetMeetings( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID")); +// } +// +// public void signalingCloseRoom(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingCloseRoom( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "roomID")); +// } +// +// public void signalingSendCustomSignal(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.signalingSendCustomSignal( +// new OnBaseListener(result, methodCall), +// value(methodCall, "operationID"), +// value(methodCall, "customInfo"), +// value(methodCall, "roomID")); +// } }