From bb6025163809e194857894c4d4c8a2e02885faa8 Mon Sep 17 00:00:00 2001
From: luyao <sunluyao1993x@gmail.com>
Date: Fri, 16 Aug 2019 16:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20MvvmActivity=20=E5=B4=A9?=
 =?UTF-8?q?=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/luyao/util/ktx/mvvm/MvvmActivity.kt   | 3 +--
 ktx/build.gradle                                        | 2 +-
 ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/luyao/util/ktx/mvvm/MvvmActivity.kt b/app/src/main/java/luyao/util/ktx/mvvm/MvvmActivity.kt
index e6e0571..c706bfb 100644
--- a/app/src/main/java/luyao/util/ktx/mvvm/MvvmActivity.kt
+++ b/app/src/main/java/luyao/util/ktx/mvvm/MvvmActivity.kt
@@ -1,6 +1,5 @@
 package luyao.util.ktx.mvvm
 
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
 import kotlinx.android.synthetic.main.activity_mvvm_demo.*
 import luyao.ktx.R
@@ -11,7 +10,7 @@ import luyao.util.ktx.ext.toast
  * Created by luyao
  * on 2019/5/31 16:28
  */
-class MvvmActivity : BaseVMActivity<MvvmModel>(), LifecycleOwner {
+class MvvmActivity : BaseVMActivity<MvvmModel>() {
 
     override fun providerVMClass() = MvvmModel::class.java
 
diff --git a/ktx/build.gradle b/ktx/build.gradle
index 378281a..d077645 100644
--- a/ktx/build.gradle
+++ b/ktx/build.gradle
@@ -103,7 +103,7 @@ publish {
     userOrg = 'luyaox'           //bintray.com 注册的用户名
     groupId = 'luyao.util.ktx'   //以后访问 jcenter上此项目的路径，一般和库项目的包名一致
     artifactId = 'AndroidUtilKTX'       //bintray.com 创建的 Package 名
-    publishVersion = '0.0.5-alpha03'         //版本号
+    publishVersion = '0.0.6'         //版本号
     desc = 'Android Kotlin Util Code' //版本说明，随意
     website = 'https://github.com/lulululbj/AndroidUtilCodeKTX'    //关于这个开源项目的网站，随意
 }
\ No newline at end of file
diff --git a/ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt b/ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt
index 8440709..567264c 100644
--- a/ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt
+++ b/ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt
@@ -3,6 +3,7 @@ package luyao.util.ktx.base
 import android.os.Bundle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 
 /**
@@ -14,14 +15,14 @@ abstract class BaseVMActivity<VM : BaseViewModel> : BaseActivity(), LifecycleObs
     lateinit var mViewModel: VM
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        initVM()
         super.onCreate(savedInstanceState)
+        initVM()
         startObserve()
     }
 
     private fun initVM() {
         providerVMClass()?.let {
-            mViewModel = ViewModelProviders.of(this).get(it)
+            mViewModel = ViewModelProvider(this).get(it)
             mViewModel.let(lifecycle::addObserver)
         }
     }