From dfac8531d4ed65183ebffcbc7f88aea16f6ac64b Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 18 Apr 2025 19:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/CurrentTaskDetails/CurrentTaskDetails.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
index 1d8f12c..d259b64 100644
--- a/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
+++ b/src/components/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -47,21 +47,29 @@
import { ElMessage } from 'element-plus'
import EventBus from '@/event-bus'
import { updateDroneQualityApi } from '@/api/drc'
+import { getLiveAiLinkApi } from '@/api/payload'
+import { CURRENT_CONFIG } from '@/utils/http/config'
const isAutoControl = ref(true)
const lineQuality = ref(1) //1流畅，2标清
provide('isAutoControl', isAutoControl)
provide('lineQuality', lineQuality)
+const taskDetailsViewer = ref(null)
+provide('taskDetailsViewer', taskDetailsViewer)
+
let taskDetails = ref({})
-const deviceOsdInfo = ref({})
provide('taskDetails', taskDetails)
+const deviceOsdInfo = ref({})
provide('deviceOsdInfo', deviceOsdInfo)
const dockSn = computed(() => taskDetails?.value?.device_sns?.[0])
const droneSn = computed(() => deviceOsdInfo?.value?.data?.sn)
provide('dockSn', dockSn)
provide('droneSn', droneSn)
+
+const isAiLive = ref(false)
+provide('isAiLive', isAiLive)
const isShow = defineModel('show')
const props = defineProps(['id'])
@@ -70,19 +78,27 @@
const isMaxMap = ref(false)
let droneWebSocket //WS实例
-// 机巢直播
+const video_id = ref('')
+provide('video_id', video_id)
+
+// 获取机巢直播
const getDeviceLiveUrl = async () => {
const res = await liveStart(dockSn.value, 2)
currentLiveUrl.value = res.data.data.rtcs_url
}
-const video_id = ref('')
+const getAiLiveUrl = ()=>{
+ const res = getLiveAiLinkApi({ original_stream_url: `${CURRENT_CONFIG.rtmpURL}${video_id.value}`, video_id:video_id.value })
+ currentLiveUrl.value = res.data.data.rtcs_url
+ isAiLive.value = true
+}
// 获取无人机直播url
async function getDroneLiveUrl() {
const res = await liveStart(droneSn.value, lineQuality.value)
currentLiveUrl.value = res.data.data.rtcs_url
video_id.value = res.data.data.video_id
+ isAiLive.value = false
}
// 无人机直播画质切换
@@ -113,14 +129,41 @@
})
}
+const dockOsdInfo = ref({})
+provide('dockOsdInfo', dockOsdInfo)
+
+const wsInfo = ref({})
+provide('wsInfo', wsInfo)
// websocket 的消息回调
const messageHandler = result => {
let payload = JSON.parse(result)
+ wsInfo.value[payload.biz_code] = payload
switch (payload.biz_code) {
+ // 无人机
case EBizCode.DeviceOsd: {
deviceOsdInfo.value = payload
setCurrentLiveUrl()
- console.log(deviceOsdInfo.value, 'device_osd信息')
+ console.log(payload, 'DeviceOsd--信息')
+ break
+ }
+ // 遥控器
+ case EBizCode.GatewayOsd: {
+ console.log(payload, 'GatewayOsd--信息')
+ break
+ }
+ // 机巢
+ case EBizCode.DockOsd: {
+ console.log(payload, 'DockOsd--信息')
+ break
+ }
+ // PsdkWidgetValues
+ case EBizCode.PsdkWidgetValues: {
+ console.log(payload, 'PsdkWidgetValues--信息')
+ break
+ }
+ // VideoSurveillance
+ case EBizCode.VideoSurveillance: {
+ console.log(payload, 'VideoSurveillance--信息')
break
}
default:
@@ -140,6 +183,8 @@
onMounted(() => {
getTaskDetails()
EventBus.on('CurrentTaskDetails-timeStop', changeLineQuality)
+ EventBus.on('CurrentTaskDetails-getAiLiveUrl', getAiLiveUrl)
+ EventBus.on('CurrentTaskDetails-getDroneLiveUrl', getDroneLiveUrl)
})
onBeforeUnmount(() => {
@@ -147,6 +192,8 @@
deviceOsdInfo.value = {}
droneWebSocket = null
EventBus.off('CurrentTaskDetails-timeStop', changeLineQuality)
+ EventBus.off('CurrentTaskDetails-getAiLiveUrl', getAiLiveUrl)
+ EventBus.off('CurrentTaskDetails-getDroneLiveUrl', getDroneLiveUrl)
})
</script>
--
Gitblit v1.9.3