From e91af284643d5e370b0d18c384fe8de65f59d9b3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 24 九月 2020 12:01:10 +0800
Subject: [PATCH] 2020-09-24 1.修改MQTTSDK引用方式，修复闪退问题。
---
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java
index 2495919..6c3a3b4 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java
@@ -9,6 +9,7 @@
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+
import com.hdl.sdk.hdl_core.HDLDeviceManger.Callback.PushCallback;
import com.hdl.sdk.hdl_core.Util.LogUtil.HDLLog;
@@ -17,7 +18,8 @@
private static final String clientid = "HDLZigbeeDriver";
private static MqttClient client;
- private static boolean isCancel = false;
+ private static boolean isCancel = false;
+
public static void setIsCancel(boolean isCancel) {
HDLZigbeeMqtt.isCancel = isCancel;
}
@@ -28,25 +30,25 @@
*/
public static void connect1(String host) {
try {
- client = new MqttClient("tcp://"+host+":1883", clientid, new MemoryPersistence());
- MqttConnectOptions options = new MqttConnectOptions();
- options.setCleanSession(false);
- options.setUserName("admin");
- options.setPassword("password".toCharArray());
- //璁剧疆鑷姩閲嶈繛
- options.setAutomaticReconnect(true);
- // 璁剧疆瓒呮椂鏃堕棿
- options.setConnectionTimeout(10);
- // 璁剧疆浼氳瘽蹇冭烦鏃堕棿
- options.setKeepAliveInterval(20);
- PushCallback pushCallback = new PushCallback();
- pushCallback.setHost(host);
- client.setCallback(pushCallback);
- client.connect(options);
- if (isCancel){
- client.close();
- isCancel = false;
- }
+ client = new MqttClient("tcp://" + host + ":1883", clientid, new MemoryPersistence());
+ MqttConnectOptions options = new MqttConnectOptions();
+ options.setCleanSession(false);
+ options.setUserName("admin");
+ options.setPassword("password".toCharArray());
+ //璁剧疆鑷姩閲嶈繛
+ options.setAutomaticReconnect(true);
+ // 璁剧疆瓒呮椂鏃堕棿
+ options.setConnectionTimeout(10);
+ // 璁剧疆浼氳瘽蹇冭烦鏃堕棿
+ options.setKeepAliveInterval(20);
+ PushCallback pushCallback = new PushCallback();
+ pushCallback.setHost(host);
+ client.setCallback(pushCallback);
+ client.connect(options);
+ if (isCancel) {
+ client.close();
+ isCancel = false;
+ }
} catch (MqttException e) {
e.printStackTrace();
}
@@ -55,9 +57,9 @@
/**
* 鍙戦�乵qtt淇℃伅
*/
- public static void sendMqttData1(String topic, String json) {
- HDLLog.info("send Mqtt to gateway:"+json);
- Log.d("111133", "sendMqttData1: "+json);
+ public static void sendMqttData1(String topic, String json) {
+ HDLLog.info("send Mqtt to gateway:" + json);
+ Log.d("111133", "sendMqttData1: " + json);
try {
MqttMessage message = new MqttMessage();
message.setQos(2);
@@ -68,7 +70,7 @@
Log.d("111133", "宸茬粡鍙戦��");
HDLLog.info("message is published completely!");
} catch (MqttException e) {
- Log.d("111133", "sendMqttData1: "+e.getMessage());
+ Log.d("111133", "sendMqttData1: " + e.getMessage());
HDLLog.info("鍙戦�乵qtt淇℃伅鍑洪敊");
e.printStackTrace();
}
--
Gitblit v1.8.0