1.升级kotlin至1.3.61版本。

2.为brick添加lazy系列方法。 3.调用brick部分api命名。
xiazunyang · Dec 12, 2019 · e86b345 · e86b345
1 parent 8f7251b
commit e86b345
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 24 deletions.
diff --git a/app/src/main/java/com/numeron/wandroid/activity/ArticleListActivity.kt b/app/src/main/java/com/numeron/wandroid/activity/ArticleListActivity.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.Observer
 import com.numeron.adapter.BindingHolder
 import com.numeron.adapter.PagedBindingAdapter
 import com.numeron.adapter.SpaceItemDecoration
-import com.numeron.brick.createViewModel
+import com.numeron.brick.lazyViewModel
 import com.numeron.delegate.ActivityExtraDelegate
 import com.numeron.starter.startActivity
 import com.numeron.util.dp
@@ -31,9 +31,7 @@ class ArticleListActivity : BaseActivity(), ArticleListParamProvider {
 
     override val chapterId: Int by ActivityExtraDelegate(0)
 
-    private val articleListViewModel: ArticleListViewModel by lazy {
-        createViewModel<ArticleListViewModel>(this)
-    }
+    private val articleListViewModel: ArticleListViewModel by lazyViewModel(this)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/com/numeron/wandroid/activity/WeChatAuthorActivity.kt b/app/src/main/java/com/numeron/wandroid/activity/WeChatAuthorActivity.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.Observer
 import com.numeron.adapter.BindingHolder
 import com.numeron.adapter.PagedBindingAdapter
 import com.numeron.adapter.SpaceItemDecoration
-import com.numeron.brick.createViewModel
+import com.numeron.brick.lazyViewModel
 import com.numeron.chameleon.Chameleon
 import com.numeron.util.dp
 import com.numeron.view.StatefulLayoutMessageObserver
@@ -20,9 +20,7 @@ import kotlinx.android.synthetic.main.activity_we_chat_author_layout.*
 
 class WeChatAuthorActivity : BaseActivity() {
 
-    private val weChatAuthorViewModel by lazy {
-        createViewModel<WeChatAuthorViewModel>()
-    }
+    private val weChatAuthorViewModel: WeChatAuthorViewModel by lazyViewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/com/numeron/wandroid/contract/ArticleListContract.kt b/app/src/main/java/com/numeron/wandroid/contract/ArticleListContract.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import com.numeron.brick.ViewModel
-import com.numeron.brick.stack
+import com.numeron.brick.lazyAutowired
 import com.numeron.wandroid.dao.ArticleDao
 import com.numeron.wandroid.entity.ApiResponse
 import com.numeron.wandroid.entity.Paged
@@ -26,7 +26,7 @@ interface ArticleListParamProvider {
 
 class ArticleListViewModel(private val paramProvider: ArticleListParamProvider) : ViewModel() {
 
-    private val articleRepository = stack<ArticleRepository>()
+    private val articleRepository: ArticleRepository by lazyAutowired()
 
     private val pagedConfig = PagedList.Config.Builder()
             .setPageSize(20)

diff --git a/app/src/main/java/com/numeron/wandroid/contract/WeChatAuthorContract.kt b/app/src/main/java/com/numeron/wandroid/contract/WeChatAuthorContract.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import com.numeron.brick.ViewModel
-import com.numeron.brick.stack
+import com.numeron.brick.lazyAutowired
 import com.numeron.wandroid.dao.WeChatAuthorDao
 import com.numeron.wandroid.entity.ApiResponse
 import com.numeron.wandroid.entity.db.WeChatAuthor
@@ -16,7 +16,7 @@ import retrofit2.http.GET
 
 class WeChatAuthorViewModel : ViewModel() {
 
-    private val weChatAuthorRepository = stack<WeChatAuthorRepository>()
+    private val weChatAuthorRepository: WeChatAuthorRepository by lazyAutowired()
 
     val loadStatusLiveData = MutableLiveData<Pair<State, String>>()
     val weChatAuthorLiveData =

diff --git a/brick/src/main/java/com/numeron/brick/Brick.kt b/brick/src/main/java/com/numeron/brick/Brick.kt
@@ -1,4 +1,5 @@
 @file:JvmName("Brick")
+@file:Suppress("FunctionName")
 
 package com.numeron.brick
 
@@ -32,7 +33,7 @@ fun addRoom(vararg room: Any) {
  * @return Model    实例
  */
 @JvmOverloads
-fun <M> stack(clazz: Class<M>, iRetrofit: Any? = null): M {
+fun <M> autowired(clazz: Class<M>, iRetrofit: Any? = null): M {
     return ModelFactory.create(clazz, iRetrofit)
 }
 
@@ -42,10 +43,18 @@ fun <M> stack(clazz: Class<M>, iRetrofit: Any? = null): M {
  * @param iRetrofit Any? 创建Model的实例时，用于创建Retrofit Api实例的Retrofit或其它工具类
  * @return M Model的实例
  */
-inline fun <reified M> stack(iRetrofit: Any? = null) = stack(M::class.java, iRetrofit)
+inline fun <reified M> autowired(iRetrofit: Any? = null) = autowired(M::class.java, iRetrofit)
+
+
+inline fun <reified M> lazyAutowired(iRetrofit: Any? = null): Lazy<M> {
+    return lazy {
+        autowired<M>(iRetrofit)
+    }
+}
+
 
 @JvmOverloads
-fun <VM : ViewModel> createViewModel(clazz: Class<VM>, store: ViewModelStore, factory: ViewModelProvider.Factory = ViewModelFactory()): VM {
+fun <VM : ViewModel> viewModel(clazz: Class<VM>, store: ViewModelStore, factory: ViewModelProvider.Factory = ViewModelFactory()): VM {
     return ViewModelProvider(store, factory).get(clazz)
 }
 
@@ -58,23 +67,30 @@ fun <VM : ViewModel> createViewModel(clazz: Class<VM>, store: ViewModelStore, fa
  * @return VM 创建后的实例
  */
 @JvmOverloads
-fun <VM : ViewModel> ViewModelStoreOwner.createViewModel(
+fun <VM : ViewModel> ViewModelStoreOwner.viewModel(
         clazz: Class<VM>, factory: ViewModelProvider.Factory = ViewModelFactory()): VM {
     return ViewModelProvider(this, factory).get(clazz)
 }
 
 /**
- * [createViewModel] 的inline方法
+ * [viewModel] 的inline方法
  */
-inline fun <reified VM : ViewModel> ViewModelStoreOwner.createViewModel(factory: ViewModelProvider.Factory): VM {
-    return createViewModel(VM::class.java, factory)
+inline fun <reified VM : ViewModel> ViewModelStoreOwner.viewModel(factory: ViewModelProvider.Factory): VM {
+    return viewModel(VM::class.java, factory)
 }
 
 /**
  * 如果ViewModel需要接收参数，建议使用此方法创建ViewModel实例
  * @param arguments Array<out Any> ViewModel的参数
  * @return VM 创建后的实例
  */
-inline fun <reified VM : ViewModel> ViewModelStoreOwner.createViewModel(vararg arguments: Any): VM {
-    return createViewModel(ViewModelFactory(*arguments))
+
+inline fun <reified VM : ViewModel> ViewModelStoreOwner.viewModel(vararg arguments: Any): VM {
+    return viewModel(ViewModelFactory(*arguments))
+}
+
+inline fun <reified VM : ViewModel> ViewModelStoreOwner.lazyViewModel(vararg arguments: Any): Lazy<VM> {
+    return lazy {
+        viewModel<VM>(*arguments)
+    }
 }
diff --git a/brick/src/main/java/com/numeron/brick/ModelFactory.java b/brick/src/main/java/com/numeron/brick/ModelFactory.java
@@ -2,7 +2,6 @@
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"