From 31b7700b976a46901f67c5d7a00281ca4745fc9f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期六, 07 十月 2023 21:44:35 +0800
Subject: [PATCH] 调整旅游模块功能

---
 app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java b/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java
index b85a593..2a4d160 100644
--- a/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java
+++ b/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java
@@ -4,7 +4,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -18,7 +17,9 @@
 
 import com.android.app_base.action.TitleBarAction;
 import com.android.app_base.base.StateViewEnum;
+import com.android.app_base.base.action.ClickAction;
 import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.blankj.utilcode.util.ToastUtils;
 import com.gyf.immersionbar.ImmersionBar;
 import com.hjq.bar.TitleBar;
 
@@ -30,27 +31,27 @@
  * @date 2023.03.02. 15:50
  * @desc Fragment鍩虹被
  */
-public abstract class BaseFragment<V extends ViewDataBinding,VM extends BaseViewModel> extends Fragment implements TitleBarAction {
-    protected V binding;
+public abstract class BaseFragment<VDB extends ViewDataBinding,VM extends BaseViewModel> extends Fragment implements TitleBarAction, ClickAction {
+    protected VDB binding;
     protected VM viewModel;
-    private int viewModelId;
+    protected int viewModelId;
 
     /**
      * 鏍囬鏍忓璞�
      */
-    private TitleBar mTitleBar;
+    protected TitleBar mTitleBar;
     /**
      * 鐘舵�佹爮娌夋蹈
      */
-    private ImmersionBar mImmersionBar;
+    protected ImmersionBar mImmersionBar;
     /**
      * 鏍瑰竷灞�
      */
-    private View mRootView;
+    protected View mRootView;
     /**
      * 璇ragment鏄惁鍔犺浇杩囨暟鎹�
      * */
-    private boolean isLoaded;
+    protected boolean isLoaded;
 
 
     @Override
@@ -65,20 +66,23 @@
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         isLoaded = false;
         if (getLayoutId() > 0){
-            binding = DataBindingUtil.inflate(inflater,getLayoutId(), container, false);
+            binding = initViewBinding(inflater, container);
             mRootView = binding.getRoot();
             return mRootView;
         }
         return null;
     }
 
+
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         //缁戝畾 ViewDataBinding 鍜� ViewModel
         initViewDataBindingAndViewModel();
         //鍒濆鍖栫姸鎬佽鍥�
         initStateView();
+        //鍒濆鍖栨矇娴稿紡鐘舵�佹爮鍜� titleBar
+        initStatusBar();
         //椤甸潰view鍒濆鍖栨柟娉�
         initView();
         //椤甸潰浜嬩欢鐩戝惉鐨勬柟娉曪紝鐢ㄤ簬ViewModel灞傝浆鍒癡iew灞傜殑浜嬩欢娉ㄥ唽
@@ -88,8 +92,7 @@
     @Override
     public void onResume() {
         super.onResume();
-        //鍒濆鍖栨矇娴稿紡鐘舵�佹爮鍜� titleBar
-        initStatusBar();
+
         if (!isLoaded){
             //椤甸潰鏁版嵁鍒濆鍖栨柟娉�
             initData();
@@ -121,6 +124,12 @@
         //璁￢iewModel鎷ユ湁View鐨勭敓鍛藉懆鏈熸劅搴�
         getLifecycle().addObserver(viewModel);
 
+    }
+    /**
+     * 鍒濆鍖朧iewBinding
+     */
+    protected VDB initViewBinding(LayoutInflater inflater, @Nullable ViewGroup container) {
+        return DataBindingUtil.inflate(inflater,getLayoutId(), container, false);
     }
 
     /**
@@ -173,6 +182,14 @@
                 }
             }
         });
+        viewModel.getMessageLivaData().observe(this, new Observer<String>() {
+            @Override
+            public void onChanged(String message) {
+                if (message != null){
+                    ToastUtils.showShort(message);
+                }
+            }
+        });
     }
     /**
      * 缂虹渷椤电瓑鐘舵�佽鍥剧殑鏇存柊

--
Gitblit v1.9.1