From e1da09cef0aa5523d0b3c6dc3de7da4ac11fe520 Mon Sep 17 00:00:00 2001
From: gaozl <gaozl@1000mu.com>
Date: Fri, 5 Jun 2026 16:59:29 +0800
Subject: [PATCH] fix: ci

---
 app/src/main/java/qianmu/container/mqtt/MQTTService.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java
index 33672c0..65e872d 100644
--- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java
+++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java
@@ -245,8 +245,10 @@ public class MQTTService extends Service {
         disconnectMqtt();
         stopSelf();
         try {
-            client.disconnect();
-        } catch (MqttException e) {
+            if (client != null) {
+                client.disconnect();
+            }
+        } catch (Exception e) {
             e.printStackTrace();
         }
         EventBus.getDefault().unregister(this);
@@ -464,7 +466,7 @@ public class MQTTService extends Service {
                 IMqttToken disconnectToken = client.disconnect();
 //                disconnectToken.waitForCompletion();
             }
-        } catch (MqttException e) {
+        } catch (Exception e) {
             LoggerUtil.e(TAG, "断开MQTT连接失败", e);
         }