日常提交:2022-08-03.

walgr · Aug 3, 2022 · 2f9f346 · 2f9f346
1 parent 9646089
commit 2f9f346
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 10 deletions.
diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelActivity.kt b/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelActivity.kt
@@ -1,5 +1,7 @@
 package com.wpf.app.quick.activity
 
+import android.content.Intent
+import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,11 @@ abstract class QuickViewModelActivity<VM : QuickViewModel<H>, H : QuickView> @Jv
     BindViewModel<VM> {
     private var mViewModel: VM? = null
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mViewModel?.onSaveInstanceState(outState)
+    }
+
     override fun onResume() {
         super.onResume()
         mViewModel?.onResume()
@@ -35,6 +42,11 @@ abstract class QuickViewModelActivity<VM : QuickViewModel<H>, H : QuickView> @Jv
         mViewModel?.onStop()
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        mViewModel?.onActivityResult(requestCode, resultCode, data)
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         mViewModel?.onDestroy()

diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelBindingActivity.kt b/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelBindingActivity.kt
@@ -1,5 +1,7 @@
 package com.wpf.app.quick.activity
 
+import android.content.Intent
+import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.databinding.DataBindingUtil
@@ -52,6 +54,37 @@ abstract class QuickViewModelBindingActivity<VM : QuickBindingViewModel<VB>, VB
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mViewModel?.onSaveInstanceState(outState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mViewModel?.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mViewModel?.onPause()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        mViewModel?.onStop()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        mViewModel?.onActivityResult(requestCode, resultCode, data)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mViewModel?.onDestroy()
+        mViewModel = null
+    }
+
     override fun initView() {
         initView(viewBinding)
     }

diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelBindingFragment.kt b/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelBindingFragment.kt
@@ -1,6 +1,7 @@
 package com.wpf.app.quick.activity
 
 import android.app.Application
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
@@ -78,5 +79,36 @@ abstract class QuickViewModelBindingFragment<VM : QuickBindingViewModel<VB>, VB
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mViewModel?.onSaveInstanceState(outState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mViewModel?.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mViewModel?.onPause()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        mViewModel?.onStop()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        mViewModel?.onActivityResult(requestCode, resultCode, data)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mViewModel?.onDestroy()
+        mViewModel = null
+    }
+
     abstract fun initView(viewDataBinding: VB?)
 }
diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelFragment.kt b/Quick/src/main/java/com/wpf/app/quick/activity/QuickViewModelFragment.kt
@@ -1,6 +1,8 @@
 package com.wpf.app.quick.activity
 
 import android.app.Application
+import android.content.Intent
+import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
@@ -20,6 +22,37 @@ open class QuickViewModelFragment<VM : QuickViewModel<H>, H : QuickView> @JvmOve
     override val titleName: String = ""
 ) : QuickFragment(), BindViewModel<VM> {
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mViewModel?.onSaveInstanceState(outState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mViewModel?.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mViewModel?.onPause()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        mViewModel?.onStop()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        mViewModel?.onActivityResult(requestCode, resultCode, data)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mViewModel?.onDestroy()
+        mViewModel = null
+    }
+
     private var mViewModel: VM? = null
 
     @CallSuper

diff --git a/Quick/src/main/java/com/wpf/app/quick/viewmodel/QuickBindingViewModel.kt b/Quick/src/main/java/com/wpf/app/quick/viewmodel/QuickBindingViewModel.kt
@@ -1,5 +1,7 @@
 package com.wpf.app.quick.viewmodel
 
+import android.content.Intent
+import android.os.Bundle
 import androidx.databinding.ViewDataBinding
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.ViewModel
@@ -11,6 +13,18 @@ import androidx.lifecycle.ViewModel
 abstract class QuickBindingViewModel<T : ViewDataBinding> : ViewModel(), LifecycleObserver {
     var mViewBinding: T? = null
 
+    open fun onResume() {}
+
+    open fun onPause() {}
+
+    open fun onStop() {}
+
+    open fun onDestroy() {}
+
+    open fun onSaveInstanceState(outState: Bundle) {}
+
+    open fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {}
+
     abstract fun onBindingCreated(mViewBinding: T?)
 
     fun getViewBinding(): T? {

diff --git a/Quick/src/main/java/com/wpf/app/quick/viewmodel/QuickViewModel.kt b/Quick/src/main/java/com/wpf/app/quick/viewmodel/QuickViewModel.kt
@@ -1,5 +1,7 @@
 package com.wpf.app.quick.viewmodel
 
+import android.content.Intent
+import android.os.Bundle
 import androidx.lifecycle.ViewModel
 import com.wpf.app.quick.activity.QuickView
 
@@ -10,13 +12,17 @@ import com.wpf.app.quick.activity.QuickView
 abstract class QuickViewModel<T : QuickView> : ViewModel() {
     var baseView: T? = null
 
-    fun onResume() {}
+    open fun onResume() {}
 
-    fun onPause() {}
+    open fun onPause() {}
 
-    fun onStop() {}
+    open fun onStop() {}
 
-    fun onDestroy() {}
+    open fun onDestroy() {}
+
+    open fun onSaveInstanceState(outState: Bundle) {}
+
+    open fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {}
 
     abstract fun onViewCreated(baseView: T)
 }
diff --git a/Quick/src/main/java/com/wpf/app/quick/widgets/recyclerview/QuickBindData.kt b/Quick/src/main/java/com/wpf/app/quick/widgets/recyclerview/QuickBindData.kt
@@ -13,12 +13,16 @@ import com.wpf.app.quickbind.interfaces.Bind
  *
  */
 open class QuickBindData(
+    @Transient
     @LayoutRes open val layoutId: Int,
 ) : QuickItemData(), Bind {
 
+    @Transient
     private var mViewHolder: QuickViewHolder<QuickBindData>? = null
+    @Transient
     private lateinit var mAdapter: QuickAdapter
     private var dealBind = true
+    @Transient
     private lateinit var mView: View
 
     open fun onCreateViewHolder(itemView: View) {

diff --git a/QuickBind/build.gradle b/QuickBind/build.gradle
@@ -46,7 +46,7 @@ dependencies {
         api project(":Quick-runtime")
 
     //GSON
-    compileOnly 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/app/src/main/java/com/wpf/app/quick/demo/MainActivity.kt b/app/src/main/java/com/wpf/app/quick/demo/MainActivity.kt
@@ -6,13 +6,11 @@ import android.widget.TextView
 import com.wpf.app.quick.activity.QuickViewModelBindingActivity
 import com.wpf.app.quick.annotations.BindView
 import com.wpf.app.quick.demo.databinding.ActivityMainBinding
-import com.wpf.app.quick.demo.viewmodel.MainViewModel
 import com.wpf.app.quick.demo.model.MyMessage
 import com.wpf.app.quick.demo.model.TestModel
-import com.wpf.app.quickbind.annotations.BindSp2View
-import java.util.ArrayList
-import java.util.HashMap
+import com.wpf.app.quick.demo.viewmodel.MainViewModel
 import com.wpf.app.quick.utils.startActivity
+import com.wpf.app.quickbind.annotations.BindSp2View
 import com.wpf.app.r2test.R2TestActivity
 
 /**

diff --git a/gradle.properties b/gradle.properties
@@ -28,7 +28,7 @@ android.nonTransitiveRClass=true
 IS_REMOTE=true
 IS_ONLY_PLUGIN=false
 GROUP=com.wpf.app.quick
-VERSION_NAME=0.2.11
+VERSION_NAME=0.2.12
 
 POM_DESCRIPTION=Quick Android.