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/other/HdlUniLogic.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index c3b16be..8c468ae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -38,6 +38,7 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
@@ -715,7 +716,7 @@
case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
HdlLogLogic.print("uni閫氱煡鍘熺敓閫�鍑虹櫥褰�---", true);
// HDLLinkPMUser.getInstance().logout(0);
- HdlAccountLogic.getInstance().logout();
+ HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
}
break;
//鏈湴瀵嗛挜鑾峰彇
@@ -823,6 +824,7 @@
case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
//閫�鍑烘棤缃戞ā寮忔爣璇�
UserConfigManage.getInstance().setNoNetworkFlag(false);
+ UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
UserConfigManage.getInstance().Save();
uniSuccessCallback(mode_type, true, callback);
if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
@@ -833,6 +835,12 @@
HDLApp.getInstance().startActivity(intent);
}
break;
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
+ //璁惧绂荤綉鏃舵湁鍏ュ彛杩涘叆鏃犵綉妯″紡
+ uniSuccessCallback(mode_type, true, callback);
+ HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
+ }
+ break;
case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
try {
//杩涘叆鏃犵綉妯″紡閫嗗彉鍣ㄨ鎯呴〉锛岀紦瀛榤ac鍜屽瘑鐮�
--
Gitblit v1.8.0