From 8231d2af7893e221d90c71bd5dec4cf3f2f1f0ce Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 十一月 2023 19:07:59 +0800
Subject: [PATCH] 2023年11月30日19:07:47

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java |   44 ++++++++++++++------------------------------
 1 files changed, 14 insertions(+), 30 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 0c8aafa..4030284 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
@@ -29,6 +29,7 @@
  */
 public class SetActivity extends CustomBaseActivity {
 
+
     private ActivitySetBinding viewBinding;
 
     @Override
@@ -55,24 +56,28 @@
                 finish();
             }
         });
-        viewBinding.setNicknameIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
+        //澶氳瑷�
+        viewBinding.setLanguageIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                changedNickname();
+                startActivity(languageSelectionActivity.class);
             }
         });
-        viewBinding.setChangePasswordIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
+        //璐﹀彿涓庡畨鍏�
+        viewBinding.setAccountSecurityIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(MeChangePasswordActivity.class);
+                startActivity(AccountAndSecurityActivity.class);
             }
         });
-        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setOnClickListener(new View.OnClickListener() {
+        //娓╁害鍗曚綅
+        viewBinding.setTemperatureUnitIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                v.setSelected(!v.isSelected());
+                startActivity(TemperatureUnitActivity.class);
             }
         });
+        //閫�鍑虹櫥褰�
         viewBinding.outTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -88,30 +93,9 @@
         viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
         viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
         viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
-        viewBinding.setNicknameIl.sllLlRlNameTv.setText(R.string.set_nickname);
-        viewBinding.setChangePasswordIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
-        viewBinding.setCloseAccountIl.sllLlRlNameTv.setText(R.string.set_close_account);
-        viewBinding.setMesIl.sllLlRlTitleTv.setText(R.string.set_message_setting);
-        viewBinding.setPushMsgIl.sllLlRlNameTv.setText(R.string.set_push_notification);
-        viewBinding.setPushMsgIl.sllLlRlRightNextIv.setVisibility(View.GONE);
-        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setVisibility(View.VISIBLE);
-        viewBinding.setCallMsgIl.sllLlRlNameTv.setText(R.string.set_alarm_message);
-        viewBinding.setGeneralMsgIl.sllLlRlTitleTv.setText(R.string.set_general_setting);
-        viewBinding.setMultiLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
-        viewBinding.setDataCenterIl.sllLlRlNameTv.setText(R.string.set_data_centre);
-        viewBinding.setPrivacyIl.sllLlRlTitleTv.setText(R.string.set_privacy);
-        viewBinding.setSystemAuthorizationIl.sllLlRlNameTv.setText(R.string.set_system_rights_managemen);
-        viewBinding.setShareIl.sllLlRlNameTv.setText(R.string.set_3_msg_sharing);
-
-        if (UserConfigManage.getInstance().isBAccount()) {
-            //B绔�
-            viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.GONE);
-        } else {
-            //C绔�
-            viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.VISIBLE);
-        }
-
-
+        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);
     }
 
     /**

--
Gitblit v1.8.0