From 071a8328823a2861f93ce556a4da3e4119cab1a3 Mon Sep 17 00:00:00 2001 From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com> Date: 星期四, 19 九月 2024 16:24:28 +0800 Subject: [PATCH] 完成金茂定制功能 --- HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Config/Configuration.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 102 insertions(+), 16 deletions(-) diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Config/Configuration.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Config/Configuration.java index 172ffc9..f9e5ed4 100644 --- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Config/Configuration.java +++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Config/Configuration.java @@ -6,24 +6,53 @@ //瀹剁數绫诲瀷鐮� //澶х被 - /**鐏厜绫�*/ + /** + * 鐏厜绫� + */ public static final int LIGTH_BIG_TYPE = 1; // - /**绐楀笜绫�*/ + /** + * 绐楀笜绫� + */ public static final int CURTAIN_BIG_TYPE = 2; - /**浼犳劅鍣ㄧ被*/ - public static final int SENSOR_BIG_TYPE = 5;//2019-07-03 灞忚斀 2019-11-1 鍘诲睆钄� - /**绌鸿皟绫�*/ + /** + * 浼犳劅鍣ㄧ被 + */ + public static final int SENSOR_BIG_TYPE = 5; + /** + * 绌鸿皟绫� + */ public static final int AIR_BIG_TYPE = 7; - /**鑳屾櫙闊充箰绫�*/ + /** + * 鍦扮儹妯″潡 + */ + public static final int GEOTHERMAL_BIG_TYPE = 8; + /** + * 鑳屾櫙闊充箰绫� + */ public static final int AUDIO_BIG_TYPE = 9; - /**瀹夐槻鍔熻兘*/ + /** + * 瀹夐槻鍔熻兘 + */ public static final int SECURITY_BIG_TYPE = 10; - /**閫昏緫鍔熻兘绫�*/ + /** + * 閫昏緫鍔熻兘绫� + */ public static final int LOGIC_BIG_TYPE = 12; - /**鍏ㄥ眬鍦烘櫙*/ + /** + * 闂ㄥ彛鏈虹被 + */ + public static final int DOOR_MACHINE_BIG_TYPE = 14; + /** + * 鍏ㄥ眬鍦烘櫙 + */ public static final int GLOBAL_LOGIC_BIG_TYPE = 17; - - /**閫氱敤寮�鍏�*/ + /** + * 鏂伴绯荤粺 + */ + public static final int FRESH_AIR_BIG_TYPE = 19; + /** + * 閫氱敤寮�鍏� + */ public static final int COMMON_SWITCH_BIG_TYPE = 100; //灏忕被 鍏堜笉鍋氬垎绫� @@ -91,6 +120,20 @@ public static final int DEVICES_SEARCH_BACK_COMMAND = 0xE549; public static final int DEVICES_READ_COMMAND = 0xE44A;//绠�鏄撶紪绋嬩緷娆′粠璁惧璇诲彇(鑾峰彇澶囨敞淇℃伅) public static final int DEVICES_READ_BACK_COMMAND = 0xE44B;//绠�鏄撶紪绋嬭鍙栬繑鍥�(鏀跺埌澶囨敞淇℃伅) + //****************2023-11-27鏂板****************浠庣綉鍏宠鍙栬澶囧拰澶囨敞淇℃伅 + public static final int SEARCH_GATEWAY_COMMAND = 0x000E;//鎼滅储缃戝叧 + public static final int SEARCH_GATEWAY_BACK_COMMAND = 0x000F;//鎼滅储缃戝叧鍥炲 + public static final int DEVICES_SEARCH_FROM_GATEWAY_COMMAND = 0xF548;//璇诲彇缃戝叧宸查厤缃姛鑳� + public static final int DEVICES_SEARCH_FROM_GATEWAY_BACK_COMMAND = 0xF549;//璇诲彇缃戝叧宸查厤缃姛鑳借繑鍥� + public static final int DEVICES_READ_FROM_GATEWAY_COMMAND = 0xF44A;//渚濇璇诲彇璁惧淇℃伅 + public static final int DEVICES_READ_FROM_GATEWAY_BACK_COMMAND = 0xF44B;//渚濇璇诲彇璁惧淇℃伅杩斿洖 + //****************2024-01-18鏂板****************浠庣綉鍏宠鍙栧満鏅拰鍦烘櫙淇℃伅 + public static final int SCENE_SEARCH_FROM_GATEWAY_COMMAND = 0xF44C;//璇诲彇缃戝叧鍦烘櫙鏁伴噺 + public static final int SCENE_SEARCH_FROM_GATEWAY_BACK_COMMAND = 0xF44D;//璇诲彇缃戝叧宸查厤缃満鏅繑鍥� + public static final int SCENE_READ_FROM_GATEWAY_COMMAND = 0xF44E;//渚濇璇诲彇鍦烘櫙淇℃伅 + public static final int SCENE_READ_FROM_GATEWAY_BACK_COMMAND = 0xF44F;//渚濇璇诲彇鍦烘櫙淇℃伅杩斿洖 + + //****************2019-07鏂板**************** public static final int DEVICES_MODIFY_COMMAND = 0xE44C;//绠�鏄撶紪绋嬩慨鏀瑰熀鏈俊鎭紙鍗曠嫭淇敼鍥炶矾澶囨敞锛� public static final int DEVICES_MODIFY_BACK_COMMAND = 0xE44D;//绠�鏄撶紪绋嬩慨鏀瑰熀鏈俊鎭洖澶� @@ -108,6 +151,11 @@ public static final int LIGHT_CTRL_BACK_COMMAND = 0x0032; public static final int LIGHT_STATE_COMMAND = 0x0033; public static final int LIGHT_STATE_BACK_COMMAND = 0x0034; + //****************2023-08鏂板**************** + public static final int LIGHT_RGB_CTRL_COMMAND = 0xE45C; + public static final int LIGHT_RGB_CTRL_BACK_COMMAND = 0xE45D; + public static final int LIGHT_RGB_STATE_COMMAND = 0xE472; + public static final int LIGHT_RGB_STATE_BACK_COMMAND = 0xE473; //绐楀笜鎿嶄綔鐮併�佺姸鎬佽鍙栫爜 public static final int CURTAIN_CTRL_COMMAND = 0xE3E0; @@ -133,7 +181,7 @@ //閫昏緫妯″潡鎿嶄綔鐮併�佺姸鎬佽鍙栫爜 public static final int LOGIC_CTRL_COMMAND = 0x0002; - public static final int LOGIC_CTRL_BACK_COMMAND = 0x0003; + public static final int LOGIC_CTRL_BACK_COMMAND = 0x0003; public static final int LOGIC_STATE_COMMAND = 0x000C; public static final int LOGIC_STATE_BACK_COMMAND = 0x000D; @@ -144,14 +192,14 @@ public static final int DRY_CONTACT_BROADCAST_STATE_COMMAND = 0x15D0;//骞茶妭鐐圭姸鎬佷富鍔ㄥ箍鎾弽棣� - //鍏鍙d氦鎹㈡満浼犳劅鍣� 浼犳劅鍣ㄦ搷浣滅爜 + //璇诲彇浼犳劅鍣ㄧ姸鎬� public static final int SENSOR_STATE_COMMAND = 0xE4F9; public static final int SENSOR_STATE_BACK_COMMAND = 0xE4FA; public static final int SENSOR_BROADCAST_STATE_BACK_COMMAND = 0x353A; //瑙f瀽锛�0xE4F9 鍛戒护涓鸿鍙栦紶鎰熷櫒鍛戒护锛�0xE4FA 涓鸿鍙栬繑鍥炲�笺�傝嫢瑕佷笉鏂幏鍙栦紶鎰熷櫒 鐨勭姸鎬侊紝 //搴旇寮�鍚紶鎰熷櫒浣胯兘鍔熻兘锛屽紑鍚悗浼犳劅鍣ㄥ氨浼氬彂鍑� 0x353A 鐨勫箍鎾姸鎬侊紝涓嶉渶 瑕佷竴鐩磋鍙栵紝鍙渶鎺ユ敹鍗冲彲銆�0x353A 涓� 0xE4FA 杩斿洖鐨勬槸涓�鏍风殑鏍煎紡鐘舵�併�� -// public static final int SENSOR_BROADCAST_COMMAND = 0x1647; + // public static final int SENSOR_BROADCAST_COMMAND = 0x1647; public static final int WARNING_COMMAND = 0xF606; //澶勭悊杞彂闊充箰鏁版嵁 public static final int AUDIO_CTRL_READ_COMMAND = 0x192E; @@ -180,6 +228,46 @@ public static final int COMMON_SWITCH_CTRL_BACK_COMMAND = 0xE01D;//閫氱敤寮�鍏虫帶鍒跺弽棣� public static final int COMMON_SWITCH_STATE_COMMAND = 0xE018;//璇婚�氱敤寮�鍏崇姸鎬� public static final int COMMON_SWITCH_STATE_BACK_COMMAND = 0xE019;//璇婚�氱敤寮�鍏崇姸鎬佸弽棣� + + + /** + * 2020-07-20 鏂伴绯荤粺 + */ + public static final int FRESH_AIR_CTRL_COMMAND = 0x144A; + public static final int FRESH_AIR_CTRL_BACK_COMMAND = 0x144B; + public static final int FRESH_AIR_STATE_COMMAND = 0x144C; + public static final int FRESH_AIR_STATE_BACK_COMMAND = 0x144D; + + /** + * 2020-07-20 閲戣寕鏂伴 + */ + public static final int FRESH_AIR_JINMAO_STATE_COMMAND = 0x1446; + public static final int FRESH_AIR_JINMAO_STATE_BACK_COMMAND = 0x1447; + public static final int FRESH_AIR_JINMAO_CTRL_COMMAND = 0x1448; + public static final int FRESH_AIR_JINMAO_CTRL_BACK_COMMAND = 0x1449; + + /** + * 2020-07-20 鍦扮儹 + */ + //鍦扮儹妯″潡 + public static final int GEOTHERMAL_MODULE_CTRL_COMMAND = 0x1C5C; + public static final int GEOTHERMAL_MODULE_CTRL_BACK_COMMAND = 0x1C5D; + public static final int GEOTHERMAL_MODULE_STATE_COMMAND = 0x1C5E; + public static final int GEOTHERMAL_MODULE_STATE_BACK_COMMAND = 0x1C5F; + + /** + * 2023-08-22 闂ㄩ攣 + */ + //闂ㄩ攣妯″潡 + public static final int DOOR_MACHINE_MODULE_SETTING_PASSWORD_COMMAND = 0x1F5C;//璁剧疆涓存椂瀵嗙爜 + public static final int DOOR_MACHINE_MODULE_SETTING_PASSWORD_BACK_COMMAND = 0x1F5D;//璁剧疆涓存椂瀵嗙爜杩斿洖 + public static final int DOOR_MACHINE_MODULE_CTRL_FRIST_COMMAND = 0xE4EE;//杩滅▼寮�閿佽繛鎺� + public static final int DOOR_MACHINE_MODULE_CTRL_FRIST_BACK_COMMAND = 0xE4EF; + public static final int DOOR_MACHINE_MODULE_CTRL_COMMAND = 0xE4F0;//杩滅▼寮�鍏抽攣 + public static final int DOOR_MACHINE_MODULE_CTRL_BACK_COMMAND = 0xE4F1; + public static final int DOOR_MACHINE_MODULE_STATE_COMMAND = 0x1F60;//璇婚棬閿佺姸鎬� + public static final int DOOR_MACHINE_MODULE_STATE_BACK_COMMAND = 0x1F61; + public static final int DOOR_MACHINE_BROADCAST_STATE_BACK_COMMAND = 0x1F4D;//骞挎挱闂ㄩ攣鐘舵�佸拰鎶ヨ // /** @@ -229,8 +317,6 @@ // public static final int RCU_AIR_CTRL_COMMAND = 0x2065; // public static final int RCU_AIR_CTRL_BACK_COMMAND = 0x2066; // public static final int RCU_AIR_CAST_COMMAND = 0x209A; - - } -- Gitblit v1.8.0