feat: 测试插件化

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>

.gitlab-ci.yml

@@ -71,7 +71,7 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - release
+    - feat/GHZSCY-5250
 
 # 代码检查
 sonarqube_analysis:
@@ -152,4 +152,4 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
+        - feat/GHZSCY-5250

app/build.gradle

@@ -401,7 +401,7 @@ dependencies {
     implementation(project(':feature:pkg'))
     implementation(project(':feature:oaid'))
     implementation(project(':feature:floating-window'))
-//    implementation(project(':feature:csj_ad'))
+    implementation(project(':feature:csj_ad'))
 //    implementation(project(':feature:beizi_startup_ad'))
     implementation(project(':feature:xapk-installer'))
     implementation(project(':feature:qq_game')) {
@@ -409,13 +409,12 @@ dependencies {
     }
     internalImplementation(project(':module_internal_test'))
 
-//    def pushProperty = findProperty('BUILD_PUSH_TYPE')
-//    // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用极光推送
-//    def pushProject = (pushProperty == null || pushProperty == 'jg')
-//            ? project(':feature:jg_push') : project(':feature:acloud_push')
-//    implementation(pushProject) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
+    // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用阿里云推送
+    def pushProject = findProperty('BUILD_PUSH_TYPE') == 'jg'
+            ? project(':feature:jg_push') : project(':feature:acloud_push')
+    implementation(pushProject) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
 }
 
 File propFile = file('sign.properties')

app/src/main/java/com/gh/ad/AdDelegateHelper.kt

@@ -191,11 +191,10 @@ object AdDelegateHelper {
     }
 
     /**
-     * 热启动是否需要显示开屏广告(目前只展示第三方广告)
+     * 热启动是否需要显示开屏广告
      */
-    private fun shouldShowStartUpAdWhenHotLaunch() = (mCsjAdImpl != null || mBeiziAdImpl != null)
-            && mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
-            && mSplashAd?.hotStartThirdPartyAd != null
+    private fun shouldShowStartUpAdWhenHotLaunch() =
+        mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK && mSplashAd?.hotStartThirdPartyAd != null
 
     /**
      * 是否需要显示下载管理广告

app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt

@@ -45,14 +45,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
             }
             isFromBackgroundToForeground = false
         }
-
-        if (activityCount == 1) {
-            // 清除桌面角标
-            if (activity !is SplashScreenActivity && activity !is AuthorizationActivity) {
-                val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
-                pushProvider?.cleanBadgeNumber(activity.applicationContext)
-            }
-        }
     }
 
     override fun onActivityResumed(activity: Activity) {
@@ -92,6 +84,10 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         XapkInstaller.updateCurrentInstallStatus()
+
+        // 清除桌面角标
+        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
+        pushProvider?.cleanBadgeNumber(activity.applicationContext)
     }
 
     override fun onActivityPaused(activity: Activity) {

app/src/main/java/com/gh/common/constant/Config.java

@@ -1,7 +1,6 @@
 package com.gh.common.constant;
 
 import android.annotation.SuppressLint;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
@@ -29,7 +28,6 @@ import com.gh.gamecenter.entity.VSetting;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.feature.entity.SimulatorEntity;
 import com.gh.gamecenter.feature.utils.ContentBlockedHelper;
-import com.gh.gamecenter.receiver.PackageChangeBroadcastReceiver;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
@@ -333,31 +331,8 @@ public class Config {
                             if (mNewApiSettingsEntity.getGameShieldContents() != null) {
                                 ContentBlockedHelper.INSTANCE.init(mNewApiSettingsEntity.getGameShieldContents());
                             }
-
-                            // 更新安装列表是否开启的配置
-//                            if (mNewApiSettingsEntity.getInstalledComplianceSwitch() != null) {
-//                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(mNewApiSettingsEntity.getInstalledComplianceSwitch());
-//                            } else {
-//                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(false);
-//                            }
-
-                            // 更新包名监听是否开启
-                            if (mNewApiSettingsEntity.isPackageObserveEnable()) {
-                                observePackageChange(mNewApiSettingsEntity.getPackageObserveActions());
-                            }
                         }
                     });
         }
     }
-
-    public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
-        PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(packageObserveActions.getAdd());
-        intentFilter.addAction(packageObserveActions.getRem());
-        intentFilter.addAction(packageObserveActions.getRep());
-        intentFilter.addDataScheme("package");
-        HaloApp.getInstance().registerReceiver(receiver, intentFilter);
-    }
-
 }

app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt

@@ -156,7 +156,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                 callBack?.invoke(false)
                 return
             }
-            if (isXapk && !XapkInstaller.isSystemHasFlaw()) {
+            if (isXapk) {
                 val xapkUnzipVersions = Config.getSettings()?.permissionPopupAppliedVersions?.xapkUnzip
                 if (xapkUnzipVersions?.contains(Build.VERSION.SDK_INT.toString()) == false) {
                     callBack?.invoke(false)

app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt

@@ -9,12 +9,10 @@ import androidx.fragment.app.FragmentActivity
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.common.util.CheckLoginUtils
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.DialogEntity
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
@@ -44,13 +42,12 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         return activity is FragmentActivity
                 && !activity.isFinishing
                 && activity !is SplashScreenActivity
-                && activity !is SplashAdActivity
     }
 
     /**
      * 预启动所有的优先级弹窗管理链
      */
-    fun preStart(withSpecialDelay: Boolean) {
+    fun preStart() {
         val launchRedirectHandler = LaunchRedirectHandler(-101)
         val updateDialogHandler = UpdateDialogHandler(-100)
         val privacyPolicyDialogHandler = PrivacyPolicyDialogHandler(-99)
@@ -67,13 +64,8 @@ object GlobalPriorityChainHelper : ISuperiorChain {
 
         launchRedirectHandler.doPreProcess()
         updateDialogHandler.doPreProcess()
-
-        // 首次启动延迟 300ms，保证请求首次启动时已经获取到了 GID 、 OAID 等标记
-        val requestDelay = if (withSpecialDelay) 300L else 0L
-        AppExecutor.uiExecutor.executeWithDelay({
-            requestOpeningDialogData(welcomeDialogHandler, privacyPolicyDialogHandler)
-            requestReserveDialogData(reserveDialogHandler)
-        }, requestDelay)
+        requestOpeningDialogData(welcomeDialogHandler, privacyPolicyDialogHandler)
+        requestReserveDialogData(reserveDialogHandler)
     }
 
     /**
@@ -131,17 +123,6 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         mainChain.resume()
     }
 
-    /**
-     * 添加新的 handler 到优先级弹窗管理链 (插队！)
-     */
-    fun queueNewHandler(handler: PriorityChainHandler) {
-        if (mainChain.isHandlerQueueEmpty()) {
-            observeLifecycle()
-        }
-
-        mainChain.addHandler(handler)
-    }
-
     /**
      * 请求首页启动弹窗相关的数据并执行相关 handler 的 preProcess
      */

app/src/main/java/com/gh/common/prioritychain/RequestInstalledListPermissionHandler.kt

@@ -1,28 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.util.PackageHelper
-import com.gh.gamecenter.common.base.GlobalActivityManager
-
-class RequestInstalledListPermissionHandler : PriorityChainHandler(-1000) {
-
-    init {
-        updateStatus(STATUS_VALID)
-    }
-
-    override fun onProcess(): Boolean {
-        val currentActivity = GlobalActivityManager.currentActivity ?: return false
-
-        if (currentActivity !is FragmentActivity) return false
-
-        PackageHelper.showGetInstallAppsListDialogAndRequestPermissionIfNeeded(
-            activity = currentActivity,
-            ignorePermanentlyDenied = true
-        ) {
-            processNext()
-        }
-
-        return true
-    }
-
-}

app/src/main/java/com/gh/common/util/DataCollectionUtils.java

@@ -1,14 +1,17 @@
 package com.gh.common.util;
 
 import android.content.Context;
+import android.os.Build;
 
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
+import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.manager.DataCollectionManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 
 import java.util.HashMap;
@@ -29,7 +32,7 @@ public class DataCollectionUtils {
         map.put("type", android.os.Build.MODEL);
         map.put("system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);
         // WIFI实时
-        DataCollectionManager.onEvent(context, "error", map, true);
+        DataCollectionManager.onEvent(context, "error", map, NetworkUtils.isWifiConnected(context));
     }
 
     // 上传下载数据（开始、完成）

app/src/main/java/com/gh/common/util/DataUtils.java

@@ -14,10 +14,12 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.base.GlobalActivityManager;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.GsonUtils;
+import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.login.entity.IdCardEntity;
@@ -30,6 +32,8 @@ import com.halo.assistant.HaloApp;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Utils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import io.reactivex.schedulers.Schedulers;
 import io.sentry.Sentry;
 import io.sentry.android.core.SentryAndroid;
@@ -104,51 +108,45 @@ public class DataUtils {
     }
 
     public static void getGid() {
-        // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
-        String savedGid = SPUtils.getString(Constants.GID);
-        if (!TextUtils.isEmpty(savedGid)) {
-            HaloApp.getInstance().setGid(savedGid);
-            onGidReceived(savedGid);
-        } else {
-            GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
-                @Override
-                public void onSuccess(String gid) {
-                    Utils.log("Gid", gid);
-                    PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, gid).apply();
+        GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
+            @Override
+            public void onSuccess(String gid) {
+                Utils.log("Gid", gid);
+                PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, gid).apply();
 
+                // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
+                String savedGid = SPUtils.getString(Constants.GID);
+                if (!TextUtils.isEmpty(savedGid)) {
+                    gid = savedGid;
+                } else {
                     SPUtils.setString(Constants.GID, gid);
-
-                    onGidReceived(gid);
                 }
 
-                @Override
-                public void onFailure(String s) {
-                    // 更新广告配置
-                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
+                HaloApp.getInstance().setGid(gid);
+
+                // 更新广告配置
+                AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
+
+                getDeviceCertification(gid);
+
+                // 避免初始化顺序问题导致 MetaUtil 一直持有空的 gid
+                MetaUtil.INSTANCE.refreshMeta();
+
+                ContentValues values = new ContentValues();
+                values.put(GhContentProvider.KEY_GID, gid);
+                values.put(GhContentProvider.KEY_ANDROID_ID, MetaUtil.getBase64EncodedAndroidId());
+                try {
+                    HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
+                } catch (Exception exception) {
+                    SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
+                    exception.printStackTrace();
                 }
-            });
-        }
-    }
+            }
 
-    private static void onGidReceived(String gid) {
-        HaloApp.getInstance().setGid(gid);
-        // 更新广告配置
-        AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
-
-        getDeviceCertification(gid);
-
-        // 避免初始化顺序问题导致 MetaUtil 一直持有空的 gid
-        MetaUtil.INSTANCE.refreshMeta();
-
-        AppExecutor.getIoExecutor().execute(() -> {
-            ContentValues values = new ContentValues();
-            values.put(GhContentProvider.KEY_GID, gid);
-            values.put(GhContentProvider.KEY_ANDROID_ID, MetaUtil.getBase64EncodedAndroidId());
-            try {
-                HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
-            } catch (Exception exception) {
-                SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
-                exception.printStackTrace();
+            @Override
+            public void onFailure(String s) {
+                // 更新广告配置
+                AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
             }
         });
     }

app/src/main/java/com/gh/common/util/PackageChangeHelper.kt

@@ -1,161 +0,0 @@
-package com.gh.common.util
-
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import com.gh.download.DownloadManager
-import com.gh.download.PackageObserver
-import com.gh.gamecenter.common.utils.NewFlatLogUtils
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.manager.PackagesManager
-import com.gh.gamecenter.packagehelper.PackageRepository
-import com.lightgame.utils.Utils
-import org.greenrobot.eventbus.EventBus
-
-object PackageChangeHelper : DefaultLifecycleObserver {
-
-    private const val TAG = "PackageChangeHelper"
-
-    private const val INSTALL_PENDING = 1
-    private const val UNINSTALL_PENDING = 2
-    private const val UPDATE_PENDING = 3
-
-    // <包名，pending 类型，应用版本> Triple
-    private var pendingPackagePair: Triple<String, Int, String>? = null
-    private var pendingGhId: String ? = null
-
-    /**
-     * 添加一个等待中，待确定是否已成功安装的应用
-     */
-    fun addInstallPendingPackage(packageName: String) {
-        val installData = PackagesManager.getInstalledData(packageName)
-
-        if (installData == null) {
-            Utils.log(TAG, "添加了: $packageName 包名等待安装成功")
-            pendingPackagePair = Triple(packageName, INSTALL_PENDING, "")
-        } else {
-            Utils.log(TAG, "添加了: $packageName 包名等待安装更新成功")
-
-            val ghId = PackageUtils.getGhId(packageName)
-
-            // 记录光环插件相关信息，用于安装成功后的处理
-            if (ghId != null) {
-                pendingGhId = ghId.toString()
-            }
-
-            pendingPackagePair = Triple(packageName, UPDATE_PENDING, installData.version)
-        }
-    }
-
-    /**
-     * 添加一个等待中，待确定是否已成功卸载的应用
-     */
-    fun addUninstallPendingPackage(packageName: String) {
-        Utils.log(TAG, "添加了: $packageName 包名等待卸载成功")
-        pendingPackagePair = Triple(packageName, UNINSTALL_PENDING, "")
-    }
-
-    override fun onResume(owner: LifecycleOwner) {
-        super.onResume(owner)
-
-        if (pendingPackagePair != null) {
-            val packageName = pendingPackagePair?.first ?: return
-            val isInstallPending = pendingPackagePair?.second == INSTALL_PENDING
-            val isUninstallPending = pendingPackagePair?.second == UNINSTALL_PENDING
-            val isUpdatePending = pendingPackagePair?.second == UPDATE_PENDING
-
-            val pendingVersion = pendingPackagePair?.third ?: ""
-
-            val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
-            val isInstalled = installedVersionName != null
-
-            if (isInstallPending && isInstalled) {
-                pendingPackagePair = null
-                pendingGhId = null
-
-                PackageRepository.addInstalledGame(packageName)
-
-                performInstallSuccessAction(packageName)
-            } else if (isUninstallPending && !isInstalled) {
-                pendingPackagePair = null
-                pendingGhId = null
-
-                performUninstallSuccessAction(packageName)
-            } else if (isUpdatePending) {
-                val isUpdateValid = if (installedVersionName != pendingVersion) {
-                    true
-                } else {
-                    !pendingGhId.isNullOrEmpty() && pendingGhId != PackageUtils.getGhId(packageName).toString()
-                }
-
-                pendingPackagePair = null
-                pendingGhId = null
-
-                if (isUpdateValid) {
-                    performUninstallSuccessAction(packageName)
-                    performInstallSuccessAction(packageName)
-                }
-            }
-        }
-    }
-
-    fun addInstall(packageName: String) {
-        performInstallSuccessAction(packageName)
-    }
-
-    fun addUpdate(packageName: String) {
-        performUninstallSuccessAction(packageName)
-        performInstallSuccessAction(packageName)
-    }
-
-    /**
-     * 对应包名安装成功后的操作，继承至 PackageChangeBroadcastObserver
-     */
-    private fun performInstallSuccessAction(packageName: String, withLog: Boolean = true) {
-        Utils.log(TAG, "安装了: $packageName 包名的程序")
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
-        val gameId = if (downloadEntity != null && downloadEntity.gameId != null) downloadEntity.gameId else ""
-        val gameName = if (downloadEntity != null && downloadEntity.name != null) downloadEntity.name else ""
-
-        if (withLog) {
-            NewFlatLogUtils.logGameInstallComplete(gameId, gameName)
-            SensorsBridge.trackInstallGameFinish(gameId, gameName)
-        }
-
-        InstallUtils.getInstance().removeInstall(packageName)
-        PackageHelper.refreshLocalPackageList()
-
-        val versionName = PackageUtils.getVersionNameByPackageName(packageName)
-        val installEb = EBPackage(EBPackage.TYPE_INSTALLED, packageName, versionName)
-
-        PackageObserver.onPackageChanged(installEb)
-        EventBus.getDefault().post(installEb)
-    }
-
-    fun addUninstall(packageName: String) {
-        performUninstallSuccessAction(packageName)
-    }
-
-    /**
-     * 对应包名卸载成功后的操作，继承至 PackageChangeBroadcastObserver
-     */
-    private fun performUninstallSuccessAction(packageName: String, withLog: Boolean = true) {
-        Utils.log(TAG, "卸载了: $packageName 包名的程序")
-        val install = PackagesManager.getInstalledData(packageName)
-        val gameId = if (install?.id != null) install.id else ""
-        val gameName = if (install?.name != null) install.name else ""
-
-        if (withLog) {
-            NewFlatLogUtils.logGameUninstallComplete(gameId!!, gameName!!)
-            SensorsBridge.trackUnloadGameFinish(gameId, gameName)
-        }
-
-        InstallUtils.getInstance().removeUninstall(packageName)
-        PackageHelper.refreshLocalPackageList()
-
-        val uninstallEb = EBPackage(EBPackage.TYPE_UNINSTALLED, packageName, "")
-        PackageObserver.onPackageChanged(uninstallEb)
-        EventBus.getDefault().post(uninstallEb)
-    }
-
-}

app/src/main/java/com/gh/common/util/PackageHelper.kt

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
@@ -8,29 +7,12 @@ import android.content.pm.PackageManager
 import android.content.pm.PermissionInfo
 import android.os.Build
 import android.provider.Settings
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import com.gh.common.constant.Config
-import com.gh.common.prioritychain.GlobalPriorityChainHelper
-import com.gh.common.prioritychain.RequestInstalledListPermissionHandler
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.PermissionHelper
 import com.gh.gamecenter.common.utils.PermissionHelper.isGetInstalledListPermissionDisabled
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.WhitePackageListEntity
 import com.gh.gamecenter.feature.entity.SettingsEntity
-import com.gh.gamecenter.manager.PackagesManager
-import com.gh.gamecenter.packagehelper.PackageRepository
-import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
-import io.reactivex.schedulers.Schedulers
-import kotlinx.coroutines.*
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
@@ -47,15 +29,10 @@ object PackageHelper {
     private const val UNSUPPORTED = 0
     private const val SUPPORTED = 1
 
-    private const val ENABLED = 2
-    private const val DISABLED = 3
-
     private var lastInstalledPackageListTime = 0L
-    private var cachedInstalledPackagesList: List<PackageInfo> = arrayListOf()
-
-    private var isGetInstalledPackagesApiAgreed = true // 用户是否已经同意使用已安装应用列表 API
-    private var isGetInstalledPackagesApiAgreedRequired = DISABLED // 需要用户手动授权才获取已安装应用列表的功能的开关
-    private var isGetInstalledPackagesPermissionSupported = UNKNOWN // 设备是否支持禁用获取已安装应用列表
+    private var installedPackageList: List<PackageInfo> = arrayListOf()
+    private var isGetInstalledPackagesApiAgreed = false
+    private var isGetInstalledListPermissionSupported = UNKNOWN // 设备是否支持禁用获取已安装应用列表。-1 代表支持情况未知，0 代表不支持， 1 代表支持
 
     // 评论黑名单包名列表，避免用户安装了 Xposed Installer 这样的工具，也能在包含该安装包的游戏详情页评论
     private var _commentPackageNameBlackList = arrayListOf<String>()
@@ -73,10 +50,6 @@ object PackageHelper {
     private var _relatedPackageList = arrayListOf<SettingsEntity.GameWithPackages>()
     val relatedPackageList: ArrayList<SettingsEntity.GameWithPackages> = _relatedPackageList
 
-    // 接口控制的已安装应用列表获取开关状态 (UI 显示)
-    private var _installedPackageApiSwitchStatusLiveData = MutableLiveData<Boolean>()
-    val installedPackageApiSwitchStatusLiveData: LiveData<Boolean> = _installedPackageApiSwitchStatusLiveData
-
     // 本地已安装包的列表
     var localPackageNameSet = hashSetOf<String>()
         get() {
@@ -88,22 +61,6 @@ object PackageHelper {
             }
         }
 
-    /**
-     * 获取已安装的白名单列表（为了在没有已安装应用列表获取能力的时候也能正常判断更新、插件化）
-     */
-    @SuppressLint("CheckResult")
-    fun getInstalledWhiteList() {
-        RetrofitManager.getInstance().newApi.installWhitelist
-            .subscribeOn(Schedulers.io())
-            .subscribe(object : BiResponse<WhitePackageListEntity>() {
-                override fun onSuccess(data: WhitePackageListEntity) {
-                    data.data?.let {
-                        addInstalledButMissingPackages(it)
-                    }
-                }
-            })
-    }
-
     @JvmStatic
     fun refreshLocalPackageList() {
         localPackageNameSet = getAllPackageName(HaloApp.getInstance().application)
@@ -152,44 +109,6 @@ object PackageHelper {
         lastInstalledPackageListTime = 0
     }
 
-    /**
-     * 在超时后，若后台没有开启获取已安装应用列表的功能，默认以接口不控制的方式获取已安装应用列表
-     */
-    fun fallbackInstalledPackageApiSwitchAfterTimeout(timeout: Long) {
-        CoroutineScope(SupervisorJob()).launch {
-            delay(timeout)
-            if (isGetInstalledPackagesApiAgreedRequired == UNKNOWN) {
-                Utils.log(TAG, "后台没有开启获取已安装应用列表的功能，超时后默认以接口不控制的方式获取已安装应用列表")
-                updateIsGetInstalledPackagesApiAgreedRequired(false)
-            }
-        }
-    }
-
-    /**
-     *  更新已安装应用列表获取开关状态
-     */
-    fun updateIsGetInstalledPackagesApiAgreedRequired(isEnabled: Boolean) {
-        // 若状态不为 unknown 或者用户已经同意使用了，无需再更新
-        if (isGetInstalledPackagesApiAgreedRequired != UNKNOWN || isGetInstalledPackagesApiAgreed()) {
-            Utils.log(TAG, "installedPackageApiSwitchStatus 不为 UNKNOWN，无需再更新")
-            return
-        }
-
-        if (isEnabled) {
-            getInstalledWhiteList()
-            _installedPackageApiSwitchStatusLiveData.postValue(true)
-            isGetInstalledPackagesApiAgreedRequired = ENABLED
-        } else {
-            isGetInstalledPackagesApiAgreedRequired = DISABLED
-
-            if (isSupportGetInstalledAppsPermission(HaloApp.getInstance())) {
-                GlobalPriorityChainHelper.queueNewHandler(RequestInstalledListPermissionHandler())
-            } else {
-                agreeOnGetInstalledPackagesApi()
-            }
-        }
-    }
-
     /**
      * 用户是否已经允许了调用获取已安装应用列表接口
      * 优先用内存的值，没有再从 SP 中获取并更新
@@ -199,18 +118,12 @@ object PackageHelper {
                 || (SPUtils.getBoolean(SP_GET_INSTALLED_API_AGREED).also { isGetInstalledPackagesApiAgreed = it })
     }
 
-    fun isGetInstalledPackagesApiAgreedRequired(): Boolean {
-        return isGetInstalledPackagesApiAgreedRequired == ENABLED
-    }
-
     /**
      * 同意使用已安装应用列表 API
      */
-    private fun agreeOnGetInstalledPackagesApi() {
+    fun agreeOnGetInstalledPackagesApi() {
         isGetInstalledPackagesApiAgreed = true
         SPUtils.setBoolean(SP_GET_INSTALLED_API_AGREED, true)
-
-        _installedPackageApiSwitchStatusLiveData.postValue(false)
     }
 
     /**
@@ -219,16 +132,18 @@ object PackageHelper {
     fun getInstalledPackages(context: Context?, flags: Int): List<PackageInfo> {
         Utils.log(TAG, "即将获取已安装应用列表")
 
+//        Utils.log(TAG, "即将获取已安装应用列表" + Thread.currentThread().getStackTrace().contentToString().replace( ',', '\n' ))
+
         // 用户未同意使用已安装应用列表 API，返回空列表
         if (!isGetInstalledPackagesApiAgreed()) {
             Utils.log(TAG, "用户未同意使用已安装应用列表 API，返回空列表")
-            return cachedInstalledPackagesList
+            return installedPackageList
         }
 
         // 简单 debounce 过于频繁的获取已安装应用列表调用
-        if (System.currentTimeMillis() - lastInstalledPackageListTime < 3000 && cachedInstalledPackagesList.isNotEmpty()) {
+        if (System.currentTimeMillis() - lastInstalledPackageListTime < 3000 && installedPackageList.isNotEmpty()) {
             Utils.log(TAG, "使用了缓存的已安装应用列表")
-            return cachedInstalledPackagesList
+            return installedPackageList
         }
 
         var shouldGetNewInstalledPackagedList = false
@@ -250,96 +165,10 @@ object PackageHelper {
 
         if (shouldGetNewInstalledPackagedList) {
             lastInstalledPackageListTime = System.currentTimeMillis()
-            cachedInstalledPackagesList = getInstalledPackagesInternal(context, flags)
+            installedPackageList = getInstalledPackagesInternal(context, flags)
         }
 
-        return cachedInstalledPackagesList
-    }
-
-    /**
-     * 显示获取已安装应用列表的对话框并请求权限
-     */
-    fun showGetInstallAppsListDialogAndRequestPermissionIfNeeded(
-        activity: FragmentActivity,
-        ignorePermanentlyDenied: Boolean = false,
-        resultClosure: (Boolean) -> Unit
-    ) {
-
-        val globalOnPermissionGrantedClosure = {
-            agreeOnGetInstalledPackagesApi()
-            // 进行包名初始化相关的操作
-            PackageRepository.initData()
-            refreshLocalPackageList()
-            refreshList()
-        }
-
-        if (isSupportGetInstalledAppsPermission(activity)) {
-            // 若系统已经授予了获取应用列表的权限，直接进行授权成功回调
-            if (!isGetInstalledListPermissionDisabled(activity)) {
-                globalOnPermissionGrantedClosure.invoke()
-                resultClosure.invoke(true)
-                return
-            }
-
-            PermissionHelper.showGetInstalledAppsListPermissionDialog(
-                activity = activity,
-                requestPermission = true,
-                ignorePermanentlyDenied = ignorePermanentlyDenied
-            ) { isGranted ->
-                if (isGranted) {
-                    SensorsBridge.trackInstalledListPermissionsResult("成功")
-                    globalOnPermissionGrantedClosure.invoke()
-                    resultClosure.invoke(true)
-
-                    trackInstalledListAfterDelay()
-                } else {
-                    resultClosure.invoke(false)
-                    SensorsBridge.trackInstalledListPermissionsResult("拒绝")
-                }
-            }
-        } else {
-            val hintDialog = PermissionHelper.showGetInstalledAppsListPermissionDialog(
-                activity = activity,
-                requestPermission = false,
-            ) {
-                // do nothing
-            }
-
-            SensorsBridge.trackInstalledListPermissionsCustomDialogShow()
-
-            val noticeDialog = DialogHelper.showGuideDialog(
-                context = activity,
-                title = "权限申请",
-                content = "是否允许“光环助手”获取已安装的应用信息",
-                confirmText = "开启",
-                cancelText = "拒绝",
-                confirmClickCallback = {
-                    SensorsBridge.trackInstalledListPermissionsCustomClick("开启")
-                    globalOnPermissionGrantedClosure.invoke()
-                    resultClosure.invoke(true)
-
-                    trackInstalledListAfterDelay()
-                },
-                cancelClickCallback = {
-                    resultClosure.invoke(false)
-                    SensorsBridge.trackInstalledListPermissionsCustomClick("拒绝")
-                }
-            )
-
-            noticeDialog?.setOnDismissListener {
-                hintDialog?.dismiss()
-            }
-        }
-    }
-
-    /**
-     * 延迟5秒后上报已安装应用列表
-     */
-    private fun trackInstalledListAfterDelay() {
-        CoroutineScope(SupervisorJob()).launch {
-            delay(5000)
-            SensorsBridge.trackNumberOfInstalledList(localPackageNameSet.size, localPackageNameSet)
-        }
+        return installedPackageList
     }
 
     /**
@@ -347,8 +176,8 @@ object PackageHelper {
      */
     fun isSupportGetInstalledAppsPermission(context: Context): Boolean {
         // 若存在缓存，直接返回缓存结果。
-        if (isGetInstalledPackagesPermissionSupported != UNKNOWN) {
-            return isGetInstalledPackagesPermissionSupported != UNSUPPORTED
+        if (isGetInstalledListPermissionSupported != UNKNOWN) {
+            return isGetInstalledListPermissionSupported != UNSUPPORTED
         }
 
         try {
@@ -356,7 +185,7 @@ object PackageHelper {
             val flag =
                 Settings.Secure.getInt(context.contentResolver, "oem_installed_apps_runtime_permission_enable", 0)
             if (flag == 1) {
-                isGetInstalledPackagesPermissionSupported = SUPPORTED
+                isGetInstalledListPermissionSupported = SUPPORTED
                 return true
             }
 
@@ -365,97 +194,22 @@ object PackageHelper {
             val permissionInfo = packageManager.getPermissionInfo("com.android.permission.GET_INSTALLED_APPS", 0)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 if (permissionInfo.protection == PermissionInfo.PROTECTION_DANGEROUS) {
-                    isGetInstalledPackagesPermissionSupported = SUPPORTED
+                    isGetInstalledListPermissionSupported = SUPPORTED
                     return true
                 } else {
-                    isGetInstalledPackagesPermissionSupported = UNSUPPORTED
+                    isGetInstalledListPermissionSupported = UNSUPPORTED
                     return false
                 }
             } else {
-                isGetInstalledPackagesPermissionSupported = UNSUPPORTED
+                isGetInstalledListPermissionSupported = UNSUPPORTED
                 return false
             }
         } catch (e: PackageManager.NameNotFoundException) {
-            isGetInstalledPackagesPermissionSupported = UNSUPPORTED
+            isGetInstalledListPermissionSupported = UNSUPPORTED
             return false
         }
     }
 
-    /**
-     * 确保指定包名的应用在已安装了的情况下能正常收录
-     */
-    fun addInstalledButMissingPackages(packageNameSet: HashSet<String>) {
-        Utils.log(TAG, "addInstalledButMissingPackages 检查已安装但未收录的应用")
-
-        val installedPackageNameSet: HashSet<String> = hashSetOf()
-
-        for (packageName in packageNameSet) {
-            if (!PackagesManager.isInstalled(packageName)
-                && PackageUtils.getVersionNameByPackageName(packageName) != null
-            ) {
-                installedPackageNameSet.add(packageName)
-            }
-        }
-
-        Utils.log(TAG, "addInstalledButMissingPackages 需要请求接口获取的包数量为 ${installedPackageNameSet.size}")
-
-        PackageRepository.addInstalledGames(
-            pkgNameList = ArrayList(installedPackageNameSet),
-            updateInstallStatus = true
-        )
-    }
-
-    fun refreshWrongInstallStatus(packageNameSet: MutableSet<String>) {
-        runOnIoThread {
-            Utils.log(TAG, "refreshWrongInstallStatus 检查安装状态异常的应用")
-
-            val installedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-            val uninstalledButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-            val updatedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-
-            for (packageName in packageNameSet) {
-                val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
-
-                if (!PackagesManager.isInstalled(packageName)
-                    && installedVersionName != null
-                ) {
-                    installedButKeepingWrongStatusPackageNameSet.add(packageName)
-                } else if (PackagesManager.isInstalled(packageName)
-                    && installedVersionName == null) {
-                    uninstalledButKeepingWrongStatusPackageNameSet.add(packageName)
-                } else if (PackagesManager.isInstalled(packageName)
-                    && installedVersionName != null
-                    && !PackagesManager.isInstalledWithSpecificVersion(packageName, installedVersionName)) {
-                    updatedButKeepingWrongStatusPackageNameSet.add(packageName)
-                }
-            }
-
-            Utils.log(TAG, "refreshWrongInstallStatus 需要更新已安装状态的包数量为 ${installedButKeepingWrongStatusPackageNameSet.size}")
-            Utils.log(TAG, "refreshWrongInstallStatus 需要更新已更新状态的包数量为 ${updatedButKeepingWrongStatusPackageNameSet.size}")
-            Utils.log(TAG, "refreshWrongInstallStatus 需要移除已安装的包数量为 ${uninstalledButKeepingWrongStatusPackageNameSet.size}")
-
-            runOnUiThread {
-                if (installedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in installedButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addInstall(packageName)
-                    }
-                }
-
-                if (uninstalledButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in uninstalledButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addUninstall(packageName)
-                    }
-                }
-
-                if (updatedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in updatedButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addUpdate(packageName)
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * 在5.1系统手机使用PackageManager获取已安装应用容易发生Package manager has died异常
      * https://stackoverflow.com/questions/13235793/transactiontoolargeeception-when-trying-tÏo-get-a-list-of-applications-installed/30062632#30062632

app/src/main/java/com/gh/common/util/PackageInstaller.kt

@@ -108,12 +108,6 @@ object PackageInstaller {
             return
         }
 
-        val packageName = downloadEntity?.packageName ?: PackageUtils.getPackageNameByPath(context, pkgPath)
-
-        packageName?.let {
-            PackageChangeHelper.addInstallPendingPackage(packageName)
-        }
-
         try {
             // 判断是否需要使用浏览器来进行安装
             if (BrowserInstallHelper.isUseBrowserToInstallEnabled()
@@ -256,8 +250,6 @@ object PackageInstaller {
     fun uninstallForPackageName(context: Context, pkn: String?) {
         if (pkn.isNullOrEmpty()) return
 
-        PackageChangeHelper.addUninstallPendingPackage(pkn)
-
         val uninstallIntent = Intent()
         uninstallIntent.action = Intent.ACTION_DELETE
         uninstallIntent.addCategory(Intent.CATEGORY_DEFAULT)

app/src/main/java/com/gh/common/util/PackageUtils.java

@@ -7,12 +7,14 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionInfo;
 import android.content.pm.Signature;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.provider.Settings;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -27,6 +29,7 @@ import com.gh.common.xapk.XapkInstaller;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.PermissionHelper;
 import com.gh.gamecenter.core.utils.MD5Utils;
 import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.feature.entity.ApkEntity;
@@ -45,10 +48,12 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -69,7 +74,7 @@ public class PackageUtils {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).applicationInfo.sourceDir;
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
         return null;
     }
@@ -307,7 +312,7 @@ public class PackageUtils {
                 return new String[]{null, null};
             }
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
         return new String[]{null, null};
     }
@@ -587,7 +592,7 @@ public class PackageUtils {
                     .getPackageInfo(packageName, 0);
             return packageInfo.firstInstallTime;
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
         return 0;
     }
@@ -614,7 +619,7 @@ public class PackageUtils {
             return HaloApp.getInstance().getApplication().getPackageManager()
                     .getPackageInfo(BuildConfig.APPLICATION_ID, 0).lastUpdateTime;
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
 
         return 0;
@@ -628,7 +633,7 @@ public class PackageUtils {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
         return null;
     }
@@ -641,7 +646,7 @@ public class PackageUtils {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionCode;
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
         return 0;
     }
@@ -655,7 +660,7 @@ public class PackageUtils {
             PackageManager packageManager = context.getApplicationContext().getPackageManager();
             return packageManager.getApplicationIcon(packageName);
         } catch (NameNotFoundException e) {
-            // do nothing
+            e.printStackTrace();
         }
         return null;
     }

app/src/main/java/com/gh/common/xapk/XapkInstaller.kt

@@ -9,6 +9,7 @@ import android.provider.Settings
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.constant.Config
 import com.gh.common.dialog.ManagerAllFilesPermissionDialogFragment
+import com.gh.common.util.*
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.DownloadNotificationHelper
 import com.gh.common.util.PackageInstaller
@@ -278,16 +279,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         }
     }
 
-    /**
-     * 系统是否存在可以自由读写 `/Android/obb` 文件的漏洞
-     */
-    fun isSystemHasFlaw(): Boolean {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) return false
-
-        val rootPath = Environment.getExternalStorageDirectory().path
-        return File(rootPath, "Android").list().contentEquals(File(rootPath, "\u200bAndroid").list())
-    }
-
     /**
      * 更新当前XAPK安装状态, 主要针对以下出现安装结果回调异常的情况：
      * 1. 用户触碰安装弹窗(原生Android系统)区域外导致安装取消

app/src/main/java/com/gh/download/DownloadManager.java

@@ -22,6 +22,7 @@ import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.entity.CustomPageTrackData;
+import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.common.exposure.ExposureUtils;
 import com.gh.common.history.HistoryHelper;
@@ -33,10 +34,16 @@ import com.gh.common.util.LunchType;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.utils.DeviceUtils;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.utils.AppDebugConfig;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
@@ -48,6 +55,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.packagehelper.PackageRepository;
@@ -56,6 +64,7 @@ import com.gh.ndownload.NDownloadBridge;
 import com.gh.ndownload.NDownloadService;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
+import com.lightgame.download.ConnectionUtils;
 import com.lightgame.download.DataWatcher;
 import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadDao;
@@ -170,6 +179,9 @@ public class DownloadManager implements DownloadStatusListener {
 
         mUpdateMarks = SPUtils.getStringSet(UPDATE_IS_READ_MARK);
 
+        // 只有下载模块需要这坨东西，因此移动到这里初始化
+        ConnectionUtils.initHttpsUrlConnection(mContext);
+
         updateDownloadMetaMap();
 
         lastTimeMap = new ArrayMap<>();

app/src/main/java/com/gh/gamecenter/BlockActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.gh.gamecenter.game.GameFragment
 
-/**
- * 板块
- */
 class BlockActivity : DownloadToolbarActivity() {
 
     companion object {

app/src/main/java/com/gh/gamecenter/CleanApkActivity.java

@@ -14,7 +14,6 @@ import com.halo.assistant.fragment.ApkCleanerFragment;
 
 /**
  * Created by khy on 2017/1/24.
- * 清理安装包
  */
 @Route(path = RouteConsts.activity.cleanApkActivity)
 public class CleanApkActivity extends ToolBarActivity {

app/src/main/java/com/gh/gamecenter/CollectionActivity.java

@@ -16,7 +16,6 @@ import java.util.ArrayList;
 
 /**
  * Created by khy on 18/07/17.
- * 我的收藏
  */
 public class CollectionActivity extends ToolBarActivity {
     @Override

app/src/main/java/com/gh/gamecenter/CropImageActivity.java

@@ -23,9 +23,6 @@ import java.lang.ref.SoftReference;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 
-/**
- * 裁剪图片
- */
 public class CropImageActivity extends ToolBarActivity {
 
     protected CropImageCustom mCropImageCustom;

app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt

@@ -24,7 +24,7 @@ import com.halo.assistant.HaloApp
 
 /**
  * Created by khy on 2017/3/24.
- * 游戏详情页
+ * 游戏详情适配器
  */
 class GameDetailActivity : DownloadToolbarActivity() {
 

app/src/main/java/com/gh/gamecenter/LibaoActivity.java

@@ -16,7 +16,6 @@ import java.util.ArrayList;
 
 /**
  * Created by khy on 2016/12/12.
- * 礼包中心
  */
 @Deprecated
 public class LibaoActivity extends ToolBarActivity {

app/src/main/java/com/gh/gamecenter/MainActivity.java

@@ -285,6 +285,9 @@ public class MainActivity extends BaseActivity {
 
         // 耗时操作
         AppExecutor.getIoExecutor().execute(() -> {
+            // 上传数据
+            DataCollectionManager.getInstance().upload();
+
             // 初始化PlatformUtils
             PlatformUtils.getInstance(getApplicationContext());
 
@@ -553,10 +556,7 @@ public class MainActivity extends BaseActivity {
             } else {
                 TextView jumpBtn = findViewById(R.id.jumpBtn);
                 jumpBtn.setText(String.format(Locale.CHINA, "跳过 %d", COUNTDOWN_MAX_COUNT - mCountdownCount));
-                Message newMsg = Message.obtain();
-                newMsg.what = COUNTDOWN_AD;
-                newMsg.obj = msg.obj;
-                mBaseHandler.sendMessageDelayed(newMsg, 1000);
+                mBaseHandler.sendEmptyMessageDelayed(COUNTDOWN_AD, 1000);
             }
         }
     }
@@ -877,6 +877,13 @@ public class MainActivity extends BaseActivity {
         return true;
     }
 
+    @Override
+    public void finish() {
+        // 上传数据
+        DataCollectionManager.getInstance().statClickData();
+        super.finish();
+    }
+
     @Override
     protected void onSaveInstanceState(@NotNull Bundle outState) {
         super.onSaveInstanceState(outState);

app/src/main/java/com/gh/gamecenter/SearchActivity.kt

@@ -29,9 +29,6 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.util.concurrent.TimeUnit
 
-/**
- * 游戏搜索页
- */
 open class SearchActivity : BaseActivity() {
 
     lateinit var searchEt: EditText

app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java

@@ -48,7 +48,6 @@ import io.reactivex.functions.Consumer;
 
 /**
  * Created by khy on 2016/11/7.
- * 分享卡片
  */
 public class ShareCardPicActivity extends ToolBarActivity {
 

app/src/main/java/com/gh/gamecenter/ShareGhActivity.java

@@ -21,7 +21,6 @@ import com.tencent.tauth.Tencent;
 
 /**
  * Created by khy on 2017/2/6.
- * 分享光环
  */
 public class ShareGhActivity extends ToolBarActivity {
 

app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt

@@ -197,15 +197,7 @@ class SplashScreenActivity : BaseActivity() {
 
     // 尝试获取安装应用列表权限并启动首页（不在乎结果）
     private fun requestGetInstallListPermissionAndLaunchMainActivity() {
-        if (PackageHelper.isSupportGetInstalledAppsPermission(this)
-            && PermissionHelper.isGetInstalledListPermissionDisabled(this)
-        ) {
-            PermissionHelper.requestGetInstalledAppsListPermission(this, true) {
-                launchMainActivity()
-            }
-        } else {
-            launchMainActivity()
-        }
+        launchMainActivity()
     }
 
     // 删除更新后的光环助手包

app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt

@@ -7,9 +7,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.halo.assistant.fragment.user.UserInfoFragment
 
-/**
- * 编辑资料
- */
 class UserInfoActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.login.user.UserViewModel
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 
-/**
- * 修改个人信息
- */
 class UserInfoEditActivity : ToolBarActivity() {
     companion object {
         fun getIntent(context: Context, editType: String): Intent {

app/src/main/java/com/gh/gamecenter/UserRegionActivity.java

@@ -8,7 +8,6 @@ import com.halo.assistant.fragment.user.SelectRegionFragment;
 
 /**
  * Created by khy on 25/09/17.
- * 选择地区
  */
 public class UserRegionActivity extends ToolBarActivity {
 

app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 新分类2.0
- */
 class CategoryV2Activity : DownloadToolbarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt

@@ -41,9 +41,6 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.io.File
 
-/**
- * 云存档管理
- */
 class CloudArchiveManagerActivity : BaseActivity_TabLayout(), ArchiveLimitSelectedListener {
 
     private lateinit var mBinding: ActivityCloudArchiveManagerBinding

app/src/main/java/com/gh/gamecenter/db/DataCollectionDao.java

@@ -0,0 +1,120 @@
+package com.gh.gamecenter.db;
+
+import android.content.Context;
+
+import com.gh.gamecenter.db.info.DataCollectionInfo;
+import com.j256.ormlite.dao.Dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+// TODO 这个数据库其实没有用了，上传到 loghub 已经有相关的逻辑处理，有空删掉它
+public class DataCollectionDao {
+
+    private DatabaseHelper helper;
+    private Dao<DataCollectionInfo, String> dao;
+
+    public DataCollectionDao(Context context) {
+        try {
+            helper = DatabaseHelper.getHelper(context);
+            dao = helper.getDao(DataCollectionInfo.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 查找一个数据
+     */
+    public List<DataCollectionInfo> findByType(String type) {
+        try {
+            return dao.queryForEq("type", type);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 添加一个数据
+     */
+    public void add(DataCollectionInfo entity) {
+        try {
+            dao.create(entity);
+        } catch (Exception e) {
+            // java.lang.IllegalStateException: attempt to re-open an already-closed object: SQLiteDatabase:
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 删除一个数据
+     */
+    public void delete(String id) {
+        try {
+            dao.deleteById(id);
+        } catch (Exception e) {
+            // java.lang.IllegalStateException: attempt to re-open an already-closed object: SQLiteDatabase:
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 删除一组数据
+     */
+    public void delete(List<String> ids) {
+        try {
+            dao.deleteIds(ids);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 根据id获取某一个数据
+     */
+    public DataCollectionInfo find(String id) {
+        try {
+            return dao.queryForId(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取所有的数据
+     */
+    public List<DataCollectionInfo> getAll() {
+        try {
+            return dao.queryForAll();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取点击数据
+     */
+    public List<DataCollectionInfo> getClickData() {
+        try {
+            return dao.queryForEq("type", "click-item");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 更新数据
+     */
+    public void update(DataCollectionInfo entity) {
+        try {
+            dao.update(entity);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java

@@ -5,7 +5,9 @@ import android.database.sqlite.SQLiteDatabase;
 
 import androidx.collection.ArrayMap;
 
+import com.gh.gamecenter.db.info.DataCollectionInfo;
 import com.gh.gamecenter.db.info.GameTrendsInfo;
+import com.gh.gamecenter.db.info.PackageInfo;
 import com.gh.gamecenter.db.info.SearchHistoryInfo;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.Dao;
@@ -50,6 +52,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             Utils.log("DatabaseHelper onCreate");
             TableUtils.createTable(connectionSource, SearchHistoryInfo.class);
+            TableUtils.createTable(connectionSource, DataCollectionInfo.class);
+            TableUtils.createTable(connectionSource, PackageInfo.class);
             TableUtils.createTable(connectionSource, GameTrendsInfo.class);
         } catch (SQLException e) {
             e.printStackTrace();
@@ -61,6 +65,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             Utils.log("DatabaseHelper onUpgrade");
             TableUtils.dropTable(connectionSource, SearchHistoryInfo.class, true);
+            TableUtils.dropTable(connectionSource, DataCollectionInfo.class, true);
+            TableUtils.dropTable(connectionSource, PackageInfo.class, true);
             TableUtils.dropTable(connectionSource, GameTrendsInfo.class, true);
             onCreate(database, connectionSource);
         } catch (SQLException e) {

app/src/main/java/com/gh/gamecenter/db/info/DataCollectionInfo.java

@@ -0,0 +1,65 @@
+package com.gh.gamecenter.db.info;
+
+import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.table.DatabaseTable;
+
+import java.io.Serializable;
+
+@DatabaseTable(tableName = "tb_datacollection")
+public class DataCollectionInfo implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 3196892351397147390L;
+
+    @DatabaseField(id = true, columnName = "id")
+    private String id;
+
+    @DatabaseField(columnName = "type")
+    private String type;
+
+    @DatabaseField(columnName = "data")
+    private String data;
+
+    public DataCollectionInfo() {
+
+    }
+
+    public DataCollectionInfo(String id, String type, String data) {
+        this.id = id;
+        this.type = type;
+        this.data = data;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "DataCollectionEntity [id=" + id + ", type=" + type + ", data="
+                + data + "]";
+    }
+
+}

app/src/main/java/com/gh/gamecenter/db/info/PackageInfo.java

@@ -0,0 +1,42 @@
+package com.gh.gamecenter.db.info;
+
+import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.table.DatabaseTable;
+
+import java.io.Serializable;
+
+@DatabaseTable(tableName = "tb_package")
+public class PackageInfo implements Serializable {
+
+    @DatabaseField(id = true, columnName = "packageName")
+    private String packageName;
+
+    @DatabaseField(columnName = "time")
+    private long time;
+
+    public PackageInfo() {
+
+    }
+
+    public PackageInfo(String packageName, long time) {
+        this.packageName = packageName;
+        this.time = time;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public long getTime() {
+        return time;
+    }
+
+    public void setTime(long time) {
+        this.time = time;
+    }
+
+}

app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt

@@ -21,7 +21,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.HomePluggableHelper
 import com.gh.common.util.NewFlatLogUtils
-import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.DownloadManagerActivity
@@ -277,12 +276,6 @@ class DownloadFragment : BaseFragment_TabLayout() {
         if (mBinding.adGameItemContainer.isVisible) {
             DownloadManager.getInstance().addObserver(mDataWatcher)
         }
-
-        refreshInstallStatus()
-    }
-
-    private fun refreshInstallStatus() {
-        PackageHelper.refreshWrongInstallStatus(PackagesManager.getInstalledSet())
     }
 
     override fun onParentActivityFinish() {

app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt

@@ -10,8 +10,8 @@ import com.ethanhua.skeleton.ViewSkeletonScreen
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.DownloadItemUtils
-import com.gh.common.util.PackageHelper
 import com.gh.download.DownloadManager
+import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment
 import com.gh.gamecenter.common.eventbus.EBReuse
@@ -29,6 +29,7 @@ import com.gh.gamecenter.feature.entity.GameInstall
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel
+import com.gh.gamecenter.wrapper.MainWrapperFragment
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
@@ -146,20 +147,15 @@ class NewInstalledGameFragment : ToolbarFragment() {
         }
 
         mBinding.run {
-            val isGetInstalledListDisagreed = PackageHelper.isGetInstalledPackagesApiAgreedRequired()
-                    && !PackageHelper.isGetInstalledPackagesApiAgreed()
-            val isGetInstalledListPermissionDisabled = PermissionHelper.isGetInstalledListPermissionDisabled(requireContext())
-
-            if (isGetInstalledListDisagreed || isGetInstalledListPermissionDisabled) {
+            if (PermissionHelper.isGetInstalledListPermissionDisabled(requireContext())) {
                 reuseNoneData.reuseNoneDataIv.visibility = View.GONE
                 reuseNoneData.reuseNoneDataTv.text = "开启应用列表权限"
                 reuseNoneData.reuseNoneDataDescTv.text = " 及时获悉游戏最新的更新消息"
                 reuseNoneData.reuseResetLoadTv.text = "去开启"
                 reuseNoneData.reuseResetLoadTv.setOnClickListener {
-                    PackageHelper.showGetInstallAppsListDialogAndRequestPermissionIfNeeded(requireActivity()) { isGranted ->
-                        if (isGranted) {
-                            updateNoDataView()
-                        }
+                    PermissionHelper.showGetInstalledAppsListPermissionDialogAndRequestPermission(requireActivity()) {
+                        updateNoDataView()
+                        PackageRepository.initData()
                     }
                 }
             } else {

app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt

@@ -3,7 +3,6 @@ package com.gh.gamecenter.download
 import android.view.View
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.PackageHelper
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.LazyFragment
@@ -95,19 +94,18 @@ class UpdatableGameFragment : LazyFragment() {
             noDataContainer.reuseResetLoadTv.layoutParams = layoutParam
             noDataContainer.reuseResetLoadTv.visibility = View.VISIBLE
             noDataContainer.reuseNoneDataDescTv.visibility = View.VISIBLE
-
-            val isGetInstalledListDisagreed = !PackageHelper.isGetInstalledPackagesApiAgreed()
-            val isGetInstalledListPermissionDisabled = PermissionHelper.isGetInstalledListPermissionDisabled(requireContext())
-
-            if (isGetInstalledListDisagreed || isGetInstalledListPermissionDisabled) {
+            if (PermissionHelper.isGetInstalledListPermissionDisabled(requireContext())) {
                 noDataContainer.reuseNoneDataIv.visibility = View.GONE
                 noDataContainer.reuseNoneDataTv.text = "开启应用列表权限"
                 noDataContainer.reuseNoneDataDescTv.text = "及时获悉游戏最新的更新消息"
                 noDataContainer.reuseResetLoadTv.text = "去开启"
                 noDataContainer.reuseResetLoadTv.setOnClickListener {
-                    PackageHelper.showGetInstallAppsListDialogAndRequestPermissionIfNeeded(requireActivity()) { isGranted ->
+                    PermissionHelper.showGetInstalledAppsListPermissionDialogAndRequestPermission(
+                        requireActivity()
+                    ) { isGranted ->
                         if (isGranted) {
                             updateNoDataView()
+                            PackageRepository.initData()
                         }
                     }
                 }

app/src/main/java/com/gh/gamecenter/entity/NewApiSettingsEntity.kt

@@ -11,12 +11,6 @@ class NewApiSettingsEntity(
     var startup: StartupAdEntity? = null,//启动文案广告
     @SerializedName("user_interested_game")
     var userInterestedGame: Boolean = false, //偏好设置状态开关
-    @SerializedName("installed_compliance_switch")
-    var installedComplianceSwitch: Boolean? = false, //安装合规开关
-    @SerializedName("listen_switch")
-    var isPackageObserveEnable: Boolean = false, // 安装包监听开关
-    @SerializedName("listen_str")
-    var packageObserveActions: PackageObserveActions? = null, // 安装包监听的三个 action
     var install: Install, // 安装相关的
     @SerializedName("game_shield_contents")
     var gameShieldContents: List<String>? = listOf(),//游戏屏蔽内容
@@ -52,13 +46,4 @@ class NewApiSettingsEntity(
         val type: String,
         val link: LinkEntity
     )
-
-    class PackageObserveActions(
-        @SerializedName("ADD")
-        val add: String,
-        @SerializedName("REM")
-        val rem: String,
-        @SerializedName("REP")
-        val rep: String
-    )
 }

app/src/main/java/com/gh/gamecenter/entity/WhitePackageListEntity.kt

@@ -1,5 +0,0 @@
-package com.gh.gamecenter.entity
-
-class WhitePackageListEntity {
-    var data: HashSet<String>? = null
-}

app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 论坛详情
- */
 class ForumDetailActivity : BaseActivity() {
 
     private var mContainerFragment: Fragment? = null

app/src/main/java/com/gh/gamecenter/forum/home/CommunityActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts.IS_DETAIL_PAGE
 import com.gh.gamecenter.video.detail.HomeVideoFragment
 
-/**
- * 社区首页
- */
 class CommunityActivity : BaseActivity() {
 
     override fun getLayoutId(): Int = R.layout.activity_community

app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt

@@ -17,9 +17,11 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.viewpager.widget.ViewPager
 import com.gh.common.browse.BrowseTimer
-import com.gh.common.util.DirectUtils
+import com.gh.common.browse.withLifecycle
 import com.gh.common.util.NewFlatLogUtils
+import com.gh.common.util.DirectUtils
 import com.gh.common.util.NewLogUtils
+import com.gh.common.util.ViewPagerFragmentHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.TrackableDialog
 import com.gh.gamecenter.common.base.adapter.FragmentAdapter
@@ -72,6 +74,7 @@ class CommunityHomeFragment : LazyFragment() {
     private var mBottomTabId = ""
 
     private val browseTimer = BrowseTimer()
+        .withLifecycle(this)
         .withResult {
             SensorsBridge.trackCommunityBrowsingDuration(it / 1000.0)
         }
@@ -199,14 +202,13 @@ class CommunityHomeFragment : LazyFragment() {
         mBottomTabId = arguments?.getString(EntranceConsts.KEY_BOTTOM_TAB_ID, "") ?: ""
     }
 
-    override fun onResume() {
-        super.onResume()
-        browseTimer.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        browseTimer.stop()
+    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
+        super.setUserVisibleHint(isVisibleToUser)
+        if (isVisibleToUser) {
+            browseTimer.start()
+        } else {
+            browseTimer.stop()
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 关注论坛/热门论坛/综合论坛
- */
 class ForumListActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt

@@ -12,9 +12,6 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.entity.ApplyModeratorStatusEntity
 
-/**
- * 版主申请
- */
 class ApplyModeratorActivity : ToolBarActivity() {
     companion object {
         fun getIntent(context: Context, bbsId: String, status: ApplyModeratorStatusEntity): Intent {

app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 版主列表
- */
 class ModeratorListActivity : ToolBarActivity() {
 
     companion object {

app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchActivity.kt

@@ -20,9 +20,6 @@ import com.gh.gamecenter.forum.detail.ForumDetailFragment
 import com.gh.gamecenter.search.SearchDefaultFragment
 import com.lightgame.utils.Util_System_Keyboard
 
-/**
- * 论坛搜索
- */
 class ForumOrUserSearchActivity : SearchActivity() {
 
     private var mBbsId = ""

app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 通用内容合集详情
- */
 class CommonCollectionDetailActivity : ToolBarActivity() {
 
     override fun provideNormalIntent(): Intent {

app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CustomCommonCollectionDetailActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 旧 通用内容合集详情
- */
 class CustomCommonCollectionDetailActivity : ToolBarActivity() {
 
     override fun provideNormalIntent(): Intent {

app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt

@@ -15,15 +15,13 @@ import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.entity.SubjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.subjectTypeToComponentStyle
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.download.DownloadEntity
 
 class GameHorizontalAdapter(
     context: Context,
     private var mSubjectEntity: SubjectEntity,
-    private var type: GameHorizontalListType = GameHorizontalListType.SubjectHorizontalType,
-    private val trackColumnClick: Boolean = true
+    private var type: GameHorizontalListType = GameHorizontalListType.SubjectHorizontalType
 ) : BaseRecyclerAdapter<GameHorizontalItemViewHolder>(context) {
 
     var gameName = ""
@@ -57,7 +55,7 @@ class GameHorizontalAdapter(
         val size = mSubjectEntity.data!!.size - getIndex()
         return if (type == GameHorizontalListType.GameDetailHorizontalType) {
             size
-        } else if (type == GameHorizontalListType.QGameSubjectHorizontalType) {
+        } else if (type == GameHorizontalListType.QGameSubjectHorizontalType){
             mSubjectEntity.data!!.size
         } else {
             when {
@@ -125,15 +123,14 @@ class GameHorizontalAdapter(
                     clickGameName = gameEntity.name ?: "",
                     clickGameId = gameEntity.id
                 )
-                if (!gameEntity.isQQMiniGame() && trackColumnClick) {
+                if (!gameEntity.isQQMiniGame()) {
                     SensorsBridge.trackColumnClick(
                         location = "游戏详情",
                         gameName = gameName,
                         gameId = gameId,
                         gameColumnName = mSubjectEntity.name ?: "",
                         gameColumnId = mSubjectEntity.id ?: "",
-                        text = "游戏",
-                        columnPattern = subjectTypeToComponentStyle[mSubjectEntity.type] ?: ""
+                        text = "游戏"
                     )
                 }
             }

app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt

@@ -7,9 +7,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 选择游戏-添加游戏
- */
 class AddGamesActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt

@@ -7,9 +7,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 选择游戏
- */
 class ChooseGamesActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.common.exposure.ExposureSource
 
-/**
- * 游戏单详情
- */
 class GameCollectionDetailActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt

@@ -798,8 +798,6 @@ class GameCollectionDetailFragment :
                 }
             }, 2000)
         }
-
-        mListViewModel.refreshPackageStatus()
     }
 
     override fun onPause() {

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt

@@ -10,7 +10,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.util.ErrorHelper
-import com.gh.common.util.PackageHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.baselist.LoadStatus
 import com.gh.gamecenter.common.constant.Constants
@@ -65,8 +64,6 @@ open class GameCollectionDetailViewModel(
     var videoIsMuted = SPUtils.getBoolean(Constants.SP_VIDEO_PLAY_MUTE, true)
     var isPostFirstOver = false
 
-    private var packageNameSet = hashSetOf<String>()
-
     @SuppressLint("CheckResult")
     fun getGameCollectionDetail() {
         mApi.getGameCollectionDetail(gameCollectionId)
@@ -131,17 +128,10 @@ open class GameCollectionDetailViewModel(
                             add(mResultLiveData.value!![i])
                         }
                     } else {
-                        packageNameSet = hashSetOf()
-
                         games?.forEach {
                             it.isAdData = adIconActive
                             add(CommentItemData(game = it))
-                            it.getApk().forEach { apk ->
-                                packageNameSet.add(apk.packageName)
-                            }
                         }
-
-                        refreshPackageStatus()
                     }
                 }
 
@@ -168,12 +158,6 @@ open class GameCollectionDetailViewModel(
     override fun getHandleTopCommentCondition(index: Int) =
         !isHandleTopComment && gameCollectionDetail != null && topCommentId.isNotBlank() && index == 0
 
-    fun refreshPackageStatus() {
-        if (packageNameSet.isNotEmpty()) {
-            PackageHelper.refreshWrongInstallStatus(packageNameSet)
-        }
-    }
-
     fun followingCommand(userId: String, isFollow: Boolean) {
         val observable = if (isFollow) {
             RetrofitManager.getInstance().api.postFollowing(userId)

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.entity.GamesCollectionDetailEntity
 
-/**
- * 游戏单详情-封面页
- */
 class GameCollectionPosterActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListActivity.kt

@@ -4,9 +4,6 @@ import android.os.Bundle
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.BaseActivity
 
-/**
- * 游戏单热榜
- */
 class GameCollectionHotListActivity : BaseActivity() {
     override fun getLayoutId(): Int {
         return R.layout.activity_amway

app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionListDetailActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.entity.GameCollectionListEntity
 
-/**
- * 游戏单合集详情
- */
 class GameCollectionListDetailActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt

@@ -7,9 +7,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 我的游戏单
- */
 class MyGameCollectionActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt

@@ -37,9 +37,6 @@ import com.zhihu.matisse.internal.utils.PathUtils
 import org.greenrobot.eventbus.EventBus
 import org.json.JSONObject
 
-/**
- * 创建/编辑游戏单
- */
 class GameCollectionEditActivity : ToolBarActivity() {
 
     private lateinit var mMenuPost: MenuItem

app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt

@@ -5,9 +5,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.core.utils.DisplayUtils
 
-/**
- * 游戏单广场
- */
 class GameCollectionSquareActivity : BaseActivity() {
     override fun getLayoutId(): Int {
         return R.layout.activity_amway

app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.entity.TagInfoEntity
 
-/**
- * 游戏单选择标签
- */
 class GameCollectionTagSelectActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt

@@ -2399,8 +2399,6 @@ class GameDetailFragment : BaseLazyFragment(), IScrollable {
 
         DownloadManager.getInstance().addObserver(dataWatcher)
         controlInstallHint()
-
-        mViewModel.refreshWrongInstallStatus()
     }
 
     override fun onFragmentPause() {

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt

@@ -14,8 +14,8 @@ import com.gh.common.history.HistoryHelper
 import com.gh.common.util.CheckLoginUtils
 import com.gh.gamecenter.feature.utils.ConcernUtils
 import com.gh.common.util.LibaoUtils
-import com.gh.common.util.PackageHelper
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.livedata.NonStickyMutableLiveData
 import com.gh.gamecenter.common.mvvm.Resource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
@@ -184,7 +184,6 @@ class GameDetailViewModel(
                         }
                     }
 
-                    refreshWrongInstallStatus()
                     filterGameTags(data)
                     filterBlockedContent(data)
                     replaceWithMirrorInfoIfNeeded(data)
@@ -257,14 +256,6 @@ class GameDetailViewModel(
         }
     }
 
-    fun refreshWrongInstallStatus() {
-        val packageNameSet = hashSetOf<String>()
-        game?.getApk()?.forEach {
-            packageNameSet.add(it.packageName)
-        }
-        PackageHelper.refreshWrongInstallStatus(packageNameSet)
-    }
-
     private fun replaceWithMirrorInfoIfNeeded(data: NewGameDetailEntity) {
         // 获取镜像相关数据，不存在时不替换
         val mirrorData = getMirrorData(data) ?: return

app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt

@@ -302,7 +302,7 @@ class DescAdapter(
 
                     galleryRv.layoutManager = LinearLayoutManager(mContext, RecyclerView.HORIZONTAL, false)
                     subjectAdapter =
-                        GameHorizontalAdapter(mContext, subjectEntity, GameHorizontalListType.GameDetailHorizontalType, false)
+                        GameHorizontalAdapter(mContext, subjectEntity, GameHorizontalListType.GameDetailHorizontalType)
                     subjectAdapter.gameName = mGameName
                     subjectAdapter.game = mViewModel.game
                     subjectAdapter.gameId = mViewModel.gameId ?: ""

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt

@@ -35,9 +35,6 @@ import org.greenrobot.eventbus.ThreadMode
 import java.text.SimpleDateFormat
 import java.util.*
 
-/**
- * 开服日历表
- */
 class ServersCalendarActivity : ToolBarActivity() {
     private lateinit var mBinding: ActivityServersCalendarBinding
     private lateinit var mViewModel: ServersCalendarViewModel

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarDetailNoDataDialog.kt

@@ -129,7 +129,7 @@ class ServersCalendarDetailNoDataDialog : BottomSheetDialogFragment() {
             HelpAndFeedbackBridge.startSuggestionActivity(
                 it.context,
                 SuggestType.GAME,
-                null
+                "service"
             )
         }
 

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarManagementActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 开服订阅
- */
 class ServersCalendarManagementActivity : BaseActivity_TabLayout() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.feature.entity.GameEntity
 
-/**
- * 历史版本
- */
 class HistoryApkListActivity : ToolBarActivity() {
 
     companion object {

app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt

@@ -45,9 +45,6 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import kotlin.math.abs
 
-/**
- * 评价详情
- */
 @Route(path = RouteConsts.activity.ratingReplyActivity)
 class RatingReplyActivity : ListActivity<RatingReplyEntity, RatingReplyViewModel>(),
     KeyboardHeightObserver {

app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt

@@ -50,9 +50,6 @@ import okhttp3.RequestBody
 import org.json.JSONObject
 import retrofit2.HttpException
 
-/**
- * 评论游戏/修改游戏评论
- */
 class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver {
 
     private var mPostDialog: WaitingDialogFragment? = null

app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt

@@ -19,9 +19,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.Single
 
-/**
- * 评论修改历史
- */
 class CommentLogsActivity : ListActivity<RatingComment, NormalListViewModel<RatingComment>>() {
 
     private var mAdapter: CommentLogsAdapter? = null

app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 浏览记录
- */
 class HistoryActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageItem.kt

@@ -175,7 +175,7 @@ abstract class CustomPageItem(
         val subjectTypeToComponentStyle by lazy {
             hashMapOf(
                 COMPONENTS_GAME_SUBJECT_TYPE_DOUBLE_CARD to "双列卡片",
-                COMPONENTS_GAME_SUBJECT_TYPE_GAME_VIDEO_HORIZONTAL_SLIDE to "视频横屏滑动",
+                COMPONENTS_GAME_SUBJECT_TYPE_GAME_VIDEO_HORIZONTAL_SLIDE to "视频横屏滚动",
                 COMPONENTS_GAME_SUBJECT_TYPE_GAME_VERTICAL to "长列表式",
                 COMPONENTS_SUBJECT_TYPE_GAME_VERTICAL_SLIDE to "滑动列表",
                 COMPONENTS_SUBJECT_TYPE_GAME_HORIZONTAL to "图标矩阵",

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageRepository.kt

@@ -233,14 +233,14 @@ class CustomPageRepository private constructor(
 
                         var isAdded = false
                         if (gameSubject != null && !gameSubject.data.isNullOrEmpty()) {
+                            // 替换游戏
+                            substituteGameIfNeeded(gameSubject)
+
                             // 记录已显示的游戏 id
                             for (game in gameSubject.data!!) {
                                 displayingGameIdSet.add(game.id)
                             }
 
-                            // 替换游戏
-                            substituteGameIfNeeded(gameSubject)
-
                             if (gameSubject.tag == "update") {
                                 // 优先显示更新标签
                                 gameSubject.data?.forEach {

app/src/main/java/com/gh/gamecenter/home/custom/tracker/SubjectTracker.kt

@@ -4,22 +4,14 @@ import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PageLocation
-import com.gh.gamecenter.home.custom.model.CustomGameItem
 import com.gh.gamecenter.home.custom.model.CustomPageItem
 import com.gh.gamecenter.home.custom.model.CustomSplitSubjectItem
 import com.gh.gamecenter.home.custom.model.CustomSubjectItem
 
 class SubjectTracker(private val pageLocation: PageLocation) {
 
-    fun trackColumnClick(
-        item: CustomPageItem,
-        game: GameEntity?,
-        text: String,
-        buttonType: String = "",
-        link: LinkEntity? = null
-    ) {
+    fun trackColumnClick(item: CustomPageItem, game: GameEntity?, text: String, buttonType: String = "", link: LinkEntity? = null) {
         val subject = when {
-            item is CustomGameItem -> item.linkColumn
             item is CustomSubjectItem -> item.data
             item is CustomSplitSubjectItem -> item.data
             else -> null
@@ -48,7 +40,6 @@ class SubjectTracker(private val pageLocation: PageLocation) {
 
     fun trackQQGameClick(item: CustomPageItem, game: GameEntity) {
         val subject = when {
-            item is CustomGameItem -> item.linkColumn
             item is CustomSubjectItem -> item.data
             item is CustomSplitSubjectItem -> item.data
             else -> null

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomHomeItemGameTestV2ViewHolder.kt

@@ -168,8 +168,10 @@ class CustomHomeItemGameTestV2ViewHolder(
             } else {
                 RIGHT_TEXT_MORE
             }
+            if (tvRight.text.isBlank()) {
+                tvRight.text = rightText
+            }
 
-            tvRight.text = rightText
             tvRight.setOnClickListener {
                 if (data.rightTop.text == ALL) {
                     NewFlatLogUtils.logGameTestV2MoreClick(rightText, "自定义页面")

app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.feature.entity.GameEntity
 
-/**
- * 外部跳转展示页
- */
 class PackageSkipActivity : BaseActivity() {
 
     override fun getLayoutId(): Int = R.layout.activity_amway

app/src/main/java/com/gh/gamecenter/libao/LibaoDetailActivity.java

@@ -19,7 +19,6 @@ import kotlin.Pair;
 
 /**
  * Created by khy on 2016/12/13.
- * 礼包详情
  */
 @Route(path = RouteConsts.activity.libaoDetailActivity)
 public class LibaoDetailActivity extends ToolBarActivity {

app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java

@@ -8,26 +8,41 @@ import com.gh.gamecenter.common.loghub.LoghubUtils;
 import com.gh.gamecenter.common.utils.Installation;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.gamecenter.db.DataCollectionDao;
+import com.gh.gamecenter.db.info.DataCollectionInfo;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
+import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 public class DataCollectionManager {
 
     private Context mContext;
+    private DataCollectionDao dao;
+    private boolean isUploading;
 
     private DataCollectionManager() {
         mContext = HaloApp.getInstance().getApplicationContext();
+        dao = new DataCollectionDao(mContext);
+        isUploading = false;
     }
 
     public static void onEvent(Context context, String type, Map<String, Object> map, boolean isUpload) {
         AppExecutor.getIoExecutor().execute(() -> {
             map.put("createdOn", Utils.getTime(context));
-            DataCollectionManager.getInstance().realTimeUpload(type, map);
+            if (isUpload) {
+                DataCollectionManager.getInstance().realTimeUpload(type, map);
+            } else {
+                onEvent(type, new JSONObject(map).toString(), false);
+            }
         });
     }
 
@@ -60,10 +75,145 @@ public class DataCollectionManager {
         return SingletonHolder.INSTANCE;
     }
 
+    public static void onEvent(String type, String data, boolean isUpload) {
+        String id = UUID.randomUUID().toString().replace("-", "");
+        DataCollectionInfo entity = new DataCollectionInfo();
+        entity.setId(id);
+        entity.setType(type);
+        entity.setData(data);
+        onEvent(entity, isUpload);
+    }
+
+    // 添加事件
+    public static void onEvent(DataCollectionInfo entity, boolean isUpload) {
+        DataCollectionManager.getInstance().add(entity, isUpload);
+    }
+
+    // 把事件加入列表
+    public void add(DataCollectionInfo entity, boolean isUpload) {
+        // 加入列表
+        dao.add(entity);
+
+        // 检查列表数目是否满足条件
+        if (isUpload) {
+            List<DataCollectionInfo> list = dao.getAll();
+            if (list != null && list.size() >= 20) {
+                try {
+                    upload(list);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    // todo 上传数据，不是很明白这种存数据库取出来删除再存进去再取出来再删是什么操作？也没时间改了~
+    private void upload(List<DataCollectionInfo> list) throws JSONException {
+        if (isUploading) {
+            return;
+        }
+        isUploading = true;
+        String version = PackageUtils.getGhVersionName();
+        String user = Installation.getUUID(mContext);
+        String channel = HaloApp.getInstance().getChannel();
+        for (DataCollectionInfo dataCollectionInfo : list) {
+            if (!"click-item".equals(dataCollectionInfo.getType())) {
+                JSONObject dataObject = new JSONObject(dataCollectionInfo.getData());
+                JSONArray jsonArray = dataObject.getJSONArray("data");
+                for (int i = 0; i < jsonArray.length(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    jsonObject.put("version", version);
+                    jsonObject.put("resu", user);
+                    jsonObject.put("jnfj", MetaUtil.getBase64EncodedIMEI());
+                    jsonObject.put("channel", channel);
+
+                    JSONObject jsonWrapper = new JSONObject();
+                    jsonWrapper.put("topic", dataCollectionInfo.getType());
+                    jsonWrapper.put("content", jsonObject.toString());
+                    jsonWrapper.put("time", Utils.getTime(HaloApp.getInstance().getApplication()));
+                    LoghubUtils.log(jsonWrapper, "collection", true);
+                }
+            }
+            dao.delete(dataCollectionInfo.getId());
+        }
+        isUploading = false;
+    }
+
+    public static void upsert(Context context, String type, Map<String, Object> map) {
+        map.put("createdOn", Utils.getTime(context));
+        String id = UUID.randomUUID().toString().replace("-", "");
+        DataCollectionInfo entity = new DataCollectionInfo();
+        entity.setId(id);
+        entity.setType(type);
+        entity.setData(new JSONObject(map).toString());
+        DataCollectionManager.getInstance().upsert(entity, type);
+    }
+
+    public void upsert(DataCollectionInfo entity, String type) {
+        List<DataCollectionInfo> list = dao.findByType(type);
+        if (list == null || list.isEmpty()) {
+            dao.add(entity);
+        } else {
+            entity.setId(list.get(0).getId());
+            dao.update(entity);
+            if (list.size() > 1) {
+                List<String> ids = new ArrayList<>();
+                for (int i = 1, size = list.size(); i < size; i++) {
+                    ids.add(list.get(i).getId());
+                }
+                dao.delete(ids);
+            }
+        }
+    }
+
+    // 上传数据
+    public void upload() {
+        statClickData();
+        List<DataCollectionInfo> list = dao.getAll();
+        if (list != null && !list.isEmpty()) {
+            try {
+                upload(list);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /*
+     * 统计点击数据
+     */
+    public void statClickData() {
+        AppExecutor.getIoExecutor().execute(() -> {
+            List<DataCollectionInfo> list = dao.getClickData();
+            if (list != null && !list.isEmpty()) {
+                List<String> ids = new ArrayList<>();
+                List<Object> data = new ArrayList<>();
+                try {
+                    DataCollectionInfo dataCollectionEntity;
+                    for (int i = 0, size = list.size(); i < size; i++) {
+                        dataCollectionEntity = list.get(i);
+                        ids.add(dataCollectionEntity.getId());
+                        data.add(new JSONObject(dataCollectionEntity.getData()));
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put("data", data);
+                onEvent(mContext, "click", map);
+                dao.delete(ids);
+            }
+        });
+    }
+
     public static void onEvent(Context context, String type, Map<String, Object> map) {
         AppExecutor.getIoExecutor().execute(() -> {
             map.put("createdOn", Utils.getTime(context));
-            DataCollectionManager.getInstance().realTimeUpload(type, map);
+            if ("news".equals(type) || "download".equals(type) || "search".equals(type)) {
+                DataCollectionManager.getInstance().realTimeUpload(type, map);
+                return;
+            }
+            onEvent(type, new JSONObject(map).toString(), true);
         });
     }
 

app/src/main/java/com/gh/gamecenter/manager/PackagesManager.kt

@@ -7,7 +7,6 @@ import com.gh.gamecenter.feature.entity.GameInstall
 import com.gh.gamecenter.entity.GameUpdateEntity
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashSet
 
 /**
  * todo 整理部分与[PackageUtils]冲突的方法
@@ -16,13 +15,14 @@ object PackagesManager {
 
     // 存在网络延迟
     private var mUpdateAndPluginList = ArrayList<GameUpdateEntity>()
-    private var mInstalledList = ArrayList<GameInstall>()
+    private val mInstalledList = ArrayList<GameInstall>()
 
     // 实时更新(已安装到本地的包名列表，不包括畅玩游戏)
-    private var mInstalledPkgSet = HashSet<String>()
+    private val mInstalledPkgList = Collections.synchronizedList(ArrayList<String>())
 
-    fun initInstallPkgSet(set: Set<String>) {
-        mInstalledPkgSet = HashSet(set)
+    fun initInstallPkgList(list: List<String>) {
+        mInstalledPkgList.clear()
+        mInstalledPkgList.addAll(list)
     }
 
     /**
@@ -41,7 +41,8 @@ object PackagesManager {
      * @param list 已安装列表数据
      */
     fun initGameInstall(list: ArrayList<GameInstall>) {
-        mInstalledList = ArrayList(list)
+        mInstalledList.clear()
+        mInstalledList.addAll(list)
     }
 
     /**
@@ -85,11 +86,9 @@ object PackagesManager {
             return false
         }
 
-        return mInstalledPkgSet.contains(packageName)
+        return mInstalledPkgList.contains(packageName)
     }
 
-    fun getInstalledSet(): MutableSet<String> = HashSet(mInstalledPkgSet)
-
     /**
      * 根据包名版本号判断是否已安装相应版本的应用
      *

app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt

@@ -22,9 +22,6 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.PopupMyGameGuideBinding
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
 
-/**
- * 我的游戏
- */
 class MyGameActivity : BaseActivity_TabLayout() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/mypost/MyPostActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 我的发布
- */
 class MyPostActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt

@@ -1,14 +1,12 @@
 package com.gh.gamecenter.packagehelper
 
 import android.annotation.SuppressLint
-import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.common.utils.tryWithDefaultCatch
 import com.gh.gamecenter.entity.PackageFilter
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.room.AppDatabase
-import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
 
 object PackageFilterManager {
@@ -79,20 +77,11 @@ object PackageFilterManager {
                     if (appendOnly) {
                         mPendingPackageNameSet.addAll(packageList)
                     } else {
-                        if (exception is retrofit2.HttpException && exception.code() == 403) {
-                            // 403 代表 key 过期，需要重新获取
-                            callbackClosure?.invoke(arrayListOf())
-                            return
-                        }
-
                         // 接口访问失败时从数据库读取上一次缓存的已安装收录列表进行更新
                         val packageEntityList =
                             AppDatabase.getInstance().packageFilterDao().getAllPackageName()
                         for (packageEntity in packageEntityList) {
-                            // 依然为已安装状态才加入到有效包名列表中
-                            if (PackageUtils.isInstalled(HaloApp.getInstance(), packageEntity.packageName)) {
-                                mValidPackageNameSet.add(packageEntity.packageName)
-                            }
+                            mValidPackageNameSet.add(packageEntity.packageName)
                         }
 
                         callbackClosure?.invoke(ArrayList(mValidPackageNameSet))

app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt

@@ -20,9 +20,9 @@ import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.*
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.GameInstall
+import com.gh.gamecenter.livedata.Event
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -30,11 +30,9 @@ import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.greenrobot.eventbus.EventBus
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
-import kotlin.collections.HashSet
 
 /**
  * 该类存储的是已安装的所有游戏(助手后台已收录的)和所有更新(包括插件化)数据
@@ -56,7 +54,7 @@ object PackageRepository {
     private const val LAST_UPLOAD_APPLIST_TIME = "last_upload_applist_time"
     private const val PAGE_SIZE = 50
 
-    private val mInstalledPkgSet = Collections.synchronizedSet(HashSet<String>())
+    private val mInstalledPkgList = Collections.synchronizedList(ArrayList<String>())
 
     @Volatile
     private var mIsInitialisingData = false
@@ -88,7 +86,7 @@ object PackageRepository {
             if (gameInstalled.isNotEmpty()) gameInstalled.clear()
             if (mInstalledGameList.isNotEmpty()) mInstalledGameList.clear()
             if (gameUpdate.isNotEmpty()) gameUpdate.clear()
-            if (mInstalledPkgSet.isNotEmpty()) mInstalledPkgSet.clear()
+            if (mInstalledPkgList.isNotEmpty()) mInstalledPkgList.clear()
 
             val list = PackageUtils.getAllPackageName(mApplication)
 
@@ -97,7 +95,7 @@ object PackageRepository {
             initFilterPackage(list) { filteredList ->
                 mIsInitialisingData = false
 
-                mInstalledPkgSet.addAll(filteredList)
+                mInstalledPkgList.addAll(filteredList)
                 notifyInstallPkgData()
 
                 loadInstalledGameDigestAndNotifyData(filteredList)
@@ -205,14 +203,12 @@ object PackageRepository {
      * @param filteredList 已安装的游戏包名集合 (仅已收录部分)
      * @param onWorkerThreadOnly 是否在工作线程执行
      * @param isVGame 包名列表是否为畅玩游戏
-     * @param updateInstallStatus 更新安装状态 （通过 EventBus 来进行）
      */
     @SuppressLint("CheckResult")
     private fun loadInstalledGameDigestAndNotifyData(
         filteredList: ArrayList<String>,
         onWorkerThreadOnly: Boolean = false,
         isVGame: Boolean = false,
-        updateInstallStatus: Boolean = false
     ) {
         var isNotifyUpdate = false
         val maxPageCount = (filteredList.size / PAGE_SIZE) + 1
@@ -247,7 +243,9 @@ object PackageRepository {
 
                             for (game in validGames) {
                                 if (gh_id == null || gh_id == game.id) {
-                                    gameInstalled.add(GameInstall.transformGameInstall(game, pkgName, isVGame))
+                                    gameInstalled.add(
+                                        GameInstall.transformGameInstall(game, pkgName, isVGame)
+                                    )
                                     mInstalledGameList.add(game)
                                     val isCanPluggable = checkGamePlugin(game, pkgName)
                                     val isCanUpdate = checkGameUpdate(game, isVGame)
@@ -255,10 +253,6 @@ object PackageRepository {
                                     if (!isNotifyUpdate && isCanUpdate || isCanPluggable) {
                                         isNotifyUpdate = true
                                     }
-
-                                    if (updateInstallStatus) {
-                                        EventBus.getDefault().post(EBPackage(EBPackage.TYPE_INSTALLED, pkgName, game.getApk().firstOrNull()?.version))
-                                    }
                                 }
                             }
                         }
@@ -406,18 +400,14 @@ object PackageRepository {
      * 新增已安装的游戏
      * @param pkgName 已安装的游戏包名
      */
-    fun addInstalledGame(pkgName: String, updateInstallStatus: Boolean = false) {
-        mInstalledPkgSet.add(pkgName)
+    fun addInstalledGame(pkgName: String) {
+        mInstalledPkgList.add(pkgName)
         notifyInstallPkgData()
 
         val list = arrayListOf(pkgName)
 
         updateFilterPackage(list) {
-            loadInstalledGameDigestAndNotifyData(
-                filteredList = list,
-                onWorkerThreadOnly = true,
-                updateInstallStatus = updateInstallStatus
-            )
+            loadInstalledGameDigestAndNotifyData(list, true)
         }
         changeRecentVaPlayed()
     }
@@ -425,29 +415,18 @@ object PackageRepository {
     /**
      * 批量新增已安装的游戏数量
      * @param pkgNameList 数组列表
-     * @param isVGame 是否为畅玩游戏
-     * @param updateInstallStatus 是否更新安装状态
      */
-    fun addInstalledGames(pkgNameList: ArrayList<String>,
-                          isVGame: Boolean = false,
-                          updateInstallStatus: Boolean = false,
-    ) {
+    fun addInstalledGames(pkgNameList: ArrayList<String>, isVGame: Boolean = false) {
         // 畅玩游戏不添加至本地的已安装包名列表中
         if (!isVGame) {
-            mInstalledPkgSet.addAll(pkgNameList)
-        } else {
-            changeRecentVaPlayed()
+            mInstalledPkgList.addAll(pkgNameList)
         }
         notifyInstallPkgData()
 
         updateFilterPackage(pkgNameList) {
-            loadInstalledGameDigestAndNotifyData(
-                filteredList = pkgNameList,
-                onWorkerThreadOnly = true,
-                isVGame = isVGame,
-                updateInstallStatus = updateInstallStatus
-            )
+            loadInstalledGameDigestAndNotifyData(pkgNameList, true, isVGame)
         }
+        changeRecentVaPlayed()
     }
 
     /**
@@ -456,8 +435,9 @@ object PackageRepository {
      * @param isVGame 是否来自于畅玩游戏
      */
     fun addUninstalledGame(pkgName: String, isVGame: Boolean) {
-        if (!isVGame && mInstalledPkgSet.isNotEmpty()) {
-            mInstalledPkgSet.remove(pkgName)
+        // TODO 检查为什么会有两个相同的包名添加到 mInstalledPkgList 里
+        if (!isVGame && mInstalledPkgList.isNotEmpty()) {
+            mInstalledPkgList.removeAll { it == pkgName }
         }
         // 尝试从临时的当前版本列表里移除已卸载的条目
         tryCatchInRelease {
@@ -513,14 +493,7 @@ object PackageRepository {
     }
 
     private fun notifyInstallPkgData() {
-        val pkgSet = hashSetOf<String>()
-
-        val iterator = mInstalledPkgSet.iterator()
-        while (iterator.hasNext()) {
-            pkgSet.add(iterator.next())
-        }
-
-        PackagesManager.initInstallPkgSet(pkgSet)
+        PackagesManager.initInstallPkgList(mInstalledPkgList)
     }
 
 }

app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt

@@ -7,9 +7,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 收货信息
- */
 class DeliveryInfoActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/personalhome/UserHomeActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.core.utils.DisplayUtils
 
-/**
- * 个人主页
- */
 class UserHomeActivity : ToolBarActivity() {
 
     override fun provideNormalIntent(): Intent {

app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt

@@ -18,9 +18,6 @@ import com.gh.gamecenter.databinding.ActivityBackgroundClipBinding
 import java.io.File
 import java.lang.ref.SoftReference
 
-/**
- * 裁剪背景
- */
 class BackgroundClipActivity : BaseActivity() {
 
     private lateinit var mBinding: ActivityBackgroundClipBinding

app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt

@@ -11,9 +11,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.feature.entity.BackgroundImageEntity
 
-/**
- * 预览背景
- */
 class BackgroundPreviewActivity : BaseActivity() {
 
     override fun getLayoutId(): Int = R.layout.activity_amway

app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt

@@ -7,9 +7,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 个性背景
- */
 class PersonalityBackgroundActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.R
 
-/**
- * 头像挂件
- */
 class AvatarBorderActivity : BaseActivity() {
 
     override fun getLayoutId(): Int {

app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.personalhome.FollowersOrFansFragment
 
-/**
- * 粉丝列表
- */
 class FansActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.personalhome.FollowersOrFansFragment
 
-/**
- * 关注列表
- */
 class FollowersActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt

@@ -9,9 +9,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 回答详情
- */
 class SimpleAnswerDetailActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.entity.SpecialColumn
 
-/**
- * 帖子详情
- */
 @Route(path = RouteConsts.activity.articleDetailActivity)
 class ArticleDetailActivity : ToolBarActivity() {
 

app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt

@@ -8,9 +8,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 
-/**
- * 帖子草稿
- */
 class ArticleDraftActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt

@@ -44,9 +44,6 @@ import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.EventBus
 
-/**
- * 发布帖子/修改帖子
- */
 class ArticleEditActivity : BaseRichEditorActivity<ArticleEditViewModel>(), KeyboardHeightObserver {
     private lateinit var mMenuDraft: MenuItem
     private lateinit var mMenuPost: MenuItem

app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt

@@ -19,9 +19,6 @@ import com.gh.gamecenter.gamecollection.detail.conversation.GameCollectionCommen
 import com.gh.gamecenter.qa.comment.conversation.CommentConversationFragment
 import com.lightgame.utils.Util_System_Keyboard
 
-/**
- * 发表评论
- */
 class CommentActivity : BaseActivity() {
 
     private val resultIntent = Intent()

app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.gamecollection.detail.conversation.GameCollectionCommentConversationFragment
 import com.gh.gamecenter.qa.comment.conversation.CommentConversationFragment
 
-/**
- * 回答/评论详情
- */
 class NewCommentDetailActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {