diff --git a/lib/src/models/notification_info.dart b/lib/src/models/notification_info.dart index 085d5d8..b62c157 100644 --- a/lib/src/models/notification_info.dart +++ b/lib/src/models/notification_info.dart @@ -1,6 +1,6 @@ import '../../flutter_openim_sdk.dart'; -/// OA notification +/// OA Notification class OANotification { /// Title String? notificationName; @@ -58,57 +58,50 @@ class OANotification { text = json['text']; externalUrl = json['externalUrl']; mixType = json['mixType']; - pictureElem = json['pictureElem'] != null - ? PictureElem.fromJson(json['pictureElem']) - : null; - soundElem = json['soundElem'] != null - ? SoundElem.fromJson(json['soundElem']) - : null; - videoElem = json['videoElem'] != null - ? VideoElem.fromJson(json['videoElem']) - : null; - fileElem = - json['fileElem'] != null ? FileElem.fromJson(json['fileElem']) : null; + pictureElem = json['pictureElem'] != null ? PictureElem.fromJson(json['pictureElem']) : null; + soundElem = json['soundElem'] != null ? SoundElem.fromJson(json['soundElem']) : null; + videoElem = json['videoElem'] != null ? VideoElem.fromJson(json['videoElem']) : null; + fileElem = json['fileElem'] != null ? FileElem.fromJson(json['fileElem']) : null; ex = json['ex']; } Map toJson() { final data = Map(); - data['notificationName'] = this.notificationName; - data['notificationFaceURL'] = this.notificationFaceURL; - data['notificationType'] = this.notificationType; - data['text'] = this.text; - data['externalUrl'] = this.externalUrl; - data['mixType'] = this.mixType; - if (this.pictureElem != null) { - data['pictureElem'] = this.pictureElem!.toJson(); + data['notificationName'] = notificationName; + data['notificationFaceURL'] = notificationFaceURL; + data['notificationType'] = notificationType; + data['text'] = text; + data['externalUrl'] = externalUrl; + data['mixType'] = mixType; + if (pictureElem != null) { + data['pictureElem'] = pictureElem!.toJson(); } - if (this.soundElem != null) { - data['soundElem'] = this.soundElem!.toJson(); + if (soundElem != null) { + data['soundElem'] = soundElem!.toJson(); } - if (this.videoElem != null) { - data['videoElem'] = this.videoElem!.toJson(); + if (videoElem != null) { + data['videoElem'] = videoElem!.toJson(); } - if (this.fileElem != null) { - data['fileElem'] = this.fileElem!.toJson(); + if (fileElem != null) { + data['fileElem'] = fileElem!.toJson(); } - data['ex'] = this.ex; + data['ex'] = ex; return data; } } -/// 群事件通知 +/// Group Event Notification class GroupNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 当前事件操作者信息 + /// Current event operator information GroupMembersInfo? opUser; - /// 群拥有者信息 + /// Group owner information GroupMembersInfo? groupOwnerUser; - /// 产生影响的群成员列表 + /// List of affected group members List? memberList; GroupNotification({ @@ -120,12 +113,8 @@ class GroupNotification { GroupNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - opUser = json['opUser'] != null - ? GroupMembersInfo.fromJson(json['opUser']) - : null; - groupOwnerUser = json['groupOwnerUser'] != null - ? GroupMembersInfo.fromJson(json['groupOwnerUser']) - : null; + opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null; + groupOwnerUser = json['groupOwnerUser'] != null ? GroupMembersInfo.fromJson(json['groupOwnerUser']) : null; if (json['memberList'] != null) { memberList = []; json['memberList'].forEach((v) { @@ -136,40 +125,42 @@ class GroupNotification { Map toJson() { final data = Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.opUser != null) { - data['opUser'] = this.opUser!.toJson(); + if (opUser != null) { + data['opUser'] = opUser!.toJson(); } - if (this.groupOwnerUser != null) { - data['groupOwnerUser'] = this.groupOwnerUser!.toJson(); + if (groupOwnerUser != null) { + data['groupOwnerUser'] = groupOwnerUser!.toJson(); } - if (this.memberList != null) { - data['memberList'] = this.memberList!.map((v) => v.toJson()).toList(); + if (memberList != null) { + data['memberList'] = memberList!.map((v) => v.toJson()).toList(); } return data; } } -/// 用户被邀请进群通知 +/// User Invited to Join Group Notification class InvitedJoinGroupNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 操作者信息 + /// Operator information GroupMembersInfo? opUser; - /// 被邀请进群的成员信息 + /// Inviter information + GroupMembersInfo? inviterUser; + + /// List of members invited to join the group List? invitedUserList; InvitedJoinGroupNotification({this.group, this.opUser, this.invitedUserList}); InvitedJoinGroupNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - opUser = json['opUser'] != null - ? GroupMembersInfo.fromJson(json['opUser']) - : null; + opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null; + inviterUser = json['inviterUser'] != null ? GroupMembersInfo.fromJson(json['inviterUser']) : null; if (json['invitedUserList'] != null) { invitedUserList = []; json['invitedUserList'].forEach((v) { @@ -179,40 +170,39 @@ class InvitedJoinGroupNotification { } Map toJson() { - final Map data = new Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + final Map data = {}; + if (group != null) { + data['group'] = group!.toJson(); } - if (this.opUser != null) { - data['opUser'] = this.opUser!.toJson(); + if (opUser != null) { + data['opUser'] = opUser!.toJson(); } - if (this.invitedUserList != null) { - data['invitedUserList'] = - this.invitedUserList!.map((v) => v.toJson()).toList(); + if (inviterUser != null) { + data['inviterUser'] = inviterUser!.toJson(); + } + if (invitedUserList != null) { + data['invitedUserList'] = invitedUserList!.map((v) => v.toJson()).toList(); } return data; } } -/// 组踢出成员通知 +/// Group Member Kicked Notification class KickedGroupMemeberNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 操作者信息 + /// Operator information GroupMembersInfo? opUser; - /// 被踢出群的成员信息列表 + /// List of members kicked from the group List? kickedUserList; - KickedGroupMemeberNotification( - {this.group, this.opUser, this.kickedUserList}); + KickedGroupMemeberNotification({this.group, this.opUser, this.kickedUserList}); KickedGroupMemeberNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - opUser = json['opUser'] != null - ? GroupMembersInfo.fromJson(json['opUser']) - : null; + opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null; if (json['kickedUserList'] != null) { kickedUserList = []; json['kickedUserList'].forEach((v) { @@ -223,87 +213,82 @@ class KickedGroupMemeberNotification { Map toJson() { final Map data = new Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.opUser != null) { - data['opUser'] = this.opUser!.toJson(); + if (opUser != null) { + data['opUser'] = opUser!.toJson(); } - if (this.kickedUserList != null) { - data['kickedUserList'] = - this.kickedUserList!.map((v) => v.toJson()).toList(); + if (kickedUserList != null) { + data['kickedUserList'] = kickedUserList!.map((v) => v.toJson()).toList(); } return data; } } -/// 退出群通知 +/// Quit Group Notification class QuitGroupNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 退群的成员信息 + /// Information of the member who quit the group GroupMembersInfo? quitUser; QuitGroupNotification({this.group, this.quitUser}); QuitGroupNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - quitUser = json['quitUser'] != null - ? GroupMembersInfo.fromJson(json['quitUser']) - : null; + quitUser = json['quitUser'] != null ? GroupMembersInfo.fromJson(json['quitUser']) : null; } Map toJson() { final data = Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.quitUser != null) { - data['quitUser'] = this.quitUser!.toJson(); + if (quitUser != null) { + data['quitUser'] = quitUser!.toJson(); } return data; } } -/// 进群通知 +/// Enter Group Notification class EnterGroupNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 进入群的成员信息 + /// Information of the member who entered the group GroupMembersInfo? entrantUser; EnterGroupNotification({this.group, this.entrantUser}); EnterGroupNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - entrantUser = json['entrantUser'] != null - ? GroupMembersInfo.fromJson(json['entrantUser']) - : null; + entrantUser = json['entrantUser'] != null ? GroupMembersInfo.fromJson(json['entrantUser']) : null; } Map toJson() { final data = Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.entrantUser != null) { - data['quitUser'] = this.entrantUser!.toJson(); + if (entrantUser != null) { + data['entrantUser'] = entrantUser!.toJson(); } return data; } } -/// 群权转让通知 +/// Group Rights Transfer Notification class GroupRightsTransferNoticication { - /// 群信息 + /// Group information GroupInfo? group; - /// 操作者信息 + /// Operator information GroupMembersInfo? opUser; - /// 群新的拥有者信息 + /// New group owner information GroupMembersInfo? newGroupOwner; GroupRightsTransferNoticication({ @@ -314,41 +299,37 @@ class GroupRightsTransferNoticication { GroupRightsTransferNoticication.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - opUser = json['opUser'] != null - ? GroupMembersInfo.fromJson(json['opUser']) - : null; - newGroupOwner = json['newGroupOwner'] != null - ? GroupMembersInfo.fromJson(json['newGroupOwner']) - : null; + opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null; + newGroupOwner = json['newGroupOwner'] != null ? GroupMembersInfo.fromJson(json['newGroupOwner']) : null; } Map toJson() { final data = Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.opUser != null) { - data['opUser'] = this.opUser!.toJson(); + if (opUser != null) { + data['opUser'] = opUser!.toJson(); } - if (this.newGroupOwner != null) { - data['newGroupOwner'] = this.newGroupOwner!.toJson(); + if (newGroupOwner != null) { + data['newGroupOwner'] = newGroupOwner!.toJson(); } return data; } } -/// 禁言成员通知 +/// Mute Member Notification class MuteMemberNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 操作者信息 + /// Operator information GroupMembersInfo? opUser; - /// 被禁言的成员信息 + /// Muted member information GroupMembersInfo? mutedUser; - /// 禁言时间s + /// Mute duration in seconds int? mutedSeconds; MuteMemberNotification({ @@ -360,40 +341,36 @@ class MuteMemberNotification { MuteMemberNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - opUser = json['opUser'] != null - ? GroupMembersInfo.fromJson(json['opUser']) - : null; - mutedUser = json['mutedUser'] != null - ? GroupMembersInfo.fromJson(json['mutedUser']) - : null; + opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null; + mutedUser = json['mutedUser'] != null ? GroupMembersInfo.fromJson(json['mutedUser']) : null; mutedSeconds = json['mutedSeconds']; } Map toJson() { final data = Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.opUser != null) { - data['opUser'] = this.opUser!.toJson(); + if (opUser != null) { + data['opUser'] = opUser!.toJson(); } - if (this.mutedUser != null) { - data['mutedUser'] = this.mutedUser!.toJson(); + if (mutedUser != null) { + data['mutedUser'] = mutedUser!.toJson(); } - data['mutedSeconds'] = this.mutedSeconds; + data['mutedSeconds'] = mutedSeconds; return data; } } -/// 阅后即焚通知 +/// Burn After Reading Notification class BurnAfterReadingNotification { - /// 接收者 + /// Receiver String? recvID; - /// 发送者 + /// Sender String? sendID; - /// 是否开启 + /// Whether enabled bool? isPrivate; BurnAfterReadingNotification({this.recvID, this.sendID, this.isPrivate}); @@ -406,22 +383,22 @@ class BurnAfterReadingNotification { Map toJson() { final data = Map(); - data['recvID'] = this.recvID; - data['sendID'] = this.sendID; - data['isPrivate'] = this.isPrivate; + data['recvID'] = recvID; + data['sendID'] = sendID; + data['isPrivate'] = isPrivate; return data; } } -/// 群成员信息发送变化通知 +/// Group Member Information Changed Notification class GroupMemberInfoChangedNotification { - /// 群信息 + /// Group information GroupInfo? group; - /// 操作者信息 + /// Operator information GroupMembersInfo? opUser; - /// 资料发生改变的成员 + /// Member with changed information GroupMembersInfo? changedUser; GroupMemberInfoChangedNotification({ @@ -432,25 +409,21 @@ class GroupMemberInfoChangedNotification { GroupMemberInfoChangedNotification.fromJson(Map json) { group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null; - opUser = json['opUser'] != null - ? GroupMembersInfo.fromJson(json['opUser']) - : null; - changedUser = json['changedUser'] != null - ? GroupMembersInfo.fromJson(json['changedUser']) - : null; + opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null; + changedUser = json['changedUser'] != null ? GroupMembersInfo.fromJson(json['changedUser']) : null; } Map toJson() { final data = Map(); - if (this.group != null) { - data['group'] = this.group!.toJson(); + if (group != null) { + data['group'] = group!.toJson(); } - if (this.opUser != null) { - data['opUser'] = this.opUser!.toJson(); + if (opUser != null) { + data['opUser'] = opUser!.toJson(); } - if (this.changedUser != null) { - data['changedUser'] = this.changedUser!.toJson(); + if (changedUser != null) { + data['changedUser'] = changedUser!.toJson(); } return data; } -} +} \ No newline at end of file diff --git a/lib/src/openim.dart b/lib/src/openim.dart index 302fcc6..974636a 100644 --- a/lib/src/openim.dart +++ b/lib/src/openim.dart @@ -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+3'; + static const version = '3.8.3-patch3+1'; static const _channel = MethodChannel('flutter_openim_sdk'); diff --git a/pubspec.yaml b/pubspec.yaml index 83ff101..ffadbb6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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+3 +version: 3.8.3-patch3+1 homepage: https://www.openim.io repository: https://github.com/openimsdk/open-im-sdk-flutter