From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/types/device-cmd.ts | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/types/device-cmd.ts b/src/types/device-cmd.ts
index 621fd25..c1e545d 100644
--- a/src/types/device-cmd.ts
+++ b/src/types/device-cmd.ts
@@ -1,4 +1,4 @@
-import { AlarmModeEnum, BatteryStoreModeEnum, DroneBatteryModeEnum } from '/@/types/airport-tsa';
+import { AlarmModeEnum, BatteryStoreModeEnum, DroneBatteryModeEnum, LinkWorkModeEnum } from '/@/types/airport-tsa'
// 机场指令集
export enum DeviceCmd {
// 简单指令
@@ -23,10 +23,10 @@
AlarmStateSwitch = 'alarm_state_switch', // 机场声光报警
BatteryStoreModeSwitch = 'battery_store_mode_switch', // 电池保养
DroneBatteryModeSwitch = 'battery_maintenance_switch', // 飞行器电池保养
-
+ SdrWorkModeSwitch = 'sdr_workmode_switch', // 增强图传
}
-export type DeviceCmdItemAction = AlarmModeEnum | BatteryStoreModeEnum | DroneBatteryModeEnum
+export type DeviceCmdItemAction = AlarmModeEnum | BatteryStoreModeEnum | DroneBatteryModeEnum | LinkWorkModeEnum
export interface DeviceCmdItem{
label: string, // 标题
@@ -39,6 +39,16 @@
loading: boolean // 按钮loading
disabled?: boolean // 按钮disabled
}
+export const noDebugCmdList: DeviceCmdItem[] = [
+ {
+ label: 'Return Home',
+ status: '--',
+ operateText: 'Return Home',
+ cmdKey: DeviceCmd.ReturnHome,
+ func: 'returnHome',
+ loading: false,
+ },
+]
// 机场指令
export const cmdList: DeviceCmdItem[] = [
@@ -88,14 +98,6 @@
cmdKey: DeviceCmd.ChargeOpen,
oppositeCmdKey: DeviceCmd.ChargeClose,
func: 'chargeStatus',
- loading: false,
- },
- {
- label: '一键返航',
- status: '--',
- operateText: '返航',
- cmdKey: DeviceCmd.ReturnHome,
- func: 'returnHome',
loading: false,
},
{
@@ -150,6 +152,15 @@
func: 'droneBatteryMode',
loading: false,
disabled: true,
+ },
+ {
+ label: '4g 增强',
+ status: '--',
+ operateText: '开启',
+ cmdKey: DeviceCmd.SdrWorkModeSwitch,
+ action: LinkWorkModeEnum.FourG_FUSION_MODE,
+ func: 'sdrWorkMode',
+ loading: false,
},
]
@@ -239,6 +250,16 @@
DroneBatteryModeMaintenanceNeedText = '需保养',
DroneBatteryModeOpenBtnText = '保养',
DroneBatteryModeCloseBtnText = '关闭保养',
+
+ SdrWorkModeFourGOpenNormalText = '开',
+ SdrWorkModeFourGOpenText = '开启中...',
+ SdrWorkModeFourGOpenFailedText = '--',
+ SdrWorkModeFourGOpenBtnText = '关闭',
+
+ SdrWorkModeFourGCloseNormalText = '--',
+ SdrWorkModeFourGCloseText = '关闭中...',
+ SdrWorkModeFourGCloseFailedText = '开',
+ SdrWorkModeFourCloseBtnText = '开启',
}
// cmd ws 消息状态
@@ -262,6 +283,9 @@
percent: number,
step_key: string,
step_result: number
+ },
+ ext?: {
+ rate?: number
}
}
result: number,
--
Gitblit v1.9.3