feat(*): 升级Base包

Author: AndroidCoderPeng

app/src/main/java/com/pengxh/kt/lib/MainActivity.kt

@@ -1,20 +1,31 @@
 package com.pengxh.kt.lib
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import com.pengxh.kt.lib.databinding.ActivityMainBinding
-import com.pengxh.kt.lite.extensions.binding
+import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : KotlinBaseActivity<ActivityMainBinding>() {
 
     private val kTag = "MainActivity"
     private val context = this@MainActivity
-    private val binding: ActivityMainBinding by binding()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun initViewBinding() = ActivityMainBinding.inflate(layoutInflater)
 
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
         binding.showDialogButton.setOnClickListener {
             AlertControlDialog.Builder()
                 .setContext(this)

lite/src/main/java/com/pengxh/kt/lite/base/KotlinBaseActivity.kt

@@ -2,22 +2,26 @@ package com.pengxh.kt.lite.base
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.viewbinding.ViewBinding
 
-abstract class KotlinBaseActivity : AppCompatActivity() {
+abstract class KotlinBaseActivity<VB : ViewBinding> : AppCompatActivity() {
+
+    protected lateinit var binding: VB
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(initLayoutView())
+        binding = initViewBinding()
+        setContentView(binding.root)
         setupTopBarLayout()
-        initData(savedInstanceState)
+        initOnCreate(savedInstanceState)
         observeRequestState()
         initEvent()
     }
 
     /**
-     * 初始化xml布局
+     * 初始化ViewBinding
      */
-    abstract fun initLayoutView(): Int
+    abstract fun initViewBinding(): VB
 
     /**
      * 特定页面定制沉浸式状态栏
@@ -27,7 +31,7 @@ abstract class KotlinBaseActivity : AppCompatActivity() {
     /**
      * 初始化默认数据
      */
-    abstract fun initData(savedInstanceState: Bundle?)
+    abstract fun initOnCreate(savedInstanceState: Bundle?)
 
     /**
      * 数据请求状态监听

lite/src/main/java/com/pengxh/kt/lite/base/KotlinBaseFragment.kt

@@ -4,30 +4,31 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
 
-abstract class KotlinBaseFragment : Fragment() {
+abstract class KotlinBaseFragment<VB : ViewBinding> : Fragment() {
 
-    lateinit var bv: View
+    private lateinit var _binding: VB
+
+    protected val binding get() = _binding
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View? {
-        bv = inflater.inflate(initLayoutRes(), container, false)
-        initView(savedInstanceState)
-        setupTopBarLayout()
-        return bv
+        _binding = initViewBinding(inflater, container)
+        return _binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        initOnCreate(savedInstanceState)
+        setupTopBarLayout()
         observeRequestState()
         initEvent()
     }
 
-    @LayoutRes
-    abstract fun initLayoutRes(): Int
+    abstract fun initViewBinding(inflater: LayoutInflater, container: ViewGroup?): VB
 
     /**
      * 沉浸式状态栏
@@ -37,7 +38,7 @@ abstract class KotlinBaseFragment : Fragment() {
     /**
      * 初始化布局以及控件
      */
-    abstract fun initView(savedInstanceState: Bundle?)
+    abstract fun initOnCreate(savedInstanceState: Bundle?)
 
     /**
      * 网络请求状态监听

lite/src/main/java/com/pengxh/kt/lite/extensions/Activity.kt

@@ -1,9 +1,9 @@
 package com.pengxh.kt.lite.extensions
 
-import androidx.activity.ComponentActivity
+import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
 
-inline fun <reified VB : ViewBinding> ComponentActivity.binding() =
+inline fun <reified VB : ViewBinding> AppCompatActivity.binding() =
     lazy(LazyThreadSafetyMode.NONE) {
         inflateBinding<VB>(layoutInflater).also { setContentView(it.root) }
     }