1.更新 DevEngine 部分代码

renbin1990 · Sep 1, 2021 · 013bf3e · 013bf3e
1 parent a694e75
commit 013bf3e
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 27 deletions.
diff --git a/app/src/main/java/afkt/project/base/BaseApplication.kt b/app/src/main/java/afkt/project/base/BaseApplication.kt
@@ -261,7 +261,8 @@ class BaseApplication : MultiDexApplication() {
      */
     private fun initEngine() {
         // 使用内部默认实现 Engine
-        DevEngine.defaultEngine()
+        DevEngine.defaultMMKVInitialize(this)
+            .defaultEngine(DevEngine.getMMKVConfig())
     }
 
     /**

diff --git a/lib/DevEngine/src/main/java/dev/engine/DevEngine.kt b/lib/DevEngine/src/main/java/dev/engine/DevEngine.kt
@@ -26,6 +26,7 @@ import dev.engine.storage.DevMediaStoreEngineImpl
 import dev.engine.storage.DevStorageEngine
 import dev.utils.app.cache.DevCache
 import dev.utils.app.logger.LogConfig
+import dev.utils.common.cipher.Cipher
 
 /**
  * detail: DevEngine
@@ -102,6 +103,17 @@ object DevEngine {
         return MMKVUtils.defaultHolder().mmkv
     }
 
+    /**
+     * 获取 MMKV Config
+     * @param cipher 加解密中间层
+     * @return [MMKVConfig]
+     * <p></p>
+     * 需先调用 [defaultMMKVInitialize]
+     */
+    fun getMMKVConfig(cipher: Cipher? = null): MMKVConfig {
+        return MMKVConfig(cipher, getMMKVByHolder()!!)
+    }
+
     // ============
     // = 初始化方法 =
     // ============

diff --git a/lib/DevEngine/src/main/java/dev/engine/cache/engine_dev_cache.kt b/lib/DevEngine/src/main/java/dev/engine/cache/engine_dev_cache.kt
@@ -20,9 +20,9 @@ class DevCacheEngineImpl(
 ) : ICacheEngine<CacheConfig?, DataItem?> {
 
     // JSON Engine
-    private var mJSONEngine: IJSONEngine<in IJSONEngine.EngineConfig>? = DevJSONEngine.getEngine()
+    private var mJSONEngine: IJSONEngine<out IJSONEngine.EngineConfig>? = DevJSONEngine.getEngine()
 
-    fun setJSONEngine(engine: IJSONEngine<in IJSONEngine.EngineConfig>) {
+    fun setJSONEngine(engine: IJSONEngine<out IJSONEngine.EngineConfig>) {
         this.mJSONEngine = engine
     }
 

diff --git a/lib/DevEngine/src/main/java/dev/engine/keyvalue/engine_mmkv.kt b/lib/DevEngine/src/main/java/dev/engine/keyvalue/engine_mmkv.kt
@@ -33,9 +33,9 @@ class MMKVKeyValueEngineImpl(
     }
 
     // JSON Engine
-    private var mJSONEngine: IJSONEngine<in IJSONEngine.EngineConfig>? = DevJSONEngine.getEngine()
+    private var mJSONEngine: IJSONEngine<out IJSONEngine.EngineConfig>? = DevJSONEngine.getEngine()
 
-    fun setJSONEngine(engine: IJSONEngine<in IJSONEngine.EngineConfig>) {
+    fun setJSONEngine(engine: IJSONEngine<out IJSONEngine.EngineConfig>) {
         this.mJSONEngine = engine
     }
 

diff --git a/lib/DevEngine/src/main/java/dev/engine/keyvalue/engine_sp.kt b/lib/DevEngine/src/main/java/dev/engine/keyvalue/engine_sp.kt
@@ -33,9 +33,9 @@ class SPKeyValueEngineImpl(
     }
 
     // JSON Engine
-    private var mJSONEngine: IJSONEngine<in IJSONEngine.EngineConfig>? = DevJSONEngine.getEngine()
+    private var mJSONEngine: IJSONEngine<out IJSONEngine.EngineConfig>? = DevJSONEngine.getEngine()
 
-    fun setJSONEngine(engine: IJSONEngine<in IJSONEngine.EngineConfig>) {
+    fun setJSONEngine(engine: IJSONEngine<out IJSONEngine.EngineConfig>) {
         this.mJSONEngine = engine
     }
 

diff --git a/project/AppInfoKtx/src/main/java/afkt/app/base/BaseApplication.kt b/project/AppInfoKtx/src/main/java/afkt/app/base/BaseApplication.kt
@@ -45,7 +45,8 @@ class BaseApplication : MultiDexApplication(),
         }
 
         // 使用内部默认实现 Engine
-        DevEngine.defaultEngine()
+        DevEngine.defaultMMKVInitialize(this)
+            .defaultEngine(DevEngine.getMMKVConfig())
 
         // 全局状态布局配置
         val global = StateLayout.Global(object : StateLayout.Listener {

diff --git a/project/GTPushKtx/src/main/java/afkt/gtpush/base/BaseApplication.kt b/project/GTPushKtx/src/main/java/afkt/gtpush/base/BaseApplication.kt
@@ -67,13 +67,9 @@ class BaseApplication : MultiDexApplication() {
             )
         }
 
-        // 个推推送 Engine 实现
-        DevPushEngine.setEngine(GTPushEngineImpl())
-        // 个推推送初始化
-        DevPushEngine.getEngine()?.initialize(
-            this, PushConfig(
-                isDebugMode = BuildConfig.DEBUG
-            )
+        // 个推推送 Engine 实现并初始化
+        DevPushEngine.setEngine(GTPushEngineImpl()).initialize(
+            this, PushConfig(isDebugMode = BuildConfig.DEBUG)
         )
 
         // =============

diff --git a/project/JPushKtx/src/main/java/afkt/jpush/base/BaseApplication.kt b/project/JPushKtx/src/main/java/afkt/jpush/base/BaseApplication.kt
@@ -67,13 +67,9 @@ class BaseApplication : MultiDexApplication() {
             )
         }
 
-        // 极光推送 Engine 实现
-        DevPushEngine.setEngine(JPushEngineImpl())
-        // 极光推送初始化
-        DevPushEngine.getEngine()?.initialize(
-            this, PushConfig(
-                isDebugMode = BuildConfig.DEBUG
-            )
+        // 极光推送 Engine 实现并初始化
+        DevPushEngine.setEngine(JPushEngineImpl()).initialize(
+            this, PushConfig(isDebugMode = BuildConfig.DEBUG)
         )
 
         // =============

diff --git a/project/UMShareKtx/src/main/java/afkt/umshare/base/BaseApplication.kt b/project/UMShareKtx/src/main/java/afkt/umshare/base/BaseApplication.kt
@@ -42,11 +42,11 @@ class BaseApplication : MultiDexApplication() {
 
         // 使用内部默认实现 Engine
         DevEngine.defaultMMKVInitialize(this)
-            .defaultEngine()
+            .defaultEngine(DevEngine.getMMKVConfig())
 
-        // 友盟分享 Engine 实现
-        DevShareEngine.setEngine(UMShareEngine())
-        // 初始化分享配置
-        DevShareEngine.getEngine()?.initialize(this, shareConfig)
+        // 友盟分享 Engine 实现并初始化
+        DevShareEngine.setEngine(UMShareEngine()).initialize(
+            this, shareConfig
+        )
     }
 }