From c3542b10ea66a1c3fad44fe8e0efd357d7d3857e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 十一月 2025 19:32:41 +0800
Subject: [PATCH] 2025年11月19日19:32:39
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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..b52b828 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;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -86,6 +84,15 @@
startActivityForResult(intent, 40);
}
});
+ //寮�鍚郴缁熼�氱煡
+ viewBinding.setNotificationSettingsIl.getRoot().setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, NotificationSettingsActivity.class);
+ startActivity(intent);
+ }
+ });
//鍒囪姳鐜
viewBinding.setContextSwitchIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
@@ -121,6 +128,7 @@
viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
+ viewBinding.setNotificationSettingsIl.sllLlRlNameTv.setText(R.string.notification_settings);
viewBinding.setLanguageIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.setLanguageIl.lineV.setVisibility(View.VISIBLE);
viewBinding.setAccountSecurityIl.lineV.setVisibility(View.VISIBLE);
@@ -128,11 +136,13 @@
viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
+ viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);
if (AppConfigManage.isDebug()) {
viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);
viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("褰撳墠鐜");
viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.VISIBLE);
if (AppConfigManage.getOnlineServer()) {
viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("绾夸笂");
} else {
@@ -140,10 +150,8 @@
}
} else {
viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.GONE);
}
-
- viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
-
}
@@ -173,7 +181,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 +207,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