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/MeFragment.java |   68 +++++++++++++++-------------------
 1 files changed, 30 insertions(+), 38 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 a1d776b..900eb6c 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
@@ -72,18 +72,27 @@
 //                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);
                         }
                     });
@@ -110,7 +119,8 @@
             public void onSuccess(BUserInfo bUserInfo) {
                 mB_UserInfo = bUserInfo;
 //                hideLoading();
-                updateView(bUserInfo, null);
+
+                setMemberName(bUserInfo.getUserName());
             }
 
             @Override
@@ -161,38 +171,6 @@
     }
 
     /**
-     * 鏇存柊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();
-            setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
-        }
-        viewBinding.fragmentMeUserNameIv.setText(userName);
-        UserConfigManage.getInstance().setUserName(userName);
-        UserConfigManage.getInstance().Save();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //鏇存柊鐢ㄦ埛鍚嶇О
-        updateView(null, null);
-    }
-
-    /**
      * 鍒濆鍖栫晫闈�
      */
     private void initView() {
@@ -228,8 +206,12 @@
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 10 && resultCode == 10) {
             if (data != null) {
-                String url = data.getStringExtra("memberHeadIcon");
-                setMemberHeadIcon(url);
+                String iconUrl = data.getStringExtra("memberHeadIcon");
+                String memberName = data.getStringExtra("memberName");
+                //鏇存柊鐢ㄦ埛澶村儚
+                setMemberHeadIcon(iconUrl);
+                //鏇存柊鐢ㄦ埛鍚嶇О
+                setMemberName(memberName);
 
             }
         }
@@ -245,4 +227,14 @@
         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