From ecaf8069072e71db4bff94671e72764b211d6af1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 26 十月 2023 00:43:51 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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..c5b1f88 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
@@ -15,20 +15,23 @@
import androidx.databinding.ViewDataBinding;
import androidx.drawerlayout.widget.DrawerLayout;
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.view.BaseActivity;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.manager.AppManager;
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.AnnualHealthStatusActivity;
import com.application.zhangshi_app_android.ui.function.CertificateOfHonorActivity;
import com.application.zhangshi_app_android.ui.function.CleanStorageActivity;
import com.application.zhangshi_app_android.ui.function.ContactsActivity;
import com.application.zhangshi_app_android.ui.function.FamilyAssetsActivity;
import com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivity;
import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
-import com.application.zhangshi_app_android.ui.function.HealthCareActivity;
import com.application.zhangshi_app_android.ui.function.HomeDevicesActivity;
import com.application.zhangshi_app_android.ui.function.HonorCollectionActivity;
import com.application.zhangshi_app_android.ui.function.HundredWishActivity;
@@ -36,7 +39,6 @@
import com.application.zhangshi_app_android.ui.function.LittleDoctorActivity;
import com.application.zhangshi_app_android.ui.function.MarriageActivity;
import com.application.zhangshi_app_android.ui.function.PetActivity;
-import com.application.zhangshi_app_android.ui.function.PetDetailActivity;
import com.application.zhangshi_app_android.ui.function.PrivacyActivity;
import com.application.zhangshi_app_android.ui.function.PropertyActivity;
import com.application.zhangshi_app_android.ui.function.TourismActivity;
@@ -54,6 +56,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import io.reactivex.functions.Consumer;
/**
* @author Ljj
@@ -117,7 +121,7 @@
classMap.put(MarriageActivity.class,(LinearLayout) findViewById(R.id.dl_marriage));
classMap.put(PropertyActivity.class,(LinearLayout) findViewById(R.id.dl_property));
classMap.put(HundredWishActivity.class,(LinearLayout) findViewById(R.id.dl_hundred_wish));
- classMap.put(HealthCareActivity.class,(LinearLayout) findViewById(R.id.dl_health_care));
+ classMap.put(AnnualHealthStatusActivity.class,(LinearLayout) findViewById(R.id.dl_health_care));
classMap.put(CertificateOfHonorActivity.class,(LinearLayout) findViewById(R.id.dl_certificate_of_honor));
classMap.put(PrivacyActivity.class,(LinearLayout) findViewById(R.id.dl_privacy));
classMap.put(TourismActivity.class,(LinearLayout) findViewById(R.id.dl_tourism));
@@ -131,8 +135,11 @@
if (set.getKey() == HomeFragment.class) {
MainActivity.start(this, HomeFragment.class);
}else{
- AppManager.getAppManager().startActivity(set.getKey());
+ if(this.getClass() != set.getKey()){
+ AppManager.getAppManager().startActivity(set.getKey());
+ }
}
+ mDrawerLayout.close();
}
});
} else {
@@ -142,13 +149,28 @@
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));
+ if (avatar.contains("profile/upload")) {//濡傛灉鏄笂浼犲埌鏈嶅姟鍣ㄧ殑鍥剧墖
+ //鍙彇profile/upload浠ュ悗鐨勯儴鍒�
+ avatar = avatar.substring(avatar.indexOf("profile/upload"));
+ avatar = BaseConfig.BASE_URL_DOMAIN + "/" + 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