1、调整成长经历页面\n2、删除婚姻个人信息

Linjiajia

2024-01-29 b17b9aa59bae6d03055f14d937821655dfaffa1f

 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;
@@ -39,11 +40,12 @@
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.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.HomeFragment;
import com.application.zhangshi_app_android.ui.home.TreeFragment;
import com.application.zhangshi_app_android.ui.main.MainActivity;
import com.hjq.bar.TitleBar;

@@ -116,7 +118,7 @@
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
        if (mDrawerLayout != null) {
            classMap.put(HomeFragment.class,(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));
@@ -126,7 +128,7 @@
            classMap.put(ContactsActivity.class,(LinearLayout) findViewById(R.id.dl_contacts));
            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));
@@ -141,8 +143,8 @@
                if (linearLayout != null) {
                    linearLayout.setOnClickListener(v -> {
                        if (set.getKey() != null){
                            if (set.getKey() == HomeFragment.class) {
                                MainActivity.start(getContext(), HomeFragment.class);
                            if (set.getKey() == TreeFragment.class) {
                                MainActivity.start(getContext(), TreeFragment.class);
                            }else{
                                AppManager.getAppManager().startActivity(set.getKey());
                            }
@@ -172,8 +174,12 @@
        }
        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){