From a30cc8c273deb6e378522b08a8cf9265a0a02e7a Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Thu, 29 Jun 2023 10:52:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=20https:?=
 =?UTF-8?q?//jira.shanqu.cc/browse/CWZS-86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/constant/Config.java   |  6 +-
 app/src/main/java/com/gh/vspace/VHelper.kt    | 76 ++++++++++---------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java
index 1e58624982..57e5179137 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -205,9 +205,6 @@ public class Config {
 
         // 加载完设置后刷新下
         PackageHelper.initList();
-
-        // 初始化畅玩相关的东西
-        VHelper.init(HaloApp.getInstance());
     }
 
     @Nullable
@@ -316,11 +313,14 @@ public class Config {
         RetrofitManager.getInstance()
                 .getVApi().getSettings(BuildConfig.VERSION_NAME)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BiResponse<VSetting>() {
                     @Override
                     public void onSuccess(VSetting data) {
                         mVSetting = data;
                         SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
+
+                        VHelper.init(HaloApp.getInstance());
                     }
                 });
     }
diff --git a/app/src/main/java/com/gh/vspace/VHelper.kt b/app/src/main/java/com/gh/vspace/VHelper.kt
index 5cc0774222..6fc28956ed 100644
--- a/app/src/main/java/com/gh/vspace/VHelper.kt
+++ b/app/src/main/java/com/gh/vspace/VHelper.kt
@@ -208,48 +208,52 @@ object VHelper {
 
                 VArchiveHelper.init()
 
-                val config = Config.getVSettingEntity()?.va
-                if (config?.arch64 != null
-                    && PackageUtils.isInstalledFromAllPackage(context, config.arch64.packageName)
-                ) {
-                    if (isVIsUsed()) {
-                        connectService(shouldCheckUpdate = true)
+                if (isVIsUsed()) {
+                    connectService(shouldCheckUpdate = true)
+                }
+
+                PackageObserver.registerPackageChangeChangeListener(mPackageObserver)
+
+                // 注册应用可见事件监听
+                ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
+                    override fun onStart(owner: LifecycleOwner) {
+                        super.onStart(owner)
+
+                        mIsAppVisible = true
+
+                        if (mShouldReConnectOnVisible) {
+                            mShouldReConnectOnVisible = false
+                            connectService(shouldConnectSilently = true)
+                        }
                     }
 
-                    // 检查畅玩助手64位组件更新
-                    getVSpaceUpdate(config.arch64, true)
-                }
+                    override fun onStop(owner: LifecycleOwner) {
+                        super.onStop(owner)
 
-                if (config?.arch32 != null
-                    && PackageUtils.isInstalledFromAllPackage(context, config.arch32.packageName)
-                ) {
-                    // 检查畅玩助手32位组件更新
-                    getVSpaceUpdate(config.arch32, false)
-                }
-                PackageObserver.registerPackageChangeChangeListener(mPackageObserver)
+                        mIsAppVisible = false
+                    }
+                })
+            }
+
+            val config = Config.getVSettingEntity()?.va
+
+            if (config?.arch64 != null
+                && m64UpdateEntity == null
+                && PackageUtils.isInstalledFromAllPackage(context, config.arch64.packageName)
+            ) {
+                // 检查畅玩助手 64 位组件更新
+                getVSpaceUpdate(config.arch64, true)
+            }
+
+            if (config?.arch32 != null
+                && m32UpdateEntity == null
+                && PackageUtils.isInstalledFromAllPackage(context, config.arch32.packageName)
+            ) {
+                // 检查畅玩助手 32 位组件更新
+                getVSpaceUpdate(config.arch32, false)
             }
 
             vGameLiveData.observeForever(mVGameObserver)
-
-            // 注册应用可见事件监听
-            ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
-                override fun onStart(owner: LifecycleOwner) {
-                    super.onStart(owner)
-
-                    mIsAppVisible = true
-
-                    if (mShouldReConnectOnVisible) {
-                        mShouldReConnectOnVisible = false
-                        connectService(shouldConnectSilently = true)
-                    }
-                }
-
-                override fun onStop(owner: LifecycleOwner) {
-                    super.onStop(owner)
-
-                    mIsAppVisible = false
-                }
-            })
         }
     }