Merge branch 'v_2.2'

Author: fmtcias

app/src/main/java/com/fmt/github/base/fragment/BasePagingVMFragment.kt

@@ -6,7 +6,7 @@ import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.fmt.github.R
-import com.fmt.github.base.viewmodel.BaseLPagingModel
+import com.fmt.github.base.viewmodel.BaseLPagingViewModel
 import com.fmt.github.ext.yes
 import com.google.android.material.button.MaterialButton
 import com.kennyc.view.MultiStateView
@@ -18,7 +18,7 @@ import kotlinx.android.synthetic.main.common_refresh_recyclerview.*
 /**
  * 基于Paging封装通用分页列表
  */
-abstract class BasePagingVMFragment<M, VM : BaseLPagingModel<M>, VH : RecyclerView.ViewHolder> :
+abstract class BasePagingVMFragment<M, VM : BaseLPagingViewModel<M>, VH : RecyclerView.ViewHolder> :
     BaseVMFragment(), OnRefreshListener,
     OnLoadMoreListener {
 

app/src/main/java/com/fmt/github/base/viewmodel/BaseLPagingModel.kt renamed to app/src/main/java/com/fmt/github/base/viewmodel/BaseLPagingViewModel.kt

@@ -13,7 +13,7 @@ import kotlinx.coroutines.launch
 /**
  * 基于Paging封装通用ViewModel
  */
-abstract class BaseLPagingModel<M> : BaseViewModel() {
+abstract class BaseLPagingViewModel<M> : BaseViewModel() {
 
     private lateinit var mDataSource: PageKeyedDataSource<Int, M>
 

app/src/main/java/com/fmt/github/home/viewmodel/ReceivedEventViewModel.kt

@@ -1,11 +1,11 @@
 package com.fmt.github.home.viewmodel
 
-import com.fmt.github.base.viewmodel.BaseLPagingModel
+import com.fmt.github.base.viewmodel.BaseLPagingViewModel
 import com.fmt.github.home.model.ReceivedEventModel
 import com.fmt.github.user.repository.UserRepository
 
 class ReceivedEventViewModel(private val mUserRepository: UserRepository) :
-    BaseLPagingModel<ReceivedEventModel>() {
+    BaseLPagingViewModel<ReceivedEventModel>() {
 
     var user = ""