From 454a84caa83c4ebc1b4c422f10166bddfb0e03ec Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 21 九月 2023 21:53:30 +0800
Subject: [PATCH] 1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件

---
 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
index 0b4cd83..a93d8b1 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
@@ -21,6 +21,8 @@
 import com.android.app_base.manager.UserManager;
 import com.android.app_base.utils.GlideUtil;
 import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.utils.rxbus.MessageEvent;
+import com.android.app_base.utils.rxbus.RxBus;
 import com.application.zhangshi_app_android.R;
 import com.application.zhangshi_app_android.ui.function.CertificateOfHonorActivity;
 import com.application.zhangshi_app_android.ui.function.CleanStorageActivity;
@@ -54,6 +56,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import io.reactivex.functions.Consumer;
 
 /**
  * @author Ljj
@@ -142,13 +146,23 @@
             mDrawerLayout.setScrimColor(getResources().getColor(R.color.color_shadow));
 
         }
+
+        setNameAndAvatar(UserManager.getInstance().getUserName(),UserManager.getInstance().getUserAvatar());
+        RxBus.getInstance().toObservable(this, MessageEvent.class).subscribe(new Consumer<MessageEvent>() {
+            @Override
+            public void accept(MessageEvent event) throws Exception {
+                if(event.getMessageEventCode() == MessageEvent.EVENT_UPDATE_USER_INFO){
+                    setNameAndAvatar(UserManager.getInstance().getUserName(),UserManager.getInstance().getUserAvatar());
+                }
+            }
+        });
     }
 
     public void setNameAndAvatar(String name,String avatar){
         if (mDrawerLayout != null){
-            GlideUtil.loadImage(UserManager.getInstance().getUserAvatar(), findViewById(R.id.dl_home_user_avatar));
+            GlideUtil.loadImage(avatar, findViewById(R.id.dl_home_user_avatar));
             TextView userNameTv = findViewById(R.id.dl_home_user_name);
-            userNameTv.setText(UserManager.getInstance().getUserName());
+            userNameTv.setText(name);
         }
     }
     private void setSelectItem(LinearLayout linearLayout) {

--
Gitblit v1.9.1