功能完善

Linjiajia

2023-10-26 ecaf8069072e71db4bff94671e72764b211d6af1

 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java

@@ -17,6 +17,7 @@
import androidx.databinding.ViewDataBinding;
import androidx.drawerlayout.widget.DrawerLayout;

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;
@@ -25,13 +26,13 @@
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;
@@ -43,6 +44,7 @@
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.main.MainActivity;
import com.hjq.bar.TitleBar;

import java.util.HashMap;
@@ -128,7 +130,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));
@@ -139,7 +141,12 @@
                if (linearLayout != null) {
                    linearLayout.setOnClickListener(v -> {
                        if (set.getKey() != null){
                            AppManager.getAppManager().startActivity(set.getKey());
                            if (set.getKey() == HomeFragment.class) {
                                MainActivity.start(getContext(), HomeFragment.class);
                            }else{
                                AppManager.getAppManager().startActivity(set.getKey());
                            }
                            mDrawerLayout.close();
                        }
                    });
                } else {
@@ -171,6 +178,11 @@

    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);