diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameActivity.kt b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameActivity.kt index 98cbc91..8b7c476 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameActivity.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameActivity.kt @@ -18,7 +18,7 @@ import java.lang.reflect.ParameterizedType * @Remark: Activity基类 与项目无关 */ abstract class BaseFrameActivity : - AppCompatActivity(), FrameView { + AppCompatActivity(), FrameView { protected val mBinding: VB by lazy(mode = LazyThreadSafetyMode.NONE) { val vbClass: Class = @@ -40,8 +40,9 @@ abstract class BaseFrameActivity : ARouter.getInstance().inject(this) // 注册EventBus if (javaClass.isAnnotationPresent(EventBusRegister::class.java)) EventBusUtils.register(this) - initView() - initViewObserve() + mBinding.initView() + initLiveDataObserve() + initRequestData() } override fun onDestroy() { diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameFragment.kt b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameFragment.kt index 0afe4e1..c90dbcc 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameFragment.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameFragment.kt @@ -19,7 +19,7 @@ import java.lang.reflect.ParameterizedType * @Class: BaseFrameFragment * @Remark: Fragment基类 与项目无关 */ -abstract class BaseFrameFragment : Fragment(), FrameView { +abstract class BaseFrameFragment : Fragment(), FrameView { protected val mBinding: VB by lazy(mode = LazyThreadSafetyMode.NONE) { val vbClass: Class = @@ -47,8 +47,9 @@ abstract class BaseFrameFragment : Fragment(), ARouter.getInstance().inject(this) // 注册EventBus if (javaClass.isAnnotationPresent(EventBusRegister::class.java)) EventBusUtils.register(this) - initView() - initViewObserve() + mBinding.initView() + initLiveDataObserve() + initRequestData() } override fun onDestroy() { diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMActivity.kt b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMActivity.kt index 9d14453..bdf41ca 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMActivity.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMActivity.kt @@ -15,7 +15,8 @@ import java.lang.reflect.ParameterizedType * @Class: BaseFrameNotMVVMActivity * @Remark: 不使用 MVVM 的 Activity 基类 */ -abstract class BaseFrameNotMVVMActivity : AppCompatActivity(), FrameNotMVVMView { +abstract class BaseFrameNotMVVMActivity : AppCompatActivity(), + FrameNotMVVMView { protected val mBinding: VB by lazy(mode = LazyThreadSafetyMode.NONE) { val vbClass: Class = @@ -31,7 +32,7 @@ abstract class BaseFrameNotMVVMActivity : AppCompatActivity(), ARouter.getInstance().inject(this) // 注册EventBus if (javaClass.isAnnotationPresent(EventBusRegister::class.java)) EventBusUtils.register(this) - initView() + mBinding.initView() } override fun onDestroy() { diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMFragment.kt b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMFragment.kt index 5dac2ba..1cc6ee9 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMFragment.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameNotMVVMFragment.kt @@ -17,7 +17,7 @@ import java.lang.reflect.ParameterizedType * @Class: BaseFrameNotMVVMFragment * @Remark: 不使用 MVVM 的 Fragment 基类 */ -abstract class BaseFrameNotMVVMFragment : Fragment(), FrameNotMVVMView { +abstract class BaseFrameNotMVVMFragment : Fragment(), FrameNotMVVMView { protected val mBinding: VB by lazy(mode = LazyThreadSafetyMode.NONE) { val vbClass: Class = @@ -40,7 +40,7 @@ abstract class BaseFrameNotMVVMFragment : Fragment(), FrameNot ARouter.getInstance().inject(this) // 注册EventBus if (javaClass.isAnnotationPresent(EventBusRegister::class.java)) EventBusUtils.register(this) - initView() + mBinding.initView() } override fun onDestroy() { diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameNotMVVMView.kt b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameNotMVVMView.kt index c06249d..0cde3a2 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameNotMVVMView.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameNotMVVMView.kt @@ -1,14 +1,16 @@ package com.quyunshuo.base.mvvm.v +import androidx.viewbinding.ViewBinding + /** * @Author: QuYunShuo * @Time: 2020/10/13 * @Class: FrameNotMVVMView * @Remark: View层基类抽象 */ -interface FrameNotMVVMView { +interface FrameNotMVVMView { /** * 初始化View */ - fun initView() + fun VB.initView() } \ No newline at end of file diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameView.kt b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameView.kt index bf9f936..b84e9ab 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameView.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/FrameView.kt @@ -1,19 +1,26 @@ package com.quyunshuo.base.mvvm.v +import androidx.viewbinding.ViewBinding + /** * @Author: QuYunShuo * @Time: 2020/10/13 * @Class: FrameView * @Remark: View层基类抽象 */ -interface FrameView { +interface FrameView { /** * 初始化View */ - fun initView() + fun VB.initView() /** - * 订阅LiveData + * 初始化LiveData的订阅关系 */ - fun initViewObserve() + fun initLiveDataObserve() + + /** + * 初始化界面创建时的数据请求 + */ + fun initRequestData() } \ No newline at end of file