From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 02 十二月 2024 10:29:09 +0800
Subject: [PATCH] 2024年12月02日10:29:05

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java |   64 +++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
index 48056eb..0959d8e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
@@ -1,11 +1,16 @@
 package com.hdl.photovoltaic.ui.me;
 
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+
+import androidx.annotation.Nullable;
 
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityAccountAndSecurityBinding;
 
 /**
@@ -13,6 +18,7 @@
  */
 public class AccountAndSecurityActivity extends CustomBaseActivity {
     private ActivityAccountAndSecurityBinding viewBinding;
+
 
     @Override
     public Object getContentView() {
@@ -32,9 +38,10 @@
 
     private void initEvent() {
 
-        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+
                 finish();
             }
         });
@@ -42,13 +49,17 @@
         viewBinding.setAccountPhoneIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(BindPhoneActivity.class);
+                Intent intent = new Intent();
+                intent.setClass(_mActivity, BindPhoneActivity.class);
+                startActivityForResult(intent, 20);
             }
         });
         viewBinding.setAccountMailIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(BindMailActivity.class);
+                Intent intent = new Intent();
+                intent.setClass(_mActivity, BindMailActivity.class);
+                startActivityForResult(intent, 20);
             }
         });
 
@@ -70,19 +81,46 @@
     }
 
     private void initView() {
-        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
-        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.toolbarTopRl.topTitleTv.setText(R.string.set_account_security);
+        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
 
-        viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
-        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
-        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        if (UserConfigManage.getInstance().isBAccount()) {
+            //浜戠鎺ュ彛涓嶆敮鎸�
+            viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.GONE);
+            viewBinding.setAccountMailIl.parentCl.setVisibility(View.GONE);
+        } else {
+            viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.VISIBLE);
+            viewBinding.setAccountMailIl.parentCl.setVisibility(View.VISIBLE);
 
-        viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
-        viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
-        viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+            viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
+            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+            viewBinding.setAccountPhoneIl.lineV.setVisibility(View.VISIBLE);
+
+            viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
+            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        }
 
         viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
+        updateStyle();
+
+
+    }
+
+    /**
+     * 鍒锋柊缁戝畾鎵嬫満鍙峰拰閭
+     */
+    private void updateStyle() {
+        String phoneStr = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
+        String emailStr = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
+        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(phoneStr);
+        viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(emailStr);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 20 && resultCode == 20) {
+            updateStyle();
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0