From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 1af3a6a..db24c47 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -259,6 +259,39 @@
                             restartApp(mHDLApp);
                         }
                     }, 500);
+                } else if (type == LogoutType.UniLogout.getValue()) {
+                    AppManagerUtils.getAppManager().finishAllActivity();
+                    //娓呯┖浣忓畢id
+                    UserConfigManage.getInstance().setHomeId("");
+                    UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(true);
+                    //閲嶆柊璁惧畾涓�涓椂闂�
+                    UserConfigManage.getInstance().setLoginDateTime(0);
+                    UserConfigManage.getInstance().Save();
+                    //娓呯┖娑堟伅缂撳瓨鏁版嵁
+                    HdlMessageLogic.getInstance().clearListMessage();
+                    //娓呯┖鐢电珯缂撳瓨鏁版嵁
+                    HdlResidenceLogic.getInstance().clearHouseList();
+                    //娓呯┖璁惧缂撳瓨鏁版嵁
+                    HdlDeviceLogic.getInstance().clearDeviceList();
+                    //娓呯┖缂撳瓨鏁版嵁
+                    if (mInfoMap != null) {
+                        mInfoMap.clear();
+                    }
+                    //鏂紑mqtt杩炴帴
+                    if (MqttRecvClient.getInstance() != null) {
+                        MqttRecvClient.getInstance().disConnect();
+                    }
+                    //鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛�
+                    // TODO: 10/10/23
+//                TcpSocketBoot.stopAllConnectLinkGateway();
+                    if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+                        HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+                    }
+                    SystemClock.sleep(200);
+                    initDCUniMPSDK();
+                    Intent intent = new Intent(getInstance(), LoginActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    startActivity(intent);
                 } else {
                     HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
                     //鍒犻櫎鎺ㄩ�乀oken

--
Gitblit v1.8.0