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 | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 450e7b2..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
@@ -1,30 +1,28 @@
package com.hdl.photovoltaic.ui.me;
-import android.app.ActivityManager;
-import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
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.ui.StartActivity;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.umeng.analytics.MobclickAgent;
-import java.util.List;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -129,20 +127,23 @@
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
- if (AppConfigManage.isDebug()) {
- viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);
- viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("褰撳墠鐜");
- viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
- if (AppConfigManage.getOnlineServer()) {
- viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("绾夸笂");
- } else {
- viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("娴嬭瘯");
- }
- } else {
- viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
- }
+// if (AppConfigManage.isDebug()) {
+// viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);
+// viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("褰撳墠鐜");
+// viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+// viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);
+// if (AppConfigManage.getOnlineServer()) {
+// viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("绾夸笂");
+// } else {
+// viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("娴嬭瘯");
+// }
+// } else {
+// viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+// viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
+// }
viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
}
@@ -173,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() {
@@ -198,15 +200,15 @@
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
-// dialog.dismiss();
+ dialog.dismiss();
HdlLogLogic.print("璁剧疆鏄惁鍒囨崲鐜鐣岄潰閫�鍑虹櫥褰�---", true);
- HDLLinkPMUser.getInstance().logout(5);
+ HdlAccountLogic.getInstance().logout(LogoutType.ServerSwitchingLogout);
}
});
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
-// dialog.dismiss();
+ dialog.dismiss();
}
});
--
Gitblit v1.8.0