xim/open-im-sdk-flutter-m
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update SDK to 1.1.5, New add clear c2c message android group message

Browse Source
This commit is contained in:
hrxiang
2021-11-17 11:30:12 +08:00
parent a97048ea9d
commit b5f80cc052
47 changed files with 276 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@@ -51,5 +51,5 @@ android {
}
}
dependencies {
implementation 'io.openim:client-sdk:1.1.5@aar'
implementation 'io.openim:client-sdk:1.1.9@aar'
}

12
android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java
View File

@@ -5,7 +5,6 @@ import android.content.Context;
import androidx.annotation.NonNull;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import io.flutter.Log;
@@ -19,7 +18,6 @@ import io.openim.flutter_openim_sdk.manager.FriendshipManager;
import io.openim.flutter_openim_sdk.manager.GroupManager;
import io.openim.flutter_openim_sdk.manager.IMManager;
import io.openim.flutter_openim_sdk.manager.MessageManager;
import io.openim.flutter_openim_sdk.util.CommonUtil;
/**
@@ -68,18 +66,12 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler
void parse(@NonNull MethodCall call, @NonNull Result result) {
try {
String managerName = CommonUtil.getParamValue(call, "ManagerName");
String managerName = call.argument("ManagerName");
Field field = FlutterOpenimSdkPlugin.class.getDeclaredField(managerName);
Method method = field.get(new Object()).getClass().getDeclaredMethod(call.method, MethodCall.class, Result.class);
Log.i("F-OpenIMSDK(flutter call native)", "{ class:" + managerName + ", method:" + method.getName() + " }");
method.invoke(field.get(new Object()), call, result);
} catch (NoSuchFieldException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
} catch (Exception e) {
e.printStackTrace();
}
}

9
android/src/main/java/io/openim/flutter_openim_sdk/listener/MsgSendProgressListener.java
View File

@@ -11,11 +11,14 @@ import open_im_sdk.SendMsgCallBack;
public class MsgSendProgressListener implements SendMsgCallBack {
final private MethodChannel.Result result;
final private MethodCall call;
// final private MethodCall call;
final private Object clientMsgID;
public MsgSendProgressListener(MethodChannel.Result result, MethodCall call) {
this.result = result;
this.call = call;
// this.call = call;
Map<String, Object> args = call.argument("message");
this.clientMsgID = args.get("clientMsgID");
}
@Override
@@ -26,7 +29,7 @@ public class MsgSendProgressListener implements SendMsgCallBack {
@Override
public void onProgress(long l) {
final Map<String, Object> values = new ArrayMap<>();
values.put("clientMsgID", CommonUtil.getSendMessageClientMsgID(call));
values.put("clientMsgID", clientMsgID);
values.put("progress", l);
CommonUtil.emitEvent("msgSendProgressListener", "onProgress", values);
}

24
android/src/main/java/io/openim/flutter_openim_sdk/manager/BaseManager.java Normal file
View File

@@ -0,0 +1,24 @@
package io.openim.flutter_openim_sdk.manager;
import io.flutter.plugin.common.MethodCall;
import io.openim.flutter_openim_sdk.util.JsonUtil;
class BaseManager {
static String jsonValue(MethodCall methodCall, String key) {
return JsonUtil.toString(methodCall.argument(key));
}
static String jsonValue(MethodCall methodCall) {
return JsonUtil.toString(methodCall.arguments);
}
static <T> T value(MethodCall methodCall, String key) {
return methodCall.argument(key);
}
static Long int2long(MethodCall methodCall, String key) {
Integer i = value(methodCall, key);
return Long.valueOf(i);
}
}

35
android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java
View File

@@ -7,7 +7,7 @@ import io.openim.flutter_openim_sdk.listener.ConversationListener;
import io.openim.flutter_openim_sdk.util.CommonUtil;
import open_im_sdk.Open_im_sdk;
public class ConversationManager {
public class ConversationManager extends BaseManager {
public void setConversationListener(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setConversationListener(new ConversationListener());
@@ -19,41 +19,47 @@ public class ConversationManager {
public void getOneConversation(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getOneConversation(
CommonUtil.getConversationSourceId(methodCall),
CommonUtil.getConversationSessionType(methodCall),
value(methodCall, "sourceID"),
int2long(methodCall, "sessionType"),
new BaseListener(result));
}
public void getMultipleConversation(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getMultipleConversation(
CommonUtil.getConversationIds(methodCall),
jsonValue(methodCall, "conversationIDList"),
new BaseListener(result));
}
public void deleteConversation(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.deleteConversation(CommonUtil.getConversationId(methodCall), new BaseListener(result));
Open_im_sdk.deleteConversation(
value(methodCall, "conversationID"),
new BaseListener(result));
}
public void setConversationDraft(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setConversationDraft(
CommonUtil.getConversationId(methodCall),
CommonUtil.getConversationDraft(methodCall),
value(methodCall, "conversationID"),
value(methodCall, "draftText"),
new BaseListener(result));
}
public void pinConversation(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.pinConversation(
CommonUtil.getConversationId(methodCall),
CommonUtil.isPinnedConversation(methodCall),
value(methodCall, "conversationID"),
value(methodCall, "isPinned"),
new BaseListener(result));
}
public void markSingleMessageHasRead(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.markSingleMessageHasRead(new BaseListener(result), CommonUtil.getSingleMessageUserid(methodCall));
Open_im_sdk.markSingleMessageHasRead(
new BaseListener(result),
value(methodCall, "userID"));
}
public void markGroupMessageHasRead(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.markGroupMessageHasRead(new BaseListener(result), CommonUtil.getGroupMessageGroupid(methodCall));
Open_im_sdk.markGroupMessageHasRead(
new BaseListener(result),
value(methodCall, "groupID"));
}
public void getTotalUnreadMsgCount(MethodCall methodCall, MethodChannel.Result result) {
@@ -61,9 +67,8 @@ public class ConversationManager {
}
public void getConversationIDBySessionType(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.getConversationIDBySessionType(CommonUtil.getConversationSourceId(methodCall),
CommonUtil.getConversationSessionType(methodCall)));
CommonUtil.runMainThreadReturn(result, Open_im_sdk.getConversationIDBySessionType(
value(methodCall, "sourceID"),
int2long(methodCall, "sessionType")));
}
}

30
android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java
View File

@@ -4,10 +4,9 @@ import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.openim.flutter_openim_sdk.listener.BaseListener;
import io.openim.flutter_openim_sdk.listener.FriendshipListener;
import io.openim.flutter_openim_sdk.util.CommonUtil;
import open_im_sdk.Open_im_sdk;
public class FriendshipManager {
public class FriendshipManager extends BaseManager {
public void setFriendListener(MethodCall methodCall, MethodChannel.Result result) {
@@ -15,11 +14,13 @@ public class FriendshipManager {
}
public void getFriendsInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getFriendsInfo(new BaseListener(result), CommonUtil.getUidList(methodCall));
Open_im_sdk.getFriendsInfo(new BaseListener(result),
jsonValue(methodCall, "uidList"));
}
public void addFriend(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.addFriend(new BaseListener(result), CommonUtil.getSDKJsonParam(methodCall));
Open_im_sdk.addFriend(new BaseListener(result),
jsonValue(methodCall));
}
public void getFriendApplicationList(MethodCall methodCall, MethodChannel.Result result) {
@@ -31,11 +32,13 @@ public class FriendshipManager {
}
public void setFriendInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setFriendInfo(CommonUtil.getSDKJsonParam(methodCall), new BaseListener(result));
Open_im_sdk.setFriendInfo(
jsonValue(methodCall), new BaseListener(result));
}
public void addToBlackList(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.addToBlackList(new BaseListener(result), CommonUtil.getJsonUid(methodCall));
Open_im_sdk.addToBlackList(new BaseListener(result),
jsonValue(methodCall, "uid"));
}
public void getBlackList(MethodCall methodCall, MethodChannel.Result result) {
@@ -43,23 +46,28 @@ public class FriendshipManager {
}
public void deleteFromBlackList(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.deleteFromBlackList(new BaseListener(result), CommonUtil.getJsonUid(methodCall));
Open_im_sdk.deleteFromBlackList(new BaseListener(result),
jsonValue(methodCall, "uid"));
}
public void checkFriend(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.checkFriend(new BaseListener(result), CommonUtil.getUidList(methodCall));
Open_im_sdk.checkFriend(new BaseListener(result),
jsonValue(methodCall, "uidList"));
}
public void deleteFromFriendList(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.deleteFromFriendList(CommonUtil.getJsonUid(methodCall), new BaseListener(result));
Open_im_sdk.deleteFromFriendList(
jsonValue(methodCall, "uid"), new BaseListener(result));
}
public void acceptFriendApplication(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.acceptFriendApplication(new BaseListener(result), CommonUtil.getJsonUid(methodCall));
Open_im_sdk.acceptFriendApplication(new BaseListener(result),
jsonValue(methodCall, "uid"));
}
public void refuseFriendApplication(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.refuseFriendApplication(new BaseListener(result), CommonUtil.getJsonUid(methodCall));
Open_im_sdk.refuseFriendApplication(new BaseListener(result),
jsonValue(methodCall, "uid"));
}
// public void forceSyncFriendApplication(MethodCall methodCall, MethodChannel.Result result) {

55
android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java
View File

@@ -4,10 +4,9 @@ import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.openim.flutter_openim_sdk.listener.BaseListener;
import io.openim.flutter_openim_sdk.listener.GroupListener;
import io.openim.flutter_openim_sdk.util.CommonUtil;
import open_im_sdk.Open_im_sdk;
public class GroupManager {
public class GroupManager extends BaseManager {
public void setGroupListener(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setGroupListener(new GroupListener());
@@ -15,32 +14,32 @@ public class GroupManager {
public void inviteUserToGroup(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.inviteUserToGroup(
CommonUtil.getGid(methodCall),
CommonUtil.getGroupOpReason(methodCall),
CommonUtil.getUidList(methodCall),
value(methodCall, "gid"),
value(methodCall, "reason"),
jsonValue(methodCall, "uidList"),
new BaseListener(result));
}
public void kickGroupMember(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.kickGroupMember(
CommonUtil.getGid(methodCall),
CommonUtil.getGroupOpReason(methodCall),
CommonUtil.getUidList(methodCall),
value(methodCall, "gid"),
value(methodCall, "reason"),
jsonValue(methodCall, "uidList"),
new BaseListener(result));
}
public void getGroupMembersInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getGroupMembersInfo(
CommonUtil.getGid(methodCall),
CommonUtil.getUidList(methodCall),
value(methodCall, "gid"),
jsonValue(methodCall, "uidList"),
new BaseListener(result));
}
public void getGroupMemberList(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getGroupMemberList(
CommonUtil.getGid(methodCall),
CommonUtil.getGroupListFilter(methodCall),
CommonUtil.getGroupListNext(methodCall),
value(methodCall, "gid"),
value(methodCall, "filter"),
value(methodCall, "next"),
new BaseListener(result));
}
@@ -51,40 +50,36 @@ public class GroupManager {
public void createGroup(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.createGroup(
CommonUtil.getGroupInfo(methodCall),
CommonUtil.getGroupMemberRoleList(methodCall),
jsonValue(methodCall, "gInfo"),
jsonValue(methodCall, "memberList"),
new BaseListener(result));
}
public void setGroupInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setGroupInfo(
CommonUtil.getGroupInfo(methodCall),
new BaseListener(result));
Open_im_sdk.setGroupInfo(jsonValue(methodCall, "gInfo"), new BaseListener(result));
}
public void getGroupsInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getGroupsInfo(
CommonUtil.getGidList(methodCall),
new BaseListener(result));
Open_im_sdk.getGroupsInfo(jsonValue(methodCall, "gidList"), new BaseListener(result));
}
public void joinGroup(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.joinGroup(
CommonUtil.getGid(methodCall),
CommonUtil.getGroupOpReason(methodCall),
value(methodCall, "gid"),
value(methodCall, "reason"),
new BaseListener(result));
}
public void quitGroup(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.quitGroup(
CommonUtil.getGid(methodCall),
value(methodCall, "gid"),
new BaseListener(result));
}
public void transferGroupOwner(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.transferGroupOwner(
CommonUtil.getGid(methodCall),
CommonUtil.getUid(methodCall),
value(methodCall, "gid"),
value(methodCall, "uid"),
new BaseListener(result));
}
@@ -94,16 +89,16 @@ public class GroupManager {
public void acceptGroupApplication(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.acceptGroupApplication(
CommonUtil.getGroupApplicationInfo(methodCall),
CommonUtil.getGroupOpReason(methodCall),
jsonValue(methodCall, "application"),
value(methodCall, "reason"),
new BaseListener(result));
}
public void refuseGroupApplication(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.refuseGroupApplication(
CommonUtil.getGroupApplicationInfo(methodCall),
CommonUtil.getGroupOpReason(methodCall),
jsonValue(methodCall, "application"),
value(methodCall, "reason"),
new BaseListener(result));
}

17
android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java
View File

@@ -7,15 +7,18 @@ import io.openim.flutter_openim_sdk.listener.SDKListener;
import io.openim.flutter_openim_sdk.util.CommonUtil;
import open_im_sdk.Open_im_sdk;
public class IMManager {
public class IMManager extends BaseManager {
public void initSDK(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result, Open_im_sdk.initSDK(CommonUtil.getSDKJsonParam(methodCall), new SDKListener()));
CommonUtil.runMainThreadReturn(result, Open_im_sdk.initSDK(
jsonValue(methodCall), new SDKListener()));
// CommonUtil.runMainThreadReturn(result, null);
}
public void login(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.login(CommonUtil.getUid(methodCall), CommonUtil.getToken(methodCall), new BaseListener(result));
Open_im_sdk.login(
value(methodCall, "uid"),
value(methodCall, "token"), new BaseListener(result));
}
public void logout(MethodCall methodCall, MethodChannel.Result result) {
@@ -31,11 +34,13 @@ public class IMManager {
// }
public void getUsersInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getUsersInfo(CommonUtil.getUidList(methodCall), new BaseListener(result));
Open_im_sdk.getUsersInfo(
jsonValue(methodCall, "uidList"), new BaseListener(result));
}
public void setSelfInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setSelfInfo(CommonUtil.getSDKJsonParam(methodCall), new BaseListener(result));
Open_im_sdk.setSelfInfo(
jsonValue(methodCall), new BaseListener(result));
}
public void forceSyncLoginUerInfo(MethodCall methodCall, MethodChannel.Result result) {
@@ -47,6 +52,6 @@ public class IMManager {
// }
public void setSdkLog(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setSdkLog(CommonUtil.getSDKLog(methodCall));
Open_im_sdk.setSdkLog(value(methodCall, "sdkLog"));
}
}

110
android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java
View File

@@ -13,7 +13,7 @@ import open_im_sdk.OnAdvancedMsgListener;
import open_im_sdk.Open_im_sdk;
public class MessageManager {
public class MessageManager extends BaseManager {
private final static String KEY_ID = "id";
// private final static Map<String, OnAdvancedMsgListener> listeners = new HashMap<>();
private static boolean initializedListener = false;
@@ -81,22 +81,22 @@ public class MessageManager {
public void sendMessage(MethodCall methodCall, MethodChannel.Result result) {
MsgSendProgressListener listener = new MsgSendProgressListener(result, methodCall);
Open_im_sdk.sendMessage(listener,
CommonUtil.getSendMessageContent(methodCall),
CommonUtil.getSendMessageReceiver(methodCall),
CommonUtil.geSendMessageGroupId(methodCall),
CommonUtil.getSendMessageOnlineOnly(methodCall));
jsonValue(methodCall, "message"),
value(methodCall, "receiver"),
value(methodCall, "groupID"),
value(methodCall, "onlineUserOnly"));
}
public void getHistoryMessageList(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getHistoryMessageList(new BaseListener(result), CommonUtil.getSDKJsonParam(methodCall));
Open_im_sdk.getHistoryMessageList(new BaseListener(result), jsonValue(methodCall));
}
public void revokeMessage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.revokeMessage(new BaseListener(result), CommonUtil.getSDKJsonParam(methodCall));
Open_im_sdk.revokeMessage(new BaseListener(result), jsonValue(methodCall));
}
public void deleteMessageFromLocalStorage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.deleteMessageFromLocalStorage(new BaseListener(result), CommonUtil.getSDKJsonParam(methodCall));
Open_im_sdk.deleteMessageFromLocalStorage(new BaseListener(result), jsonValue(methodCall));
}
public void deleteMessages(MethodCall methodCall, MethodChannel.Result result) {
@@ -105,141 +105,151 @@ public class MessageManager {
public void insertSingleMessageToLocalStorage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.insertSingleMessageToLocalStorage(new BaseListener(result),
CommonUtil.getSingleMessageContent(methodCall),
CommonUtil.getSingleMessageUserid(methodCall),
CommonUtil.getSingleMessageSender(methodCall));
jsonValue(methodCall, "message"),
value(methodCall, "userID"),
value(methodCall, "sender"));
}
public void findMessages(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.findMessages(new BaseListener(result), CommonUtil.getMessageIdList(methodCall));
Open_im_sdk.findMessages(new BaseListener(result), jsonValue(methodCall, "messageIDList"));
}
public void markC2CMessageAsRead(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.markC2CMessageAsRead(new BaseListener(result),
CommonUtil.getSingleMessageUserid(methodCall),
CommonUtil.getMessageIdList(methodCall));
value(methodCall, "userID"),
jsonValue(methodCall, "messageIDList"));
}
public void typingStatusUpdate(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.typingStatusUpdate(CommonUtil.getSingleMessageUserid(methodCall),
CommonUtil.getSingleMessageTyping(methodCall));
Open_im_sdk.typingStatusUpdate(value(methodCall, "userID"),
value(methodCall, "typing"));
}
public void createTextMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createTextMessage(
CommonUtil.getMessageText(methodCall)));
value(methodCall, "text")));
}
public void createTextAtMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createTextAtMessage(
CommonUtil.getMessageText(methodCall),
CommonUtil.getAtUserList(methodCall)));
value(methodCall, "text"),
jsonValue(methodCall, "atUserList")));
}
public void createImageMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createImageMessage(
CommonUtil.getImagePath(methodCall)));
value(methodCall, "imagePath")));
}
public void createImageMessageFromFullPath(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createImageMessageFromFullPath(
CommonUtil.getImagePath(methodCall)));
value(methodCall, "imagePath")));
}
public void createSoundMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createSoundMessage(
CommonUtil.getSoundPath(methodCall),
CommonUtil.getSoundDuration(methodCall)));
value(methodCall, "soundPath"),
int2long(methodCall, "duration")));
}
public void createSoundMessageFromFullPath(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createSoundMessageFromFullPath(
CommonUtil.getSoundPath(methodCall),
CommonUtil.getSoundDuration(methodCall)));
value(methodCall, "soundPath"),
int2long(methodCall, "duration")));
}
public void createVideoMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createVideoMessage(
CommonUtil.getVideoPath(methodCall),
CommonUtil.getVideoType(methodCall),
CommonUtil.getVideoDuration(methodCall),
CommonUtil.getVideoSnapshotPath(methodCall)));
value(methodCall, "videoPath"),
value(methodCall, "videoType"),
int2long(methodCall, "duration"),
value(methodCall, "snapshotPath")));
}
public void createVideoMessageFromFullPath(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createVideoMessageFromFullPath(
CommonUtil.getVideoPath(methodCall),
CommonUtil.getVideoType(methodCall),
CommonUtil.getVideoDuration(methodCall),
CommonUtil.getVideoSnapshotPath(methodCall)));
value(methodCall, "videoPath"),
value(methodCall, "videoType"),
int2long(methodCall, "duration"),
value(methodCall, "snapshotPath")));
}
public void createFileMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createFileMessage(
CommonUtil.getFilePath(methodCall),
CommonUtil.getFileName(methodCall)));
value(methodCall, "filePath"),
value(methodCall, "fileName")));
}
public void createFileMessageFromFullPath(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createFileMessageFromFullPath(
CommonUtil.getFilePath(methodCall),
CommonUtil.getFileName(methodCall)));
value(methodCall, "filePath"),
value(methodCall, "fileName")));
}
public void createMergerMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createMergerMessage(
CommonUtil.getMergerMessageList(methodCall),
CommonUtil.getMergerMessageTitle(methodCall),
CommonUtil.getSummaryList(methodCall)));
jsonValue(methodCall, "messageList"),
value(methodCall, "title"),
jsonValue(methodCall, "summaryList")));
}
public void createForwardMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result,
Open_im_sdk.createForwardMessage(
CommonUtil.getForwardMessage(methodCall)));
jsonValue(methodCall, "message")));
}
public void createLocationMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result, Open_im_sdk.createLocationMessage(
CommonUtil.getMessageDes(methodCall),
CommonUtil.getLocationLongitude(methodCall),
CommonUtil.getLocationLatitude(methodCall)
value(methodCall, "description"),
value(methodCall, "longitude"),
value(methodCall, "latitude")
));
}
public void createCustomMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result, Open_im_sdk.createCustomMessage(
CommonUtil.getCustomMessageData(methodCall),
CommonUtil.getCustomMessageExt(methodCall),
CommonUtil.getMessageDes(methodCall)
value(methodCall, "data"),
value(methodCall, "extension"),
value(methodCall, "description")
));
}
public void createQuoteMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result, Open_im_sdk.createQuoteMessage(
CommonUtil.getQuoteMessageText(methodCall),
CommonUtil.getQuoteMessageBody(methodCall)
value(methodCall, "quoteText"),
jsonValue(methodCall, "quoteMessage")
));
}
public void createCardMessage(MethodCall methodCall, MethodChannel.Result result) {
CommonUtil.runMainThreadReturn(result, Open_im_sdk.createCardMessage(
CommonUtil.getCardMessage(methodCall)
jsonValue(methodCall, "cardMessage")
));
}
public void forceSyncMsg(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.forceSyncMsg();
}
public void clearC2CHistoryMessage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.clearC2CHistoryMessage(new BaseListener(result),
value(methodCall, "userID"));
}
public void clearGroupHistoryMessage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.clearGroupHistoryMessage(new BaseListener(result),
value(methodCall, "groupID"));
}
}

297
android/src/main/java/io/openim/flutter_openim_sdk/util/CommonUtil.java
View File

@@ -8,7 +8,6 @@ import androidx.collection.ArrayMap;
import java.util.Map;
import io.flutter.Log;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.openim.flutter_openim_sdk.FlutterOpenimSdkPlugin;
@@ -16,18 +15,6 @@ import io.openim.flutter_openim_sdk.FlutterOpenimSdkPlugin;
public class CommonUtil {
private final static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
public static <T> T getParamValue(MethodCall methodCall, String param) {
return methodCall.argument(param);
}
public static String getSDKJsonParam(MethodCall methodCall, String key) {
return JsonUtil.toString(methodCall.argument(key));
}
public static String getSDKJsonParam(MethodCall methodCall) {
return JsonUtil.toString(methodCall.arguments);
}
public static void runMainThreadReturn(final MethodChannel.Result result, final Object param) {
MAIN_HANDLER.post(() -> result.success(param));
}
@@ -68,288 +55,4 @@ public class CommonUtil {
public static <T> void emitEvent(String method, String type, T data) {
emitEvent(method, type, null, null, data);
}
///////////////////////////////////////
//////////////////////////////////////
public static String getUid(MethodCall methodCall) {
return getParamValue(methodCall, KEY_UID);
}
public static String getJsonUid(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_UID);
}
public static String getToken(MethodCall methodCall) {
return getParamValue(methodCall, KEY_TOKEN);
}
public static String getUidList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_USER_IDS);
}
public static String getMessageText(MethodCall methodCall) {
return getParamValue(methodCall, KEY_TEXT);
}
public static String getAtUserList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_AT_USER_LIST);
}
public static String getImagePath(MethodCall methodCall) {
return getParamValue(methodCall, KEY_IMAGE_PATH);
}
public static String getSoundPath(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SOUND_PATH);
}
public static long getSoundDuration(MethodCall methodCall) {
Integer i = getParamValue(methodCall, KEY_SOUND_DURATION);
return Long.valueOf(i);
}
public static String getVideoPath(MethodCall methodCall) {
return getParamValue(methodCall, KEY_VIDEO_PATH);
}
public static String getVideoType(MethodCall methodCall) {
return getParamValue(methodCall, KEY_VIDEO_TYPE);
}
public static long getVideoDuration(MethodCall methodCall) {
Integer i = getParamValue(methodCall, KEY_VIDEO_DURATION);
return Long.valueOf(i);
}
public static String getVideoSnapshotPath(MethodCall methodCall) {
return getParamValue(methodCall, KEY_VIDEO_SNAPSHOT_PATH);
}
public static String getFilePath(MethodCall methodCall) {
return getParamValue(methodCall, KEY_FILE_PATH);
}
public static String getFileName(MethodCall methodCall) {
return getParamValue(methodCall, KEY_FILE_NAME);
}
public static String getMergerMessageList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_MERGER_MESSAGE_LIST);
}
public static String getMergerMessageTitle(MethodCall methodCall) {
return getParamValue(methodCall, KEY_MERGER_MESSAGE_TITLE);
}
public static String getSummaryList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_SUMMARY_LIST);
}
public static String getForwardMessage(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_FORWARD_MESSAGE);
}
public static String getSendMessageContent(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_SEND_MESSAGE_CONTENT);
}
public static Object getSendMessageClientMsgID(MethodCall methodCall) {
Map<String, Object> map = getParamValue(methodCall, KEY_SEND_MESSAGE_CONTENT);
return map.get(KEY_SEND_MESSAGE_CONTENT_CLIENT_ID);
}
public static String getSendMessageReceiver(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SEND_MESSAGE_RECEIVER);
}
public static String geSendMessageGroupId(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SEND_MESSAGE_GROUP_ID);
}
public static boolean getSendMessageOnlineOnly(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SEND_MESSAGE_ONLINE_ONLY);
}
public static String getSingleMessageContent(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SINGLE_MESSAGE_CONTENT);
}
public static String getSingleMessageUserid(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SINGLE_MESSAGE_USERID);
}
public static String getGroupMessageGroupid(MethodCall methodCall) {
return getParamValue(methodCall, KEY_GROUP_MESSAGE_GROUPID);
}
public static String getSingleMessageSender(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SINGLE_MESSAGE_SENDER);
}
public static String getSingleMessageTyping(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SINGLE_MESSAGE_TYPING);
}
public static String getMessageIdList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_FIND_MESSAGE_IDS);
}
public static String getConversationId(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CONVERSATION_ID);
}
public static String getConversationIds(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_CONVERSATION_IDS);
}
public static String getConversationSourceId(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CONVERSATION_SOURCE_ID);
}
public static int getConversationSessionType(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CONVERSATION_SESSION_TYPE);
}
public static String getConversationDraft(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CONVERSATION_DRAFT);
}
public static boolean isPinnedConversation(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CONVERSATION_PINNED);
}
public static String getGid(MethodCall methodCall) {
return getParamValue(methodCall, KEY_GROUP_ID);
}
public static String getGidList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_GROUP_IDS);
}
public static String getGroupOpReason(MethodCall methodCall) {
return getParamValue(methodCall, KEY_GROUP_OP_REASON);
}
public static int getGroupListFilter(MethodCall methodCall) {
return getParamValue(methodCall, KEY_GROUP_LIST_FILTER);
}
public static int getGroupListNext(MethodCall methodCall) {
return getParamValue(methodCall, KEY_GROUP_LIST_NEXT);
}
public static String getGroupInfo(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_GROUP_INFO);
}
public static String getGroupMemberRoleList(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_GROUP_MEMBER_ROLE_LIST);
}
public static String getGroupApplicationInfo(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_GROUP_APPLICATION_INFO);
}
public static double getLocationLatitude(MethodCall methodCall) {
return getParamValue(methodCall, KEY_LOCATION_MESSAGE_LA);
}
public static double getLocationLongitude(MethodCall methodCall) {
return getParamValue(methodCall, KEY_LOCATION_MESSAGE_LO);
}
public static String getMessageDes(MethodCall methodCall) {
return getParamValue(methodCall, KEY_MESSAGE_DES);
}
public static String getCustomMessageData(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CUSTOM_MESSAGE_DATA);
}
public static String getCustomMessageExt(MethodCall methodCall) {
return getParamValue(methodCall, KEY_CUSTOM_MESSAGE_EXT);
}
public static String getQuoteMessageText(MethodCall methodCall) {
return getParamValue(methodCall, KEY_QUOTE_MESSAGE_TEXT);
}
public static String getQuoteMessageBody(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_QUOTE_MESSAGE_BODY);
}
public static String getCardMessage(MethodCall methodCall) {
return getSDKJsonParam(methodCall, KEY_CARD_MESSAGE);
}
public static int getSDKLog(MethodCall methodCall) {
return getParamValue(methodCall, KEY_SDK_LOG);
}
//login
final static String KEY_UID = "uid";
final static String KEY_TOKEN = "token";
//create message body
final static String KEY_TEXT = "text";
final static String KEY_AT_USER_LIST = "atUserList";
final static String KEY_IMAGE_PATH = "imagePath";
final static String KEY_SOUND_PATH = "soundPath";
final static String KEY_SOUND_DURATION = "duration";
final static String KEY_VIDEO_PATH = "videoPath";
final static String KEY_VIDEO_TYPE = "videoType";
final static String KEY_VIDEO_DURATION = "duration";
final static String KEY_VIDEO_SNAPSHOT_PATH = "snapshotPath";
final static String KEY_FILE_PATH = "filePath";
final static String KEY_FILE_NAME = "fileName";
final static String KEY_MERGER_MESSAGE_LIST = "messageList";
final static String KEY_MERGER_MESSAGE_TITLE = "title";
final static String KEY_SUMMARY_LIST = "summaryList";
final static String KEY_FORWARD_MESSAGE = "message";
final static String KEY_LOCATION_MESSAGE_LO = "longitude";
final static String KEY_LOCATION_MESSAGE_LA = "latitude";
final static String KEY_MESSAGE_DES = "description";
final static String KEY_CUSTOM_MESSAGE_DATA = "data";
final static String KEY_CUSTOM_MESSAGE_EXT = "extension";
final static String KEY_QUOTE_MESSAGE_TEXT = "quoteText";
final static String KEY_QUOTE_MESSAGE_BODY = "quoteMessage";
final static String KEY_CARD_MESSAGE = "cardMessage";
//send message
final static String KEY_SEND_MESSAGE_CONTENT = "message";
final static String KEY_SEND_MESSAGE_CONTENT_CLIENT_ID = "clientMsgID";
final static String KEY_SEND_MESSAGE_RECEIVER = "receiver";
final static String KEY_SEND_MESSAGE_GROUP_ID = "groupID";
final static String KEY_SEND_MESSAGE_ONLINE_ONLY = "onlineUserOnly";
//single chat
final static String KEY_SINGLE_MESSAGE_CONTENT = "message";
final static String KEY_SINGLE_MESSAGE_USERID = "userID";
final static String KEY_SINGLE_MESSAGE_SENDER = "sender";
final static String KEY_SINGLE_MESSAGE_TYPING = "typing";
//group chat
final static String KEY_GROUP_MESSAGE_GROUPID = "groupID";
// find message
final static String KEY_FIND_MESSAGE_IDS = "messageIDList";
// conversation
final static String KEY_CONVERSATION_ID = "conversationID";
final static String KEY_CONVERSATION_IDS = "conversationIDList";
final static String KEY_CONVERSATION_DRAFT = "draftText";
final static String KEY_CONVERSATION_PINNED = "isPinned";
final static String KEY_CONVERSATION_SOURCE_ID = "sourceID";
final static String KEY_CONVERSATION_SESSION_TYPE = "sessionType";
// user info
final static String KEY_USER_IDS = "uidList";
// group
final static String KEY_GROUP_ID = "gid";
final static String KEY_GROUP_IDS = "gidList";
final static String KEY_GROUP_OP_REASON = "reason";
// final static String KEY_GROUP_USER_ID = "uid";
// final static String KEY_GROUP_USER_IDS = "uidList";
final static String KEY_GROUP_LIST_FILTER = "filter";
final static String KEY_GROUP_LIST_NEXT = "next";
final static String KEY_GROUP_INFO = "gInfo";
final static String KEY_GROUP_MEMBER_ROLE_LIST = "memberList";
final static String KEY_GROUP_APPLICATION_INFO = "application";
//
final static String KEY_SDK_LOG = "sdkLog";
}