From 1df231fd6aafa221aef3532d069c7e27d4331be7 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期日, 27 八月 2023 19:21:01 +0800
Subject: [PATCH] 功能全部完成

---
 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 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 805e396..90f73d9 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
@@ -11,6 +11,7 @@
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
@@ -19,6 +20,8 @@
 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.application.zhangshi_app_android.R;
 import com.application.zhangshi_app_android.ui.function.CertificateOfHonorActivity;
 import com.application.zhangshi_app_android.ui.function.CleanStorageActivity;
@@ -37,6 +40,7 @@
 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.hjq.bar.TitleBar;
 
 import java.util.HashMap;
@@ -61,7 +65,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("娌$粰渚ф媺鏍忓竷灞�灏变笉瑕佸紑鍚晶鎷夋爮鍟�");
             }
@@ -70,6 +74,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;
+
+    }
 
     /**
      * 鏄惁寮�鍚晶鎷夋爮
@@ -83,14 +104,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(HomeFragment.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));
@@ -123,6 +143,9 @@
                 }
             }
             mDrawerLayout.setScrimColor(getResources().getColor(R.color.color_shadow));
+            GlideUtil.loadImage(UserManager.getInstance().getUserAvatar(), findViewById(R.id.dl_home_user_avatar));
+            TextView userNameTv = findViewById(R.id.dl_home_user_name);
+            userNameTv.setText(UserManager.getInstance().getUserName());
         }
     }
     private void setSelectItem(LinearLayout linearLayout) {
@@ -150,6 +173,8 @@
         mDrawerLayout.open();
     }
 
+
+
     public PopupWindow initPopUpWindow(View view){
         PopupWindow popupWindow = new PopupWindow(getSelfActivity());
         // 璁剧疆甯冨眬鏂囦欢

--
Gitblit v1.9.1