From d830fef6a2bc2ab061e6ac2b423c4a49dda3cf21 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 十二月 2023 18:08:26 +0800
Subject: [PATCH] 2023年12月06日18:08:20

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java |  136 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 96 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index bea1c3d..817490e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -5,6 +5,8 @@
 import android.view.View;
 
 
+import androidx.annotation.Nullable;
+
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.R;
@@ -24,6 +26,9 @@
  */
 public class MeFragment extends CustomBaseFragment {
     private FragmentMeBinding viewBinding;
+
+    private CUserInfo mC_UserInfo;
+    private BUserInfo mB_UserInfo;
 
 
     @Override
@@ -63,21 +68,37 @@
         HdlAccountLogic.getInstance().getMemberInfo_C(new CloudCallBeak<CUserInfo>() {
             @Override
             public void onSuccess(CUserInfo cUserInfo) {
+                if (cUserInfo == null) {
+                    return;
+                }
+                mC_UserInfo = cUserInfo;
+                UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
+                UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+                UserConfigManage.getInstance().Save();
 //                hideLoading();
                 //鑾峰彇鐢ㄦ埛澶村儚璺緞
                 if (cUserInfo.getMemberHeadIcon().contains("http")) {
-                    updateView(null, cUserInfo);
+                    //鏇存柊鐢ㄦ埛澶村儚
+                    setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+                    //鏇存柊鐢ㄦ埛鍚嶇О
+                    setMemberName(cUserInfo.getMemberName());
                 } else {
                     HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
                         @Override
                         public void onSuccess(String url) {
                             cUserInfo.setMemberHeadIcon(url);
-                            updateView(null, cUserInfo);
+                            //鏇存柊鐢ㄦ埛澶村儚
+                            setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+                            //鏇存柊鐢ㄦ埛鍚嶇О
+                            setMemberName(cUserInfo.getMemberName());
                         }
 
                         @Override
                         public void onFailure(HDLException e) {
-                            updateView(null, cUserInfo);
+//                            //鏇存柊鐢ㄦ埛澶村儚
+//                            setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+                            //鏇存柊鐢ㄦ埛鍚嶇О
+                            setMemberName(cUserInfo.getMemberName());
                             HdlThreadLogic.toast(_mActivity, e);
                         }
                     });
@@ -102,8 +123,10 @@
         HdlAccountLogic.getInstance().getUserInfo_B(new CloudCallBeak<BUserInfo>() {
             @Override
             public void onSuccess(BUserInfo bUserInfo) {
+                mB_UserInfo = bUserInfo;
 //                hideLoading();
-                updateView(bUserInfo, null);
+
+                setMemberName(bUserInfo.getUserName());
             }
 
             @Override
@@ -119,6 +142,16 @@
      * 娉ㄥ唽鐩戝惉鍣�
      */
     private void initEvent() {
+
+        viewBinding.fragmentMeIconParentCl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setClass(_mActivity, PersonalDataActivity.class);
+                intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
+                startActivityForResult(intent, 10);
+            }
+        });
         viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -133,10 +166,15 @@
                 startActivity(AsRegardsActivity.class);
             }
         });
+        final int[] count = {0};
         viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(TestMainActivity.class);
+                count[0] = count[0] + 1;
+                if (count[0] > 3) {
+                    count[0] = 0;
+                    startActivity(TestMainActivity.class);
+                }
             }
         });
 
@@ -144,45 +182,22 @@
     }
 
     /**
-     * 鏇存柊ui
-     *
-     * @param bUserInfo B绔釜浜轰俊鎭�
-     * @param cUserInfo C绔釜浜轰俊鎭�
-     */
-    private void updateView(BUserInfo bUserInfo, CUserInfo cUserInfo) {
-        if (viewBinding == null) {
-            return;
-        }
-        String userName = UserConfigManage.getInstance().getUserName();
-        if (bUserInfo != null) {
-            //B绔�
-            userName = bUserInfo.getUserName();
-        }
-        if (cUserInfo != null) {
-            //C绔�
-            userName = cUserInfo.getMemberName();
-            GlideUtils.getRoundedCornersImage(_mActivity, cUserInfo.getMemberHeadIcon(), viewBinding.fragmentMeIconIv, new RoundedCorners(4));
-        }
-        viewBinding.fragmentMeUserNameIv.setText(userName);
-        UserConfigManage.getInstance().setUserName(userName);
-        UserConfigManage.getInstance().Save();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //鏇存柊鐢ㄦ埛鍚嶇О
-        updateView(null, null);
-    }
-
-    /**
      * 鍒濆鍖栫晫闈�
      */
     private void initView() {
-        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.power_station_me);
-        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
 
+
+        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me);
+//        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
+//        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
+
+        viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.message_center);
+        viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineTitleIv.setText(R.string.set_message_center);
+        viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineV.setVisibility(View.VISIBLE);
+
+        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
+        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.set_user_management);
+        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);
 
         viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
         viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
@@ -190,6 +205,47 @@
 
         viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
         viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
+
+        if (!UserConfigManage.getInstance().isBAccount()) {
+            viewBinding.fragmentMeLineMessageCenterIl.getRoot().setVisibility(View.GONE);
+            viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
+        }
+
     }
 
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10 && resultCode == 10) {
+            if (data != null) {
+                String iconUrl = data.getStringExtra("memberHeadIcon");
+                String memberName = data.getStringExtra("memberName");
+                //鏇存柊鐢ㄦ埛澶村儚
+                setMemberHeadIcon(iconUrl);
+                //鏇存柊鐢ㄦ埛鍚嶇О
+                setMemberName(memberName);
+
+            }
+        }
+    }
+
+    /**
+     * 鏄剧ず鐢ㄦ埛澶村儚
+     */
+    private void setMemberHeadIcon(String memberHeadIconUrl) {
+        if (mC_UserInfo != null) {
+            mC_UserInfo.setMemberHeadIcon(memberHeadIconUrl);
+        }
+        GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4));
+
+    }
+
+    /**
+     * 鏄剧ず鐢ㄦ埛鍚嶇О
+     */
+    private void setMemberName(String userName) {
+        viewBinding.fragmentMeUserNameIv.setText(userName);
+        UserConfigManage.getInstance().setUserName(userName);
+        UserConfigManage.getInstance().Save();
+
+    }
 }

--
Gitblit v1.8.0