From 53057d6bbf444fe630debd9f043d4ce4ad22279b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 七月 2025 11:41:59 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 582bf17..535eba2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -7,13 +7,18 @@
import androidx.annotation.Nullable;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
+import com.hdl.photovoltaic.enums.LogoutType;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
@@ -169,7 +174,8 @@
public void Confirm() {
dialog.dismiss();
HdlLogLogic.print("璁剧疆鐣岄潰閫�鍑虹櫥褰�---", true);
- HDLLinkPMUser.getInstance().logout(0);
+ HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
+
}
});
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@@ -196,7 +202,7 @@
public void Confirm() {
dialog.dismiss();
HdlLogLogic.print("璁剧疆鏄惁鍒囨崲鐜鐣岄潰閫�鍑虹櫥褰�---", true);
- HDLLinkPMUser.getInstance().logout(100);
+ HdlAccountLogic.getInstance().logout(LogoutType.ServerSwitchingLogout);
}
});
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
--
Gitblit v1.8.0