From dcdd7495322c36bc41c7d18fa91dc8884bc976ef Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 七月 2025 13:09:24 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 5cc4457..545fed9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -13,6 +13,7 @@
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -818,18 +819,18 @@
/**
* 閫�鍑虹櫥褰�
*/
- public void logout() {
+ public void logout(LogoutType logoutType) {
HdlResidenceLogic.getInstance().pushDel(new CloudCallBeak<String>() {
@Override
public void onSuccess(String obj) {
// SharedPreUtils.putBoolean("pushAddCache", true);
- HDLLinkPMUser.getInstance().logout(0);
+ HDLLinkPMUser.getInstance().logout(logoutType.getValue());
}
@Override
public void onFailure(HDLException e) {
// SharedPreUtils.putBoolean("pushAddCache", false);
- HDLLinkPMUser.getInstance().logout(0);
+ HDLLinkPMUser.getInstance().logout(logoutType.getValue());
}
});
}
@@ -843,7 +844,7 @@
UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
//UserConfigManage.getInstance().getUserId()琛ㄧず绗竴娆″畨瑁呯櫥褰�
if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
- //涓嶅悓璐﹀彿,鍒犻櫎涔嬪墠鐨勬棫璐﹀彿鏃ュ織淇℃伅;
+ //涓嶅悓璐﹀彿,鍒犻櫎涔嬪墠鐨勬棫璐﹀彿淇℃伅;
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getUserFilePath());
UserConfigManage.getInstance().setHomeId("");
--
Gitblit v1.8.0