错误码补充

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

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连接失败")
     }
 

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()

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) }
         }
     }