commit 1.2.7 添加ViewBinding，后续无需重写layoutId()方法

Author: hegaojian

JetpackMvvm/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 26
-        versionName "1.2.6"
+        versionCode 27
+        versionName "1.2.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }

JetpackMvvm/proguard-rules.pro

@@ -60,5 +60,12 @@
 -keep class com.tbruyelle.rxpermissions2.** { *; }
 -keep interface com.tbruyelle.rxpermissions2.** { *; }
 
+################ ViewBinding & DataBinding ###############
+-keepclassmembers class * implements androidx.viewbinding.ViewBinding {
+  public static * inflate(android.view.LayoutInflater);
+  public static * inflate(android.view.LayoutInflater, android.view.ViewGroup, boolean);
+  public static * bind(android.view.View);
+}
+
 
 

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/activity/BaseVmActivity.kt

@@ -1,11 +1,13 @@
 package me.hgj.jetpackmvvm.base.activity
 
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
 import me.hgj.jetpackmvvm.ext.getVmClazz
+import me.hgj.jetpackmvvm.ext.util.notNull
 import me.hgj.jetpackmvvm.network.manager.NetState
 import me.hgj.jetpackmvvm.network.manager.NetworkStateManager
 
@@ -16,11 +18,6 @@ import me.hgj.jetpackmvvm.network.manager.NetworkStateManager
  */
 abstract class BaseVmActivity<VM : BaseViewModel> : AppCompatActivity() {
 
-    /**
-     * 是否需要使用DataBinding 供子类BaseVmDbActivity修改，用户请慎动
-     */
-    private var isUserDb = false
-
     lateinit var mViewModel: VM
 
     abstract fun layoutId(): Int
@@ -33,11 +30,11 @@ abstract class BaseVmActivity<VM : BaseViewModel> : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (!isUserDb) {
+        initDataBind().notNull({
+            setContentView(it)
+        }, {
             setContentView(layoutId())
-        } else {
-            initDataBind()
-        }
+        })
         init(savedInstanceState)
     }
 
