From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息
---
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java
index 06c3b84..81859bb 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java
@@ -3,6 +3,7 @@
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -11,37 +12,47 @@
import android.widget.PopupWindow;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import androidx.drawerlayout.widget.DrawerLayout;
-import com.android.app_base.base.view.BaseActivity;
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.view.BaseFragment;
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.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;
import com.application.zhangshi_app_android.ui.function.IncomeAndExpensesActivity;
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.PersonalNotepadActivity;
+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;
+import com.application.zhangshi_app_android.ui.home.TreeFragment;
+import com.application.zhangshi_app_android.ui.main.MainActivity;
import com.hjq.bar.TitleBar;
import java.util.HashMap;
import java.util.Map;
+
+import io.reactivex.functions.Consumer;
/**
* @author Ljj
@@ -62,7 +73,7 @@
mDrawerLayout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
VDB mBinding = DataBindingUtil.inflate(inflater, getLayoutId(), mDrawerLayout, true);
if (getDrawerLayoutId() > 0){
- getLayoutInflater().inflate(getDrawerLayoutId(), mDrawerLayout, true);
+ inflater.inflate(getDrawerLayoutId(), mDrawerLayout, true);
}else {
throw new IllegalArgumentException("娌＄粰渚ф媺鏍忓竷灞�灏变笉瑕佸紑鍚晶鎷夋爮鍟�");
}
@@ -71,6 +82,23 @@
return super.initViewBinding(inflater, container);
}
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ isLoaded = false;
+ if (getLayoutId() > 0){
+ binding = initViewBinding(inflater, container);
+ if (isDrawerLayoutEnabled()) {
+ //濡傛灉寮�鍚簡渚ф媺鏍忥紝灏辨妸甯冨眬鏀惧埌渚ф媺鏍忛噷闈�
+ mRootView = mDrawerLayout;
+ }else {
+ mRootView = binding.getRoot();
+ }
+ return mRootView;
+ }
+ return null;
+
+ }
/**
* 鏄惁寮�鍚晶鎷夋爮
@@ -84,14 +112,13 @@
*/
protected int getDrawerLayoutId(){
return R.layout.layout_drawer;
- };
+ }
@Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
if (mDrawerLayout != null) {
- classMap.put(null,(LinearLayout) findViewById(R.id.dl_home_root_net));
+ classMap.put(TreeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
classMap.put(FamilyMemorabiliaActivity.class,(LinearLayout) findViewById(R.id.dl_family_memorabilia));
classMap.put(FamilyAssetsActivity.class,(LinearLayout) findViewById(R.id.dl_family_assets));
classMap.put(HomeDevicesActivity.class,(LinearLayout) findViewById(R.id.dl_home_devices));
@@ -99,13 +126,13 @@
classMap.put(LittleDoctorActivity.class,(LinearLayout) findViewById(R.id.dl_little_doctor));
classMap.put(CleanStorageActivity.class,(LinearLayout) findViewById(R.id.dl_clean_storage));
classMap.put(ContactsActivity.class,(LinearLayout) findViewById(R.id.dl_contacts));
- classMap.put(PetActivity.class,(LinearLayout) findViewById(R.id.dl_pet));
+ classMap.put(PetDetailActivity.class,(LinearLayout) findViewById(R.id.dl_pet));
classMap.put(IncomeAndExpensesActivity.class,(LinearLayout) findViewById(R.id.dl_income_and_expenses));
- classMap.put(GrowthExperienceActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
+ classMap.put(PersonalNotepadActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
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));
@@ -116,7 +143,12 @@
if (linearLayout != null) {
linearLayout.setOnClickListener(v -> {
if (set.getKey() != null){
- AppManager.getAppManager().startActivity(set.getKey());
+ if (set.getKey() == TreeFragment.class) {
+ MainActivity.start(getContext(), TreeFragment.class);
+ }else{
+ AppManager.getAppManager().startActivity(set.getKey());
+ }
+ mDrawerLayout.close();
}
});
} else {
@@ -125,6 +157,16 @@
}
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());
+ }
+ }
+ });
}
private void setSelectItem(LinearLayout linearLayout) {
if (linearLayout == null){
@@ -132,11 +174,26 @@
}
TextView textView = (TextView) linearLayout.getChildAt(1);
ImageView imageView = (ImageView) linearLayout.getChildAt(2);
- textView.setTextColor(Color.parseColor("#FFF6739F"));
- imageView.setBackgroundResource(R.drawable.ic_vector_pink);
+ TypedValue textColor = new TypedValue();
+ getContext().getTheme().resolveAttribute(R.attr.drawerTextColor, textColor, true);
+ textView.setTextColor(textColor.data);
+ TypedValue icon = new TypedValue();
+ getContext().getTheme().resolveAttribute(R.attr.drawerSelectIcon, icon, true);
+ imageView.setBackgroundResource(icon.resourceId);
}
-
+ public void setNameAndAvatar(String name,String avatar){
+ if (mDrawerLayout != null){
+ 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(name);
+ }
+ }
/**
* 鑾峰彇DrawerLayout
*/
@@ -151,6 +208,8 @@
mDrawerLayout.open();
}
+
+
public PopupWindow initPopUpWindow(View view){
PopupWindow popupWindow = new PopupWindow(getSelfActivity());
// 璁剧疆甯冨眬鏂囦欢
--
Gitblit v1.9.1