From 0cb577d80ca6cd5d086745ae8d651b0ecff99e67 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 24 六月 2025 16:53:07 +0800
Subject: [PATCH] 2025年06月24日16:53:04
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 96 +++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 0f6a697..dfce959 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -7,6 +7,7 @@
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Build;
+import android.os.Handler;
import android.os.LocaleList;
import android.os.Process;
import android.os.SystemClock;
@@ -233,56 +234,61 @@
HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@Override
public void onReLogin(int type) {
- if (5 == type) {
- //鍒囨崲鏈嶅姟鍣ㄥ湴鍧�鐢ㄧ殑
- UserConfigManage.getInstance().setOnlineServer(!UserConfigManage.getInstance().isOnlineServer());
- UserConfigManage.getInstance().Save();
- restartApp(mHDLApp);
- return;
- }
-
- HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
- //type: 0:姝ｅ父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
- //鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
- AppManagerUtils.getAppManager().finishAllActivity();
+ if (100 == type) {
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ //鍒囨崲鏈嶅姟鍣ㄥ湴鍧�鐢ㄧ殑
+ UserConfigManage.getInstance().setOnlineServer(!UserConfigManage.getInstance().isOnlineServer());
+ UserConfigManage.getInstance().Save();
+ restartApp(mHDLApp);
+ }
+ }, 500);
+ ;
+ } else {
+ HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
+ //type: 0:姝ｅ父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
+ //鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
+ AppManagerUtils.getAppManager().finishAllActivity();
// HDLSDKSPUtils.clear();//搴曞眰鑷繁娓呯┖
- //娓呯┖浣忓畢id
- UserConfigManage.getInstance().setHomeId("");
- //閲嶆柊鐧婚檰,榛樿鍚屾剰闅愮鏀跨瓥
- UserConfigManage.getInstance().setAcceiptPolicy(false);
- //閲嶆柊璁惧畾涓�涓椂闂�
- UserConfigManage.getInstance().setLoginDateTime(0);
- UserConfigManage.getInstance().Save();
+ //娓呯┖浣忓畢id
+ UserConfigManage.getInstance().setHomeId("");
+ //閲嶆柊鐧婚檰,榛樿鍚屾剰闅愮鏀跨瓥
+ UserConfigManage.getInstance().setAcceiptPolicy(false);
+ //閲嶆柊璁惧畾涓�涓椂闂�
+ 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
+ //娓呯┖娑堟伅缂撳瓨鏁版嵁
+ 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();
+ 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);
+ if (type == 1) {
+ intent.putExtra("isJpush", true);
+ }
+ startActivity(intent);
}
- SystemClock.sleep(200);
- initDCUniMPSDK();
- Intent intent = new Intent(getInstance(), LoginActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- if (type == 1) {
- intent.putExtra("isJpush", true);
- }
- startActivity(intent);
}
});
--
Gitblit v1.8.0