From c958e1806f0cc150644d9e8da82df0e6c8d8fe77 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 28 十月 2020 09:59:56 +0800
Subject: [PATCH] 2020-10-28 1.更新
---
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java | 4 ++++
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java | 12 ++++++++----
Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200924.aar | 0
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 1 +
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200923.aar b/Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200924.aar
similarity index 70%
rename from Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200923.aar
rename to Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200924.aar
index d2f7d80..9ce9eac 100644
--- a/Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200923.aar
+++ b/Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200924.aar
Binary files differ
diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
index ebdcc53..d2dbb78 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -73,6 +73,7 @@
private static ZigbeeSceneSaveBean zigbeeSceneBean;//璁惧鍦烘櫙鏁版嵁
private static int type = 0;
+// public static boolean isZigbee = true;
/**
* 鍒濆鍖�
diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java
index 59422a0..72fdf71 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java
@@ -50,6 +50,10 @@
stateListener = newStateListener;
}
+ public static String getIpAddr() {
+ return ipAddr;
+ }
+
public void setIpAddr(String ipAddr) {
this.ipAddr = ipAddr;
}
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 6c3a3b4..4042eb4 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
@@ -59,20 +59,24 @@
*/
public static void sendMqttData1(String topic, String json) {
HDLLog.info("send Mqtt to gateway:" + json);
- Log.d("111133", "sendMqttData1: " + json);
+ Log.d("ZigbeeMqtt", "sendMqttData1: " + json);
try {
+ if(client == null){
+ HDLZigbeeMqtt.connect1(HDLCommandText.getIpAddr());
+ }
+
MqttMessage message = new MqttMessage();
message.setQos(2);
message.setRetained(false);
message.setPayload(json.getBytes());
MqttDeliveryToken token = client.getTopic(topic).publish(message);
token.waitForCompletion();
- Log.d("111133", "宸茬粡鍙戦��");
+ Log.d("ZigbeeMqtt", "宸茬粡鍙戦��");
HDLLog.info("message is published completely!");
} catch (MqttException e) {
- Log.d("111133", "sendMqttData1: " + e.getMessage());
+ Log.d("ZigbeeMqtt", "sendMqttData1 catch: " + e.getMessage());
HDLLog.info("鍙戦�乵qtt淇℃伅鍑洪敊");
- e.printStackTrace();
+// e.printStackTrace();
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0