fixed onSaveInstanceState issue

sovegetables · Aug 24, 2020 · 28b52ab · 28b52ab
1 parent 7b873cf
commit 28b52ab
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 10 deletions.
diff --git a/agronweb/src/main/java/cn/sovegetables/web/CommonWebActivity.kt b/agronweb/src/main/java/cn/sovegetables/web/CommonWebActivity.kt
@@ -3,6 +3,7 @@ package cn.sovegetables.web
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.os.PersistableBundle
 import android.text.TextUtils
 import android.view.ContextMenu
 import android.view.View
@@ -37,7 +38,7 @@ open class CommonWebActivity : BaseActivity() {
 
         fun start(activity: Activity, webConfig: WebConfig){
             val intent = Intent(activity, CommonWebActivity::class.java)
-            intent.putExtra(KEY_WEB_CONFIG, webConfig)
+            putWebConfig(intent, webConfig)
             activity.startActivity(intent)
         }
 
@@ -47,7 +48,7 @@ open class CommonWebActivity : BaseActivity() {
 
         fun start(fragment: Fragment, webConfig: WebConfig){
             val intent = Intent(fragment.requireContext(), CommonWebActivity::class.java)
-            intent.putExtra(KEY_WEB_CONFIG, webConfig)
+            putWebConfig(intent, webConfig)
             fragment.startActivity(intent)
         }
 
@@ -57,10 +58,14 @@ open class CommonWebActivity : BaseActivity() {
 
         fun getIntent(webConfig: WebConfig) : Intent{
             val intent = Intent()
-            intent.putExtra(KEY_WEB_CONFIG, webConfig)
+            putWebConfig(intent, webConfig)
             return intent
         }
 
+        fun putWebConfig(intent: Intent, webConfig: WebConfig) {
+            intent.putExtra(KEY_WEB_CONFIG, webConfig)
+        }
+
         fun getWebConfig(activity: CommonWebActivity) : WebConfig{
             return activity.intent?.getParcelableExtra(KEY_WEB_CONFIG) as  WebConfig
         }
@@ -70,8 +75,8 @@ open class CommonWebActivity : BaseActivity() {
 
     @CallSuper
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
         webConfig = getWebConfig(this)
+        super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_common_web)
 
         val updater : TopBarItemUpdater = topBarAction.leftItemUpdater()
@@ -154,6 +159,16 @@ open class CommonWebActivity : BaseActivity() {
         web.loadUrl(url)
     }
 
+    override fun onSaveInstanceState(outState: Bundle, outPersistentState: PersistableBundle) {
+        super.onSaveInstanceState(outState, outPersistentState)
+        outState.putParcelable(KEY_WEB_CONFIG, webConfig)
+    }
+
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+        webConfig = getWebConfig(this)
+    }
+
     protected open fun onPrepareWeb(web: ArgonWebView?, webConfig: WebConfig) {
     }
 
@@ -204,7 +219,7 @@ open class CommonWebActivity : BaseActivity() {
     }
 
     override fun createSystemBarConfig(): SystemBarConfig? {
-        val config = getWebConfig(this)
+        val config = webConfig
         val builder = SystemBarConfig.Builder()
         if(config.statusColorInt != null){
             builder.setStatusBarColor(config.statusColorInt!!)

diff --git a/agronweb/src/main/java/cn/sovegetables/web/ProcessCommonWebActivity.kt b/agronweb/src/main/java/cn/sovegetables/web/ProcessCommonWebActivity.kt
@@ -1,10 +1,35 @@
 package cn.sovegetables.web
 
-import android.os.Bundle
+import android.app.Activity
+import android.content.Intent
+import androidx.fragment.app.Fragment
 
 open class ProcessCommonWebActivity : CommonWebActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    companion object{
+
+        fun start(activity: Activity, url: String){
+            start(activity, WebConfig(url = url, enableAutoTitle = true))
+        }
+
+        fun start(activity: Activity, webConfig: WebConfig){
+            val intent = Intent(activity, ProcessCommonWebActivity::class.java)
+            putWebConfig(intent,  webConfig)
+            activity.startActivity(intent)
+        }
+
+        fun start(fragment: Fragment, url: String){
+            start(fragment, WebConfig(url = url, enableAutoTitle = true))
+        }
+
+        fun start(fragment: Fragment, webConfig: WebConfig){
+            val intent = Intent(fragment.requireContext(), ProcessCommonWebActivity::class.java)
+            putWebConfig(intent,  webConfig)
+            fragment.startActivity(intent)
+        }
+
+        fun setIWebModule(module: IWebModule){
+            CommonWebActivity.setIWebModule(module)
+        }
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip