From d451118d4be05f180cfe1f99bc5904f74db8cc3f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 二月 2024 15:40:58 +0800
Subject: [PATCH] 引用线上库
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java
index e3c80dc..5793c31 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java
@@ -114,7 +114,7 @@
/**
* 鍙兘杩斿洖code灞炴�у彲鑳芥病鏈� 娌℃湁鐨勮瘽鐩存帴鎴愬姛 鏈夌殑璇濆彧鏈�200鎵嶄細鎴愬姛
*/
- if (code == null || code == 200 || code == 0) {
+ if (code == null || code.intValue() == 200 || code.intValue() == 0) {
notifySucceed(msg);
} else {
notifyFailure(ErrorUtils.getByCode(code));
@@ -325,8 +325,10 @@
String requestTopic = linkRequest.getCloudTopic();
byte[] encryBytes = null;
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
- if (gatewayBean != null && getGatewayTypeList().contains(gatewayBean.getGatewayType())) {
- //閫嗗彉鍣ㄨ繙绋媘qtt绉橀挜涓嶄竴鏍�
+ if (gatewayBean != null && getNotGatewayTypeList().contains(gatewayBean.getGatewayType())) {
+ /**
+ * 姣背娉㈣繖杈硅幏鍙栨暟鎹殑鏃跺�� 宸茬粡璁剧疆浜嗕富浠庡瘑閽ヨ繘鍘讳簡 杩欒竟涓嶄綔澶勭悊
+ */
encryBytes = EncryptUtil.encryBytes(linkRequest.getCloudSendBytes(), gatewayBean.getAesKey());
} else {
encryBytes = EncryptUtil.encryBytes(linkRequest.getCloudSendBytes(), HDLLinkConfig.getInstance().getAesKey());
@@ -420,16 +422,48 @@
}
- /**
- * 鏀寔姣背绫诲瀷
- *
- * @return 绫诲瀷鍒楄〃
- */
- public static List<String> getGatewayTypeList() {
- List<String> typeList = new ArrayList<>();
+
+// /**
+// * 鏀寔姣背绫诲瀷
+// *
+// * @return 绫诲瀷鍒楄〃
+// */
+// public static List<String> getGatewayTypeList() {
+// List<String> typeList = new ArrayList<>();
+//// typeList.add("sensor.mmv_sleep");//鐫＄湢姣背娉pk
+//// typeList.add("sensor.mmv_pose");//濮挎�佹绫虫尝spk
+// typeList.add("energy.hdl_inverter");//閫嗗彉鍣╯pk
// typeList.add("sensor.mmv_sleep");//鐫＄湢姣背娉pk
// typeList.add("sensor.mmv_pose");//濮挎�佹绫虫尝spk
+// typeList.add("sensor.hdl_mmw_pose");//Wi-Fi姣背娉T鐗堟湰
+// return typeList;
+// }
+//
+// public static List<String> getMillimeterTypeList() {
+// List<String> typeList = new ArrayList<>();
+//// typeList.add("AGATEWAY");//缃戝叧
+// typeList.add("sensor.mmv_sleep");//鐫＄湢姣背娉pk
+// typeList.add("sensor.mmv_pose");//濮挎�佹绫虫尝spk
+// typeList.add("sensor.hdl_mmw_pose");//Wi-Fi姣背娉T鐗堟湰
+// return typeList;
+// }
+
+ /**
+ * 鑾峰彇闄や簡缃戝叧鐨勫叾瀹冪綉缁滆澶囷紝涓婇潰鍐欑殑閭ｄ袱涓柟娉曚笉涓�鑷磄etGatewayTypeList锛実etMillimeterTypeList锛岀粺涓�浜嗕笅锛屼互鍏嶅悗鏈熷嚭闂
+ * @return
+ */
+ public static List<String> getNotGatewayTypeList(){
+ List<String> typeList = new ArrayList<>();
typeList.add("energy.hdl_inverter");//閫嗗彉鍣╯pk
+ typeList.add("sensor.mmv_sleep");//鐫＄湢姣背娉pk
+ typeList.add("sensor.mmv_pose");//濮挎�佹绫虫尝spk
+ typeList.add("sensor.hdl_mmw_pose");//Wi-Fi姣背娉T鐗堟湰
+ return typeList;
+ }
+
+ public static List<String> getNewMillimeterTypeList() {
+ List<String> typeList = new ArrayList<>();
+ typeList.add("sensor.hdl_mmw_pose");//Wi-Fi姣背娉T鐗堟湰
return typeList;
}
@@ -447,6 +481,7 @@
}
+
public static boolean isInverterTopic(String topic) {
if (TextUtils.isEmpty(topic)) {
return false;
--
Gitblit v1.8.0