From 2c2bc8614c8ea0ce386369eb4924da1e6aa052d1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 27 Sep 2023 09:35:57 +0800
Subject: [PATCH] 添加环境配置区分
---
src/types/device.ts | 135 +++++++++++++++++++++++++++++++++++----------
1 files changed, 105 insertions(+), 30 deletions(-)
diff --git a/src/types/device.ts b/src/types/device.ts
index f23f27e..f7be5c4 100644
--- a/src/types/device.ts
+++ b/src/types/device.ts
@@ -1,6 +1,8 @@
import { commonColor } from '/@/utils/color'
import { NightLightsStateEnum, DistanceLimitStatus, ObstacleAvoidance } from './device-setting'
import { AlarmModeEnum, BatteryStoreModeEnum, DroneBatteryStateEnum, FourGLinkStateEnum, SdrLinkStateEnum, LinkWorkModeEnum } from './airport-tsa'
+import { CameraMode } from '/@/types/live-stream'
+
export interface DeviceValue {
key: string; // 'domain-type-subtype'
domain: string; // 表示一个领域，作为一个命名空间，暂时分 飞机类-0, 负载类-1,RC类-2,机场类-3 4种
@@ -20,11 +22,8 @@
export enum DRONE_TYPE {
M30 = 67,
M300 = 60,
- Phantom4 = 11,
- Phantom4Pro = 18,
- Phantom4RTK = 59,
- Phantom4Advanced = 27,
Mavic3EnterpriseAdvanced= 77,
+ M350 = 89,
}
// DJI负载类型枚举值
@@ -76,10 +75,7 @@
M3T: `${DOMAIN.DRONE}-${DRONE_TYPE.Mavic3EnterpriseAdvanced}-${DEVICE_SUB_TYPE.ONE}`,
M300: `${DOMAIN.DRONE}-${DRONE_TYPE.M300}-${DEVICE_SUB_TYPE.ZERO}`,
- Phantom4: `${DOMAIN.DRONE}-${DRONE_TYPE.Phantom4}-${DEVICE_SUB_TYPE.ZERO}`,
- Phantom4Pro: `${DOMAIN.DRONE}-${DRONE_TYPE.Phantom4Pro}-${DEVICE_SUB_TYPE.ZERO}`,
- Phantom4RTK: `${DOMAIN.DRONE}-${DRONE_TYPE.Phantom4RTK}-${DEVICE_SUB_TYPE.ZERO}`,
- Phantom4Advanced: `${DOMAIN.DRONE}-${DRONE_TYPE.Phantom4Advanced}-${DEVICE_SUB_TYPE.ZERO}`,
+ M350: `${DOMAIN.DRONE}-${DRONE_TYPE.M350}-${DEVICE_SUB_TYPE.ZERO}`,
FPV: `${DOMAIN.PAYLOAD}-${PAYLOAD_TYPE.FPV}-${DEVICE_SUB_TYPE.ZERO}`,
H20: `${DOMAIN.PAYLOAD}-${PAYLOAD_TYPE.H20}-${DEVICE_SUB_TYPE.ZERO}`,
@@ -113,10 +109,7 @@
[DEVICE_MODEL_KEY.M3T]: 'Mavic 3T',
// [DEVICE_MODEL_KEY.M3M]: 'Mavic 3M',
[DEVICE_MODEL_KEY.M300]: 'M300 RTK',
- [DEVICE_MODEL_KEY.Phantom4]: 'Phantom 4',
- [DEVICE_MODEL_KEY.Phantom4Pro]: 'Phantom 4 Pro',
- [DEVICE_MODEL_KEY.Phantom4RTK]: 'Phantom 4 RTK',
- [DEVICE_MODEL_KEY.Phantom4Advanced]: 'Phantom 4 Advanced',
+ [DEVICE_MODEL_KEY.M350]: 'M350 RTK',
// payload
[DEVICE_MODEL_KEY.FPV]: 'FPV',
@@ -141,6 +134,37 @@
// dock
[DEVICE_MODEL_KEY.Dock]: 'Dock',
+}
+
+// 控制权
+export enum ControlSource {
+ A = 'A',
+ B = 'B'
+}
+
+export interface PayloadInfo {
+ index: number,
+ model: string,
+ control_source?: ControlSource,
+ payload_sn?: string,
+ payload_index?: string,
+ payload_name?: string,
+}
+
+// 设备信息
+export interface OnlineDevice {
+ model: string,
+ callsign: string,
+ sn: string,
+ mode: number,
+ gateway: {
+ model: string,
+ callsign: string,
+ sn: string,
+ domain: string,
+ },
+ payload: PayloadInfo[],
+ selected?:boolean,
}
// 固件升级类型
@@ -184,7 +208,7 @@
children?: Device[],
domain: number,
type: number,
- firmware_progress?: number, // 升级进度
+ firmware_progress?: string, // 升级进度
}
export interface DeviceStatus {
@@ -207,6 +231,7 @@
is_dock: boolean,
gateway_sn: string,
gateway_callsign: string,
+ payloads: null | PayloadInfo [],
}
export interface GatewayOsd {
@@ -215,6 +240,24 @@
longitude: number,
latitude: number,
}
+
+export interface OsdCameraLiveview {
+ bottom: number,
+ left: number,
+ right: number,
+ top: number,
+}
+export interface DeviceOsdCamera {
+ camera_mode: CameraMode,
+ payload_index: string,
+ photo_state: number,
+ record_time: number,
+ recording_state: number,
+ remain_photo_num: number,
+ remain_record_duration: number,
+ liveview_world_region: OsdCameraLiveview
+}
+
export interface DeviceOsd {
longitude: number,
latitude: number,
@@ -242,6 +285,7 @@
height_limit?: number;// 限高设置
distance_limit_status?: DistanceLimitStatus;// 限远开关
obstacle_avoidance?: ObstacleAvoidance;// 飞行器避障开关设置
+ cameras?: DeviceOsdCamera[]
}
export enum NetworkStateTypeEnum {
@@ -263,16 +307,16 @@
}
export enum DroneInDockEnum {
- INSIDE, OUTSIDE
+ OUTSIDE, INSIDE
}
export interface DockBasicOsd {
- network_state: {
+ network_state?: {
type: NetworkStateTypeEnum,
quality: number,
rate: number,
},
- drone_charge_state: {
+ drone_charge_state?: {
state: number,
capacity_percent: number,
},
@@ -285,7 +329,7 @@
latitude: number,
longitude: number,
height: number,
- alternate_land_point: {
+ alternate_land_point?: {
latitude: number,
longitude: number,
height: number,
@@ -293,14 +337,14 @@
is_configured: number
}
first_power_on: number,
- positionState: {
+ positionState?: {
gps_number: number,
is_fixed: number,
rtk_number: number,
is_calibration: number,
quality: number,
},
- storage: {
+ storage?: {
total: number,
used: number,
},
@@ -308,25 +352,32 @@
cover_state: number,
supplement_light_state: number,
emergency_stop_state: number,
- air_conditioner: {
+ air_conditioner?: {
air_conditioner_state: number,
switch_time: number,
}
battery_store_mode?: BatteryStoreModeEnum; // 电池保养(存储)模式
alarm_state?: AlarmModeEnum; // 机场声光报警状态
putter_state: number,
- sub_device: {
+ sub_device?: {
device_sn?: string,
device_model_key?: string,
device_online_status: number,
device_paired: number,
},
+ // live_capacity?: LiveCapacity; // 直播能力
+ // live_status?: Array<LiveStatus>; // 直播状态
}
-
+export enum DrcStateEnum {
+ DISCONNECT = 0,
+ CONNECTING = 1,
+ CONNECTED = 2
+}
export interface DockLinkOsd {
+ drc_state: DrcStateEnum,
flighttask_prepare_capacity: number,
flighttask_step_code: number,
- media_file_detail: {
+ media_file_detail?: {
remain_upload: number
},
sdr: {
@@ -334,7 +385,7 @@
down_quality: string,
frequency_band: number,
},
- wireless_link?:{
+ wireless_link?:{ // 图传链路<会包括4G和sdr信息
dongle_number: number, // dongle 数量
['4g_link_state']: FourGLinkStateEnum, // 4g_link_state
sdr_link_state: SdrLinkStateEnum, // sdr链路连接状态
@@ -359,13 +410,13 @@
job_number: number,
acc_time: number,
activation_time: number,
- maintain_status: {
+ maintain_status?: {
maintain_status_array: MaintainStatus[]
}
electric_supply_voltage: number,
working_voltage: string,
working_current: string,
- backup_battery: {
+ backup_battery?: {
voltage: number,
temperature: number,
switch: number,
@@ -379,9 +430,25 @@
export interface DockOsd {
basic_osd: DockBasicOsd,
link_osd: DockLinkOsd,
- work_osd: DockWorkOsd
+ work_osd: DockWorkOsd
}
-
+export enum EModeText {
+ '待机' = 0,
+ '准备' = 1,
+ '准备就绪' = 2,
+ '手动操作' = 3,
+ '自动操作' = 4,
+ '航线'=5,
+ '全景'=6,
+ '跟踪启用'=7,
+ '广播监视' =8,
+ '返航'=9,
+ '降落'=10,
+ '迫降'=11,
+ '三叶式着陆'=12,
+ '升级'=13,
+ '离线'=14
+}
export enum EModeCode {
Standby,
Preparing,
@@ -417,6 +484,7 @@
M30 = '0-67-0' as any,
M30T = '0-67-1' as any,
M300 = '0-60-0' as any,
+ M350 = DEVICE_MODEL_KEY.M350 as any,
Z30 = '1-20-0' as any,
XT2 = '1-26-0' as any,
FPV = '1-39-0' as any,
@@ -434,7 +502,14 @@
M3E_Camera = '1-66-0' as any,
M3T_Camera = '1-67-0' as any,
}
-
+export enum EDockModeText {
+ '已断开连接' = -1,
+ '空闲' = 0,
+ '调试' = 1,
+ '远程调试' = 2,
+ '正在升级' = 3,
+ '工作中' = 4
+}
export enum EDockModeCode {
Disconnected = -1,
Idle,
@@ -460,7 +535,7 @@
}
// TODO: 设备拓扑管理优化
-// 设备信息
+// 设备osd信息
export interface DeviceInfoType {
gateway: GatewayOsd, // 遥控器
dock: DockOsd, // 机场
--
Gitblit v1.9.3