From 3529b83937d8c7ab6a176d2fd1c00dd21152531e Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Wed, 31 Dec 2025 10:53:59 +0800
Subject: [PATCH] mqtt

---
 App.vue                 | 69 +++++++++++++++++++++++------------------
 pages/control/index.vue |  2 +-
 utils/mqtt.js           |  4 +--
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/App.vue b/App.vue
index afe3896..dbc213c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,12 +1,8 @@
 <script>
   import config from './config'
   import { getToken } from '@/utils/auth'
-  import {
-    initMQTT,
-    disconnectMQTT,
-    getMQTTStatus,
-    manualReconnect
-  } from '@/utils/mqtt';
+  import { initMQTT, disconnectMQTT, getMQTTStatus, getMQTTClient } from '@/utils/mqtt'; // 替换为你的mqtt工具层路径
+
   export default {
     globalData: {
       mqttClient: null, // 全局MQTT客户端实例
@@ -20,7 +16,9 @@
         clean: true
       },
       mqttSubscribeList: [ // 全局基础订阅列表（所有页面都需要的主题）
-        {topic: 'dtu/#', qos: 0},
+        "dtu/864865085016294/up",
+        "dtu/864536071808560/up",
+        "dtu/864865085008135/up"
         // {topic: 'system/status', qos: 1}
       ],
     },
@@ -31,18 +29,20 @@
     },
     onShow() {
       console.log('应用切前台，检查MQTT连接');
-      const { isConnected } = getMQTTStatus();
-      if (!isConnected) {
+      const { isConnected, isManualDisconnect } = getMQTTStatus();
+      // 未连接且非手动断开 → 重新初始化连接
+      if (!isConnected && !isManualDisconnect) {
         this.initGlobalMQTT();
       }
       console.info("mqtt：",isConnected,getMQTTStatus);
     },
-
+    // 应用切后台时触发（最小化/锁屏/切换应用）
     onHide() {
       console.log('应用切后台，断开MQTT连接');
-      // 切后台主动断开（避免小程序后台占用资源）
-      disconnectMQTT();
-      this.globalData.mqttClient = null;
+      // 手动断开连接（避免后台消耗资源）
+      disconnectMQTT(() => {
+        console.log('MQTT断开完成，应用进入后台');
+      });
     },
     methods: {
       // 初始化应用
@@ -62,23 +62,32 @@
           this.$tab.reLaunch('/pages/login') 
         }
       },
-      // 初始化全局MQTT
-      async initGlobalMQTT() {
-        try {
-          // 调用工具类初始化连接（传入全局配置+全局订阅列表）
-          const client = await initMQTT(
-              this.globalData.mqttConfig,
-              this.globalData.mqttSubscribeList
-          );
-          // 挂载客户端到全局
-          this.globalData.mqttClient = client;
-          // 通知所有页面：客户端已就绪，可绑定自定义事件
-          uni.$emit('mqtt_client_ready', client);
-          console.log('全局MQTT初始化成功');
-        } catch (err) {
-          console.error('全局MQTT初始化失败：', err);
-          uni.$emit('mqtt_init_fail', err);
-        }
+      /**
+       * 初始化全局MQTT连接（核心方法）
+       */
+      initGlobalMQTT() {
+        const {mqttConfig, mqttSubscribeList} = this.globalData;
+
+        // 调用MQTT工具层的初始化方法
+        initMQTT(
+            mqttConfig,
+            mqttSubscribeList,
+            // 连接成功回调
+            (client) => {
+              console.log('MQTT全局连接成功');
+              this.globalData.mqttClient = getMQTTClient();
+            },
+            // 连接失败回调
+            (err) => {
+              console.error('MQTT全局连接失败：', err);
+              // 可添加重试逻辑/用户提示
+              uni.showToast({
+                title: '设备通信异常',
+                icon: 'none',
+                duration: 3000
+              });
+            }
+        );
       }
     }
   }
diff --git a/pages/control/index.vue b/pages/control/index.vue
index 8ec4ebe..ae7c22f 100644
--- a/pages/control/index.vue
+++ b/pages/control/index.vue
@@ -160,7 +160,7 @@ import UniDatetimePicker
   from "../../uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue";
 import { findDtuDataByInfo } from "@/api/system/data";
 
-import { getMQTTClientInstance, publishMQTT } from '@/utils/mqtt';
+import { getMQTTClient } from '@/utils/mqtt';
 
 export default {
   dicts: ['sys_data_map'],
diff --git a/utils/mqtt.js b/utils/mqtt.js
index 7b2e95b..f272a20 100644
--- a/utils/mqtt.js
+++ b/utils/mqtt.js
@@ -153,8 +153,8 @@ export function disconnectMQTT(onComplete) {
  * 获取MQTT客户端实例
  * @returns {Client} MQTT客户端
  */
-export function getMQTTClientInstance() {
-    return client.instance;
+export function getMQTTClient() {
+    return client;
 }
 
 /**