From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 535eba2..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
@@ -84,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
@@ -119,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);
@@ -126,25 +136,22 @@
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);
-// 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);
-
+ 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 {
+ viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("娴嬭瘯");
+ }
+ } else {
+ viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setNotificationSettingsIl.lineV.setVisibility(View.GONE);
+ }
}
--
Gitblit v1.8.0