From b0da63410a7aaf64b11183c95b3da38013a6457b Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 28 Oct 2025 15:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java
index 7630499..51393a4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java
@@ -130,51 +130,51 @@
*/
public int nTriggerAlarmInterval;
/**
-探测器状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DETECTOR_STATUS_TYPE}
+探测器状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DETECTOR_STATUS_TYPE}
*/
public int emState;
/**
-设备布防时音量 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_VOLUME}
+设备布防时音量 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_VOLUME}
*/
public int emBeepVolume;
/**
-灵敏度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_SENSITIVITY}
+灵敏度 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_SENSITIVITY}
*/
public int emSensentivity;
/**
-功率调节 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_POWER_REGULATION_TYPE}
+功率调节 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_POWER_REGULATION_TYPE}
*/
public int emPowerRegulation;
/**
-在线状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ONLINE_STATUS}
+在线状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ONLINE_STATUS}
*/
public int emOnline;
/**
-报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_ALARM_TYPE}
+报警类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_ALARM_TYPE}
*/
public int emAlarmType;
/**
-输入类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_INPUT_TYPE}
+输入类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_INPUT_TYPE}
*/
public int emInputType;
/**
-LED亮度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_LED_BRIGHTNESS_LEVEL}
+LED亮度 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_LED_BRIGHTNESS_LEVEL}
*/
public int emLedBrightnessLevel;
/**
-操作模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OPERATION_MODE}
+操作模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_OPERATION_MODE}
*/
public int emOperationMode;
/**
-防误按模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ANTI_MISPRESS_TYPE}
+防误按模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ANTI_MISPRESS_TYPE}
*/
public int emAntiMispress;
/**
-外部电源状态，若未开启检测外接电源状态则为未知 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EXPOWER_STATE}
+外部电源状态，若未开启检测外接电源状态则为未知 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_EXPOWER_STATE}
*/
public int emExPowerState;
/**
-设备报警音量 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_VOLUME}
+设备报警音量 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_VOLUME}
*/
public int emVolume;
/**
@@ -206,7 +206,7 @@
*/
public NET_WPAN_RELAY_INFO stuRelayTran=new NET_WPAN_RELAY_INFO();
/**
-传感器感应方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_BUTTON_ALARM_TYPE}
+传感器感应方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_BUTTON_ALARM_TYPE}
*/
public int emType;
/**
--
Gitblit v1.9.3