From e7193e9ef432cf09934ed8f236a2db02182619ad Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 20 Mar 2023 16:14:49 +0800 Subject: [PATCH] =?UTF-8?q?BaseFragment=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nnbc123/app/base/BaseBindingFragment.java | 4 +++- app/src/main/java/com/nnbc123/app/base/BaseFragment.java | 2 +- .../main/java/com/nnbc123/app/base/BaseViewBindingFragment.kt | 3 ++- app/src/main/res/layout/fragment_no_data.xml | 2 +- app/src/main/res/layout/fragment_no_data_large_iv.xml | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nnbc123/app/base/BaseBindingFragment.java b/app/src/main/java/com/nnbc123/app/base/BaseBindingFragment.java index 2e620a009..5bc35250d 100644 --- a/app/src/main/java/com/nnbc123/app/base/BaseBindingFragment.java +++ b/app/src/main/java/com/nnbc123/app/base/BaseBindingFragment.java @@ -8,6 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.nnbc123.app.ui.widget.marqueeview.MarqueeView; import com.nnbc123.library.annatation.ActLayoutRes; /** @@ -21,7 +22,8 @@ public abstract class BaseBindingFragment extends Bas @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { mBinding = DataBindingUtil.bind(inflater.inflate(getClass().getAnnotation(ActLayoutRes.class).value(),container,false)); - return mBinding.getRoot(); + mView = mBinding.getRoot(); + return mView; } @Override diff --git a/app/src/main/java/com/nnbc123/app/base/BaseFragment.java b/app/src/main/java/com/nnbc123/app/base/BaseFragment.java index d9e42e32a..99d8a3fc8 100644 --- a/app/src/main/java/com/nnbc123/app/base/BaseFragment.java +++ b/app/src/main/java/com/nnbc123/app/base/BaseFragment.java @@ -366,7 +366,7 @@ public abstract class BaseFragment extends RxFragment implements KeyEvent.Callba @Override public void showNoData(int drawable, CharSequence charSequence) { - showNoData(mView, drawable, charSequence); + showNoData(getView(), drawable, charSequence); } @Override diff --git a/app/src/main/java/com/nnbc123/app/base/BaseViewBindingFragment.kt b/app/src/main/java/com/nnbc123/app/base/BaseViewBindingFragment.kt index 82ac1901a..ef362d667 100644 --- a/app/src/main/java/com/nnbc123/app/base/BaseViewBindingFragment.kt +++ b/app/src/main/java/com/nnbc123/app/base/BaseViewBindingFragment.kt @@ -19,7 +19,8 @@ abstract class BaseViewBindingFragment : BaseFragment() { val aClass = type.actualTypeArguments[0] as Class<*> val method = aClass.getDeclaredMethod("inflate", LayoutInflater::class.java) _binding = method.invoke(null, layoutInflater) as T - return binding.root + mView = binding.root + return mView } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/res/layout/fragment_no_data.xml b/app/src/main/res/layout/fragment_no_data.xml index 6df9dbb88..dd6668ecc 100644 --- a/app/src/main/res/layout/fragment_no_data.xml +++ b/app/src/main/res/layout/fragment_no_data.xml @@ -19,7 +19,7 @@ android:layout_marginTop="15dp" android:gravity="center" android:text="@string/no_list_data" - android:textColor="@color/text_normal_282828" + android:textColor="@color/text_secondary_878b9c" android:textSize="13sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_no_data_large_iv.xml b/app/src/main/res/layout/fragment_no_data_large_iv.xml index 104b17190..53baa76d6 100644 --- a/app/src/main/res/layout/fragment_no_data_large_iv.xml +++ b/app/src/main/res/layout/fragment_no_data_large_iv.xml @@ -24,7 +24,7 @@ android:gravity="center" android:text="@string/no_list_data" android:layout_marginTop="15dp" - android:textColor="@color/text_normal_282828" + android:textColor="@color/text_secondary_878b9c" android:textSize="13sp" />