From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
similarity index 83%
rename from app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index 8884874..eba87a4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -10,9 +10,12 @@
 
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 
 
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -27,6 +30,7 @@
 import com.hdl.photovoltaic.other.HdlAccountLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.ui.bean.QrCodeBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.utils.GlideUtils;
 import com.hdl.photovoltaic.utils.PermissionUtils;
@@ -37,9 +41,9 @@
 
 
 /**
- * 涓汉璧勬枡鐨勭晫闈�
+ * C绔釜浜鸿祫鏂欑殑鐣岄潰
  */
-public class PersonalDataActivity extends CustomBaseActivity {
+public class CPersonalDataActivity extends CustomBaseActivity {
     private ActivityPersonalDataBinding viewBinding;
 
     private CameraAlbumPopWindow cameraAlbumPopWindow;
@@ -126,6 +130,31 @@
                 changedNickname();
             }
         });
+        viewBinding.personalDataPhoneIl.getRoot().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setClass(_mActivity, BindPhoneActivity.class);
+                startActivityForResult(intent, 20);
+            }
+        });
+        viewBinding.personalDataMailIl.getRoot().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setClass(_mActivity, BindMailActivity.class);
+                startActivityForResult(intent, 20);
+            }
+        });
+        viewBinding.personalDataQrCodeIl.getRoot().setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+
+                startActivity(QrCodeMainActivity.class);
+
+            }
+        });
 
 
     }
@@ -137,10 +166,18 @@
         viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
         viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
         viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
+        viewBinding.personalDataMailIl.sllLlRlNameTv.setText(R.string.home_login_email);
+        viewBinding.personalDataPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
+        viewBinding.personalDataQrCodeIl.sllLlRlNameTv.setText(R.string.qr_code_business_card);
         viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
         viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
         viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
+        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
         setMemberHeadIcon();
+        updateStyle();
     }
 
 
@@ -281,6 +318,8 @@
                 default:
                     break;
             }
+        } else if (requestCode == 20 && resultCode == 20) {
+            updateStyle();
         }
     }
 
@@ -319,5 +358,16 @@
         }
     }
 
+    /**
+     * 鍒锋柊缁戝畾鎵嬫満鍙峰拰閭
+     */
+    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.personalDataPhoneIl.sllLlRlRightContentTv.setText(phoneStr);
+        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setText(emailStr);
+
+    }
+
 
 }
\ No newline at end of file

--
Gitblit v1.8.0