From 0ea24e032913373ea743651cb2cfe32d585245b0 Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Thu, 1 Jan 2026 12:05:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                 | 102 +++++++++-------------------------------
 pages/control/index.vue |   4 +-
 2 files changed, 25 insertions(+), 81 deletions(-)

diff --git a/App.vue b/App.vue
index afe3896..b86da0c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,89 +1,33 @@
 <script>
-  import config from './config'
-  import { getToken } from '@/utils/auth'
-  import {
-    initMQTT,
-    disconnectMQTT,
-    getMQTTStatus,
-    manualReconnect
-  } from '@/utils/mqtt';
-  export default {
-    globalData: {
-      mqttClient: null, // 全局MQTT客户端实例
-      mqttConfig: {     // MQTT全局配置（可根据环境切换）
-        host: '1.94.254.176',
-        port: 9001,      // 小程序用wss端口（如EMQ X的8084）
-        isSSL: false,     // true=wss，false=ws
-        username: 'admin',
-        password: 'Admin#12345678',
-        keepalive: 60,
-        clean: true
-      },
-      mqttSubscribeList: [ // 全局基础订阅列表（所有页面都需要的主题）
-        {topic: 'dtu/#', qos: 0},
-        // {topic: 'system/status', qos: 1}
-      ],
-    },
-    onLaunch() {
-      this.initApp()
-      console.log('应用启动，初始化MQTT连接');
-      this.initGlobalMQTT();
-    },
-    onShow() {
-      console.log('应用切前台，检查MQTT连接');
-      const { isConnected } = getMQTTStatus();
-      if (!isConnected) {
-        this.initGlobalMQTT();
-      }
-      console.info("mqtt：",isConnected,getMQTTStatus);
-    },
+import config from './config'
+import { getToken } from '@/utils/auth'
 
-    onHide() {
-      console.log('应用切后台，断开MQTT连接');
-      // 切后台主动断开（避免小程序后台占用资源）
-      disconnectMQTT();
-      this.globalData.mqttClient = null;
+export default {
+  onLaunch: function() {
+    this.initApp()
+  },
+  methods: {
+    // 初始化应用
+    initApp() {
+      // 初始化应用配置
+      this.initConfig()
+      // 检查用户登录状态
+      //#ifdef H5
+      this.checkLogin()
+      //#endif
     },
-    methods: {
-      // 初始化应用
-      initApp() {
-        // 初始化应用配置
-        this.initConfig()
-        // 检查用户登录状态
-        //#ifdef H5
-        this.checkLogin()
-        //#endif
-      },
-      initConfig() {
-        this.globalData.config = config
-      },
-      checkLogin() {
-        if (!getToken()) {
-          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);
-        }
+    initConfig() {
+      this.globalData.config = config
+    },
+    checkLogin() {
+      if (!getToken()) {
+        this.$tab.reLaunch('/pages/login')
       }
     }
   }
+}
 </script>
 
 <style lang="scss">
-  @import '@/static/scss/index.scss';
+@import '@/static/scss/index.scss'
 </style>
diff --git a/pages/control/index.vue b/pages/control/index.vue
index 8ec4ebe..2791db2 100644
--- a/pages/control/index.vue
+++ b/pages/control/index.vue
@@ -359,7 +359,7 @@ export default {
             //todo
 
             // this.status[type] = this.status[type] === 0 ? 1 : 0;
-            // this.show[type] = this.status[type] === 0 ? "运行" : "暂停";
+            // this.show[type] = this.status[type] === 0 ? "暂停" : "运行";
 
           }
         }
@@ -475,7 +475,7 @@ export default {
 
       if (isSuccess) {
         this.status[type] = this.status[type] === 0 ? 1 : 0;
-        this.show[type] = this.status[type] === 0 ? "运行" : "暂停";
+        this.show[type] = this.status[type] === 0 ? "暂停" : "运行";
       }
       this.deviceType = '';
       this.$modal.msgSuccess("设备操作成功！")

From ead9717f221ba19919c8eb5b27dfce74a4843d8e Mon Sep 17 00:00:00 2001
From: xce <mahuanran01@gamil.com>
Date: Sun, 4 Jan 2026 23:52:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?mqtt=E6=9B=B4=E6=8D=A2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json           | 2 +-
 pages/control/index.vue | 2 +-
 pages/demo/index.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index ffd45fb..51ab1e1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,7 +41,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxccd7e2a0911b3397",
+        "appid" : "wxd86ebf13689eac0d",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,
diff --git a/pages/control/index.vue b/pages/control/index.vue
index 2791db2..a1a5aac 100644
--- a/pages/control/index.vue
+++ b/pages/control/index.vue
@@ -172,7 +172,7 @@ export default {
       mqttClient: null,
       temp: "",
       mqttConfig: {
-        host: '1.94.254.176',
+        host: '122.51.109.52',
         port: 9001,
         username: 'admin',
         password: 'Admin#12345678',
diff --git a/pages/demo/index.vue b/pages/demo/index.vue
index 8ad983a..23ea720 100644
--- a/pages/demo/index.vue
+++ b/pages/demo/index.vue
@@ -238,7 +238,7 @@ export default {
     return {
       // MQTT配置
       mqttConfig: {
-        broker: 'ws://1.94.254.176:9001/mqtt', // 公共测试服务器
+        broker: 'ws://122.51.109.52:9001/mqtt', // 公共测试服务器
         clientId: 'uniapp_mqtt_' + Math.random().toString(16).substr(2, 8),
         username: 'admin',
         password: 'Admin#12345678',