@@ -86,8 +83,8 @@ abstract class BaseVmActivity<VM : BaseViewModel> : AppCompatActivity() {
      * 将非该Activity绑定的ViewModel添加 loading回调 防止出现请求时不显示 loading 弹窗bug
      * @param viewModels Array<out BaseViewModel>
      */
-    protected fun addLoadingObserve(vararg viewModels: BaseViewModel){
-        viewModels.forEach {viewModel ->
+    protected fun addLoadingObserve(vararg viewModels: BaseViewModel) {
+        viewModels.forEach { viewModel ->
             //显示弹窗
             viewModel.loadingChange.showDialog.observeInActivity(this, Observer {
                 showLoading(it)
@@ -99,12 +96,10 @@ abstract class BaseVmActivity<VM : BaseViewModel> : AppCompatActivity() {
         }
     }
 
-    fun userDataBinding(isUserDb: Boolean) {
-        this.isUserDb = isUserDb
-    }
-
     /**
      * 供子类BaseVmDbActivity 初始化Databinding操作
      */
-    open fun initDataBind() {}
+    open fun initDataBind(): View? {
+        return null
+    }
 }

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/activity/BaseVmDbActivity.kt

@@ -1,9 +1,9 @@
 package me.hgj.jetpackmvvm.base.activity
 
-import android.os.Bundle
-import androidx.databinding.DataBindingUtil
+import android.view.View
 import androidx.databinding.ViewDataBinding
 import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
+import me.hgj.jetpackmvvm.ext.inflateBindingWithGeneric
 
 /**
  * 作者　: hegaojian
@@ -13,18 +13,15 @@ import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
  */
 abstract class BaseVmDbActivity<VM : BaseViewModel, DB : ViewDataBinding> : BaseVmActivity<VM>() {
 
-    lateinit var mDatabind: DB
+    override fun layoutId() = 0
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        userDataBinding(true)
-        super.onCreate(savedInstanceState)
-    }
+    lateinit var mDatabind: DB
 
     /**
      * 创建DataBinding
      */
-    override fun initDataBind() {
-        mDatabind = DataBindingUtil.setContentView(this, layoutId())
-        mDatabind.lifecycleOwner = this
+    override fun initDataBind(): View? {
+        mDatabind = inflateBindingWithGeneric(layoutInflater)
+        return mDatabind.root
     }
 }

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/activity/BaseVmVbActivity.kt

@@ -0,0 +1,28 @@
+package me.hgj.jetpackmvvm.base.activity
+
+import android.view.View
+import androidx.viewbinding.ViewBinding
+import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
+import me.hgj.jetpackmvvm.ext.inflateBindingWithGeneric
+
+/**
+ * 作者　: hegaojian
+ * 时间　: 2019/12/12
+ * 描述　: 包含 ViewModel 和 ViewBinding ViewModelActivity基类，把ViewModel 和 ViewBinding 注入进来了
+ * 需要使用 ViewBinding 的清继承它
+ */
+abstract class BaseVmVbActivity<VM : BaseViewModel, VB : ViewBinding> : BaseVmActivity<VM>() {
+
+    override fun layoutId(): Int = 0
+
+    lateinit var mViewBind: VB
+
+    /**
+     * 创建DataBinding
+     */
+    override fun initDataBind(): View? {
+        mViewBind = inflateBindingWithGeneric(layoutInflater)
+        return mViewBind.root
+
+    }
+}

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/fragment/BaseVmDbFragment.kt

@@ -4,16 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
-import me.hgj.jetpackmvvm.ext.getVmClazz
-import me.hgj.jetpackmvvm.network.manager.NetState
-import me.hgj.jetpackmvvm.network.manager.NetworkStateManager
+import me.hgj.jetpackmvvm.ext.inflateBindingWithGeneric
 
 /**
  * 作者　: hegaojian
@@ -23,6 +16,8 @@ import me.hgj.jetpackmvvm.network.manager.NetworkStateManager
  */
 abstract class BaseVmDbFragment<VM : BaseViewModel, DB : ViewDataBinding> : BaseVmFragment<VM>() {
 
+    override fun layoutId() = 0
+
     //该类绑定的ViewDataBinding
     private var _binding: DB? = null
     val mDatabind: DB get() = _binding!!
@@ -32,8 +27,7 @@ abstract class BaseVmDbFragment<VM : BaseViewModel, DB : ViewDataBinding> : Base
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        _binding = DataBindingUtil.inflate(inflater, layoutId(), container, false)
-        mDatabind.lifecycleOwner = this
+        _binding  = inflateBindingWithGeneric(inflater,container,false)
         return mDatabind.root
     }
 

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/fragment/BaseVmFragment.kt

@@ -38,7 +38,6 @@ abstract class BaseVmFragment<VM : BaseViewModel> : Fragment() {
      */
     abstract fun layoutId(): Int
 
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/base/fragment/BaseVmVbFragment.kt

@@ -0,0 +1,38 @@
+package me.hgj.jetpackmvvm.base.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.viewbinding.ViewBinding
+import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
+import me.hgj.jetpackmvvm.ext.inflateBindingWithGeneric
+
+/**
+ * 作者　: hegaojian
+ * 时间　: 2019/12/12
+ * 描述　: ViewModelFragment基类，自动把ViewModel注入Fragment和 ViewBinding 注入进来了
+ * 需要使用 ViewBinding 的清继承它
+ */
+abstract class BaseVmVbFragment<VM : BaseViewModel, VB : ViewBinding> : BaseVmFragment<VM>() {
+
+    override fun layoutId() = 0
+
+    //该类绑定的 ViewBinding
+    private var _binding: VB? = null
+    val mViewBind: VB get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding  = inflateBindingWithGeneric(inflater,container,false)
+        return mViewBind.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/ext/BaseViewModelExt.kt

@@ -106,6 +106,8 @@ fun <T> BaseViewModel.request(
             resultState.paresResult(it)
         }.onFailure {
             it.message?.loge()
+            //打印错误栈信息
+            it.printStackTrace()
             resultState.paresException(it)
         }
     }
@@ -133,6 +135,8 @@ fun <T> BaseViewModel.requestNoCheck(
             resultState.paresResult(it)
         }.onFailure {
             it.message?.loge()
+            //打印错误栈信息
+            it.printStackTrace()
             resultState.paresException(it)
         }
     }
@@ -169,6 +173,8 @@ fun <T> BaseViewModel.request(
             }.onFailure { e ->
                 //打印错误消息
                 e.message?.loge()
+                //打印错误栈信息
+                e.printStackTrace()
                 //失败回调
                 error(ExceptionHandle.handleException(e))
             }
@@ -177,6 +183,8 @@ fun <T> BaseViewModel.request(
             loadingChange.dismissDialog.postValue(false)
             //打印错误消息
             it.message?.loge()
+            //打印错误栈信息
+            it.printStackTrace()
             //失败回调
             error(ExceptionHandle.handleException(it))
         }
@@ -214,6 +222,8 @@ fun <T> BaseViewModel.requestNoCheck(
             loadingChange.dismissDialog.postValue(false)
             //打印错误消息
             it.message?.loge()
+            //打印错误栈信息
+            it.printStackTrace()
             //失败回调
             error(ExceptionHandle.handleException(it))
         }

JetpackMvvm/src/main/java/me/hgj/jetpackmvvm/ext/ViewBindUtil.kt

@@ -0,0 +1,56 @@
+package me.hgj.jetpackmvvm.ext
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.ParameterizedType
+
+/**
+ * 作者　: hegaojian
+ * 时间　: 2021/12/21
+ * 描述　:
+ */
+
+@JvmName("inflateWithGeneric")
+fun <VB : ViewBinding> AppCompatActivity.inflateBindingWithGeneric(layoutInflater: LayoutInflater): VB =
+    withGenericBindingClass<VB>(this) { clazz ->
+        clazz.getMethod("inflate", LayoutInflater::class.java).invoke(null, layoutInflater) as VB
+    }.also { binding ->
+        if (binding is ViewDataBinding) {
+            binding.lifecycleOwner = this
+        }
+    }
+
+@JvmName("inflateWithGeneric")
+fun <VB : ViewBinding> Fragment.inflateBindingWithGeneric(layoutInflater: LayoutInflater, parent: ViewGroup?, attachToParent: Boolean): VB =
+    withGenericBindingClass<VB>(this) { clazz ->
+        clazz.getMethod("inflate", LayoutInflater::class.java, ViewGroup::class.java, Boolean::class.java)
+            .invoke(null, layoutInflater, parent, attachToParent) as VB
+    }.also { binding ->
+        if (binding is ViewDataBinding) {
+            binding.lifecycleOwner = viewLifecycleOwner
+        }
+    }
+
+private fun <VB : ViewBinding> withGenericBindingClass(any: Any, block: (Class<VB>) -> VB): VB {
+    var genericSuperclass = any.javaClass.genericSuperclass
+    var superclass = any.javaClass.superclass
+    while (superclass != null) {
+        if (genericSuperclass is ParameterizedType) {
+                try {
+                    return block.invoke(genericSuperclass.actualTypeArguments[1] as Class<VB>)
+                } catch (e: NoSuchMethodException) {
+                } catch (e: ClassCastException) {
+                } catch (e: InvocationTargetException) {
+                    throw e.targetException
+                }
+        }
+        genericSuperclass = superclass.genericSuperclass
+        superclass = superclass.superclass
+    }
+    throw IllegalArgumentException("There is no generic of ViewBinding.")
+}