From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 5c0183d..582bf17 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
@@ -122,22 +122,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);
- 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);
- }
+// 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.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
}
--
Gitblit v1.8.0