From 2ddedb48ebcb4952e57aefe2fa0b2ba8094ea4c0 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 17 Apr 2025 13:52:04 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/hooks/controlDrone/useMqtt.js | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/hooks/controlDrone/useMqtt.js b/src/hooks/controlDrone/useMqtt.js
index 2ee7e3d..caaff48 100644
--- a/src/hooks/controlDrone/useMqtt.js
+++ b/src/hooks/controlDrone/useMqtt.js
@@ -6,23 +6,18 @@
-export function useMqtt (deviceTopicInfo) {
+export function useMqtt (mqttState,deviceTopicInfo) {
let cacheSubscribeArr= []
- const store = useStore()
-
- const mqttState = computed(() => {
- return store.state.common.mqttState
- })
function publishMqtt (topic, body, ots) {
- mqttState.value?.publishMqtt(topic, JSON.stringify(body), ots)
+ mqttState?.publishMqtt(topic, JSON.stringify(body), ots)
}
function subscribeMqtt (topic, handleMessageMqtt) {
- mqttState.value?.subscribeMqtt(topic)
+ mqttState?.subscribeMqtt(topic)
const handler = handleMessageMqtt || onMessageMqtt
- mqttState.value?.on('onMessageMqtt', handler)
+ mqttState?.on('onMessageMqtt', handler)
cacheSubscribeArr.push({
topic,
callback: handler,
@@ -52,8 +47,8 @@
function unsubscribeDrc () {
// 销毁已订阅事件
cacheSubscribeArr.forEach(item => {
- mqttState.value?.off('onMessageMqtt', item.callback)
- mqttState.value?.unsubscribeMqtt(item.topic)
+ mqttState?.off('onMessageMqtt', item.callback)
+ mqttState?.unsubscribeMqtt(item.topic)
})
cacheSubscribeArr = []
}
@@ -87,7 +82,7 @@
},
}
const pingInterval = setInterval(() => {
- if (!mqttState.value) return
+ if (!mqttState) return
heartBeatSeq.value += 1
body.data.ts = new Date().getTime()
body.data.seq = heartBeatSeq.value
--
Gitblit v1.9.3