+
{{ osdVisible.gateway_callsign }}
-
+
@@ -267,7 +267,7 @@
- {{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}
+ {{ deviceInfo.dock.basic_osd?.drone_in_dock }}
@@ -413,6 +413,17 @@
+
+
+
@@ -452,6 +463,8 @@ import DockControlPanel from './g-map/DockControlPanel.vue'
import { useDockControl } from './g-map/use-dock-control'
import DroneControlPanel from './g-map/DroneControlPanel.vue'
import { useConnectMqtt } from './g-map/use-connect-mqtt'
+import LivestreamOthers from './livestream-others.vue'
+import LivestreamAgora from './livestream-agora.vue'
export default defineComponent({
components: {
@@ -475,7 +488,9 @@ export default defineComponent({
DockControlPanel,
DroneControlPanel,
CarryOutOutlined,
- RocketOutlined
+ RocketOutlined,
+ LivestreamOthers,
+ LivestreamAgora
},
name: 'GMap',
props: {},
@@ -534,6 +549,12 @@ export default defineComponent({
const drawVisible = computed(() => {
return store.state.drawVisible
})
+ const livestreamOthersVisible = computed(() => {
+ return store.state.livestreamOthersVisible
+ })
+ const livestreamAgoraVisible = computed(() => {
+ return store.state.livestreamAgoraVisible
+ })
const osdVisible = computed(() => {
return store.state.osdVisible
})
@@ -572,7 +593,7 @@ export default defineComponent({
}
}
if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
- deviceTsaUpdateHook.initMarker(EDeviceTypeName.Dock, [EDeviceTypeName.Dock], data.currentSn, data.dockInfo[data.currentSn].basic_osd?.longitude, data.dockInfo[data.currentSn].basic_osd?.latitude)
+ deviceTsaUpdateHook.initMarker(EDeviceTypeName.Dock, EDeviceTypeName[EDeviceTypeName.Dock], data.currentSn, data.dockInfo[data.currentSn].basic_osd?.longitude, data.dockInfo[data.currentSn].basic_osd?.latitude)
if (osdVisible.value.visible && osdVisible.value.is_dock && osdVisible.value.gateway_sn !== '') {
deviceInfo.dock = data.dockInfo[osdVisible.value.gateway_sn]
deviceInfo.device = data.deviceInfo[deviceInfo.dock.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
@@ -607,15 +628,27 @@ export default defineComponent({
})
updateCoordinates('wgs84-gcj02', ele)
- useGMapCoverHook.init2DPin(
- ele.name,
- ele.resource.content.geometry.coordinates,
- ele.resource.content.properties.color,
- {
- id: ele.id,
- name: ele.name
- }
- )
+ const data = { id: ele.id, name: ele.name }
+ if (MapElementEnum.PIN === ele.resource?.type) {
+ useGMapCoverHook.init2DPin(
+ ele.name,
+ ele.resource.content.geometry.coordinates,
+ ele.resource.content.properties.color,
+ data
+ )
+ } else if (MapElementEnum.LINE === ele.resource?.type) {
+ useGMapCoverHook.initPolyline(
+ ele.name,
+ ele.resource.content.geometry.coordinates,
+ ele.resource.content.properties.color,
+ data)
+ } else if (MapElementEnum.POLY === ele.resource?.type) {
+ useGMapCoverHook.initPolygon(
+ ele.name,
+ ele.resource.content.geometry.coordinates,
+ ele.resource.content.properties.color,
+ data)
+ }
}
store.state.wsEvent.mapElementCreat = {}
@@ -749,6 +782,12 @@ export default defineComponent({
console.log('layers', layers)
store.commit('SET_LAYER_INFO', layers)
}
+ function closeLivestreamOthers () {
+ store.commit('SET_LIVESTREAM_OTHERS_VISIBLE', false)
+ }
+ function closeLivestreamAgora () {
+ store.commit('SET_LIVESTREAM_AGORA_VISIBLE', false)
+ }
function updateCoordinates (transformType: string, element: any) {
const geoType = element.resource?.content.geometry.type
const type = element.resource?.type as number
@@ -769,39 +808,38 @@ export default defineComponent({
) as GeojsonCoordinate
element.resource.content.geometry.coordinates = transResult
}
- } else if (MapElementEnum.LINE === type && geoType === 'LineString') {
+ } else if (MapElementEnum.LINE === type) {
const coordinates = element.resource?.content.geometry
.coordinates as GeojsonCoordinate[]
if (transformType === 'wgs84-gcj02') {
- coordinates.forEach(coordinate => {
- coordinate = wgs84togcj02(
+ coordinates.forEach((coordinate, i, arr) => {
+ arr[i] = wgs84togcj02(
coordinate[0],
coordinate[1]
) as GeojsonCoordinate
})
} else if (transformType === 'gcj02-wgs84') {
- coordinates.forEach(coordinate => {
- coordinate = gcj02towgs84(
+ coordinates.forEach((coordinate, i, arr) => {
+ arr[i] = gcj02towgs84(
coordinate[0],
coordinate[1]
) as GeojsonCoordinate
})
}
element.resource.content.geometry.coordinates = coordinates
- } else if (MapElementEnum.LINE === type && geoType === 'Polygon') {
+ } else if (MapElementEnum.POLY === type) {
const coordinates = element.resource?.content.geometry
.coordinates[0] as GeojsonCoordinate[]
-
if (transformType === 'wgs84-gcj02') {
- coordinates.forEach(coordinate => {
- coordinate = wgs84togcj02(
+ coordinates.forEach((coordinate, i, arr) => {
+ arr[i] = wgs84togcj02(
coordinate[0],
coordinate[1]
) as GeojsonCoordinate
})
} else if (transformType === 'gcj02-wgs84') {
- coordinates.forEach(coordinate => {
- coordinate = gcj02towgs84(
+ coordinates.forEach((coordinate, i, arr) => {
+ arr[i] = gcj02towgs84(
coordinate[0],
coordinate[1]
) as GeojsonCoordinate
@@ -815,6 +853,8 @@ export default defineComponent({
draw,
mouseMode,
drawVisible,
+ livestreamOthersVisible,
+ livestreamAgoraVisible,
osdVisible,
pin,
state,
@@ -830,7 +870,9 @@ export default defineComponent({
NetworkStateTypeEnum,
NetworkStateQualityEnum,
RainfallEnum,
- DroneInDockEnum
+ DroneInDockEnum,
+ closeLivestreamOthers,
+ closeLivestreamAgora
}
}
})
@@ -875,7 +917,8 @@ export default defineComponent({
}
.osd-panel {
position: absolute;
- left: 10px;
+ margin-left: 10px;
+ left: 0;
top: 10px;
width: 480px;
background: #000;
@@ -926,4 +969,17 @@ export default defineComponent({
min-height: 2px;
border-radius: 2px;
}
+
+.liveview {
+ position: absolute;
+ color: #fff;
+ z-index: 1;
+ left: 0;
+ margin-left: 10px;
+ top: 10px;
+ text-align: center;
+ width: 800px;
+ height: 720px;
+ background: #232323;
+}
diff --git a/src/components/g-map/DockControlPanel.vue b/src/components/g-map/DockControlPanel.vue
index ade675b..0c52427 100644
--- a/src/components/g-map/DockControlPanel.vue
+++ b/src/components/g-map/DockControlPanel.vue
@@ -73,15 +73,14 @@ watch(() => props.deviceInfo, (value) => {
deep: true
})
+// dock 控制指令
+const debugStatus = ref(props.deviceInfo.dock?.basic_osd?.mode_code === EDockModeCode.Remote_Debugging)
const emit = defineEmits(['close-control-panel'])
function closeControlPanel () {
- emit('close-control-panel', props.sn)
+ emit('close-control-panel', props.sn, debugStatus.value)
}
-// dock 控制指令
-const debugStatus = ref(props.deviceInfo.dock?.basic_osd.mode_code === EDockModeCode.Remote_Debugging)
-
async function onDeviceStatusChange (status: boolean) {
let result = false
if (status) {
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index ea8956a..6aa8c16 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -112,15 +112,53 @@
:options="WaylineLostControlActionInCommandFlightOptions"
>