From 2ab89961ba0adb8e2987936ce112cd2c36abdef1 Mon Sep 17 00:00:00 2001 From: xuqm Date: Wed, 1 Mar 2023 18:05:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/org/bjca/trust/push/constant/Constants.kt | 6 ++++++ .../cn/org/bjca/trust/push/message/ImCallback.kt | 3 +-- .../push/message/callback/CallbackListener.kt | 3 +-- .../org/bjca/trust/push/message/client/ImClient.kt | 22 +++++++++++++++------- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/push/src/main/java/cn/org/bjca/trust/push/constant/Constants.kt b/push/src/main/java/cn/org/bjca/trust/push/constant/Constants.kt index c733a5e..c03577b 100644 --- a/push/src/main/java/cn/org/bjca/trust/push/constant/Constants.kt +++ b/push/src/main/java/cn/org/bjca/trust/push/constant/Constants.kt @@ -3,6 +3,12 @@ package cn.org.bjca.trust.push.constant import androidx.annotation.StringDef const val ERROR_DEVICE = "10001" +const val ERROR_MSG_SEND_1 = "10011" +const val ERROR_MSG_SEND_2 = "10012" +const val ERROR_MSG_SEND_3 = "10013" +const val ERROR_CONNECTED = "10021" + +const val SUCCESS_CONNECTED = "20001" @StringDef(ERROR_DEVICE) annotation class Constants \ No newline at end of file diff --git a/push/src/main/java/cn/org/bjca/trust/push/message/ImCallback.kt b/push/src/main/java/cn/org/bjca/trust/push/message/ImCallback.kt index 4b3b3bb..20a121c 100644 --- a/push/src/main/java/cn/org/bjca/trust/push/message/ImCallback.kt +++ b/push/src/main/java/cn/org/bjca/trust/push/message/ImCallback.kt @@ -1,7 +1,6 @@ package cn.org.bjca.trust.push.message import cn.org.bjca.trust.push.common.LogHelper -import cn.org.bjca.trust.push.enums.ConnAckReturnCode import cn.org.bjca.trust.push.enums.OsType import cn.org.bjca.trust.push.message.callback.CallbackListener import cn.org.bjca.trust.push.message.msg.Message @@ -27,7 +26,7 @@ class ImCallback : CallbackListener { LogHelper.d("------其它设备登录::${var1}------") } - override fun connectError(code: ConnAckReturnCode) { + override fun connectError(code: String) { LogHelper.d("im连接失败") } diff --git a/push/src/main/java/cn/org/bjca/trust/push/message/callback/CallbackListener.kt b/push/src/main/java/cn/org/bjca/trust/push/message/callback/CallbackListener.kt index 4560ed3..7d782d9 100644 --- a/push/src/main/java/cn/org/bjca/trust/push/message/callback/CallbackListener.kt +++ b/push/src/main/java/cn/org/bjca/trust/push/message/callback/CallbackListener.kt @@ -1,6 +1,5 @@ package cn.org.bjca.trust.push.message.callback -import cn.org.bjca.trust.push.enums.ConnAckReturnCode import cn.org.bjca.trust.push.enums.OsType import cn.org.bjca.trust.push.message.msg.Message @@ -21,7 +20,7 @@ interface CallbackListener { fun connectionKicked(var1: OsType) // im连接失败 - fun connectError(code: ConnAckReturnCode) + fun connectError(code: String) // im连接丢失 fun connectionLost() diff --git a/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt b/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt index 6c664ab..00b21a5 100644 --- a/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt +++ b/push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt @@ -8,9 +8,12 @@ import cn.org.bjca.trust.push.common.DeviceHelper import cn.org.bjca.trust.push.common.LogHelper import cn.org.bjca.trust.push.common.MessageHelper import cn.org.bjca.trust.push.common.json.GsonImplHelp +import cn.org.bjca.trust.push.constant.ERROR_CONNECTED +import cn.org.bjca.trust.push.constant.ERROR_MSG_SEND_1 +import cn.org.bjca.trust.push.constant.ERROR_MSG_SEND_2 +import cn.org.bjca.trust.push.constant.ERROR_MSG_SEND_3 import cn.org.bjca.trust.push.db.DbHelper import cn.org.bjca.trust.push.db.message.SzyxMessage -import cn.org.bjca.trust.push.enums.ConnAckReturnCode import cn.org.bjca.trust.push.enums.OsType import cn.org.bjca.trust.push.enums.PacketType import cn.org.bjca.trust.push.kit.ImClientInterface @@ -44,7 +47,7 @@ class ImClient : ImClientInterface { mqttArrivedClient.connect(options) } } catch (e: Exception) { - connectOptions.callback?.connectError(ConnAckReturnCode.CONNECTED) + connectOptions.callback?.connectError(ERROR_CONNECTED) } isConnecting = false }.start() @@ -184,7 +187,7 @@ class ImClient : ImClientInterface { super.handleMessage(msg) val msgId = msg.obj as String MessageHelper.changeStatus(msgId, false)?.let { - connectOptions.callback?.sendError("1001", it) + connectOptions.callback?.sendError(ERROR_MSG_SEND_1, it) } } @@ -205,8 +208,12 @@ class ImClient : ImClientInterface { ) ) if (!isConnect()) { - msg.messageId?.let { MessageHelper.changeStatus(it,false) } - MessageHelper.parseMessage(msg)?.let { connectOptions.callback?.sendError("1002", it) } + msg.messageId?.let { MessageHelper.changeStatus(it, false) } + MessageHelper.parseMessage(msg)?.let { + connectOptions.callback?.sendError( + ERROR_MSG_SEND_2, it + ) + } return } try { @@ -220,8 +227,9 @@ class ImClient : ImClientInterface { } catch (e: MqttException) { LogHelper.e("发送消息失败", e) e.printStackTrace() - MessageHelper.parseMessage(msg)?.let { connectOptions.callback?.sendError("1003", it) } - msg.messageId?.let { MessageHelper.changeStatus(it,false) } + MessageHelper.parseMessage(msg) + ?.let { connectOptions.callback?.sendError(ERROR_MSG_SEND_3, it) } + msg.messageId?.let { MessageHelper.changeStatus(it, false) } } }