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/HDLCommand.java | 474 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 449 insertions(+), 25 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLCommand.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLCommand.java
index 84a4bb7..302b167 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLCommand.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HDLCommand.java
@@ -1,6 +1,7 @@
package com.hdl.sdk.ttl.HDLDeviceManger.Core;
import android.content.Context;
+import android.util.Log;
import com.hdl.sdk.ttl.Config.Configuration;
import com.hdl.sdk.ttl.Config.MCUConstants;
@@ -11,17 +12,32 @@
import com.hdl.sdk.ttl.HDLAppliances.HDLCommonSwitch.CommonSwitchBackInfo;
import com.hdl.sdk.ttl.HDLAppliances.HDLCurtain.CurtainCtrlBackInfo;
import com.hdl.sdk.ttl.HDLAppliances.HDLCurtain.Parser.CurtainCtrlParser;
+import com.hdl.sdk.ttl.HDLAppliances.HDLDoorMachine.DoorMachineBackInfo;
+import com.hdl.sdk.ttl.HDLAppliances.HDLDoorMachine.Parser.DoorMachineParser;
+import com.hdl.sdk.ttl.HDLAppliances.HDLFreshAir.FreshAirBackInfo;
+import com.hdl.sdk.ttl.HDLAppliances.HDLFreshAir.FreshAirJinMaoBackInfo;
+import com.hdl.sdk.ttl.HDLAppliances.HDLFreshAir.Parser.FreshAirJinMaoParser;
+import com.hdl.sdk.ttl.HDLAppliances.HDLFreshAir.Parser.FreshAirParser;
+import com.hdl.sdk.ttl.HDLAppliances.HDLGeothermal.GeothermalBackInfo;
+import com.hdl.sdk.ttl.HDLAppliances.HDLGeothermal.Parser.GeothermalParser;
+import com.hdl.sdk.ttl.HDLAppliances.HDLLight.ColourLightCtrlBackInfo;
import com.hdl.sdk.ttl.HDLAppliances.HDLLight.LightCtrlBackInfo;
+import com.hdl.sdk.ttl.HDLAppliances.HDLLight.Parser.LightCtrlParser;
import com.hdl.sdk.ttl.HDLAppliances.HDLLogic.LogicCtrlBackInfo;
import com.hdl.sdk.ttl.HDLAppliances.HDLSecurity.Parser.SecurityParser;
import com.hdl.sdk.ttl.HDLDeviceManger.Bean.AppliancesInfo;
import com.hdl.sdk.ttl.HDLDeviceManger.Bean.DeviceStateBean;
import com.hdl.sdk.ttl.HDLDeviceManger.Bean.MCUDataBean;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.AirFeedBackEvent;
+import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.ColourLightFeedBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CommonSwitchCtrlBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CurtainFeedBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DeviceStateEvent;
+import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DoorMachineFeedBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.EventCode;
+import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.FreshAirFeedBackEvent;
+import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.FreshAirJinMaoFeedBackEvent;
+import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.GeothermalFeedBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.LightFeedBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.LogicFeedBackEvent;
import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.MCUFeedBackEvent;
@@ -55,6 +71,9 @@
private static Timer securityCtrlFailTimer = null;//瀹夐槻妯″潡鎿嶄綔澶辫触Timer
private static Timer commonSwitchCtrlFailTimer = null;//閫氱敤寮�鍏冲け璐imer
+ private static Timer freshAirCtrlFailTimer = null;//鎺у埗鏂伴澶辫触Timer
+ private static Timer geothermalCtrlFailTimer = null;//鎺у埗鍦扮儹澶辫触Timer 2020-07-20
+ private static Timer doorMachineCtrlFailTimer = null;//鎺у埗闂ㄩ攣澶辫触Timer
// /**
// * 鍒濆鍖� SDK
@@ -87,6 +106,14 @@
*/
public static void getHomeDevices() {
HandleSearch.getHomeDevices();
+ }
+
+
+ /**
+ * 鑾峰彇瀹跺眳璁惧澶囨敞
+ */
+ public static void getDevRemarks() {
+ HandleSearch.getDevRemarks();
}
/**
@@ -233,6 +260,40 @@
}, mRequestTimeout);
}
+ /**
+ * 鎺у埗CCT OR RGB
+ *
+ * @param info
+ * @param brightness 浜害
+ * @param color
+ */
+ public static void colourLightCtrl(final AppliancesInfo info, int brightness, int color) {
+ HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
+ if (lightCtrlFailTimer != null) {
+ lightCtrlFailTimer.cancel();
+ lightCtrlFailTimer = null;
+ }
+ if (info.getBigType() == Configuration.LIGTH_BIG_TYPE) {
+ addSendData(info, LightCtrlParser.getColourLightAddByte(info, brightness, color), Configuration.CONTROL);
+
+ lightCtrlFailTimer = new Timer();
+ lightCtrlFailTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
+ ColourLightCtrlBackInfo colourLightCtrlBackInfo = new ColourLightCtrlBackInfo(info);
+ EventBus.getDefault().post(new ColourLightFeedBackEvent(colourLightCtrlBackInfo, false));
+ }
+ }
+ }, mRequestTimeout);
+
+ } else {
+ HDLLog.I("鐏厜璁惧鎺у埗涓嶅湪鑼冨洿鍐�"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
/**
* 鎺у埗绐楀笜
@@ -308,6 +369,11 @@
if (info.getBigType() == Configuration.AIR_BIG_TYPE) {
if (info.getDeviceType() == HDLApConfig.TYPE_AC_PANEL) {
addSendData(info, AirCtrlParser.getAirPanelAddByte(type, state), Configuration.CONTROL);
+ } else if (info.getDeviceType() == HDLApConfig.TYPE_AC_TECHSYS) {
+ byte[] airbytes = AirCtrlParser.getAirTechAddByte(info, type, state);
+ if (airbytes != null) {
+ addSendData(info, airbytes, Configuration.CONTROL);
+ }
} else {
byte[] airbytes = AirCtrlParser.getAcAddByte(info, type, state);
if (airbytes != null) {
@@ -379,6 +445,7 @@
/**
* 鑾峰彇閫氱敤寮�鍏崇姸鎬�
+ *
* @param info
*/
public static void getCommonSwitchStateFromNetwork(final AppliancesInfo info) {
@@ -400,6 +467,7 @@
/**
* 瀹夐槻妯″潡 甯冮槻璁剧疆
* 2019-7-29
+ *
* @param info
*/
public static void securityArmingCtrl(final AppliancesInfo info, int state) {
@@ -417,7 +485,7 @@
@Override
public void run() {
if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
- EventBus.getDefault().post(new SecurityArmingFeedBackEvent(info,0, false));
+ EventBus.getDefault().post(new SecurityArmingFeedBackEvent(info, 0, false));
}
}
}, 5000);
@@ -433,6 +501,7 @@
/**
* 瀹夐槻妯″潡 鎶ヨ璁剧疆
* 2019-7-29
+ *
* @param info
* @param state 鍙戦�佺殑鎶ヨ鍐呭锛屽彧鎶ヨ涓�绉�
*/
@@ -612,6 +681,7 @@
/**
* 鑾峰彇绐楀笜璁惧鐘舵��
+ *
* @param info
*/
public static void getCurtainDeviceStateFromNetwork(final AppliancesInfo info) {
@@ -633,6 +703,7 @@
/**
* 鑾峰彇鐏厜璁惧鐘舵��
+ *
* @param info
*/
public static void getLightDeviceStateFromNetwork(final AppliancesInfo info) {
@@ -645,7 +716,7 @@
case HDLApConfig.TYPE_LIGHT_RELAY:
case HDLApConfig.TYPE_LIGHT_MIX_DIMMER:
case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
- //鍙戦�佽幏鐏厜鐘舵�佹暟鎹�
+ //鍙戦�佽幏鍙栫伅鍏夌姸鎬佹暟鎹�
addSendData(info, new byte[0], Configuration.STATE);
break;
default:
@@ -654,10 +725,35 @@
}
}
+ /**
+ * 鑾峰彇CTT or RGB鐏澶囩姸鎬�
+ *
+ * @param info
+ */
+ public static void getColourLightDeviceStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+ case HDLApConfig.TYPE_LIGHT_CCT:
+ case HDLApConfig.TYPE_LIGHT_RGB:
+ case HDLApConfig.TYPE_LIGHT_DALI:
+ case HDLApConfig.TYPE_LIGHT_DMX:
+ //鍙戦�佽幏鍙栫伅鍏夌姸鎬佹暟鎹�
+ byte[] sendbytes = new byte[]{(byte) info.getChannelNum()};
+ addSendData(info, sendbytes, Configuration.STATE);
+ break;
+ default:
+ HDLLog.I("涓嶆槸CTT or RGB鐏厜璁惧");
+ break;
+ }
+ }
/**
* 鑾峰彇閫昏緫 鍦烘櫙鍙�
+ *
* @param info
*/
public static void getLogicDeviceStateFromNetwork(final AppliancesInfo info) {
@@ -679,6 +775,7 @@
/**
* 鑾峰彇瀹夐槻妯″潡鐘舵��
+ *
* @param info
*/
public static void getSecurityStateFromNetwork(final AppliancesInfo info) {
@@ -699,6 +796,7 @@
/**
* 鑾峰彇浼犳劅鍣ㄦā鍧楃姸鎬�
+ *
* @param info
*/
public static void getSensorStateFromNetwork(final AppliancesInfo info) {
@@ -752,6 +850,7 @@
/**
* 鑾峰彇骞叉帴鐐逛紶鎰熷櫒妯″潡鐘舵��
+ *
* @param info
*/
public static void getDryContactSensorStateFromNetwork(final AppliancesInfo info) {
@@ -804,6 +903,7 @@
/**
* 鑾峰彇HVAC绌鸿皟璁惧鐘舵��
+ *
* @param info
*/
public static void getHVACDeviceStateFromNetwork(final AppliancesInfo info) {
@@ -815,10 +915,32 @@
case HDLApConfig.TYPE_AC_HVAC:
// case HDLApConfig.TYPE_AC_PANEL:
//鍙戦�丠VAC鐘舵�佹暟鎹�
- addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
+ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
break;
default:
HDLLog.I("涓嶆槸HVAC绌鸿皟璁惧");
+ break;
+ }
+ }
+
+
+ /**
+ * 鑾峰彇绉戞妧绯荤粺鐘舵��
+ *
+ * @param info
+ */
+ public static void getTechSysDeviceStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+ case HDLApConfig.TYPE_AC_TECHSYS:
+ //鍙戦�佺鎶�绯荤粺鐘舵�佹暟鎹�
+ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
+ break;
+ default:
+ HDLLog.I("涓嶆槸绉戞妧绯荤粺璁惧");
break;
}
}
@@ -857,6 +979,7 @@
case HDLApConfig.TYPE_AC_COOLMASTER:
case HDLApConfig.TYPE_AC_INFRARED:
case HDLApConfig.TYPE_AC_PANEL:
+ case HDLApConfig.TYPE_AC_TECHSYS:
//2019-8-21 澧炲姞鍒ょ┖
byte[] acState = getACState(info);
if (acState != null && acState.length >= 4) {
@@ -1081,6 +1204,7 @@
switch (info.getDeviceType()) {
case HDLApConfig.TYPE_AC_HVAC:
case HDLApConfig.TYPE_AC_PANEL:
+ case HDLApConfig.TYPE_AC_TECHSYS:
curState = infos.get(j).getArrCurState();
break;
default:
@@ -1127,6 +1251,321 @@
}
+ /**
+ * 鑾峰彇鏂伴
+ *
+ * @param info
+ */
+ public static void getFreshAirDeviceStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+ case HDLApConfig.TYPE_FRESH_AIR:
+ case HDLApConfig.TYPE_FRESH_AIR_JINMAO:
+ //鍙戦�佽幏鍙栨柊椋庣郴缁熸墍鏈夋暟鎹�
+ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
+ break;
+ default:
+ HDLLog.I("涓嶆槸鏂伴绯荤粺璁惧");
+ break;
+ }
+ }
+
+ /**
+ * 鎺у埗鏂伴绯荤粺
+ *
+ * @param info
+ * @param type
+ * @param state 2020-07-20
+ */
+ public static void freshAirCtrl(final AppliancesInfo info, int type, int state) {
+// HDLDeviceManager.isFreshAirCtrlSuccess = false;
+ HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
+ if (freshAirCtrlFailTimer != null) {
+ freshAirCtrlFailTimer.cancel();
+ freshAirCtrlFailTimer = null;
+ }
+ if (info.getBigType() == Configuration.FRESH_AIR_BIG_TYPE) {
+ byte[] freshAirbytes = FreshAirParser.getFreshAirAddByte(info, type, state);
+ addSendData(info, freshAirbytes, Configuration.CONTROL);
+ freshAirCtrlFailTimer = new Timer();
+ freshAirCtrlFailTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
+ FreshAirBackInfo mFreshAirBackInfo = new FreshAirBackInfo();
+ mFreshAirBackInfo.setAppliancesInfo(info);
+ EventBus.getDefault().post(new FreshAirFeedBackEvent(mFreshAirBackInfo, false));
+ }
+ }
+ }, mRequestTimeout);
+
+
+ } else {
+ HDLLog.I("鏂伴璁惧鎺у埗涓嶅湪鑼冨洿鍐�"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
+
+
+ /**
+ * 鑾峰彇閲戣寕鏂伴鐘舵��
+ *
+ * @param info
+ */
+ public static void getFreshAirJinMaoDeviceStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+ case HDLApConfig.TYPE_FRESH_AIR_JINMAO:
+ //鍙戦�佽幏鍙栨柊椋庣郴缁熸墍鏈夋暟鎹�
+ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
+ break;
+ default:
+ HDLLog.I("涓嶆槸閲戣寕鏂伴绯荤粺璁惧");
+ break;
+ }
+ }
+
+ /**
+ * 鎺у埗閲戣寕鏂伴
+ *
+ * @param info
+ * @param type
+ * @param state 2020-07-20
+ */
+ public static void freshAirJinMaoCtrl(final AppliancesInfo info, int type, int state) {
+// HDLDeviceManager.isFreshAirCtrlSuccess = false;
+ HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
+ if (freshAirCtrlFailTimer != null) {
+ freshAirCtrlFailTimer.cancel();
+ freshAirCtrlFailTimer = null;
+ }
+ if (info.getDeviceType() == HDLApConfig.TYPE_FRESH_AIR_JINMAO) {
+ byte[] sendBytes = FreshAirJinMaoParser.getFreshAirAddByte(info, type, state);
+ addSendData(info, sendBytes, Configuration.CONTROL);
+ freshAirCtrlFailTimer = new Timer();
+ freshAirCtrlFailTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
+ FreshAirJinMaoBackInfo mFreshAirJinMaoBackInfo = new FreshAirJinMaoBackInfo();
+ mFreshAirJinMaoBackInfo.setAppliancesInfo(info);
+ EventBus.getDefault().post(new FreshAirJinMaoFeedBackEvent(mFreshAirJinMaoBackInfo, false));
+ }
+ }
+ }, mRequestTimeout);
+
+
+ } else {
+ HDLLog.I("涓嶆槸閲戣寕鏂伴绯荤粺璁惧");
+ }
+ }
+
+
+ /**
+ * 鑾峰彇鍦扮儹鐘舵��
+ *
+ * @param info
+ */
+ public static void getGeothermalStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+ case HDLApConfig.TYPE_GEOTHERMAL_JINMAO:
+ case HDLApConfig.TYPE_GEOTHERMAL_MODULE:
+ //鍙戦�佽幏鍙栧湴鐑郴缁熸墍鏈夋暟鎹�
+ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
+ break;
+ default:
+ HDLLog.I("涓嶆槸鍦扮儹璁惧");
+ break;
+ }
+ }
+
+ /**
+ * 鎺у埗鍦扮儹妯″潡娓╁害
+ *
+ * @param info
+ * @param tempInt 2020-03-15
+ */
+ public static void geothermalCtrlTemp(final AppliancesInfo info, int tempInt) {
+// HDLDeviceManager.isGeothermalCtrlSuccess = false;
+ HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
+ if (geothermalCtrlFailTimer != null) {
+ geothermalCtrlFailTimer.cancel();
+ geothermalCtrlFailTimer = null;
+ }
+ if (info.getBigType() == Configuration.GEOTHERMAL_BIG_TYPE) {
+ byte[] sendbytes = GeothermalParser.getGeothermalAddByteTemp(info, tempInt);
+ addSendData(info, sendbytes, Configuration.CONTROL);
+
+ geothermalCtrlFailTimer = new Timer();
+ geothermalCtrlFailTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
+ GeothermalBackInfo mGeothermalBackInfo = new GeothermalBackInfo();
+ mGeothermalBackInfo.setAppliancesInfo(info);
+ EventBus.getDefault().post(new GeothermalFeedBackEvent(mGeothermalBackInfo, EventCode.FAILURE_TIMEOUT));
+ }
+ }
+ }, mRequestTimeout);
+
+
+ } else {
+ HDLLog.I("鍦扮儹妯″潡鎺у埗涓嶅湪鑼冨洿鍐�"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
+
+ /**
+ * 鎺у埗鍦扮儹妯″潡
+ *
+ * @param info
+ * @param type
+ * @param state 2019-07-10
+ */
+ public static void geothermalCtrl(final AppliancesInfo info, int type, int state) {
+// HDLDeviceManager.isGeothermalCtrlSuccess = false;
+ HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
+ if (geothermalCtrlFailTimer != null) {
+ geothermalCtrlFailTimer.cancel();
+ geothermalCtrlFailTimer = null;
+ }
+ if (info.getBigType() == Configuration.GEOTHERMAL_BIG_TYPE) {
+ byte[] sendbytes = GeothermalParser.getGeothermalAddByte(info, type, state);
+ addSendData(info, sendbytes, Configuration.CONTROL);
+
+ geothermalCtrlFailTimer = new Timer();
+ geothermalCtrlFailTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
+ GeothermalBackInfo mGeothermalBackInfo = new GeothermalBackInfo();
+ mGeothermalBackInfo.setAppliancesInfo(info);
+ EventBus.getDefault().post(new GeothermalFeedBackEvent(mGeothermalBackInfo, EventCode.FAILURE_TIMEOUT));
+ }
+ }
+ }, 5000);
+
+
+ } else {
+ HDLLog.I("鍦扮儹妯″潡鎺у埗涓嶅湪鑼冨洿鍐�"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
+
+
+ /**
+ * 鑾峰彇闂ㄩ攣鐘舵��
+ *
+ * @param info
+ */
+ public static void getDoorMachineDeviceStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+ case HDLApConfig.TYPE_DOOR_MACHINE:
+ //鍙戦�佽幏鍙栭棬閿佹墍鏈夋暟鎹�
+ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE);
+ break;
+ default:
+ HDLLog.I("涓嶆槸闂ㄩ攣璁惧");
+ break;
+ }
+ }
+
+ /**
+ * 闂ㄩ攣妯″潡 杩滅▼寮�閿佽幏鍙栧瘑閽�
+ * 2023-8-25
+ *
+ * @param info
+ */
+ public static void doorMachineGetSecret(final AppliancesInfo info) {
+ if (info.getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE) {
+ byte[] sendbytes = new byte[]{(byte) info.getChannelNum()};
+ cusSendCommand(Configuration.DOOR_MACHINE_MODULE_CTRL_FRIST_COMMAND, info.getDeviceSubnetID(), info.getDeviceDeviceID(), sendbytes);
+ } else {
+ HDLLog.I("涓嶆槸闂ㄩ攣妯″潡"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
+
+ /**
+ * 鎺у埗闂ㄩ攣杩滅▼寮�閿�
+ *
+ * @param info
+ * @param secretBytes 瀵嗛挜
+ * @param password 寮�閿佸瘑鐮� 2023-08-22
+ */
+ public static void doorMachineCtrl(final AppliancesInfo info, byte[] secretBytes, String password, int doorStatus) {
+ HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
+ if (doorMachineCtrlFailTimer != null) {
+ doorMachineCtrlFailTimer.cancel();
+ doorMachineCtrlFailTimer = null;
+ }
+ if (info.getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE) {
+ byte[] doorMachinebytes = DoorMachineParser.getDoorMachineAddByte(info, secretBytes, password, doorStatus);
+ addSendData(info, doorMachinebytes, Configuration.CONTROL);
+ doorMachineCtrlFailTimer = new Timer();
+ doorMachineCtrlFailTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info)) {
+ DoorMachineBackInfo mDoorMachineBackInfo = new DoorMachineBackInfo();
+ mDoorMachineBackInfo.setAppliancesInfo(info);
+ EventBus.getDefault().post(new DoorMachineFeedBackEvent(mDoorMachineBackInfo, false));
+ }
+ }
+ }, mRequestTimeout);
+
+
+ } else {
+ HDLLog.I("闂ㄩ攣鎺у埗涓嶅湪鑼冨洿鍐�"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
+
+
+ /**
+ * 闂ㄩ攣妯″潡 璁剧疆涓存椂瀵嗙爜
+ * 2023-8-25
+ *
+ * @param info
+ * @param tempPassword 涓存椂瀵嗙爜
+ * @param startTime 寮�濮嬫椂闂存埑
+ * @param endTime 缁撴潫鏃堕棿鎴�
+ */
+ public static void doorMachineSettingPwd(final AppliancesInfo info, String tempPassword, String startTime, String endTime) {
+ if (info.getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE) {
+ byte[] sendbytes = DoorMachineParser.getDoorMachineSettingPwdByte(info, tempPassword, startTime, endTime);
+ cusSendCommand(Configuration.DOOR_MACHINE_MODULE_SETTING_PASSWORD_COMMAND, info.getDeviceSubnetID(), info.getDeviceDeviceID(), sendbytes);
+ } else {
+ HDLLog.I("涓嶆槸闂ㄩ攣妯″潡"
+ + " LittleType = " + info.getLittleType()
+ + " BigType = " + info.getBigType()
+ );
+ }
+ }
/**
* 鑳屾櫙闊充箰鎺у埗
@@ -1347,34 +1786,19 @@
sendDatas.count++;
if (type == Configuration.STATE) {
sendDatas.command = info.getStateCommand();
+ HDLLog.I("---getDevice锛� " + info.getDeviceKey() + " ---getStateCommand锛� " + Integer.toHexString(info.getStateCommand()));//2019-8-2
sendDatas.isCtrlSuccess = HDLDeviceManager.isGetDeviceStateSuccess;
} else if (type == Configuration.CONTROL) {
sendDatas.command = info.getCtrlCommand();
- HDLLog.I("getDeviceKey锛� " + info.getDeviceKey());//2019-8-2
+ HDLLog.I("---getDevice锛� " + info.getDeviceKey() + " ---getCtrlCommand锛� " + Integer.toHexString(info.getCtrlCommand()));//2019-8-2
sendDatas.isCtrlSuccess = HDLDeviceManager.getDeviceCtrlSuccessStateWithInfo(info);
-
-// switch (info.getBigType()) {
-// case Configuration.LIGTH_BIG_TYPE:
-// sendDatas.isCtrlSuccess = HDLDeviceManager.isLightCtrlSuccess;
-// break;
-// case Configuration.CURTAIN_BIG_TYPE:
-// sendDatas.isCtrlSuccess = HDLDeviceManager.isCurtainCtrlSuccess;
-// break;
-// case Configuration.AIR_BIG_TYPE:
-// sendDatas.isCtrlSuccess = HDLDeviceManager.isACCtrlSuccess;
-// break;
-// case Configuration.LOGIC_BIG_TYPE:
-// sendDatas.isCtrlSuccess = HDLDeviceManager.isSceneCtrlSuccess;
-// break;
-// case Configuration.SECURITY_BIG_TYPE:
-// sendDatas.isCtrlSuccess = HDLDeviceManager.isSecurityCtrlSuccess;
-// break;
-// default:
-// sendDatas.isCtrlSuccess = false;
-// }
}
if (!sendDatas.isCtrlSuccess) {
- HDLLog.I("鎺у埗鍙戦�佺" + sendDatas.count + "娆�");
+ if (type == Configuration.STATE) {
+ HDLLog.I("璇诲彇鍙戦�佺" + sendDatas.count + "娆�");
+ } else if (type == Configuration.CONTROL) {
+ HDLLog.I("鎺у埗鍙戦�佺" + sendDatas.count + "娆�");
+ }
cusSendCommand(sendDatas.command, info.getDeviceSubnetID(), info.getDeviceDeviceID(), sendDatas.addBytes);
} else {
sendCycleTimer.cancel();
--
Gitblit v1.8.0