From 11409771024381e06173490d846bf121e6a19552 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 15 一月 2026 21:29:05 +0800
Subject: [PATCH] 2026年01月15日21:29:00
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 380d866..6525f06 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
@@ -14,6 +14,7 @@
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;
@@ -83,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
@@ -118,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);
@@ -125,12 +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.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.VISIBLE);
if (AppConfigManage.getOnlineServer()) {
viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("绾夸笂");
} else {
@@ -138,12 +150,27 @@
}
} else {
viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
- viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.GONE);
}
-// viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ if (UserConfigManage.getInstance().isTourist_mode()) {
+ viewBinding.outTv.setVisibility(View.GONE);
+ viewBinding.setAccountSecurityIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setAccountSecurityIl.lineV.setVisibility(View.GONE);
+ viewBinding.setNotificationSettingsIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.GONE);
+ viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.GONE);
+ }
-
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setLanguageIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setAccountSecurityIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setNotificationSettingsIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setTemperatureUnitIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setContextSwitchIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
@Override
@@ -172,7 +199,7 @@
public void Confirm() {
dialog.dismiss();
HdlLogLogic.print("璁剧疆鐣岄潰閫�鍑虹櫥褰�---", true);
- HdlAccountLogic.getInstance().logout();
+ HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
}
});
@@ -200,7 +227,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