|
|
@@ -2,8 +2,10 @@ package cn.org.bjca.trust.push.message.client |
|
|
|
|
|
|
|
import android.content.Context |
|
|
|
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.enums.ConnAckReturnCode |
|
|
|
import cn.org.bjca.trust.push.enums.MsgType |
|
|
|
import cn.org.bjca.trust.push.kit.ImClientInterface |
|
|
|
import cn.org.bjca.trust.push.message.msg.SendMessage |
|
|
|
import org.eclipse.paho.client.mqttv3.* |
|
|
@@ -89,11 +91,14 @@ class ImClient : ImClientInterface { |
|
|
|
} |
|
|
|
|
|
|
|
override fun messageArrived(topic: String?, message: MqttMessage) { |
|
|
|
LogHelper.e( |
|
|
|
"----------IM收到消息-------------${topic}::${ |
|
|
|
String(message.payload, Charsets.UTF_8) |
|
|
|
}" |
|
|
|
) |
|
|
|
val sendMessage = GsonImplHelp.get() |
|
|
|
.toObject(String(message.payload, Charsets.UTF_8), SendMessage::class.java) |
|
|
|
MessageHelper.parseMessage( |
|
|
|
MsgType.getMsgType(sendMessage.messageType), |
|
|
|
sendMessage |
|
|
|
)?.also { |
|
|
|
connectOptions.callback?.messageArrived(it) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
override fun deliveryComplete(token: IMqttDeliveryToken?) { |
|
|
@@ -147,6 +152,10 @@ class ImClient : ImClientInterface { |
|
|
|
} |
|
|
|
|
|
|
|
override fun sendMessage(msg: SendMessage) { |
|
|
|
if (!isConnect()) { |
|
|
|
connectOptions.callback?.sendError(msg) |
|
|
|
return |
|
|
|
} |
|
|
|
try { |
|
|
|
mqttSendClient.publish( |
|
|
|
"server", |
|
|
|