Core sdk upgrade to 2.3.4
This commit is contained in:
@@ -10,6 +10,8 @@ class OnSignalingListener {
|
||||
final Function(SignalingInfo info)? onInviteeRejectedByOtherDevice;
|
||||
final Function(SignalingInfo info)? onInviteeAcceptedByOtherDevice;
|
||||
final Function(SignalingInfo info)? onHangup;
|
||||
final Function(RoomCallingInfo info)? onRoomParticipantConnected;
|
||||
final Function(RoomCallingInfo info)? onRoomParticipantDisconnected;
|
||||
|
||||
OnSignalingListener({
|
||||
this.onInvitationCancelled,
|
||||
@@ -20,6 +22,8 @@ class OnSignalingListener {
|
||||
this.onInviteeAcceptedByOtherDevice,
|
||||
this.onInviteeRejectedByOtherDevice,
|
||||
this.onHangup,
|
||||
this.onRoomParticipantConnected,
|
||||
this.onRoomParticipantDisconnected,
|
||||
});
|
||||
|
||||
/// 被邀请者收到:邀请者取消音视频通话
|
||||
@@ -61,4 +65,12 @@ class OnSignalingListener {
|
||||
void hangup(SignalingInfo info) {
|
||||
onHangup?.call(info);
|
||||
}
|
||||
|
||||
void roomParticipantConnected(RoomCallingInfo info) {
|
||||
onRoomParticipantConnected?.call(info);
|
||||
}
|
||||
|
||||
void roomParticipantDisconnected(RoomCallingInfo info) {
|
||||
onRoomParticipantDisconnected?.call(info);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,31 +244,46 @@ class IMManager {
|
||||
} else if (call.method == ListenerType.signalingListener) {
|
||||
String type = call.arguments['type'];
|
||||
dynamic data = call.arguments['data'];
|
||||
final u = Utils.toObj(data, (map) => SignalingInfo.fromJson(map));
|
||||
dynamic info;
|
||||
switch (type) {
|
||||
case 'onRoomParticipantConnected':
|
||||
case 'onRoomParticipantDisconnected':
|
||||
info = Utils.toObj(data, (map) => RoomCallingInfo.fromJson(map));
|
||||
break;
|
||||
default:
|
||||
info = Utils.toObj(data, (map) => SignalingInfo.fromJson(map));
|
||||
break;
|
||||
}
|
||||
switch (type) {
|
||||
case 'onInvitationCancelled':
|
||||
signalingManager.listener.invitationCancelled(u);
|
||||
signalingManager.listener.invitationCancelled(info);
|
||||
break;
|
||||
case 'onInvitationTimeout':
|
||||
signalingManager.listener.invitationTimeout(u);
|
||||
signalingManager.listener.invitationTimeout(info);
|
||||
break;
|
||||
case 'onInviteeAccepted':
|
||||
signalingManager.listener.inviteeAccepted(u);
|
||||
signalingManager.listener.inviteeAccepted(info);
|
||||
break;
|
||||
case 'onInviteeRejected':
|
||||
signalingManager.listener.inviteeRejected(u);
|
||||
signalingManager.listener.inviteeRejected(info);
|
||||
break;
|
||||
case 'onReceiveNewInvitation':
|
||||
signalingManager.listener.receiveNewInvitation(u);
|
||||
signalingManager.listener.receiveNewInvitation(info);
|
||||
break;
|
||||
case 'onInviteeAcceptedByOtherDevice':
|
||||
signalingManager.listener.inviteeAcceptedByOtherDevice(u);
|
||||
signalingManager.listener.inviteeAcceptedByOtherDevice(info);
|
||||
break;
|
||||
case 'onInviteeRejectedByOtherDevice':
|
||||
signalingManager.listener.inviteeRejectedByOtherDevice(u);
|
||||
signalingManager.listener.inviteeRejectedByOtherDevice(info);
|
||||
break;
|
||||
case 'onHangUp':
|
||||
signalingManager.listener.hangup(u);
|
||||
signalingManager.listener.hangup(info);
|
||||
break;
|
||||
case 'onRoomParticipantConnected':
|
||||
signalingManager.listener.roomParticipantConnected(info);
|
||||
break;
|
||||
case 'onRoomParticipantDisconnected':
|
||||
signalingManager.listener.roomParticipantDisconnected(info);
|
||||
break;
|
||||
}
|
||||
} else if (call.method == ListenerType.workMomentsListener) {
|
||||
|
||||
@@ -101,6 +101,22 @@ class SignalingManager {
|
||||
'operationID': Utils.checkOperationID(operationID),
|
||||
}));
|
||||
|
||||
/// 获取当前群通话信息
|
||||
/// [groupID] 当前群ID
|
||||
Future<RoomCallingInfo> signalingGetRoomByGroupID({
|
||||
required String groupID,
|
||||
String? operationID,
|
||||
}) =>
|
||||
_channel
|
||||
.invokeMethod(
|
||||
'signalingGetRoomByGroupID',
|
||||
_buildParam({
|
||||
'groupID': groupID,
|
||||
'operationID': Utils.checkOperationID(operationID),
|
||||
}))
|
||||
.then((value) =>
|
||||
Utils.toObj(value, (map) => RoomCallingInfo.fromJson(map)));
|
||||
|
||||
static Map _buildParam(Map param) {
|
||||
param["ManagerName"] = "signalingManager";
|
||||
return param;
|
||||
|
||||
@@ -114,12 +114,21 @@ class SignalingCertificate {
|
||||
/// 服务器地址
|
||||
String? liveURL;
|
||||
|
||||
SignalingCertificate({this.token, this.roomID, this.liveURL});
|
||||
/// 占线列表
|
||||
List<String>? busyLineUserIDList;
|
||||
|
||||
SignalingCertificate({
|
||||
this.token,
|
||||
this.roomID,
|
||||
this.liveURL,
|
||||
this.busyLineUserIDList,
|
||||
});
|
||||
|
||||
SignalingCertificate.fromJson(Map<String, dynamic> json) {
|
||||
token = json['token'];
|
||||
roomID = json['roomID'];
|
||||
liveURL = json['liveURL'];
|
||||
busyLineUserIDList = json['busyLineUserIDList'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
@@ -127,6 +136,89 @@ class SignalingCertificate {
|
||||
data['token'] = this.token;
|
||||
data['roomID'] = this.roomID;
|
||||
data['liveURL'] = this.liveURL;
|
||||
data['busyLineUserIDList'] = this.busyLineUserIDList;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class RoomCallingInfo {
|
||||
InvitationInfo? invitation;
|
||||
List<Participant>? participant;
|
||||
String? token;
|
||||
String? roomID;
|
||||
String? liveURL;
|
||||
String? groupID;
|
||||
|
||||
RoomCallingInfo({
|
||||
this.invitation,
|
||||
this.participant,
|
||||
this.token,
|
||||
this.roomID,
|
||||
this.liveURL,
|
||||
this.groupID,
|
||||
});
|
||||
|
||||
RoomCallingInfo.fromJson(Map<String, dynamic> json) {
|
||||
invitation = json['invitation'] != null
|
||||
? InvitationInfo.fromJson(json['invitation'])
|
||||
: null;
|
||||
if (json['participant'] != null) {
|
||||
participant = <Participant>[];
|
||||
json['participant'].forEach((v) {
|
||||
participant!.add(Participant.fromJson(v));
|
||||
});
|
||||
}
|
||||
token = json['token'];
|
||||
roomID = json['roomID'] ?? invitation?.roomID;
|
||||
liveURL = json['liveURL'];
|
||||
groupID = json['groupID'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final data = Map<String, dynamic>();
|
||||
if (this.invitation != null) {
|
||||
data['invitation'] = this.invitation!.toJson();
|
||||
}
|
||||
if (this.participant != null) {
|
||||
data['participant'] = this.participant!.map((v) => v.toJson()).toList();
|
||||
}
|
||||
data['token'] = this.token;
|
||||
data['roomID'] = this.roomID;
|
||||
data['liveURL'] = this.liveURL;
|
||||
data['groupID'] = this.groupID;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class Participant {
|
||||
GroupInfo? groupInfo;
|
||||
GroupMembersInfo? groupMemberInfo;
|
||||
UserInfo? userInfo;
|
||||
|
||||
Participant({this.groupInfo, this.groupMemberInfo, this.userInfo});
|
||||
|
||||
Participant.fromJson(Map<String, dynamic> json) {
|
||||
groupInfo = json['groupInfo'] != null
|
||||
? GroupInfo.fromJson(json['groupInfo'])
|
||||
: null;
|
||||
groupMemberInfo = json['groupMemberInfo'] != null
|
||||
? GroupMembersInfo.fromJson(json['groupMemberInfo'])
|
||||
: null;
|
||||
userInfo =
|
||||
json['userInfo'] != null ? UserInfo.fromJson(json['userInfo']) : null;
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final data = Map<String, dynamic>();
|
||||
if (this.groupInfo != null) {
|
||||
data['groupInfo'] = this.groupInfo!.toJson();
|
||||
}
|
||||
if (this.groupMemberInfo != null) {
|
||||
data['groupMemberInfo'] = this.groupMemberInfo!.toJson();
|
||||
}
|
||||
if (this.userInfo != null) {
|
||||
data['userInfo'] = this.userInfo!.toJson();
|
||||
}
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
|
||||
import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
|
||||
|
||||
class OpenIM {
|
||||
static const version = '2.3.3';
|
||||
static const version = '2.3.4';
|
||||
|
||||
static const _channel = const MethodChannel('flutter_openim_sdk');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user