From b87fc6206ba7f5257f54e255f5b3ff73a477e23e Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 02 Sep 2025 09:36:13 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into test
---
src/utils/device-setting.js | 154 ++++++++++++++++++++++++++-------------------------
1 files changed, 78 insertions(+), 76 deletions(-)
diff --git a/src/utils/device-setting.js b/src/utils/device-setting.js
index b5f356e..86cbc26 100644
--- a/src/utils/device-setting.js
+++ b/src/utils/device-setting.js
@@ -11,37 +11,38 @@
/**
* 根据osd 更新信息
- * @param deviceSetting
+ * @param deviceSetting.value
* @param deviceInfo
* @returns
*/
export function updateDeviceSettingInfoByOsd(deviceSetting, deviceInfo) {
- const { device, dock, gateway } = deviceInfo || {}
- if (!deviceSetting) {
+ // const { device, dock, gateway } = deviceInfo.value || {}
+ let device = deviceInfo?? {}
+ if (!deviceSetting.value) {
return
}
// 夜航灯
let nightLightsState = ""
if (isNil(device?.night_lights_state)) {
- deviceSetting[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].editable = false
- deviceSetting[
+ deviceSetting.value[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].editable = false
+ deviceSetting.value[
DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET
].value = DEFAULT_PLACEHOLDER
nightLightsState = DEFAULT_PLACEHOLDER
} else {
- deviceSetting[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].editable = true
+ deviceSetting.value[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].editable = true
nightLightsState = device?.night_lights_state
if (nightLightsState === NightLightsStateEnum.CLOSE) {
- deviceSetting[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].value = "关闭"
+ deviceSetting.value[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].value = "关闭"
} else if (nightLightsState === NightLightsStateEnum.OPEN) {
- deviceSetting[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].value = "开启"
+ deviceSetting.value[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].value = "开启"
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET
].value = DEFAULT_PLACEHOLDER
}
}
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET
].trueValue = nightLightsState
@@ -49,169 +50,169 @@
let heightLimit = device?.height_limit
if (isNil(heightLimit) || heightLimit === 0) {
heightLimit = DEFAULT_PLACEHOLDER
- deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].editable = false
+ deviceSetting.value[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].editable = false
} else {
- deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].editable = true
+ deviceSetting.value[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].editable = true
}
- deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].trueValue = heightLimit
- deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].value =
+ deviceSetting.value[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].trueValue = heightLimit
+ deviceSetting.value[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].value =
heightLimit + Unit_M
// 限远
let distanceLimitStatus = ""
if (isNil(device?.distance_limit_status?.state)) {
distanceLimitStatus = DEFAULT_PLACEHOLDER
- deviceSetting[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].editable = false
- deviceSetting[
+ deviceSetting.value[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].editable = false
+ deviceSetting.value[
DeviceSettingKeyEnum.DISTANCE_LIMIT_SET
].value = DEFAULT_PLACEHOLDER
} else {
- deviceSetting[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].editable = true
+ deviceSetting.value[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].editable = true
distanceLimitStatus = device?.distance_limit_status?.state
if (distanceLimitStatus === DistanceLimitStatusEnum.UNSET) {
- deviceSetting[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].value = "关闭"
+ deviceSetting.value[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].value = "关闭"
} else if (distanceLimitStatus === DistanceLimitStatusEnum.SET) {
const distanceLimit = device?.distance_limit_status?.distance_limit
if (distanceLimit) {
- deviceSetting[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].value =
+ deviceSetting.value[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].value =
distanceLimit + Unit_M
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.DISTANCE_LIMIT_SET
].value = DEFAULT_PLACEHOLDER
}
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.DISTANCE_LIMIT_SET
].value = DEFAULT_PLACEHOLDER
}
}
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.DISTANCE_LIMIT_SET
].trueValue = distanceLimitStatus
// 避障
if (isNil(device?.obstacle_avoidance)) {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].editable = false
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].value = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].trueValue = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].editable = false
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].value = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].trueValue = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].editable = false
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].value = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].trueValue = DEFAULT_PLACEHOLDER
} else {
const { horizon, upside, downside } = device.obstacle_avoidance || {}
if (isNil(horizon)) {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].editable = false
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].value = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].trueValue = DEFAULT_PLACEHOLDER
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].editable = false
if (horizon === ObstacleAvoidanceStatusEnum.CLOSE) {
- deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON].value =
+ deviceSetting.value[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON].value =
"关闭"
} else if (horizon === ObstacleAvoidanceStatusEnum.OPEN) {
- deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON].value =
+ deviceSetting.value[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON].value =
"开启"
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].value = DEFAULT_PLACEHOLDER
}
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON
].trueValue = horizon
}
if (isNil(upside)) {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].editable = false
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].value = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].trueValue = DEFAULT_PLACEHOLDER
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].editable = false
if (upside === ObstacleAvoidanceStatusEnum.CLOSE) {
- deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE].value =
+ deviceSetting.value[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE].value =
"关闭"
} else if (upside === ObstacleAvoidanceStatusEnum.OPEN) {
- deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE].value =
+ deviceSetting.value[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE].value =
"开启"
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].value = DEFAULT_PLACEHOLDER
}
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE
].trueValue = upside
}
if (isNil(downside)) {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].editable = false
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].value = DEFAULT_PLACEHOLDER
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].trueValue = DEFAULT_PLACEHOLDER
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].editable = false
if (downside === ObstacleAvoidanceStatusEnum.CLOSE) {
- deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE].value =
+ deviceSetting.value[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE].value =
"关闭"
} else if (downside === ObstacleAvoidanceStatusEnum.OPEN) {
- deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE].value =
+ deviceSetting.value[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE].value =
"开启"
} else {
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].value = DEFAULT_PLACEHOLDER
}
- deviceSetting[
+ deviceSetting.value[
DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE
].trueValue = downside
}
}
- return deviceSetting
+ return deviceSetting.value
}
// 更新formModel
@@ -219,8 +220,9 @@
deviceSettingFormModelFromOsd,
deviceInfo
) {
- const { device, dock, gateway } = deviceInfo || {}
- if (!deviceSettingFormModelFromOsd) {
+ // const { device, dock, gateway } = deviceInfo || {}
+ let device = deviceInfo?? {}
+ if (!deviceSettingFormModelFromOsd.value) {
return
}
// 夜航灯
@@ -229,17 +231,17 @@
!isNil(nightLightsState) &&
nightLightsState === NightLightsStateEnum.OPEN
) {
- deviceSettingFormModelFromOsd.nightLightsState = true
+ deviceSettingFormModelFromOsd.value.nightLightsState = true
} else {
- deviceSettingFormModelFromOsd.nightLightsState = false
+ deviceSettingFormModelFromOsd.value.nightLightsState = false
}
// 限高
const heightLimit = device?.height_limit
if (isNil(heightLimit) || heightLimit === 0) {
- deviceSettingFormModelFromOsd.heightLimit = 20
+ deviceSettingFormModelFromOsd.value.heightLimit = 20
} else {
- deviceSettingFormModelFromOsd.heightLimit = heightLimit
+ deviceSettingFormModelFromOsd.value.heightLimit = heightLimit
}
// 限远
@@ -248,36 +250,36 @@
!isNil(distanceLimitStatus) &&
distanceLimitStatus === DistanceLimitStatusEnum.SET
) {
- deviceSettingFormModelFromOsd.distanceLimitStatus.state = true
- deviceSettingFormModelFromOsd.distanceLimitStatus.distanceLimit =
+ deviceSettingFormModelFromOsd.value.distanceLimitStatus.state = true
+ deviceSettingFormModelFromOsd.value.distanceLimitStatus.distanceLimit =
device?.distance_limit_status?.distance_limit || 15
} else {
- deviceSettingFormModelFromOsd.distanceLimitStatus.state = false
- deviceSettingFormModelFromOsd.distanceLimitStatus.distanceLimit = 15
+ deviceSettingFormModelFromOsd.value.distanceLimitStatus.state = false
+ deviceSettingFormModelFromOsd.value.distanceLimitStatus.distanceLimit = 15
}
// 避障
if (isNil(device?.obstacle_avoidance)) {
- deviceSettingFormModelFromOsd.obstacleAvoidanceHorizon = false
- deviceSettingFormModelFromOsd.obstacleAvoidanceUpside = false
- deviceSettingFormModelFromOsd.obstacleAvoidanceDownside = false
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceHorizon = false
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceUpside = false
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceDownside = false
} else {
const { horizon, upside, downside } = device.obstacle_avoidance || {}
if (!isNil(horizon) && horizon === ObstacleAvoidanceStatusEnum.OPEN) {
- deviceSettingFormModelFromOsd.obstacleAvoidanceHorizon = true
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceHorizon = true
} else {
- deviceSettingFormModelFromOsd.obstacleAvoidanceHorizon = false
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceHorizon = false
}
if (!isNil(upside) && upside === ObstacleAvoidanceStatusEnum.OPEN) {
- deviceSettingFormModelFromOsd.obstacleAvoidanceUpside = true
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceUpside = true
} else {
- deviceSettingFormModelFromOsd.obstacleAvoidanceUpside = false
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceUpside = false
}
if (!isNil(downside) && downside === ObstacleAvoidanceStatusEnum.OPEN) {
- deviceSettingFormModelFromOsd.obstacleAvoidanceDownside = true
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceDownside = true
} else {
- deviceSettingFormModelFromOsd.obstacleAvoidanceDownside = false
+ deviceSettingFormModelFromOsd.value.obstacleAvoidanceDownside = false
}
}
- return deviceSettingFormModelFromOsd
+ return deviceSettingFormModelFromOsd.value
}
--
Gitblit v1.9.3