Bugfix: fix bug coming with lateinit

Mindjet · Jan 3, 2018 · 6268ab1 · 6268ab1
1 parent 3858dc6
commit 6268ab1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/library/src/main/java/io/github/mindjet/livemvvm/viewmodel/BaseItemViewModel.kt b/library/src/main/java/io/github/mindjet/livemvvm/viewmodel/BaseItemViewModel.kt
@@ -2,21 +2,27 @@ package io.github.mindjet.livemvvm.viewmodel
 
 import android.databinding.ViewDataBinding
 import android.support.annotation.LayoutRes
+import android.util.Log
 
 /**
  * Created by Mindjet on 2017/10/16.
  */
 abstract class BaseItemViewModel<B : ViewDataBinding> : BaseViewModel<B>() {
 
+    private val TAG = "BaseItemViewModel"
+
     @LayoutRes
     abstract fun needLayoutId(): Int
 
     fun onAttachedToAdapter(binding: B) {
-        if (this.binding == null) {
+        try {
+            val dump = this.binding
+        } catch (e: UninitializedPropertyAccessException) {
+            Log.i(TAG, "This is the first time ${this} attached to the adapter")
             this.binding = binding
+            this.context = binding.root.context
             onAttachedTheFirstTime(binding)
-            onAttached(binding)
-        } else {
+        } finally {
             onAttached(binding)
         }
     }

diff --git a/library/src/main/java/io/github/mindjet/livemvvm/viewmodel/BaseViewModel.kt b/library/src/main/java/io/github/mindjet/livemvvm/viewmodel/BaseViewModel.kt
@@ -14,13 +14,13 @@ abstract class BaseViewModel<B : ViewDataBinding> : ViewModel() {
 
     protected lateinit var binding: B
     protected lateinit var context: Context
-    protected lateinit var activity: BaseActivity<B>
+    protected lateinit var activity:BaseActivity<B>
 
     fun onAttachedWithActivity(binding: B, baseActivity: BaseActivity<B>) {
         this.binding = binding
         this.context = binding.root.context
         this.activity = baseActivity
-        this.binding.setVariable(BR.data, this)
+        this.binding?.setVariable(BR.data, this)
         onAttachedTheFirstTime(binding)
         onAttached(binding)
     }