diff --git a/lib/src/listener/connect_listener.dart b/lib/src/listener/connect_listener.dart index 9d72004..a354717 100644 --- a/lib/src/listener/connect_listener.dart +++ b/lib/src/listener/connect_listener.dart @@ -4,38 +4,38 @@ class OnConnectListener { Function()? onConnectSuccess; Function()? onConnecting; Function()? onKickedOffline; - Function()? onUserSigExpired; + Function()? onUserTokenExpired; OnConnectListener({ this.onConnectFailed, this.onConnectSuccess, this.onConnecting, this.onKickedOffline, - this.onUserSigExpired, + this.onUserTokenExpired, }); /// SDK连接服务器失败 void connectFailed(int? code, String? errorMsg) { - if (null != onConnectFailed) onConnectFailed!(code, errorMsg); + onConnectFailed?.call(code, errorMsg); } /// SDK连接服务器成功 void connectSuccess() { - if (null != onConnectSuccess) onConnectSuccess!(); + onConnectSuccess?.call(); } /// SDK正在连接服务器 void connecting() { - if (null != onConnecting) onConnecting!.call(); + onConnecting?.call(); } /// 账号已在其他地方登录,当前设备被踢下线 void kickedOffline() { - if (null != onKickedOffline) onKickedOffline!(); + onKickedOffline?.call(); } /// 登录凭证过期,需要重新登录 - void userSigExpired() { - if (null != onUserSigExpired) onUserSigExpired!(); + void userTokenExpired() { + onUserTokenExpired?.call(); } } diff --git a/lib/src/listener/conversation_listener.dart b/lib/src/listener/conversation_listener.dart index 713da74..12e8a05 100644 --- a/lib/src/listener/conversation_listener.dart +++ b/lib/src/listener/conversation_listener.dart @@ -20,29 +20,28 @@ class OnConversationListener { /// 会话发生改变 void conversationChanged(List list) { - if (onConversationChanged != null) onConversationChanged!(list); + onConversationChanged?.call(list); } /// 有新会话产生 void newConversation(List list) { - if (onNewConversation != null) onNewConversation!(list); + onNewConversation?.call(list); } /// 未读消息总数发送改变 void totalUnreadMessageCountChanged(int i) { - if (onTotalUnreadMessageCountChanged != null) - onTotalUnreadMessageCountChanged!(i); + onTotalUnreadMessageCountChanged?.call(i); } void syncServerFailed() { - if (onSyncServerFailed != null) onSyncServerFailed!(); + onSyncServerFailed?.call(); } void syncServerFinish() { - if (onSyncServerFinish != null) onSyncServerFinish!(); + onSyncServerFinish?.call(); } void syncServerStart() { - if (onSyncServerStart != null) onSyncServerStart!(); + onSyncServerStart?.call(); } } diff --git a/lib/src/listener/msg_send_progress_listener.dart b/lib/src/listener/msg_send_progress_listener.dart index c38ddba..9163690 100644 --- a/lib/src/listener/msg_send_progress_listener.dart +++ b/lib/src/listener/msg_send_progress_listener.dart @@ -6,6 +6,6 @@ class OnMsgSendProgressListener { /// 消息发送进度 void progress(String clientMsgID, int progress) { - if (null != onProgress) onProgress!(clientMsgID, progress); + onProgress?.call(clientMsgID, progress); } } diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index b1d3db1..34a65b2 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -57,8 +57,8 @@ class IMManager { case 'onKickedOffline': _connectListener.kickedOffline(); break; - case 'onUserSigExpired': - _connectListener.userSigExpired(); + case 'onUserTokenExpired': + _connectListener.userTokenExpired(); break; } } else if (call.method == ListenerType.userListener) {