From 566ddb2ea03e2514de50f2ca861a2674f6e840ac Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期一, 27 十一月 2023 13:32:27 +0800
Subject: [PATCH] 新增科技系统、门锁、新风和地暖支持
---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLSerialPortCore.java | 61 +++++++++---------------------
1 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLSerialPortCore.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLSerialPortCore.java
index ec3647e..670c4c9 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLSerialPortCore.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLSerialPortCore.java
@@ -1,19 +1,15 @@
package com.hdl.sdk.ttl.HDLDeviceManger.Core;
-import android.serialport.api.SerialPort;
-import android.widget.TextView;
+//import android.serialport.api.SerialPort;
+
+import android.serialport.SerialPort;
+import android.util.Log;
import com.hdl.sdk.ttl.Config.Configuration;
-import com.hdl.sdk.ttl.Config.MCUConstants;
-import com.hdl.sdk.ttl.HDLDeviceManger.Bean.MCUDataBean;
import com.hdl.sdk.ttl.HDLDeviceManger.Bean.UdpDataBean;
-import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.EventCode;
import com.hdl.sdk.ttl.HDLDeviceManger.HDLListener.IMcuOtaListener;
-import com.hdl.sdk.ttl.Utils.HDLUtlis.HDLStringUtils;
-import com.hdl.sdk.ttl.Utils.HDLUtlis.HDLUtlis;
import com.hdl.sdk.ttl.Utils.LogUtils.HDLLog;
-
import java.io.File;
import java.io.IOException;
@@ -58,7 +54,7 @@
public static SerialPort getSerialPort() throws SecurityException, IOException, InvalidParameterException {
if (mSerialPort == null) {
- mSerialPort = new SerialPort(new File(mPathname), mBaudrate, 0);
+ mSerialPort = new SerialPort(new File(mPathname), mBaudrate);
mInputStream = mSerialPort.getInputStream();//璋冪敤瀵硅薄SerialPort鏂规硶锛岃幏鍙栦覆鍙ｄ腑"璇诲拰鍐�"鐨勬暟鎹祦
mOutputStream = mSerialPort.getOutputStream();
bOpenSuccess = true;
@@ -92,7 +88,7 @@
try {
mPathname = mmPathname;
mBaudrate = mmBaudrate;
- mSerialPort = new SerialPort(new File(mPathname), mBaudrate, 0);
+ mSerialPort = new SerialPort(new File(mPathname), mBaudrate);
HDLLog.I("HDLSDK 涓插彛鍚姩鎴愬姛");
//璋冪敤瀵硅薄SerialPort鏂规硶锛岃幏鍙栦覆鍙ｄ腑"璇诲拰鍐�"鐨勬暟鎹祦
mInputStream = mSerialPort.getInputStream();
@@ -468,24 +464,12 @@
if (receiveBytes.length < 14) {
return;
}
-// 鎵撳嵃鎺ユ敹鏁版嵁
-// HDLLog.I("receiveBytes HandleHDLdata: " + HDLStringUtils.ByteArrToHex(receiveBytes, 0, receiveBytes.length));
//2019-8-21 鏍￠獙Crc
if (!Crc.checkCRC(receiveBytes)) {
- HDLLog.I("checkCRC锛氭楠屽け璐�");
+// HDLLog.I("checkCRC锛氭楠屽け璐�");
return;
}
-// HDLLog.I("checkCRC锛氭楠屾垚鍔�");
-
-// //鏍￠獙鏄惁涓�0xAA 0xAA 寮�澶存暟鎹暟鎹�
-// if (!isHDLDataWithHead(receiveBytes)) {
-// return;
-// }
-
- //鎵撳嵃鎺ユ敹鏁版嵁
-// HDLLog.I("receiveBytes HandleHDLdata: " + HDLStringUtils.ByteArrToHex(receiveBytes, 0, receiveBytes.length));
-
//鏁版嵁闀垮害
int addDataLength = (receiveBytes[2] & 0xFF) - 11;
//闄勫姞鏁版嵁
@@ -503,17 +487,6 @@
int targetSubnetID = receiveBytes[9] & 0xFF;
//鐩爣璁惧鍙�
int targetDeviceID = receiveBytes[10] & 0xFF;
-// //鍙傛暟
-// UdpDataBean udpDataBean = new UdpDataBean();
-// udpDataBean.sourceSubnetID = sourceSubnetID;
-// udpDataBean.sourceDeviceID = sourceDeviceID;
-// udpDataBean.desSubnetID = targetSubnetID;
-// udpDataBean.desDeviceID = targetDeviceID;
-// udpDataBean.command = command;
-//
-// udpDataBean.addBytes = usefulBytes;
-//// HandleOutsideData(targetSubnetID, targetDeviceID, command, usefulBytes, receiveBytes, udpDataBean);
-// HandleInsideData(udpDataBean);
//s2019-8-20 澧炲姞鐩爣瀛愮綉鍙疯澶囧彿鍒ゆ柇
if ((targetSubnetID == 0xFF && targetDeviceID == 0xFF)
@@ -549,13 +522,6 @@
HDLDeviceManager.handle(sendDatas, sendDatas.command);
}
} else {
-// if (sendDatas.addBytes[0] == HandleSearch.random1
-// && sendDatas.addBytes[1] == HandleSearch.random2
-// && HandleSearch.rcuIp.equals(sendDatas.ipAddress)
-// ) {
-// HDLDeviceManager.handle(sendDatas, sendDatas.command);
-//
-// }
if (sendDatas.addBytes[0] == HandleSearch.random1
&& sendDatas.addBytes[1] == HandleSearch.random2
) {
@@ -569,11 +535,13 @@
case Configuration.COMMON_SWITCH_CTRL_BACK_COMMAND:
case Configuration.COMMON_SWITCH_STATE_BACK_COMMAND:
case Configuration.LIGHT_CTRL_BACK_COMMAND:
+ case Configuration.LIGHT_RGB_CTRL_BACK_COMMAND:
case Configuration.CURTAIN_CTRL_BACK_COMMAND:
case Configuration.AIR_CTRL_BACK_COMMAND:
case Configuration.LOGIC_CTRL_BACK_COMMAND:
case Configuration.LOGIC_STATE_BACK_COMMAND:
case Configuration.LIGHT_STATE_BACK_COMMAND:
+ case Configuration.LIGHT_RGB_STATE_BACK_COMMAND:
case Configuration.SECURITY_ARMING_CTRL_BACK_COMMAND://20190729瀹夐槻妯″潡 甯冮槻璁剧疆鍙嶉
case Configuration.SECURITY_STATE_BACK_COMMAND://20190729 璇诲彇瀹夐槻璁剧疆鍙嶉
case Configuration.SECURITY_ALARM_CTRL_BACK_COMMAND://20190729 鎶ヨ璁剧疆鍙嶉
@@ -596,7 +564,16 @@
case Configuration.AUDIO_CTRL_READ_BACK_COMMAND:
// case Configuration.AUDIO_MenuPlay_INSTRUCTION_COMMAND:
case Configuration.AUDIO_MenuPlay_INSTRUCTION_BACK_COMMAND:
-
+ case Configuration.FRESH_AIR_CTRL_BACK_COMMAND://2020-07-20 鏂板 鏂伴绯荤粺
+ case Configuration.FRESH_AIR_STATE_BACK_COMMAND://2020-07-20 鏂板 鏂伴绯荤粺
+ case Configuration.FRESH_AIR_JINMAO_CTRL_BACK_COMMAND://2020-07-20 鏂板 閲戣寕鏂伴
+ case Configuration.FRESH_AIR_JINMAO_STATE_BACK_COMMAND://2020-07-20 鏂板 閲戣寕鏂伴
+ case Configuration.GEOTHERMAL_MODULE_CTRL_BACK_COMMAND://2020-07-20 鏂板 鍦扮儹妯″潡
+ case Configuration.GEOTHERMAL_MODULE_STATE_BACK_COMMAND://2020-07-20 鏂板 鍦扮儹妯″潡
+ case Configuration.DOOR_MACHINE_MODULE_CTRL_FRIST_BACK_COMMAND://2023-08-22 鏂板 闂ㄩ攣
+ case Configuration.DOOR_MACHINE_MODULE_CTRL_BACK_COMMAND://2023-08-22 鏂板 闂ㄩ攣
+ case Configuration.DOOR_MACHINE_MODULE_STATE_BACK_COMMAND://2023-08-22 鏂板 闂ㄩ攣
+ case Configuration.DOOR_MACHINE_BROADCAST_STATE_BACK_COMMAND://2023-08-25 鏂板闂ㄩ攣鐘舵�佸拰鎶ヨ骞挎挱
HDLDeviceManager.handle(sendDatas, sendDatas.command);
break;
--
Gitblit v1.8.0