From a7e6761ba0cfccdf33ed552eb2d3b783c8e4ab4a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 20:49:12 +0800
Subject: [PATCH] feat:事件弹窗显示调整

---
 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