From a1628cc4760d366e118ea46d7d7057323ea87d31 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期二, 26 八月 2025 10:58:14 +0800
Subject: [PATCH] 代码同步
---
/dev/null | 0
HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java | 2 +-
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 12 ++++++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
index 6b02529..9fe4abf 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
@@ -30,7 +30,7 @@
//appkey:ryfElI3tVOT
//appsecret:AKIn7s1A2YnNvAZRtL8FQxzp0R2KUpIY
- HDLLink.getInstance().initCloud(this, "ryfElI3tVOT", "AKIn7s1A2YnNvAZRtL8FQxzp0R2KUpIY", HdlCloudApi.BASE_BAHRAIN_URL);
+ HDLLink.getInstance().initCloud(this, "Lstzip08fTl", "iSIr5TSz1Rzxc1QRQ3RgnGwGB2SeAAAA", HdlCloudApi.BASE_CHINA_URL);
//娉ㄥ唽鍏ㄥ眬骞挎挱,鍒锋柊token
GlobalBroadcastManager.registerGlobalBroadcast(this);
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index 20e7579..e76c21e 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -92,9 +92,9 @@
tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�...");
responseTv.setText("");
- String supplier = "JINMAOYUN";//鍘傚晢
-// String mac = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
- String mac = editText.getText().toString();
+ String supplier = "HIK KNX";//鍘傚晢
+ String mac = "FQ4895630";//璁惧鍞竴MAC鍦板潃
+// String mac = editText.getText().toString();
String spk = "screen.touch";//浜у搧spk
if (TextUtils.isEmpty(mac)) {
@@ -410,9 +410,13 @@
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse) msg;
Log.i("onMessage", "response.getTopic():" + response.getTopic());
+ String topic = String.format(TopicConstant.GATEWAY_LOGIN,
+ HDLLinkConfig.getInstance().getGatewayId())+ "_reply";;
+
if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())) {
localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
-
+ }else if (topic.equals(response.getTopic())){
+ //tcp杩炴帴鎴愬姛锛屽鐞嗕笟鍔￠�昏緫
}
}
};
diff --git a/HDLSDK_DEMO.rar b/HDLSDK_DEMO.rar
deleted file mode 100644
index fe0cd6c..0000000
--- a/HDLSDK_DEMO.rar
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0