优化

gedoor · Jan 22, 2020 · be3b884 · be3b884
1 parent 61f3eec
commit be3b884
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/app/src/main/java/com/kunfei/bookshelf/help/ReadBookControl.java b/app/src/main/java/com/kunfei/bookshelf/help/ReadBookControl.java
@@ -91,7 +91,7 @@ private ReadBookControl() {
         updateReaderSettings();
     }
 
-    void updateReaderSettings() {
+    public void updateReaderSettings() {
         this.hideStatusBar = preferences.getBoolean("hide_status_bar", false);
         this.hideNavigationBar = preferences.getBoolean("hide_navigation_bar", false);
         this.indent = preferences.getInt("indent", 2);

diff --git a/app/src/main/java/com/kunfei/bookshelf/help/storage/Restore.kt b/app/src/main/java/com/kunfei/bookshelf/help/storage/Restore.kt
@@ -5,8 +5,11 @@ import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
 import com.kunfei.bookshelf.DbHelper
 import com.kunfei.bookshelf.MApplication
+import com.kunfei.bookshelf.R
 import com.kunfei.bookshelf.bean.*
 import com.kunfei.bookshelf.help.FileHelp
+import com.kunfei.bookshelf.help.LauncherIcon
+import com.kunfei.bookshelf.help.ReadBookControl
 import com.kunfei.bookshelf.model.BookSourceManager
 import com.kunfei.bookshelf.model.ReplaceRuleManager
 import com.kunfei.bookshelf.model.TxtChapterRuleManager
@@ -82,6 +85,8 @@ object Restore {
         } catch (e: Exception) {
             e.printStackTrace()
         }
+        var donateHb = MApplication.getConfigPreferences().getLong("DonateHb", 0)
+        donateHb = if (donateHb > System.currentTimeMillis()) 0 else donateHb
         Preferences.getSharedPreferences(MApplication.getInstance(), path, "config")?.all?.map {
             val edit = MApplication.getConfigPreferences().edit()
             when (val value = it.value) {
@@ -92,6 +97,13 @@ object Restore {
                 is String -> edit.putString(it.key, value)
                 else -> Unit
             }
+            edit.putLong("DonateHb", donateHb)
+            edit.putInt("versionCode", MApplication.getVersionCode())
+            edit.apply()
+            LauncherIcon.ChangeIcon(MApplication.getConfigPreferences().getString("launcher_icon", MApplication.getInstance().getString(R.string.icon_main)))
+            ReadBookControl.getInstance().updateReaderSettings()
+            MApplication.getInstance().upThemeStore()
+            MApplication.getInstance().initNightTheme()
             edit.commit()
         }
     }

diff --git a/app/src/main/java/com/kunfei/bookshelf/help/storage/WebDavHelp.kt b/app/src/main/java/com/kunfei/bookshelf/help/storage/WebDavHelp.kt
@@ -2,10 +2,12 @@ package com.kunfei.bookshelf.help.storage
 
 import android.content.Context
 import android.widget.Toast
+import com.hwangjr.rxbus.RxBus
 import com.kunfei.bookshelf.MApplication
 import com.kunfei.bookshelf.R
 import com.kunfei.bookshelf.base.observer.MySingleObserver
 import com.kunfei.bookshelf.constant.AppConstant
+import com.kunfei.bookshelf.constant.RxBusTag
 import com.kunfei.bookshelf.help.FileHelp
 import com.kunfei.bookshelf.utils.ZipUtils
 import com.kunfei.bookshelf.utils.webdav.WebDav
@@ -85,6 +87,7 @@ object WebDavHelp {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(object : MySingleObserver<Boolean>() {
                     override fun onSuccess(t: Boolean) {
+                        RxBus.get().post(RxBusTag.RECREATE, true)
                         Toast.makeText(MApplication.getInstance(), R.string.restore_success, Toast.LENGTH_SHORT).show()
                     }
                 })