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