Modify: 基类进一步封装

Lib_Base/src/main/java/com/quyunshuo/base/BaseApplication.kt

@@ -9,4 +9,8 @@ import android.app.Application
  * @Remark: 自定义Application的基类
  */
 open class BaseApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+    }
 }

Lib_Base/src/main/java/com/quyunshuo/base/mvvm/m/BaseRepository.kt

@@ -0,0 +1,25 @@
+package com.quyunshuo.base.mvvm.m
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+
+/**
+ * @Author: QuYunShuo
+ * @Time: 2020/8/27
+ * @Class: BaseRepository
+ * @Remark: 仓库层 Repository 基类
+ */
+open class BaseRepository {
+
+    /**
+     * 发起请求封装
+     * @param requestBlock 请求的整体逻辑
+     * @return Flow<T>
+     */
+    protected suspend fun <T> flowRequest(requestBlock: suspend FlowCollector<T>.() -> Unit) =
+        flow {
+            requestBlock()
+        }.flowOn(Dispatchers.IO)     // 通过 flowOn 切换到 io 线程
+}

Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameActivity.kt

@@ -1,7 +1,9 @@
-package com.quyunshuo.base.ui
+package com.quyunshuo.base.mvvm.v
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 
 /**
@@ -10,13 +12,17 @@ import androidx.viewbinding.ViewBinding
  * @Class: BaseFrameActivity
  * @Remark: Activity基类 与项目无关
  */
-abstract class BaseFrameActivity<VB : ViewBinding> : AppCompatActivity() {
+abstract class BaseFrameActivity<VB : ViewBinding, VM : ViewModel>(private val vmClass: Class<VM>) :
+    AppCompatActivity() {
 
-    lateinit var mBinding: VB
+    protected val mViewModel: VM by lazy(mode = LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this).get(vmClass)
+    }
+
+    protected val mBinding: VB by lazy(mode = LazyThreadSafetyMode.NONE) { initViewBinding() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mBinding = initViewBinding()
         setContentView(mBinding.root)
         initView()
     }

Lib_Base/src/main/java/com/quyunshuo/base/mvvm/v/BaseFrameFragment.kt

@@ -0,0 +1,43 @@
+package com.quyunshuo.base.mvvm.v
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.viewbinding.ViewBinding
+
+/**
+ * @Author: QuYunShuo
+ * @Time: 2020/8/27
+ * @Class: BaseFrameFragment
+ * @Remark: Fragment基类 与项目无关
+ */
+abstract class BaseFrameFragment<VB : ViewBinding, VM : ViewModel>(private val vmClass: Class<VM>) :
+    Fragment() {
+
+    protected val mViewModel: VM by lazy(mode = LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this).get(vmClass)
+    }
+
+    protected val mBinding: VB by lazy(mode = LazyThreadSafetyMode.NONE) { initViewBinding() }
+
+    protected abstract fun initViewBinding(): VB
+
+    protected abstract fun initView()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return mBinding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initView()
+    }
+}

Lib_Base/src/main/java/com/quyunshuo/base/mvvm/vm/BaseViewModel.kt

@@ -0,0 +1,17 @@
+package com.quyunshuo.base.mvvm.vm
+
+import androidx.lifecycle.ViewModel
+import com.quyunshuo.base.mvvm.m.BaseRepository
+
+/**
+ * @Author: QuYunShuo
+ * @Time: 2020/8/27
+ * @Class: BaseViewModel
+ * @Remark: ViewModel 基类
+ */
+abstract class BaseViewModel<R : BaseRepository> : ViewModel() {
+
+    protected val mRepository: R by lazy { initRepository() }
+
+    protected abstract fun initRepository(): R
+}

Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseFrameFragment.kt

@@ -1,12 +0,0 @@
-package com.quyunshuo.base.ui
-
-import androidx.fragment.app.Fragment
-
-/**
- * @Author: QuYunShuo
- * @Time: 2020/8/27
- * @Class: BaseFrameFragment
- * @Remark: Fragment基类 与项目无关
- */
-abstract class BaseFrameFragment : Fragment() {
-}

Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseRepository.kt

@@ -1,10 +0,0 @@
-package com.quyunshuo.base.ui
-
-/**
- * @Author: QuYunShuo
- * @Time: 2020/8/27
- * @Class: BaseRepository
- * @Remark: 仓库层 Repository 基类
- */
-open class BaseRepository {
-}

Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseViewModel.kt

@@ -1,12 +0,0 @@
-package com.quyunshuo.base.ui
-
-import androidx.lifecycle.ViewModel
-
-/**
- * @Author: QuYunShuo
- * @Time: 2020/8/27
- * @Class: BaseViewModel
- * @Remark: ViewModel 基类
- */
-open class BaseViewModel : ViewModel() {
-}

Lib_Base/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="base_AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="base_AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/base_colorPrimary</item>
         <item name="colorPrimaryDark">@color/base_colorPrimaryDark</item>