Compare commits

..

1 Commits

Author SHA1 Message Date
Brett
a9567886b4 https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.3-patch.3 2025-03-07 18:54:27 +08:00
30 changed files with 26 additions and 1408 deletions

View File

@@ -1,3 +1,7 @@
## 3.8.3+3
- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.3-patch.3)
## 3.8.2
- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.2)

View File

@@ -30,10 +30,6 @@ buildscript {
rootProject.allprojects {
repositories {
maven {
url 'http://192.168.77.132:8081/repository/mvn2-group'
allowInsecureProtocol true
}
google()
mavenCentral()
}
@@ -46,9 +42,6 @@ android {
defaultConfig {
minSdkVersion 21
ndk {
abiFilters "arm64-v8a","x86" // 根据需要添加其他 ABI
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -57,5 +50,5 @@ android {
}
dependencies {
implementation 'com.openim:sdkcore:1.0.12'
implementation 'io.openim:core-sdk:3.8.3-patch3@aar'
}

View File

@@ -1,6 +1,5 @@
#Tue Nov 12 14:22:37 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

View File

@@ -24,7 +24,7 @@ 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.manager.UserManager;
import io.openim.flutter_openim_sdk.manager.ChannelManager;
/**
* FlutterOpenimSdkPlugin
@@ -42,7 +42,6 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler,
private static MessageManager messageManager;
private static ConversationManager conversationManager;
private static GroupManager groupManager;
private static ChannelManager channelManager;
private static Activity activity;
private static Context context;
private ConnectivityListener connectivityListener;
@@ -56,8 +55,6 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler,
FlutterOpenimSdkPlugin.messageManager = new MessageManager();
FlutterOpenimSdkPlugin.conversationManager = new ConversationManager();
FlutterOpenimSdkPlugin.groupManager = new GroupManager();
FlutterOpenimSdkPlugin.channelManager = new ChannelManager();
}

View File

@@ -29,14 +29,6 @@ public class OnAdvancedMsgListener implements open_im_sdk_callback.OnAdvancedMsg
CommonUtil.emitEvent("advancedMsgListener", "onNewRecvMessageRevoked", values);
}
@Override
public void onNewRecvMessageEdited(String s) {
final Map<String, String> values = new ArrayMap<>();
values.put("id", id);
values.put("messageEdited", s);
CommonUtil.emitEvent("advancedMsgListener", "onNewRecvMessageEdited", values);
}
@Override
public void onRecvC2CReadReceipt(String s) {
final Map<String, String> values = new ArrayMap<>();

View File

@@ -1,32 +0,0 @@
package io.openim.flutter_openim_sdk.listener;
import io.openim.flutter_openim_sdk.util.CommonUtil;
public class OnChannelListener implements open_im_sdk_callback.OnChannelListener {
@Override
public void onChannelDismissed(String s) {
CommonUtil.emitEvent("channelListener", "onChannelDismissed", s);
}
@Override
public void onChannelInfoChanged(String s) {
CommonUtil.emitEvent("channelListener", "onChannelInfoChanged", s);
}
@Override
public void onChannelMemberAdded(String s) {
CommonUtil.emitEvent("channelListener", "onChannelMemberAdded", s);
}
@Override
public void onChannelMemberDeleted(String s) {
CommonUtil.emitEvent("channelListener", "onChannelMemberDeleted", s);
}
@Override
public void onChannelMemberInfoChanged(String s) {
CommonUtil.emitEvent("channelListener", "onChannelMemberInfoChanged", s);
}
}

View File

@@ -1,103 +0,0 @@
package io.openim.flutter_openim_sdk.manager;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.openim.flutter_openim_sdk.listener.OnBaseListener;
import io.openim.flutter_openim_sdk.listener.OnChannelListener;
import open_im_sdk.Open_im_sdk;
public class ChannelManager extends BaseManager {
public void setChannelListener(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setChannelListener(new OnChannelListener());
result.success(null);
}
public void getChannelMembersInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getSpecifiedChannelMembersInfo(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID"),
jsonValue(methodCall, "userIDList")
);
}
public void getChannelMemberList(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getChannelMemberList(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID"),
value(methodCall, "filter"),
value(methodCall, "offset"),
value(methodCall, "count")
);
}
public void getChannelsInfo(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getSpecifiedChannelsInfo(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
jsonValue(methodCall, "channelIDList")
);
}
public void joinChannel(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.joinChannel(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID"),
value(methodCall, "reason"),
value(methodCall, "joinSource"),
value(methodCall, "ex")
);
}
public void quitChannel(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.quitChannel(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID")
);
}
public void changeChannelMute(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.changeChannelMute(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID"),
value(methodCall, "mute")
);
}
public void changeChannelMemberMute(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.changeChannelMemberMute(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID"),
value(methodCall, "userID"),
int2long(methodCall, "seconds")
);
}
public void isJoinChannel(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.isJoinChannel(new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID")
);
}
public void getUsersInChannel(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.getUsersInChannel(new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "channelID"),
jsonValue(methodCall, "userIDs")
);
}
}

View File

@@ -27,7 +27,6 @@ public class MessageManager extends BaseManager {
jsonValue(methodCall, "message"),
value(methodCall, "userID"),
value(methodCall, "groupID"),
value(methodCall, "channelID"),
jsonValue(methodCall, "offlinePushInfo"),
value(methodCall, "isOnlineOnly")
);
@@ -42,16 +41,6 @@ public class MessageManager extends BaseManager {
);
}
public void editMessage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.editMessage(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
value(methodCall, "conversationID"),
value(methodCall, "clientMsgID"),
jsonValue(methodCall, "message")
);
}
public void deleteMessageFromLocalStorage(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.deleteMessageFromLocalStorage(
new OnBaseListener(result, methodCall),
@@ -100,7 +89,6 @@ public class MessageManager extends BaseManager {
value(methodCall, "operationID"),
jsonValue(methodCall, "message"),
value(methodCall, "groupID"),
value(methodCall, "channelID"),
value(methodCall, "senderID")
);
}
@@ -351,7 +339,6 @@ public class MessageManager extends BaseManager {
jsonValue(methodCall, "message"),
value(methodCall, "userID"),
value(methodCall, "groupID"),
value(methodCall, "channelId"),
jsonValue(methodCall, "offlinePushInfo"),
value(methodCall, "isOnlineOnly")
);
@@ -388,16 +375,6 @@ public class MessageManager extends BaseManager {
jsonValue(methodCall, "fileElem")));
}
public void fetchSurroundingMessages(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.fetchSurroundingMessages(
new OnBaseListener(result, methodCall),
value(methodCall, "operationID"),
jsonValue(methodCall, "message"),
int2long(methodCall, "before"),
int2long(methodCall, "after"));
}
public void setCustomBusinessListener(MethodCall methodCall, MethodChannel.Result result) {
Open_im_sdk.setCustomBusinessListener(new OnCustomBusinessListener());

View File

@@ -49,25 +49,7 @@ public class CommonUtil {
res.put("errMsg", errMsg);
}
Log.i("F-OpenIMSDK(native call flutter)", "thread: " + threadName + " { method:" + method + ", type:" + type + " }");
FlutterOpenimSdkPlugin.channel.invokeMethod(method, res, new MethodChannel.Result() {
@Override
public void success(Object result) {
// 处理成功返回值
Log.i("F-OpenIMSDK(native call flutter)", "Method " + method + " returned: ");
}
@Override
public void error(String errorCode, String errorMessage, Object errorDetails) {
// 处理错误
Log.e("F-OpenIMSDK(native call flutter)", "Method " + method + " error: " + errorCode + ", " + errorMessage);
}
@Override
public void notImplemented() {
// 处理未实现的方法
Log.w("F-OpenIMSDK(native call flutter)", "Method " + method + " not implemented");
}
});
FlutterOpenimSdkPlugin.channel.invokeMethod(method, res);
});
}

View File

@@ -1,101 +0,0 @@
import Foundation
import OpenIMCore
public class ChannelManager: BaseServiceManager {
public override func registerHandlers() {
super.registerHandlers()
// self["changeChannelMemberMute"] = changeChannelMemberMute
// self["changeChannelMute"] = changeChannelMute
// self["getChannelMemberList"] = getChannelMemberList
self["getChannelMembersInfo"] = getChannelMembersInfo
self["getChannelsInfo"] = getChannelsInfo
self["getUsersInChannel"] = getUsersInChannel
self["isJoinChannel"] = isJoinChannel
self["joinChannel"] = joinChannel
self["quitChannel"] = quitChannel
self["setChannelListener"] = setChannelListener
}
// func changeChannelMemberMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
// Open_im_sdkChangeChannelMemberMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[string:"userID"], methodCall[int:"seconds"])
// }
//
// func changeChannelMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
// Open_im_sdkChangeChannelMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[bool: "mute"])
// }
//
// func getChannelMemberList(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
// Open_im_sdkGetChannelMemberList(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[int32: "filter"],
// methodCall[int32: "offset"], methodCall[int32: "count"])
// }
func getChannelMembersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkGetSpecifiedChannelMembersInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[jsonString: "userIDList"])
}
func getChannelsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkGetSpecifiedChannelsInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "channelIDList"])
}
func getUsersInChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkGetUsersInChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"],
methodCall[jsonString: "userIDs"])
}
func isJoinChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkIsJoinChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"])
}
func joinChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkJoinChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[string:
"reason"], methodCall[int32: "joinSource"], methodCall[jsonString: "ex"])
}
func quitChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkQuitChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"])
}
func setChannelListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkSetChannelListener(ChannelListener(channel: channel))
callBack(result)
}
}
public class ChannelListener: NSObject, Open_im_sdk_callbackOnChannelListenerProtocol {
private let channel: FlutterMethodChannel
init(channel: FlutterMethodChannel) {
self.channel = channel
}
public func onChannelDismissed(_ s: String?) {
CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelDismissed", errCode: nil, errMsg: nil, data: s)
}
public func onChannelInfoChanged(_ s: String?) {
CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelInfoChanged", errCode: nil, errMsg: nil, data: s)
}
public func onChannelMemberAdded(_ s: String?) {
CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelMemberAdded", errCode: nil, errMsg: nil, data: s)
}
public func onChannelMemberDeleted(_ s: String?) {
CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelMemberDeleted", errCode: nil, errMsg: nil, data: s)
}
public func onChannelMemberInfoChanged(_ s: String?) {
CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelMemberInfoChanged", errCode: nil, errMsg: nil, data: s)
}
}

View File

@@ -9,7 +9,6 @@ public class MessageManager: BaseServiceManager {
self["setAdvancedMsgListener"] = setAdvancedMsgListener
self["sendMessage"] = sendMessage
self["revokeMessage"] = revokeMessage
self["editMessage"] = editMessage
self["deleteMessageFromLocalStorage"] = deleteMessageFromLocalStorage
self["deleteMessageFromLocalAndSvr"] = deleteMessageFromLocalAndSvr
self["deleteAllMsgFromLocal"] = deleteAllMsgFromLocal
@@ -48,10 +47,6 @@ public class MessageManager: BaseServiceManager {
self["setMessageLocalEx"] = setMessageLocalEx
self["setAppBadge"] = setAppBadge
self["fetchSurroundingMessages"] = fetchSurroundingMessages
self["sendMessageNotOss"] = sendMessageNotOss
self["createImageMessageByURL"] = createImageMessageByURL
self["createSoundMessageByURL"] = createSoundMessageByURL
@@ -70,17 +65,13 @@ public class MessageManager: BaseServiceManager {
func sendMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
let sendMsgProgressListener: SendMsgProgressListener = SendMsgProgressListener(channel: channel,result: result,methodCall: methodCall)
Open_im_sdkSendMessage(sendMsgProgressListener, methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[string: "userID"],
methodCall[string: "groupID"], methodCall[string: "channelID"],methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
methodCall[string: "groupID"], methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
}
func revokeMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkRevokeMessage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"])
}
func editMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkEditMessage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"],methodCall[jsonString: "message"])
}
func deleteMessageFromLocalStorage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkDeleteMessageFromLocalStorage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"])
}
@@ -104,7 +95,7 @@ public class MessageManager: BaseServiceManager {
func insertGroupMessageToLocalStorage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkInsertGroupMessageToLocalStorage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "message"],
methodCall[string: "groupID"], methodCall[string: "channelID"],methodCall[string: "senderID"])
methodCall[string: "groupID"], methodCall[string: "senderID"])
}
func markMessagesAsReadByMsgID(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -236,7 +227,7 @@ public class MessageManager: BaseServiceManager {
func sendMessageNotOss(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
let sendMsgProgressListener: SendMsgProgressListener = SendMsgProgressListener(channel: channel,result: result,methodCall: methodCall)
Open_im_sdkSendMessageNotOss(sendMsgProgressListener, methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[string: "userID"], methodCall[string: "groupID"], methodCall[string: "channelID"],methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
Open_im_sdkSendMessageNotOss(sendMsgProgressListener, methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[string: "userID"], methodCall[string: "groupID"], methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
}
func createImageMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -259,13 +250,6 @@ public class MessageManager: BaseServiceManager {
Open_im_sdkSetCustomBusinessListener(CustomBusinessListener(channel: channel))
callBack(result)
}
func fetchSurroundingMessages(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkFetchSurroundingMessages(BaseCallback(result: result),methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[int: "before"], methodCall[int: "after"])
}
}
public class SendMsgProgressListener: NSObject, Open_im_sdk_callbackSendMsgCallBackProtocol {
@@ -319,14 +303,7 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
values["messageRevoked"] = messageRevoked
CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onNewRecvMessageRevoked", errCode: nil, errMsg: nil, data: values)
}
public func onNewRecvMessageEdited(_ messageEdited: String?) {
var values: [String: Any] = [:]
values["id"] = id
values["messageEdited"] = messageEdited
CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onNewRecvMessageEdited", errCode: nil, errMsg: nil, data: values)
}
public func onRecvC2CReadReceipt(_ msgReceiptList: String?) {
var values: [String: Any] = [:]
values["id"] = id

View File

@@ -8,15 +8,13 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin {
let messageManager: MessageManager
let groupManager: GroupManager
let userManger: UserManager
let channelManager: ChannelManager
init(channel: FlutterMethodChannel) {
self.imManager = IMMananger(channel: channel)
self.conversationManager = ConversationManager(channel: channel)
self.friendshipManager = FriendshipManager(channel: channel)
self.messageManager = MessageManager(channel: channel)
self.groupManager = GroupManager(channel: channel)
self.channelManager = ChannelManager(channel: channel)
self.userManger = UserManager(channel: channel)
}
@@ -39,8 +37,6 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin {
friendshipManager.handleMethod(call: call, result: result)
case "groupManager":
groupManager.handleMethod(call: call, result: result)
case "channelManager":
channelManager.handleMethod(call: call, result: result)
case "userManager":
userManger.handleMethod(call: call, result: result)
default:

View File

@@ -4,7 +4,7 @@
#
Pod::Spec.new do |s|
s.name = 'flutter_openim_sdk'
s.version = '0.0.10'
s.version = '0.0.1'
s.summary = 'A new Flutter project.'
s.description = <<-DESC
A new Flutter project.
@@ -15,17 +15,12 @@ A new Flutter project.
s.source = { :path => '.' }
s.source_files = 'Classes/**/*'
s.dependency 'Flutter'
s.platform = :ios, '13.0'
s.platform = :ios, '11.0'
#s.ios.vendored_frameworks = 'frameworks/*.xcframework'
#s.vendored_frameworks = 'frameworks/*.xcframework'
s.dependency 'openim_sdk_core_ios','0.10.0'
s.dependency 'OpenIMSDKCore','3.8.3+3'
s.static_framework = true
s.library = 'resolv'
# s.vendored_frameworks = 'Framework/*.xcframework'
# Flutter.framework does not contain a i386 slice.
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386 arm64' }

View File

@@ -17,7 +17,6 @@ export 'src/listener/conversation_listener.dart';
export 'src/listener/custom_business_listener.dart';
export 'src/listener/friendship_listener.dart';
export 'src/listener/group_listener.dart';
export 'src/listener/channel_listener.dart';
export 'src/listener/listener_for_service.dart';
export 'src/listener/msg_send_progress_listener.dart';
export 'src/listener/upload_file_listener.dart';
@@ -25,13 +24,11 @@ export 'src/listener/user_listener.dart';
export 'src/manager/im_conversation_manager.dart';
export 'src/manager/im_friendship_manager.dart';
export 'src/manager/im_group_manager.dart';
export 'src/manager/im_channel_manager.dart';
export 'src/manager/im_manager.dart';
export 'src/manager/im_message_manager.dart';
export 'src/manager/im_user_manager.dart';
export 'src/models/conversation_info.dart';
export 'src/models/group_info.dart';
export 'src/models/channel_info.dart';
export 'src/models/init_config.dart';
export 'src/models/message.dart';
export 'src/models/notification_info.dart';

View File

@@ -12,8 +12,4 @@ class ConversationType {
/// Notification
static const notification = 4;
/// Super channel chat
static const superChannel = 11;
}

View File

@@ -4,7 +4,6 @@ class ListenerType {
static const connectListener = 'connectListener';
static const userListener = 'userListener';
static const groupListener = 'groupListener';
static const channelListener = 'channelListener';
static const advancedMsgListener = 'advancedMsgListener';
static const conversationListener = 'conversationListener';
static const friendListener = 'friendListener';

View File

@@ -168,9 +168,6 @@ class MessageType {
/// Recall Message
static const revokeMessageNotification = 2101;
/// Edit Message
static const editMessageNotification = 2108;
/// Single Chat Has Read Receipt
static const signalHasReadReceiptNotification = 2150;

View File

@@ -4,7 +4,6 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
class OnAdvancedMsgListener {
Function(Message msg)? onMsgDeleted;
Function(RevokedInfo info)? onNewRecvMessageRevoked;
Function(EditedInfo info)? onNewRecvMessageEdited;
Function(List<ReadReceiptInfo> list)? onRecvC2CReadReceipt;
Function(Message msg)? onRecvNewMessage;
Function(Message msg)? onRecvOfflineNewMessage;
@@ -16,7 +15,6 @@ class OnAdvancedMsgListener {
OnAdvancedMsgListener({
this.onMsgDeleted,
this.onNewRecvMessageRevoked,
this.onNewRecvMessageEdited,
this.onRecvC2CReadReceipt,
this.onRecvNewMessage,
this.onRecvOfflineNewMessage,
@@ -32,12 +30,6 @@ class OnAdvancedMsgListener {
onNewRecvMessageRevoked?.call(info);
}
/// Message has been edited
void newRecvMessageEdited(EditedInfo info) {
onNewRecvMessageEdited?.call(info);
}
/// C2C Message Read Receipt
void recvC2CReadReceipt(List<ReadReceiptInfo> list) {
onRecvC2CReadReceipt?.call(list);

View File

@@ -1,60 +0,0 @@
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
import '../models/channel_info.dart';
/// Channel Listener
class OnChannelListener {
Function(ChannelInfo info)? onChannelDismissed;
Function(ChannelInfo info)? onChannelInfoChanged;
Function(ChannelMembersInfo info)? onChannelMemberAdded;
Function(ChannelMembersInfo info)? onChannelMemberDeleted;
Function(ChannelMembersInfo info)? onChannelMemberInfoChanged;
Function(ChannelInfo info)? onJoinedChannelAdded;
Function(ChannelInfo info)? onJoinedChannelDeleted;
OnChannelListener({
this.onChannelDismissed,
this.onChannelInfoChanged,
this.onChannelMemberAdded,
this.onChannelMemberDeleted,
this.onChannelMemberInfoChanged,
this.onJoinedChannelAdded,
this.onJoinedChannelDeleted,
});
void channelDismissed(ChannelInfo info) {
onChannelDismissed?.call(info);
}
/// Channel information changed
void channelInfoChanged(ChannelInfo info) {
onChannelInfoChanged?.call(info);
}
/// Channel member added
void channelMemberAdded(ChannelMembersInfo info) {
onChannelMemberAdded?.call(info);
}
/// Channel member deleted
void channelMemberDeleted(ChannelMembersInfo info) {
onChannelMemberDeleted?.call(info);
}
/// Channel member information changed
void channelMemberInfoChanged(ChannelMembersInfo info) {
onChannelMemberInfoChanged?.call(info);
}
/// Joined channel added
void joinedChannelAdded(ChannelInfo info) {
onJoinedChannelAdded?.call(info);
}
/// Joined channel deleted
void joinedChannelDeleted(ChannelInfo info) {
onJoinedChannelDeleted?.call(info);
}
}

View File

@@ -1,323 +0,0 @@
import 'dart:developer';
import 'package:flutter/services.dart';
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
import 'package:flutter_openim_sdk/src/models/set_channel_member_info.dart';
import '../listener/channel_listener.dart';
import '../models/channel_info.dart';
class ChannelManager {
MethodChannel _channel;
late OnChannelListener listener;
ChannelManager(this._channel);
/// Channel relationship listener
Future setChannelListener(OnChannelListener listener) {
this.listener = listener;
return _channel.invokeMethod('setChannelListener', _buildParam({}));
}
/// Query channel member information
/// [channelID] Channel ID
/// [userIDList] List of user IDs
Future<List<ChannelMembersInfo>> getChannelMembersInfo({
required String channelID,
required List<String> userIDList,
String? operationID,
}) =>
_channel
.invokeMethod(
'getChannelMembersInfo',
_buildParam({
'channelID': channelID,
'userIDList': userIDList,
"operationID": Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toList(value, (map) => ChannelMembersInfo.fromJson(map)));
/// Paginate and retrieve the channel member list
/// [channelID] Channel ID
/// [filter] Member filter (0: All, 1: Channel owner, 2: Administrator, 3: Regular member, 4: Admin + Regular member, 5: Channel owner + Admin)
/// [offset] Starting index
/// [count] Total count
Future<List<ChannelMembersInfo>> getChannelMemberList({
required String channelID,
int filter = 0,
int offset = 0,
int count = 0,
String? operationID,
}) =>
_channel
.invokeMethod(
'getChannelMemberList',
_buildParam({
'channelID': channelID,
'filter': filter,
'offset': offset,
'count': count,
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toList(value, (map) => ChannelMembersInfo.fromJson(map)));
// /// Paginate and retrieve the channel member list as a map
// /// [channelID] Channel ID
// /// [filter] Member filter (0: All, 1: Channel owner, 2: Administrator, 3: Regular member, 4: Admin + Regular member, 5: Channel owner + Admin)
// /// [offset] Starting index
// /// [count] Total count
// Future<List<dynamic>> getChannelMemberListMap({
// required String channelID,
// int filter = 0,
// int offset = 0,
// int count = 0,
// String? operationID,
// }) =>
// _channel
// .invokeMethod(
// 'getChannelMemberList',
// _buildParam({
// 'channelID': channelID,
// 'filter': filter,
// 'offset': offset,
// 'count': count,
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toListMap(value));
// /// Query the list of joined channels
// Future<List<ChannelInfo>> getJoinedChannelList({String? operationID}) => _channel
// .invokeMethod(
// 'getJoinedChannelList',
// _buildParam({
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toList(value, (map) => ChannelInfo.fromJson(map)));
//
// Future<List<ChannelInfo>> getJoinedChannelListPage({String? operationID, int offset = 0, int count = 40}) => _channel
// .invokeMethod(
// 'getJoinedChannelListPage',
// _buildParam({
// 'offset': offset,
// 'count': count,
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toList(value, (map) => ChannelInfo.fromJson(map)));
// /// Query the list of joined channels
// Future<List<dynamic>> getJoinedChannelListMap({String? operationID}) =>
// _channel
// .invokeMethod(
// 'getJoinedChannelList',
// _buildParam({
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toListMap(value));
/// Check if the user has joined a channel
/// [channelID] Channel ID
Future<bool> isJoinedChannel({
required String channelID,
String? operationID,
}) =>
_channel
.invokeMethod(
'isJoinChannel',
_buildParam({
'channelID': channelID,
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) => value == 'true' ? true : false);
/// Query channel information
Future<List<ChannelInfo>> getChannelsInfo({
required List<String> channelIDList,
String? operationID,
}) =>
_channel
.invokeMethod(
'getChannelsInfo',
_buildParam({
'channelIDList': channelIDList,
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toList(value, (map) => ChannelInfo.fromJson(map)));
/// Apply to join a channel, requiring approval from an administrator or the channel.
/// [joinSource] 2: Invited, 3: Searched, 4: Using a QR code
Future<dynamic> joinChannel(
{required String channelID,
String? reason,
String? operationID,
int joinSource = 3,
String? ex}) =>
_channel.invokeMethod(
'joinChannel',
_buildParam({
'channelID': channelID,
'reason': reason,
'joinSource': joinSource,
'ex': ex,
'operationID': Utils.checkOperationID(operationID),
}));
/// Exit a channel
Future<dynamic> quitChannel({
required String channelID,
String? operationID,
}) =>
_channel.invokeMethod(
'quitChannel',
_buildParam({
'channelID': channelID,
'operationID': Utils.checkOperationID(operationID),
}));
//
// /// Query a channel
// /// [keywordList] Search keywords; currently, only one keyword is supported, and it cannot be empty.
// /// [isSearchChannelID] Whether to search by channel ID (Note: cannot set both to false at the same time); defaults to false if not set.
// /// [isSearchChannelName] Whether to search by channel name; defaults to false if not set.
// Future<List<ChannelInfo>> searchChannels({
// List<String> keywordList = const [],
// bool isSearchChannelID = false,
// bool isSearchChannelName = false,
// String? operationID,
// }) =>
// _channel
// .invokeMethod(
// 'searchChannels',
// _buildParam({
// 'searchParam': {
// 'keywordList': keywordList,
// 'isSearchChannelID': isSearchChannelID,
// 'isSearchChannelName': isSearchChannelName,
// },
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toList(value, (map) => ChannelInfo.fromJson(map)));
// /// Get a channel member list based on join time
// Future<List<ChannelMembersInfo>> getChannelMemberListByJoinTime({
// required String channelID,
// int offset = 0,
// int count = 0,
// int joinTimeBegin = 0,
// int joinTimeEnd = 0,
// List<String> filterUserIDList = const [],
// String? operationID,
// }) =>
// _channel
// .invokeMethod(
// 'getChannelMemberListByJoinTimeFilter',
// _buildParam({
// 'channelID': channelID,
// 'offset': offset,
// 'count': count,
// 'joinTimeBegin': joinTimeBegin,
// 'joinTimeEnd': joinTimeEnd,
// 'excludeUserIDList': filterUserIDList,
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toList(value, (map) => ChannelMembersInfo.fromJson(map)));
// /// Search for channel members
// /// [channelID] Channel ID
// /// [keywordList] Search keywords; currently, only one keyword is supported, and it cannot be empty.
// /// [isSearchUserID] Whether to search by member ID
// /// [isSearchMemberNickname] Whether to search by member nickname
// /// [offset] Start index
// /// [count] Total count to retrieve
// Future<List<ChannelMembersInfo>> searchChannelMembers({
// required String channelID,
// List<String> keywordList = const [],
// bool isSearchUserID = false,
// bool isSearchMemberNickname = false,
// int offset = 0,
// int count = 40,
// String? operationID,
// }) =>
// _channel
// .invokeMethod(
// 'searchChannelMembers',
// _buildParam({
// 'searchParam': {
// 'channelID': channelID,
// 'keywordList': keywordList,
// 'isSearchUserID': isSearchUserID,
// 'isSearchMemberNickname': isSearchMemberNickname,
// 'offset': offset,
// 'count': count,
// },
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toList(value, (map) => ChannelMembersInfo.fromJson(map)));
// /// Query a channel
// /// [channelID] Channel ID
// /// [keywordList] Search keyword, currently only supports searching with one keyword, and it cannot be empty
// /// [isSearchUserID] Whether to search member IDs with the keyword
// /// [isSearchMemberNickname] Whether to search member nicknames with the keyword
// /// [offset] Starting index
// /// [count] Total number to retrieve each time
// Future<List<dynamic>> searchChannelMembersListMap({
// required String channelID,
// List<String> keywordList = const [],
// bool isSearchUserID = false,
// bool isSearchMemberNickname = false,
// int offset = 0,
// int count = 40,
// String? operationID,
// }) =>
// _channel
// .invokeMethod(
// 'searchChannelMembers',
// _buildParam({
// 'searchParam': {
// 'channelID': channelID,
// 'keywordList': keywordList,
// 'isSearchUserID': isSearchUserID,
// 'isSearchMemberNickname': isSearchMemberNickname,
// 'offset': offset,
// 'count': count,
// },
// 'operationID': Utils.checkOperationID(operationID),
// }))
// .then((value) => Utils.toListMap(value));
//
// /// Modify the ChannelMemberInfo ex field
// Future<dynamic> setChannelMemberInfo({
// required SetChannelMemberInfo channelMembersInfo,
// String? operationID,
// }) =>
// _channel.invokeMethod(
// 'setChannelMemberInfo',
// _buildParam({
// 'info': channelMembersInfo.toJson(),
// 'operationID': Utils.checkOperationID(operationID),
// }));
Future<dynamic> getUsersInChannel(
String channelID,
List<String> userIDs, {
String? operationID,
}) =>
_channel.invokeMethod(
'getUsersInChannel',
_buildParam({
'channelID': channelID,
'userIDs': userIDs,
'operationID': Utils.checkOperationID(operationID),
}));
static Map _buildParam(Map<String, dynamic> param) {
param["ManagerName"] = "channelManager";
param = Utils.cleanMap(param);
log('param: $param');
return param;
}
}

View File

@@ -6,9 +6,6 @@ import 'package:flutter/services.dart';
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
import 'package:flutter_openim_sdk/src/logger.dart';
import '../models/channel_info.dart';
import 'im_channel_manager.dart';
class IMManager {
MethodChannel _channel;
late ConversationManager conversationManager;
@@ -16,7 +13,6 @@ class IMManager {
late MessageManager messageManager;
late GroupManager groupManager;
late UserManager userManager;
late ChannelManager channelManager;
late OnConnectListener _connectListener;
OnListenerForService? _listenerForService;
@@ -33,7 +29,6 @@ class IMManager {
friendshipManager = FriendshipManager(_channel);
messageManager = MessageManager(_channel);
groupManager = GroupManager(_channel);
channelManager = ChannelManager(_channel);
userManager = UserManager(_channel);
_addNativeCallback(_channel);
}
@@ -128,44 +123,7 @@ class IMManager {
groupManager.listener.joinedGroupDeleted(i);
break;
}
} else if (call.method == ListenerType.channelListener) {
String type = call.arguments['type'];
dynamic data = call.arguments['data'];
switch (type) {
case 'onChannelDismissed':
final i = Utils.toObj(data, (map) => ChannelInfo.fromJson(map));
channelManager.listener.channelDismissed(i);
break;
case 'onChannelInfoChanged':
final i = Utils.toObj(data, (map) => ChannelInfo.fromJson(map));
channelManager.listener.channelInfoChanged(i);
break;
case 'onChannelMemberAdded':
final i = Utils.toObj(
data, (map) => ChannelMembersInfo.fromJson(map));
channelManager.listener.channelMemberAdded(i);
break;
case 'onChannelMemberDeleted':
final i = Utils.toObj(
data, (map) => ChannelMembersInfo.fromJson(map));
channelManager.listener.channelMemberDeleted(i);
break;
case 'onChannelMemberInfoChanged':
final i = Utils.toObj(
data, (map) => ChannelMembersInfo.fromJson(map));
channelManager.listener.channelMemberInfoChanged(i);
break;
case 'onJoinedChannelAdded':
final i = Utils.toObj(data, (map) => ChannelInfo.fromJson(map));
channelManager.listener.joinedChannelAdded(i);
break;
case 'onJoinedChannelDeleted':
final i = Utils.toObj(data, (map) => ChannelInfo.fromJson(map));
channelManager.listener.joinedChannelDeleted(i);
break;
}
}else if (call.method == ListenerType.advancedMsgListener) {
} else if (call.method == ListenerType.advancedMsgListener) {
var type = call.arguments['type'];
// var id = call.arguments['data']['id'];
switch (type) {
@@ -179,11 +137,6 @@ class IMManager {
var info = Utils.toObj(value, (map) => RevokedInfo.fromJson(map));
messageManager.msgListener.newRecvMessageRevoked(info);
break;
case 'onNewRecvMessageEdited':
var value = call.arguments['data']['messageEdited'];
var info = Utils.toObj(value, (map) => EditedInfo.fromJson(map));
messageManager.msgListener.newRecvMessageEdited(info);
break;
case 'onRecvC2CReadReceipt':
var value = call.arguments['data']['msgReceiptList'];
var list = Utils.toList(value, (map) => ReadReceiptInfo.fromJson(map));

View File

@@ -36,7 +36,6 @@ class MessageManager {
required OfflinePushInfo offlinePushInfo,
String? userID,
String? groupID,
String? channelID,
bool isOnlineOnly = false,
String? operationID,
}) =>
@@ -48,7 +47,6 @@ class MessageManager {
'offlinePushInfo': offlinePushInfo.toJson(),
'userID': userID ?? '',
'groupID': groupID ?? '',
'channelID': channelID ?? '',
'isOnlineOnly': isOnlineOnly,
'operationID': Utils.checkOperationID(operationID),
}))
@@ -132,7 +130,6 @@ class MessageManager {
/// [message] Message content
Future<Message> insertGroupMessageToLocalStorage({
String? groupID,
String? channelID,
String? senderID,
Message? message,
String? operationID,
@@ -143,7 +140,6 @@ class MessageManager {
_buildParam({
"message": message?.toJson(),
"groupID": groupID,
"channelID": channelID,
"senderID": senderID,
"operationID": Utils.checkOperationID(operationID),
}))
@@ -151,8 +147,7 @@ class MessageManager {
/// Typing status update
/// [msgTip] Custom content
@Deprecated(
'Use [OpenIM.iMManager.conversationManager.changeInputStates(conversationID:focus:)] instead')
@Deprecated('Use [OpenIM.iMManager.conversationManager.changeInputStates(conversationID:focus:)] instead')
Future typingStatusUpdate({
required String userID,
String? msgTip,
@@ -532,8 +527,7 @@ class MessageManager {
},
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toObj(value, (map) => SearchResult.fromJson(map)));
.then((value) => Utils.toObj(value, (map) => SearchResult.fromJson(map)));
/// Revoke a message
/// [message] The message to be revoked
@@ -550,23 +544,6 @@ class MessageManager {
"operationID": Utils.checkOperationID(operationID),
}));
/// Edit a message
/// [message] The message to be edited
Future editMessage({
required String conversationID,
required String clientMsgID,
String? operationID,
required Message message,
}) =>
_channel.invokeMethod(
'editMessage',
_buildParam({
'conversationID': conversationID,
'clientMsgID': clientMsgID,
"operationID": Utils.checkOperationID(operationID),
'message': message.toJson(),
}));
/// Mark messages as read
/// [conversationID] Conversation ID
/// [messageIDList] List of clientMsgIDs of messages to be marked as read
@@ -606,8 +583,7 @@ class MessageManager {
'viewType': viewType.rawValue,
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
.then((value) => Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
/// Get chat history (newly received chat history after startMsg). Used for locating a specific message in global search and then fetching messages received after that message.
/// [conversationID] Conversation ID, can be used for querying notifications
@@ -630,8 +606,7 @@ class MessageManager {
'viewType': viewType.rawValue,
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
.then((value) => Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
/// Find message details
/// [conversationID] Conversation ID
@@ -647,8 +622,7 @@ class MessageManager {
'searchParams': searchParams.map((e) => e.toJson()).toList(),
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) =>
Utils.toObj(value, (map) => SearchResult.fromJson(map)));
.then((value) => Utils.toObj(value, (map) => SearchResult.fromJson(map)));
/// Rich text message
/// [text] Input content
@@ -700,7 +674,6 @@ class MessageManager {
required OfflinePushInfo offlinePushInfo,
String? userID,
String? groupID,
String? channelID,
bool isOnlineOnly = false,
String? operationID,
}) =>
@@ -712,7 +685,6 @@ class MessageManager {
'offlinePushInfo': offlinePushInfo.toJson(),
'userID': userID ?? '',
'groupID': groupID ?? '',
'channelID': channelID ?? '',
'isOnlineOnly': isOnlineOnly,
'operationID': Utils.checkOperationID(operationID),
}))
@@ -816,28 +788,6 @@ class MessageManager {
}));
}
/// Fetch Surrounding Messages
/// [message] Message content
/// [before] message index - before
/// [after] message index - after
/// [operationID] Operation ID
Future<List<Message>> FetchSurroundingMessages({
required Message message,
int? before,
int? after,
String? operationID,
}) =>
_channel
.invokeMethod(
'fetchSurroundingMessages',
_buildParam({
'message': message.toJson(),
'before': before ?? 0,
'after': after ?? 0,
'operationID': Utils.checkOperationID(operationID),
}))
.then((value) => Utils.toList(value, (map) => Message.fromJson(map)));
static Map _buildParam(Map<String, dynamic> param) {
param["ManagerName"] = "messageManager";
param = Utils.cleanMap(param);

View File

@@ -1,165 +0,0 @@
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
/// Channel Information
class ChannelInfo {
/// Channel ID
String channelID;
/// Channel Name
String? channelName;
/// Channel Announcement
String? notification;
/// Channel Introduction
String? introduction;
/// Channel Avatar
String? faceURL;
/// Creation Time
int? createTime;
/// Number of Channel Members
int? memberCount;
/// Channel Status: 0 - Normal, 1 - Blocked, 2 - Dissolved, 3 - Muted
int? status;
/// Creator's ID
String? creatorUserID;
/// Channel Type [ChannelType]
int? channelType;
/// Extra Information
String? ex;
ChannelInfo({
required this.channelID,
this.channelName,
this.notification,
this.introduction,
this.faceURL,
this.createTime,
this.memberCount,
this.status,
this.creatorUserID,
this.channelType,
this.ex,
});
ChannelInfo.fromJson(Map<String, dynamic> json) : channelID = json['channelID'] {
channelName = json['channelName'];
notification = json['notification'];
introduction = json['introduction'];
faceURL = json['faceURL'];
createTime = json['createTime'];
memberCount = json['memberCount'];
status = json['status'];
creatorUserID = json['creatorUserID'];
channelType = json['channelType'];
ex = json['ex'];
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
data['channelID'] = this.channelID;
data['channelName'] = this.channelName;
data['notification'] = this.notification;
data['introduction'] = this.introduction;
data['faceURL'] = this.faceURL;
data['createTime'] = this.createTime;
data['memberCount'] = this.memberCount;
data['status'] = this.status;
data['creatorUserID'] = this.creatorUserID;
data['channelType'] = this.channelType;
data['ex'] = this.ex;
return data;
}
/// Corresponding Conversation Type for Channel Type
int get sessionType => ConversationType.superChannel;
@override
bool operator ==(Object other) =>
identical(this, other) || other is ChannelInfo && runtimeType == other.runtimeType && channelID == other.channelID;
@override
int get hashCode => channelID.hashCode;
}
/// Channel Member Information
class ChannelMembersInfo {
/// Channel ID
String? channelID;
/// User ID
String? userID;
/// Nickname
String? nickname;
/// Avatar
String? faceURL;
/// Role [ChannelRoleLevel]
int? roleLevel;
/// Join Time
int? joinTime;
/// Extra Information
String? ex;
/// Mute End Time (seconds)
int? muteEndTime;
ChannelMembersInfo({
this.channelID,
this.userID,
this.roleLevel,
this.joinTime,
this.nickname,
this.faceURL,
this.ex,
this.muteEndTime,
});
ChannelMembersInfo.fromJson(Map<String, dynamic> json) {
channelID = json['channelID'];
userID = json['userID'];
roleLevel = json['roleLevel'];
joinTime = json['joinTime'];
nickname = json['nickname'];
faceURL = json['faceURL'];
ex = json['ex'];
muteEndTime = json['muteEndTime'];
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
data['channelID'] = this.channelID;
data['userID'] = this.userID;
data['roleLevel'] = this.roleLevel;
data['joinTime'] = this.joinTime;
data['nickname'] = this.nickname;
data['faceURL'] = this.faceURL;
data['ex'] = this.ex;
data['muteEndTime'] = this.muteEndTime;
return data;
}
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is ChannelMembersInfo &&
runtimeType == other.runtimeType &&
channelID == other.channelID &&
userID == other.userID;
@override
int get hashCode => channelID.hashCode ^ userID.hashCode;
}

View File

@@ -15,9 +15,6 @@ class ConversationInfo {
// Group ID in case of a group chat
String? groupID;
// Channel ID in case of a channel chat
String? channelID;
// Display name or nickname
String? showName;
@@ -72,7 +69,6 @@ class ConversationInfo {
this.conversationType,
this.userID,
this.groupID,
this.channelID,
this.showName,
this.faceURL,
this.recvMsgOpt,
@@ -95,7 +91,6 @@ class ConversationInfo {
conversationType = json['conversationType'];
userID = json['userID'];
groupID = json['groupID'];
channelID = json['channelID'];
showName = json['showName'];
faceURL = json['faceURL'];
recvMsgOpt = json['recvMsgOpt'];
@@ -127,7 +122,6 @@ class ConversationInfo {
data['conversationType'] = this.conversationType;
data['userID'] = this.userID;
data['groupID'] = this.groupID;
data['channelID'] = this.channelID;
data['showName'] = this.showName;
data['faceURL'] = this.faceURL;
data['recvMsgOpt'] = this.recvMsgOpt;
@@ -153,10 +147,6 @@ class ConversationInfo {
// Check if it's a group chat
bool get isGroupChat => conversationType == ConversationType.group || conversationType == ConversationType.superGroup;
// Check if it's a channel chat
bool get isChannelChat => conversationType == ConversationType.superChannel;
// Check if it's a valid conversation (not in a group if isNotInGroup is true)
bool get isValid => isSingleChat || (isGroupChat && !isNotInGroup!);

View File

@@ -42,9 +42,6 @@ class Message {
/// Group ID.
String? groupID;
/// Channel ID.
String? channelID;
/// Message localEx.
String? localEx;
@@ -140,7 +137,6 @@ class Message {
this.senderNickname,
this.senderFaceUrl,
this.groupID,
this.channelID,
this.localEx,
this.seq,
this.isRead,
@@ -183,7 +179,6 @@ class Message {
senderNickname = json['senderNickname'];
senderFaceUrl = json['senderFaceUrl'];
groupID = json['groupID'];
channelID = json['channelID'];
localEx = json['localEx'];
seq = json['seq'];
isRead = json['isRead'];
@@ -229,7 +224,6 @@ class Message {
data['senderNickname'] = this.senderNickname;
data['senderFaceUrl'] = this.senderFaceUrl;
data['groupID'] = this.groupID;
data['channelID'] = this.channelID;
data['localEx'] = this.localEx;
data['seq'] = this.seq;
data['isRead'] = this.isRead;
@@ -281,7 +275,6 @@ class Message {
senderNickname = message.senderNickname;
senderFaceUrl = message.senderFaceUrl;
groupID = message.groupID;
channelID = message.channelID;
// content = message.content;
seq = message.seq;
isRead = message.isRead;
@@ -1123,82 +1116,6 @@ class RevokedInfo {
}
}
/// Message revocation details
class EditedInfo {
/// Editer's ID
String? editerID;
/// Message ID
String? clientMsgID;
/// Revocation time
int? editTime;
/// Message sending time
int? sourceMessageSendTime;
/// Message sender
String? sourceMessageSendID;
/// Message sender's nickname
String? sourceMessageSenderNickname;
/// Conversation type [ConversationType]
int? sessionType;
/// Message contentType
int? contentType;
/// Message content
String? content;
EditedInfo({
this.editerID,
this.clientMsgID,
this.editTime,
this.sourceMessageSendTime,
this.sourceMessageSendID,
this.sourceMessageSenderNickname,
this.sessionType,
this.contentType,
this.content,
});
EditedInfo.fromJson(Map<String, dynamic> json) {
editerID = json['editerID'];
clientMsgID = json['clientMsgID'];
editTime = json['editTime'];
sourceMessageSendTime = json['sourceMessageSendTime'];
sourceMessageSendID = json['sourceMessageSendID'];
sourceMessageSenderNickname = json['sourceMessageSenderNickname'];
sessionType = json['sessionType'];
contentType = json['contentType'];
content = json['content'];
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
data['editerID'] = this.editerID;
data['clientMsgID'] = this.clientMsgID;
data['editTime'] = this.editTime;
data['sourceMessageSendTime'] = this.sourceMessageSendTime;
data['sourceMessageSendID'] = this.sourceMessageSendID;
data['sourceMessageSenderNickname'] = this.sourceMessageSenderNickname;
data['sessionType'] = this.sessionType;
data['contentType'] = this.contentType;
data['content'] = this.content;
return data;
}
}
class AdvancedMessage {
List<Message>? messageList;
bool? isEnd;

View File

@@ -1,5 +1,4 @@
import '../../flutter_openim_sdk.dart';
import 'channel_info.dart';
/// OA notification
class OANotification {
@@ -455,254 +454,3 @@ class GroupMemberInfoChangedNotification {
return data;
}
}
///todo 所有的聊天的操作者都没有,暂时没有处理
/// 聊天室事件通知
class ChannelNotification {
/// 聊天室信息
ChannelInfo? Channel;
/// 当前事件操作者信息
ChannelMembersInfo? opUser;
/// 聊天室拥有者信息
ChannelMembersInfo? ChannelOwnerUser;
/// 产生影响的聊天室成员列表
List<ChannelMembersInfo>? memberList;
ChannelNotification({
this.Channel,
this.opUser,
this.ChannelOwnerUser,
this.memberList,
});
ChannelNotification.fromJson(Map<String, dynamic> json) {
Channel = json['channel'] != null ? ChannelInfo.fromJson(json['channel']) : null;
opUser = json['opUser'] != null
? ChannelMembersInfo.fromJson(json['opUser'])
: null;
ChannelOwnerUser = json['channelOwnerUser'] != null
? ChannelMembersInfo.fromJson(json['channelOwnerUser'])
: null;
if (json['memberList'] != null) {
memberList = <ChannelMembersInfo>[];
json['memberList'].forEach((v) {
memberList!.add(ChannelMembersInfo.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
if (this.Channel != null) {
data['channel'] = this.Channel!.toJson();
}
if (this.opUser != null) {
data['opUser'] = this.opUser!.toJson();
}
if (this.ChannelOwnerUser != null) {
data['channelOwnerUser'] = this.ChannelOwnerUser!.toJson();
}
if (this.memberList != null) {
data['memberList'] = this.memberList!.map((v) => v.toJson()).toList();
}
return data;
}
}
/// 组踢出成员通知
class KickedChannelMemeberNotification {
/// 聊天室信息
ChannelInfo? Channel;
/// 操作者信息
ChannelMembersInfo? opUser;
/// 被踢出聊天室的成员信息列表
List<ChannelMembersInfo>? kickedUserList;
KickedChannelMemeberNotification(
{this.Channel, this.opUser, this.kickedUserList});
KickedChannelMemeberNotification.fromJson(Map<String, dynamic> json) {
Channel = json['channel'] != null ? ChannelInfo.fromJson(json['channel']) : null;
opUser = json['opUser'] != null
? ChannelMembersInfo.fromJson(json['opUser'])
: null;
if (json['kickedUserList'] != null) {
kickedUserList = <ChannelMembersInfo>[];
json['kickedUserList'].forEach((v) {
kickedUserList!.add(ChannelMembersInfo.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.Channel != null) {
data['channel'] = this.Channel!.toJson();
}
if (this.opUser != null) {
data['opUser'] = this.opUser!.toJson();
}
if (this.kickedUserList != null) {
data['kickedUserList'] =
this.kickedUserList!.map((v) => v.toJson()).toList();
}
return data;
}
}
/// 退出聊天室通知
class QuitChannelNotification {
/// 聊天室信息
ChannelInfo? Channel;
/// 退聊天室的成员信息
ChannelMembersInfo? quitUser;
QuitChannelNotification({this.Channel, this.quitUser});
QuitChannelNotification.fromJson(Map<String, dynamic> json) {
Channel = json['channel'] != null ? ChannelInfo.fromJson(json['channel']) : null;
quitUser = json['quitUser'] != null
? ChannelMembersInfo.fromJson(json['quitUser'])
: null;
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
if (this.Channel != null) {
data['channel'] = this.Channel!.toJson();
}
if (this.quitUser != null) {
data['quitUser'] = this.quitUser!.toJson();
}
return data;
}
}
/// 进聊天室通知
class EnterChannelNotification {
/// 聊天室信息
ChannelInfo? Channel;
/// 进入聊天室的成员信息
ChannelMembersInfo? entrantUser;
EnterChannelNotification({this.Channel, this.entrantUser});
EnterChannelNotification.fromJson(Map<String, dynamic> json) {
Channel = json['channel'] != null ? ChannelInfo.fromJson(json['channel']) : null;
entrantUser = json['entrantUser'] != null
? ChannelMembersInfo.fromJson(json['entrantUser'])
: null;
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
if (this.Channel != null) {
data['channel'] = this.Channel!.toJson();
}
if (this.entrantUser != null) {
data['quitUser'] = this.entrantUser!.toJson();
}
return data;
}
}
/// 禁言成员通知
class MuteChannelMemberNotification {
/// 聊天室信息
ChannelInfo? Channel;
/// 操作者信息
ChannelMembersInfo? opUser;
/// 被禁言的成员信息
ChannelMembersInfo? mutedUser;
/// 禁言时间s
int? mutedSeconds;
MuteChannelMemberNotification({
this.Channel,
this.opUser,
this.mutedUser,
this.mutedSeconds,
});
MuteChannelMemberNotification.fromJson(Map<String, dynamic> json) {
Channel = json['channel'] != null ? ChannelInfo.fromJson(json['channel']) : null;
opUser = json['opUser'] != null
? ChannelMembersInfo.fromJson(json['opUser'])
: null;
mutedUser = json['mutedUser'] != null
? ChannelMembersInfo.fromJson(json['mutedUser'])
: null;
mutedSeconds = json['mutedSeconds'];
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
if (this.Channel != null) {
data['channel'] = this.Channel!.toJson();
}
if (this.opUser != null) {
data['opUser'] = this.opUser!.toJson();
}
if (this.mutedUser != null) {
data['mutedUser'] = this.mutedUser!.toJson();
}
data['mutedSeconds'] = this.mutedSeconds;
return data;
}
}
/// 聊天室成员信息发送变化通知
class ChannelMemberInfoChangedNotification {
/// 聊天室信息
ChannelInfo? Channel;
/// 操作者信息
ChannelMembersInfo? opUser;
/// 资料发生改变的成员
ChannelMembersInfo? changedUser;
ChannelMemberInfoChangedNotification({
this.Channel,
this.opUser,
this.changedUser,
});
ChannelMemberInfoChangedNotification.fromJson(Map<String, dynamic> json) {
Channel = json['channel'] != null ? ChannelInfo.fromJson(json['channel']) : null;
opUser = json['opUser'] != null
? ChannelMembersInfo.fromJson(json['opUser'])
: null;
changedUser = json['changedUser'] != null
? ChannelMembersInfo.fromJson(json['changedUser'])
: null;
}
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
if (this.Channel != null) {
data['Channel'] = this.Channel!.toJson();
}
if (this.opUser != null) {
data['opUser'] = this.opUser!.toJson();
}
if (this.changedUser != null) {
data['changedUser'] = this.changedUser!.toJson();
}
return data;
}
}

View File

@@ -1,41 +0,0 @@
class SetChannelMemberInfo {
SetChannelMemberInfo({
required this.channelID,
required this.userID,
this.roleLevel,
this.nickname,
this.faceURL,
this.ex,
});
final String channelID;
final String userID;
final int? roleLevel;
final String? nickname;
final String? faceURL;
final String? ex;
SetChannelMemberInfo.fromJson(Map<String, dynamic> json)
: channelID = json['channelID'],
userID = json['userID'],
roleLevel = json['roleLevel'],
nickname = json['nickname'],
faceURL = json['faceURL'],
ex = json['ex'];
Map<String, dynamic> toJson() {
final data = Map<String, dynamic>();
data['channelID'] = channelID;
data['userID'] = userID;
data['roleLevel'] = roleLevel;
data['nickname'] = nickname;
data['faceURL'] = faceURL;
data['ex'] = ex;
return data;
}
@override
String toString() {
return 'SetChannelMemberInfo{channelID: $channelID, userID: $userID, roleLevel: $roleLevel, nickname: $nickname, faceURL: $faceURL, ex: $ex}';
}
}

View File

@@ -47,8 +47,6 @@ class ConversationReq {
final bool? isMsgDestruct;
final int? msgDestructTime;
final int? groupAtType;
final String? channelID;
final int? channelAtType;
ConversationReq({
this.userID,
@@ -61,8 +59,6 @@ class ConversationReq {
this.isMsgDestruct,
this.msgDestructTime,
this.groupAtType,
this.channelID,
this.channelAtType,
});
ConversationReq.fromJson(Map<String, dynamic> json)
@@ -75,11 +71,8 @@ class ConversationReq {
burnDuration = json['burnDuration'],
isMsgDestruct = json['isMsgDestruct'],
msgDestructTime = json['msgDestructTime'],
channelID=json['channelID'],
channelAtType = json['channelAtType'],
groupAtType = json['groupAtType'];
Map<String, dynamic> toJson() {
final data = <String, dynamic>{};
data['userID'] = userID;
@@ -92,8 +85,7 @@ class ConversationReq {
data['isMsgDestruct'] = isMsgDestruct;
data['msgDestructTime'] = msgDestructTime;
data['groupAtType'] = groupAtType;
data['channelID'] = channelID;
data['channelAtType'] = channelAtType;
return data;
}
}

View File

@@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
class OpenIM {
static const version = '3.8.3+2';
static const version = '3.8.3+3';
static const _channel = MethodChannel('flutter_openim_sdk');

View File

@@ -1,6 +1,6 @@
name: flutter_openim_sdk
description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source.
version: 3.8.3+2
version: 3.8.3+3
homepage: https://www.openim.io
repository: https://github.com/openimsdk/open-im-sdk-flutter