feat: 礼包功能模块化

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt
#	ndownload

.gitlab-ci.yml

@@ -71,8 +71,8 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - dev-5.26.0
-    - dev-5.27.0
+    - dev-5.29.0
+    - dev-5.30.0
 
 # 代码检查
 sonarqube_analysis:
@@ -103,8 +103,8 @@ sonarqube_analysis:
      exit_codes: 137
    only:
      - dev
-     - dev-5.26.0
-     - dev-5.27.0
+     - dev-5.29.0
+     - dev-5.30.0
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -122,8 +122,8 @@ send_sonar_report:
      exit_codes: 137
    only:
      - dev
-     - dev-5.26.0
-     - dev-5.27.0
+     - dev-5.29.0
+     - dev-5.30.0
 
 oss-upload&send-email:
     tags:
@@ -155,5 +155,5 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail.py
     only:
         - dev
-        - dev-5.26.0
-        - dev-5.27.0
+        - dev-5.29.0
+        - dev-5.30.0

app/build.gradle

@@ -11,7 +11,7 @@ android {
 
     String CONFIG_ID = ""
     String FIRST_LAUNCH = ""
-    int ACTIVATE_REPORTING_RATIO = 0
+    int ACTIVATE_REPORTING_RATIO = 100
 
     buildFeatures {
         viewBinding true
@@ -71,6 +71,11 @@ android {
 
         proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt'
 
+        String CORE_EVENT_GAME_CATEGORY = ""
+
+        // 推广用的关键事件游戏类型
+        buildConfigField "String", "CORE_EVENT_GAME_CATEGORY", "\"${CORE_EVENT_GAME_CATEGORY}\""
+
         // 推广用的配置 id
         buildConfigField "String", "CONFIG_ID", "\"${CONFIG_ID}\""
 
@@ -314,6 +319,9 @@ dependencies {
     implementation(project(':module_login')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+    implementation(project(':module_libao')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
     implementation(project(':module_setting')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
@@ -334,6 +342,7 @@ dependencies {
     implementation(project(':feature:oaid'))
     implementation(project(':feature:floating-window'))
     implementation(project(':feature:beizi_startup_ad'))
+    implementation(project(':feature:xapk-installer'))
 }
 
 File propFile = file('sign.properties')

app/proguard-rules.txt

@@ -24,8 +24,8 @@
 -keep class com.gh.gamecenter.BR
 -keep class com.gh.gamecenter.retrofit.* {*;}
 -keep class com.gh.gamecenter.eventbus.* {*;}
--keep class com.gh.gamecenter.home.gamecollection.GameCollectionStackLayout {*;}
--keep class com.gh.gamecenter.home.gamecollection.GameCollectionStackAnimation {*;}
+-keep class com.gh.gamecenter.home.gamecollection.carousel.GameCollectionStackLayout {*;}
+-keep class com.gh.gamecenter.home.gamecollection.carousel.GameCollectionStackAnimation {*;}
 
 # Prevent R8 from leaving Data object members always null
 -keepclassmembers,allowobfuscation class * {

app/src/default/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -33,4 +33,8 @@ class FlavorProviderImp : IFlavorProvider {
     override fun logEvent(content: String) {
         // do nothing
     }
+
+    override fun logCoreEvent() {
+        // do nothing
+    }
 }

app/src/gdt/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -42,6 +42,10 @@ class FlavorProviderImp : IFlavorProvider {
         GdtHelper.logAction(content)
     }
 
+    override fun logCoreEvent() {
+        // do nothing
+    }
+
     companion object {
         private const val GDT_DEFAULT_CHANNEL = "GDT_GHZS_01"
     }

app/src/kuaishou/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -42,6 +42,10 @@ class FlavorProviderImp : IFlavorProvider {
         KuaishouHelper.onEvent(content)
     }
 
+    override fun logCoreEvent() {
+        logEvent("EVENT_KEY_PATH_OPTIMIZATION")
+    }
+
     companion object {
         private const val KUAISHOU_CHANNEL = "KS-GHZS-01"
     }

app/src/main/AndroidManifest.xml

@@ -106,8 +106,8 @@
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:resizeableActivity="true"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
         tools:replace="android:name,android:allowBackup"
         tools:targetApi="n">
@@ -232,15 +232,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/TransparentStatusBarAndNavigationBar" />
 
-        <activity
-            android:name="com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
-        <activity
-            android:name="com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.ShareGhActivity"
             android:screenOrientation="portrait" />
@@ -756,6 +747,10 @@
             android:name=".servers.gametest2.GameServerTestV2Activity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity"
+            android:screenOrientation="portrait" />
+
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -826,6 +821,10 @@
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name="com.gh.common.xapk.XapkInstallReceiver"
+            android:exported="false" />
+
         <receiver
             android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
             android:exported="true">

app/src/main/assets/lottie/icon_fab_change.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":60,"w":144,"h":144,"nm":"icon_change","ddd":0,"assets":[{"id":"comp_0","nm":"icon_change_detail","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"stroke1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[37.04,52.994,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.533,-0.143],[0.143,-0.533],[1.487,-1.304],[1.961,-0.258],[1.774,0.875],[0.709,0.661],[0,0],[0,0.445],[0,0],[-0.276,0],[0,0],[-0.013,0],[0,0],[0.315,-0.315],[0,0],[-0.682,-0.336],[-1.569,0.207],[-1.19,1.043],[-0.41,1.528]],"o":[[0.533,0.143],[-0.512,1.91],[-1.487,1.304],[-1.961,0.258],[-0.879,-0.433],[0,0],[-0.315,0.315],[0,0],[0,-0.276],[0,0],[0.013,0],[0,0],[0.445,0],[0,0],[0.555,0.508],[1.419,0.7],[1.569,-0.207],[1.19,-1.043],[0.143,-0.533]],"v":[[8.605,-4.301],[9.312,-3.076],[6.247,1.854],[0.958,4.25],[-4.77,3.304],[-7.163,1.652],[-8.493,2.982],[-9.347,2.628],[-9.347,-1.665],[-8.847,-2.165],[-8.161,-2.165],[-8.122,-2.165],[-4.554,-2.165],[-4.2,-1.311],[-5.748,0.237],[-3.885,1.51],[0.697,2.267],[4.928,0.35],[7.381,-3.594]],"c":true},"ix":2},"nm":"stroke1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,1,1,1,0.5,1,1,1,1,1,1,1,0,1,0.5,0.8,1,0.6],"ix":9}},"s":{"a":0,"k":[-5.347,-4.665],"ix":5},"e":{"a":0,"k":[8.653,-4.665],"ix":6},"t":1,"nm":"color1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"stroke1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"stroke2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[34.96,19.006,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.961,0.258],[-1.774,-0.875],[-0.709,-0.661],[0,0],[0,-0.445],[0,0],[0.276,0],[0,0],[0.012,0],[0,0],[-0.315,0.315],[0,0],[0.682,0.336],[1.569,-0.207],[1.19,-1.043],[0.41,-1.528],[0.533,0.143],[-0.143,0.533],[-1.487,1.304]],"o":[[1.961,-0.258],[0.879,0.433],[0,0],[0.315,-0.315],[0,0],[0,0.276],[0,0],[-0.012,0],[0,0],[-0.445,0],[0,0],[-0.555,-0.508],[-1.419,-0.7],[-1.569,0.207],[-1.19,1.043],[-0.143,0.533],[-0.533,-0.143],[0.512,-1.91],[1.487,-1.304]],"v":[[-0.958,-4.25],[4.77,-3.304],[7.163,-1.652],[8.493,-2.982],[9.347,-2.628],[9.347,1.665],[8.847,2.165],[8.16,2.165],[8.123,2.165],[4.554,2.165],[4.2,1.311],[5.748,-0.237],[3.885,-1.51],[-0.697,-2.267],[-4.928,-0.35],[-7.381,3.594],[-8.605,4.301],[-9.312,3.076],[-6.247,-1.854]],"c":true},"ix":2},"nm":"stroke2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,1,1,1,0.5,1,1,1,1,1,1,1,0,1,0.5,0.8,1,0.6],"ix":9}},"s":{"a":0,"k":[5.347,4.665],"ix":5},"e":{"a":0,"k":[-8.653,4.665],"ix":6},"t":1,"nm":"color2","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"stroke2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon_change_detail","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":36,"s":[360]}],"ix":10},"p":{"a":0,"k":[72,72,0],"ix":2,"l":2},"a":{"a":0,"k":[36,36,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":72,"h":72,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/icon_title_change_dark.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":60,"w":72,"h":72,"nm":"icon_title_change","ddd":0,"assets":[{"id":"comp_0","nm":"arrow","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"arrow_e_dark","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.25,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.701,0.456],[-1.627,-0.674],[-0.705,-0.667],[0,0],[-0.552,0],[0,-0.552],[0,0],[0.552,0],[0,0],[0.012,0],[0,0],[0,0.552],[-0.552,0],[0,0],[0.615,0.255],[1.276,-0.342],[0.804,-1.048],[0,-1.321],[-0.804,-1.048],[-1.276,-0.342],[-1.22,0.505],[-0.66,1.144],[-0.478,-0.276],[0.276,-0.478],[1.627,-0.674],[1.701,0.456],[1.072,1.397],[0,1.761],[-1.072,1.397]],"o":[[1.701,-0.456],[0.909,0.376],[0,0],[0,-0.552],[0.552,0],[0,0],[0,0.552],[0,0],[-0.012,0],[0,0],[-0.552,0],[0,-0.552],[0,0],[-0.493,-0.435],[-1.22,-0.505],[-1.276,0.342],[-0.804,1.048],[0,1.321],[0.804,1.048],[1.276,0.342],[1.22,-0.505],[0.276,-0.478],[0.478,0.276],[-0.881,1.525],[-1.627,0.674],[-1.701,-0.456],[-1.072,-1.397],[0,-1.761],[1.072,-1.397]],"v":[[-1.821,-7.727],[3.311,-7.391],[5.75,-5.809],[5.75,-6.5],[6.75,-7.5],[7.75,-6.5],[7.75,-3.5],[6.75,-2.5],[6.331,-2.5],[6.295,-2.5],[3.75,-2.5],[2.75,-3.5],[3.75,-4.5],[4.219,-4.5],[2.546,-5.543],[-1.303,-5.796],[-4.51,-3.653],[-5.75,0],[-4.51,3.653],[-1.303,5.796],[2.546,5.543],[5.446,3],[6.812,2.634],[7.178,4],[3.311,7.391],[-1.821,7.727],[-6.097,4.87],[-7.75,0],[-6.097,-4.87]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.158117651939,0.532358944416,0.878431379795,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"arrow_e_dark","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"arrow","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":36,"s":[360]}],"ix":10},"p":{"a":0,"k":[36,36,0],"ix":2,"l":2},"a":{"a":0,"k":[30,30,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":60,"h":60,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/icon_title_change_light.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":60,"w":72,"h":72,"nm":"icon_title_change","ddd":0,"assets":[{"id":"comp_0","nm":"arrow","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"arrow_e_light","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.25,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.701,0.456],[-1.627,-0.674],[-0.705,-0.667],[0,0],[-0.552,0],[0,-0.552],[0,0],[0.552,0],[0,0],[0.012,0],[0,0],[0,0.552],[-0.552,0],[0,0],[0.615,0.255],[1.276,-0.342],[0.804,-1.048],[0,-1.321],[-0.804,-1.048],[-1.276,-0.342],[-1.22,0.505],[-0.66,1.144],[-0.478,-0.276],[0.276,-0.478],[1.627,-0.674],[1.701,0.456],[1.072,1.397],[0,1.761],[-1.072,1.397]],"o":[[1.701,-0.456],[0.909,0.376],[0,0],[0,-0.552],[0.552,0],[0,0],[0,0.552],[0,0],[-0.012,0],[0,0],[-0.552,0],[0,-0.552],[0,0],[-0.493,-0.435],[-1.22,-0.505],[-1.276,0.342],[-0.804,1.048],[0,1.321],[0.804,1.048],[1.276,0.342],[1.22,-0.505],[0.276,-0.478],[0.478,0.276],[-0.881,1.525],[-1.627,0.674],[-1.701,-0.456],[-1.072,-1.397],[0,-1.761],[1.072,-1.397]],"v":[[-1.821,-7.727],[3.311,-7.391],[5.75,-5.809],[5.75,-6.5],[6.75,-7.5],[7.75,-6.5],[7.75,-3.5],[6.75,-2.5],[6.331,-2.5],[6.295,-2.5],[3.75,-2.5],[2.75,-3.5],[3.75,-4.5],[4.219,-4.5],[2.546,-5.543],[-1.303,-5.796],[-4.51,-3.653],[-5.75,0],[-4.51,3.653],[-1.303,5.796],[2.546,5.543],[5.446,3],[6.812,2.634],[7.178,4],[3.311,7.391],[-1.821,7.727],[-6.097,4.87],[-7.75,0],[-6.097,-4.87]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141176477075,0.588235318661,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"arrow_e_light","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"arrow","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":36,"s":[360]}],"ix":10},"p":{"a":0,"k":[36,36,0],"ix":2,"l":2},"a":{"a":0,"k":[30,30,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":60,"h":60,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

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

@@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils.getBoolean
 import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.packagehelper.PackageViewModel
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode

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

@@ -5,6 +5,7 @@ import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.util.FloatingBackViewManager
+import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.SingletonWebActivity
 import com.gh.gamecenter.SkipActivity
@@ -61,6 +62,8 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         ) {
             VHelper.showFeedbackDialogIfLastSuccessfulLaunchedGameExitUnexpectedly(activity)
         }
+
+        XapkInstaller.updateCurrentInstallStatus()
     }
 
     override fun onActivityPaused(activity: Activity) {

app/src/main/java/com/gh/common/DefaultJsApi.kt

@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import com.alibaba.android.arouter.launcher.ARouter
+import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
 import com.gh.download.DownloadManager
@@ -33,10 +34,12 @@ import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.SensorsEvent
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
@@ -71,6 +74,7 @@ class DefaultJsApi(
     private var mDownloadWatcher: DataWatcher? = null // 下载观察者
     private var mDownloadUrlSet: HashSet<String>? = null // 下载的 url 集合
     private var mDownloadHandler: CompletionHandler<Any>? = null // 下载信息回调
+    private var mExposureEvent: ExposureEvent? = null // 活动曝光实体
 
     init {
         if (mFragment != null) {
@@ -213,7 +217,7 @@ class DefaultJsApi(
                     VHelper.launch(context, packageName)
                 }
             } else {
-                PackageUtils.launchApplicationByPackageName(context, packageName)
+                PackageLauncher.launchApp(context, packageName = packageName)
             }
         }
     }
@@ -624,6 +628,26 @@ class DefaultJsApi(
         }
     }
 
+    @JavascriptInterface
+    fun logExposure(event: Any) {
+        val simpleExposureEvent = event.toString().toObject() ?: SimpleExposureEvent()
+        if (simpleExposureEvent.id.isNotEmpty()) {
+            val exposureSource = ExposureSource("游戏活动", "${simpleExposureEvent.title}+${simpleExposureEvent.id}")
+            mExposureEvent = ExposureEvent.createEvent(
+                gameEntity = null,
+                source = arrayListOf(exposureSource),
+            )
+            ExposureManager.log(mExposureEvent!!)
+        }
+    }
+
+    /**
+     * 获取 ExposureEvent，可能为空
+     */
+    fun getExposureEvent(): ExposureEvent? {
+        return mExposureEvent
+    }
+
     private fun autoUnregisterDownloadObserverIfNeeded(fragment: Fragment?) {
         fragment?.parentFragmentManager?.registerFragmentLifecycleCallbacks(
             object : FragmentManager.FragmentLifecycleCallbacks() {
@@ -676,6 +700,9 @@ class DefaultJsApi(
     @Keep
     internal class TextShareEvent(var text: String = "", var type: String = "")
 
+    @Keep
+    internal class SimpleExposureEvent(var title: String = "", var id: String = "")
+
     @Keep
     internal class InviteFriendsEvent(
         var type: String = "",

app/src/main/java/com/gh/common/DefaultUrlHandler.kt

@@ -15,7 +15,6 @@ import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.LibaoDetailActivity
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
@@ -36,6 +35,7 @@ import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.gh.gamecenter.entity.VideoLinkEntity
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
@@ -51,14 +51,21 @@ object DefaultUrlHandler {
 
     @JvmStatic
     fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
-        return interceptUrl(context, url, entrance, false)
+        return interceptUrl(context, url, null, entrance, false)
     }
 
     /**
+     * 检查并拦截部分内部处理的 url
+     * @param traceEvent 供一些页面用于登记曝光来源的实体
      * @param bringAppToFront 是否需要在不匹配 host 的时候把 APP 调回到前台 (如微信调起)
+     *
+     * @return 是否已拦截处理
      */
     @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String, bringAppToFront: Boolean = false): Boolean {
+    fun interceptUrl(context: Context, url: String,
+                     traceEvent: ExposureEvent? = null,
+                     entrance: String,
+                     bringAppToFront: Boolean = false): Boolean {
         val uri = Uri.parse(url)
         if ("ghzhushou" == uri.scheme) {
             Utils.log("url = $url")
@@ -82,6 +89,7 @@ object DefaultUrlHandler {
                     id = id,
                     tab = uri.getQueryParameter("to"),
                     autoDownload = uri.getQueryParameter("auto_download") == "true",
+                    traceEvent = traceEvent,
                     entrance = entrance
                 )
 
@@ -90,10 +98,11 @@ object DefaultUrlHandler {
                     id,
                     uri.getQueryParameter("name"),
                     false,
+                    null,
                     entrance
                 )
 
-                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
+                "libao" -> DirectUtils.directToGiftDetail(context, id, entrance)
 
                 "qq" -> try {
                     DirectUtils.directToQqConversation(context, id)
@@ -467,7 +476,7 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
-                    DirectUtils.directToGameCollectionDetail(context, id, entrance)
+                    DirectUtils.directToGameCollectionDetail(context, id, entrance, traceEvent = traceEvent)
                 }
 
                 EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {

app/src/main/java/com/gh/common/FixedRateJobHelper.kt

@@ -20,7 +20,7 @@ object FixedRateJobHelper {
     private const val CHECKER_PERIOD: Long = 15 * 1000L
     private const val TIME_PERIOD: Long = 10 * 60 * 1000L
     private const val LOGHUB_PERIOD: Long = 2 * 60 * 1000L
-    private const val EXPOSURE_PERIOD: Long = 5 * 60 * 1000L
+    private const val EXPOSURE_PERIOD: Long = 1 * 60 * 1000L
     private const val REGION_SETTING_PERIOD: Long = 60 * 1000L
     private const val VIDEO_RECORD_PERIOD: Long = 60 * 1000L
 

app/src/main/java/com/gh/common/chain/AutoSwitchAssistantInstallHandler.kt

@@ -0,0 +1,23 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.R
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.feature.entity.GameEntity
+
+class AutoSwitchAssistantInstallHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        if (BrowserInstallHelper.isUseBrowserToInstallEnabled()
+            && BrowserInstallHelper.shouldUseBrowserToInstall()
+            && gameEntity.isSplitXApk()) {
+            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+        }
+        if (hasNext()) {
+            getNext()?.handleRequest(context, gameEntity)
+        } else {
+            processEndCallback?.invoke(null)
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt

@@ -1,6 +1,7 @@
 package com.gh.common.chain
 
 import android.content.Context
+import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -8,14 +9,15 @@ import com.gh.gamecenter.feature.entity.GameEntity
 class BrowserInstallHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        BrowserInstallHelper.showBrowserInstallHintDialog(context, gameEntity.isVGame(), object : EmptyCallback {
-            override fun onCallback() {
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
+        BrowserInstallHelper.showBrowserInstallHintDialog(
+            context,
+            gameEntity.isVGame() || gameEntity.isSplitXApk()
+        ) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
             }
-        })
+        }
     }
 }

app/src/main/java/com/gh/common/chain/UnsupportedFeatureHandler.kt

@@ -0,0 +1,27 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.feature.entity.GameEntity
+
+class UnsupportedFeatureHandler : ChainHandler() {
+
+    override fun handleRequest(
+        context: Context, gameEntity: GameEntity
+    ) {
+        if (shouldShowUnsupportedFeatureDialog()) {
+            DialogHelper.showUnsupportedFeatureDialog(context)
+        } else {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+
+    /**
+     * TODO 检查某个版本是否支持指定的功能
+     */
+    private fun shouldShowUnsupportedFeatureDialog(): Boolean = false
+}

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

@@ -205,9 +205,6 @@ public class Config {
 
         // 加载完设置后刷新下
         PackageHelper.initList();
-
-        // 初始化畅玩相关的东西
-        VHelper.init(HaloApp.getInstance());
     }
 
     @Nullable
@@ -308,6 +305,26 @@ public class Config {
         return mVSetting;
     }
 
+    /**
+     * 请求网络数据，尝试刷新畅玩相关配置
+     */
+    @SuppressLint("CheckResult")
+    public static void refreshVSettingEntity() {
+        RetrofitManager.getInstance()
+                .getVApi().getSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BiResponse<VSetting>() {
+                    @Override
+                    public void onSuccess(VSetting data) {
+                        mVSetting = data;
+                        SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
+
+                        VHelper.init(HaloApp.getInstance());
+                    }
+                });
+    }
+
     @Nullable
     public static GameGuidePopupEntity getGameGuidePopupEntity() {
         return mGameGuidePopupEntity;
@@ -385,16 +402,7 @@ public class Config {
                     }
                 });
 
-        RetrofitManager.getInstance()
-                .getVApi().getSettings(BuildConfig.VERSION_NAME)
-                .subscribeOn(Schedulers.io())
-                .subscribe(new BiResponse<VSetting>() {
-                    @Override
-                    public void onSuccess(VSetting data) {
-                        mVSetting = data;
-                        SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
-                    }
-                });
+        refreshVSettingEntity();
 
         RetrofitManager.getInstance()
                 .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)

app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt

@@ -18,9 +18,9 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
-import com.gh.gamecenter.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity
 import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
 import java.text.SimpleDateFormat

app/src/main/java/com/gh/common/databind/BindingAdapters.java

@@ -19,6 +19,7 @@ import androidx.core.content.ContextCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.gh.common.chain.AutoSwitchAssistantInstallHandler;
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CertificationHandler;
 import com.gh.common.chain.ChainBuilder;
@@ -29,6 +30,7 @@ import com.gh.common.chain.DownloadDialogHelperHandler;
 import com.gh.common.chain.GamePermissionHandler;
 import com.gh.common.chain.OverseaDownloadHandler;
 import com.gh.common.chain.PackageCheckHandler;
+import com.gh.common.chain.UnsupportedFeatureHandler;
 import com.gh.common.chain.ValidateVSpaceHandler;
 import com.gh.common.chain.VersionNumberHandler;
 import com.gh.common.constant.Config;
@@ -45,6 +47,7 @@ import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
+import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.ReservationHelper;
 import com.gh.download.DownloadManager;
@@ -278,68 +281,68 @@ public class BindingAdapters {
         }
     }
 
-    public static void setLiBaoBtn(TextView view, String status) {
-        if (TextUtils.isEmpty(status)) return;
-        switch (status) {
-            case "coming":
-                view.setText(R.string.libao_coming);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "ling":
-                view.setText(R.string.libao_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "tao":
-                view.setText(R.string.libao_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "used_up":
-                view.setText(R.string.libao_used_up);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "finish":
-                view.setText(R.string.libao_finish);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "linged":
-                view.setText(R.string.libao_linged);
-                view.setBackgroundResource(R.drawable.libao_linged_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
-                break;
-            case "taoed":
-                view.setText(R.string.libao_taoed);
-                view.setBackgroundResource(R.drawable.libao_taoed_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
-                break;
-            case "copy":
-                view.setText(R.string.libao_copy);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "repeatLing":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatLinged":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "repeatTao":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatTaoed":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "unshelve":
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText(R.string.libao_unshelve);
-                break;
-            default:
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText("异常");
-        }
-    }
+//    public static void setLiBaoBtn(TextView view, String status) {
+//        if (TextUtils.isEmpty(status)) return;
+//        switch (status) {
+//            case "coming":
+//                view.setText(R.string.libao_coming);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "ling":
+//                view.setText(R.string.libao_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "tao":
+//                view.setText(R.string.libao_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "used_up":
+//                view.setText(R.string.libao_used_up);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "finish":
+//                view.setText(R.string.libao_finish);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "linged":
+//                view.setText(R.string.libao_linged);
+//                view.setBackgroundResource(R.drawable.libao_linged_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
+//                break;
+//            case "taoed":
+//                view.setText(R.string.libao_taoed);
+//                view.setBackgroundResource(R.drawable.libao_taoed_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
+//                break;
+//            case "copy":
+//                view.setText(R.string.libao_copy);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "repeatLing":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatLinged":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "repeatTao":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatTaoed":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "unshelve":
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText(R.string.libao_unshelve);
+//                break;
+//            default:
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText("异常");
+//        }
+//    }
 
     // 大图下的进度条
     public static void setDownloadButton(DownloadButton progressBar,
@@ -398,6 +401,7 @@ public class BindingAdapters {
                             }
 
                             ChainBuilder builder = new ChainBuilder();
+                            builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CheckStoragePermissionHandler());
                             builder.addHandler(new ValidateVSpaceHandler());
@@ -419,6 +423,7 @@ public class BindingAdapters {
                             }
                         } else {
                             ChainBuilder builder = new ChainBuilder();
+                            builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
@@ -457,11 +462,11 @@ public class BindingAdapters {
                         }
 
                         if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity);
+                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity, null);
                             return;
                         }
 
-                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
+                        PackageLauncher.launchApp(v.getContext(), gameEntity, gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
                                 v.getContext(),
@@ -477,7 +482,7 @@ public class BindingAdapters {
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
 
                         if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch(v.getContext(), gameEntity);
+                            VHelper.installOrLaunch(v.getContext(), gameEntity, null);
                             return;
                         }
 

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

@@ -24,6 +24,7 @@ import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -34,7 +35,6 @@ import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.feature.entity.DetectionObjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PackageDialogEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.dialog.BaseDialogFragment

app/src/main/java/com/gh/common/exposure/ExposureListener.kt

@@ -4,6 +4,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.LayoutManager
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import io.reactivex.functions.Consumer
 
@@ -18,7 +20,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
             Consumer(Throwable::printStackTrace)
         )
     }
-    var layoutManager: LinearLayoutManager? = null
+    var layoutManager: LayoutManager? = null
     var visibleState: ExposureThrottleBus.VisibleState? = null
 
     init {
@@ -47,12 +49,28 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
         super.onScrolled(recyclerView, dx, dy)
 
-        if (layoutManager == null) layoutManager = recyclerView.layoutManager as LinearLayoutManager
+        layoutManager = recyclerView.layoutManager
 
-        layoutManager?.run {
-            visibleState =
-                ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
-            throttleBus.postVisibleState(visibleState!!)
+        if (layoutManager != null) {
+            if (layoutManager is LinearLayoutManager) {
+                (layoutManager as LinearLayoutManager).run {
+                    visibleState =
+                        ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
+                    throttleBus.postVisibleState(visibleState!!)
+                }
+            } else if (layoutManager is StaggeredGridLayoutManager) {
+                (recyclerView.layoutManager as StaggeredGridLayoutManager).run {
+                    val firstVisibleItemArray = IntArray(2)
+                    val lastVisibleItemArray = IntArray(2)
+
+                    findFirstVisibleItemPositions(firstVisibleItemArray)
+                    findLastVisibleItemPositions(lastVisibleItemArray)
+
+                    visibleState =
+                        ExposureThrottleBus.VisibleState(firstVisibleItemArray.first(), lastVisibleItemArray.first())
+                    throttleBus.postVisibleState(visibleState!!)
+                }
+            }
         }
     }
 

app/src/main/java/com/gh/common/exposure/ExposureUtils.kt

@@ -48,6 +48,7 @@ object ExposureUtils {
         }
         if (!TextUtils.isEmpty(entity.id)) {
             ExposureManager.log(exposureEvent)
+            ExposureManager.commitSavedExposureEvents(forcedUpload = true)
         }
         return exposureEvent
     }

app/src/main/java/com/gh/common/provider/AppDialogUtilsProviderImpl.kt

@@ -0,0 +1,22 @@
+package com.gh.common.provider
+
+import android.app.Dialog
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IAppDialogUtilsProvider
+
+@Route(path = RouteConsts.provider.appDialogUtils, name = "DialogUtils暴露服务")
+class AppDialogUtilsProviderImpl : IAppDialogUtilsProvider {
+
+    override fun showWaitDialog(context: Context, string: String): Dialog {
+        return DialogUtils.showWaitDialog(context, string)
+    }
+
+
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/ConcernProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.Intent
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.ConcernActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.provider.IConcernProvider
+
+@Route(path = RouteConsts.provider.concern, name = "ConcernActivity暴露服务")
+class ConcernProviderImpl : IConcernProvider {
+
+    override fun getIntent(context: Context, entrance: String): Intent {
+        return ConcernActivity.getIntent(context, entrance)
+    }
+
+    override fun init(context: Context?) {}
+}

app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt

@@ -15,7 +15,7 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
         entrance: String,
         bringAppToFront: Boolean
     ): Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, entrance, bringAppToFront)
+        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront)
     }
 
     override fun init(context: Context?) {

app/src/main/java/com/gh/common/provider/DetailDownloadUtilsProviderImpl.kt

@@ -0,0 +1,70 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.view.View
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DetailDownloadUtils
+import com.gh.gamecenter.adapter.viewholder.DetailViewHolder
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.provider.IDetailDownloadUtilsProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.detailDownloadUtils, name = "DetailDownloadUtils暴露服务")
+class DetailDownloadUtilsProviderImpl : IDetailDownloadUtilsProvider {
+
+    override fun detailInitDownload(
+        contentView: View,
+        gameEntity: GameEntity?,
+        downloadEntity: DownloadEntity?,
+        isNewsDetail: Boolean,
+        entrance: String?,
+        name: String?,
+        title: String?,
+        exposureEvent: ExposureEvent?,
+        isCheck: Boolean
+    ) {
+        return DetailDownloadUtils.detailInitDownload(
+            DetailViewHolder(
+                contentView,
+                gameEntity,
+                downloadEntity,
+                isNewsDetail,
+                entrance,
+                name,
+                title,
+                exposureEvent
+            ),
+            isCheck
+        )
+    }
+
+    override fun detailInitInvalidate(
+        contentView: View,
+        gameEntity: GameEntity,
+        downloadEntity: DownloadEntity,
+        isNewsDetail: Boolean,
+        entrance: String,
+        name: String,
+        title: String,
+        exposureEvent: ExposureEvent?
+    ) {
+        return DetailDownloadUtils.detailInvalidate(
+            DetailViewHolder(
+                contentView,
+                gameEntity,
+                downloadEntity,
+                isNewsDetail,
+                entrance,
+                name,
+                title,
+                exposureEvent
+            )
+        )
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/DeviceTokenUtilsProviderImpl.kt

@@ -0,0 +1,17 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DeviceTokenUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDeviceTokenUtilsProvider
+
+@Route(path = RouteConsts.provider.deviceTokenUtils, name = "DeviceTokenUtils暴露服务")
+class DeviceTokenUtilsProviderImpl : IDeviceTokenUtilsProvider {
+
+    override fun syncServerTime(context: Context) {
+        DeviceTokenUtils.syncServerTime(context)
+    }
+
+    override fun init(context: Context?) {}
+}

app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt

@@ -0,0 +1,119 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.NewFlatLogUtils
+import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.entity.GameUpdateEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
+import com.gh.gamecenter.feature.view.DownloadButton
+import com.gh.gamecenter.packagehelper.PackageRepository
+import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.Utils
+
+@Route(path = RouteConsts.provider.downloadButtonClickedHandler, name = "DownloadButton点击事件暴露服务")
+class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
+    override fun onClicked(downloadButton: DownloadButton) {
+        var gameId = ""
+        var gameName = ""
+        var gameCategory = ""
+        var gameTypeInChinese = ""
+        var downloadStatus = ""
+        var downloadStatusInChinese = ""
+        var gameSchemaType = ""
+        var packageName = ""
+
+        val boundedObject = downloadButton.getObject()
+
+        Utils.log("DownloadButtonClickedProviderImpl", "$downloadButton onClicked ${boundedObject?.javaClass}")
+
+        if (boundedObject != null) {
+            when (boundedObject) {
+                is GameEntity -> {
+                    gameId = boundedObject.id
+                    gameName = boundedObject.name ?: ""
+                    gameCategory = boundedObject.category ?: ""
+                    downloadStatus = if (boundedObject.isVGame()) {
+                        "畅玩"
+                    } else if (boundedObject.downloadStatus == "demo") {
+                        "试玩"
+                    } else {
+                        "下载"
+                    }
+                    gameTypeInChinese = boundedObject.categoryChinese
+                    downloadStatusInChinese = boundedObject.downloadStatusChinese
+                    gameSchemaType = boundedObject.gameBitChinese
+                    packageName = boundedObject.getUniquePackageName() ?: ""
+                }
+
+                is GameUpdateEntity -> {
+                    gameId = boundedObject.id
+                    gameName = boundedObject.name ?: ""
+                    // 下载管理-更新页面，把下载状态都置为下载
+                    downloadStatus = "下载"
+                    gameTypeInChinese = boundedObject.categoryChinese
+                    downloadStatusInChinese = boundedObject.downloadStatusChinese
+                    packageName = boundedObject.packageName
+                }
+
+                is DownloadEntity -> {
+                    gameId = boundedObject.gameId
+                    gameName = boundedObject.name ?: ""
+                    gameCategory = boundedObject.getGameCategory()
+                    downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
+                    packageName = boundedObject.packageName
+                }
+            }
+
+            // 上报 UI 状态为启动的点击事件 (样式为启动，或者文案包含启动都算能启动)
+            if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
+                || downloadButton.text.contains("启动")) {
+
+                // boundedObject 里找不到游戏类型时，尝试从已安装列表中获取
+                if (gameCategory.isEmpty() && packageName.isNotEmpty()) {
+                    gameCategory = PackageRepository.gameInstalled.find { it.packageName == packageName }?.category ?: ""
+                }
+
+                NewFlatLogUtils.logGameLaunchButtonClicked(
+                    gameId = gameId,
+                    gameName = gameName,
+                    location = downloadButton.getWidgetBusinessName(),
+                    gameCategory = gameCategory,
+                    downloadStatus = downloadStatus
+                )
+            }
+
+            // 预约状态不上报
+            if (downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVABLE
+                && downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVED
+            ) {
+
+                // 上报神策点击事件
+                SensorsBridge.trackEvent(
+                    "DownLoadbuttonClick",
+                    "game_id", gameId,
+                    "game_name", gameName,
+                    "game_type", gameTypeInChinese,
+                    "download_status", downloadStatusInChinese,
+                    "button_name", downloadButton.text,
+                    "game_schema_type", gameSchemaType,
+                    "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
+                    "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
+                    "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
+                    "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
+                    "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
+                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
+                )
+            }
+
+        }
+    }
+
+    override fun init(context: Context?) {
+        // do nothing
+    }
+
+}

app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt

@@ -5,7 +5,9 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDownloadManagerProvider
+import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
 
 @Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
 class DownloadManagerProviderImpl : IDownloadManagerProvider {
@@ -18,6 +20,18 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider {
         DownloadManager.getInstance().resumeAllInvisiblePendingTask()
     }
 
+    override fun getStatus(url: String): DownloadStatus {
+        return DownloadManager.getInstance().getStatus(url)
+    }
+
+    override fun addObserver(dataWatcher: DataWatcher) {
+        return DownloadManager.getInstance().addObserver(dataWatcher)
+    }
+
+    override fun removeObserver(dataWatcher: DataWatcher) {
+        return DownloadManager.getInstance().removeObserver(dataWatcher)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/GameDetailProviderImpl.kt

@@ -18,6 +18,16 @@ class GameDetailProviderImpl : IGameDetailProvider {
     ) {
         GameDetailActivity.startGameDetailActivity(context, gameId, entrance, traceEvent)
     }
+
+    override fun startGameDetailActivity(
+        context: Context,
+        gameEntity: GameEntity?,
+        entrance: String,
+        traceEvent: ExposureEvent?
+    ) {
+        GameDetailActivity.startGameDetailActivity(context, gameEntity, entrance, traceEvent)
+    }
+
     override fun startGameDetailActivity(
         context: Context,
         gameEntity: GameEntity?,

app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt

@@ -33,6 +33,10 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
         return PackageUtils.getSideLoadedInfo()
     }
 
+    override fun launchApplicationByPackageName(context: Context, packageName: String) {
+        PackageUtils.launchApplicationByPackageName(context, packageName)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/RegionSettingHelperProviderImpl.kt

@@ -30,6 +30,10 @@ class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
         return RegionSettingHelper.getIpInfo()
     }
 
+    override fun shouldThisGameBeFiltered(gameId: String?): Boolean {
+        return RegionSettingHelper.shouldThisGameBeFiltered(gameId)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/UpdateManagerProviderImpl.kt

@@ -9,7 +9,7 @@ import com.gh.gamecenter.manager.UpdateManager
 
 @Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
 class UpdateManagerProviderImpl: IUpdateManagerProvider {
-    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler) {
+    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler?) {
         UpdateManager.getInstance(context).checkUpdate(isAutoCheck, handler)
     }
 

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

@@ -1,7 +1,7 @@
 package com.gh.common.util
 
 import android.text.TextUtils
-import com.gh.gamecenter.eventbus.EBConcernChanged
+import com.gh.gamecenter.common.eventbus.EBConcernChanged
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -38,7 +38,12 @@ object ConcernUtils {
                 override fun onResponse(response: ResponseBody?) {
                     super.onResponse(response)
                     listener?.onSuccess()
-                    EventBus.getDefault().post(EBConcernChanged(gameId, true))
+                    EventBus.getDefault().post(
+                        EBConcernChanged(
+                            gameId,
+                            true
+                        )
+                    )
                 }
 
                 override fun onFailure(e: HttpException?) {
@@ -57,7 +62,12 @@ object ConcernUtils {
                 override fun onResponse(response: ResponseBody?) {
                     super.onResponse(response)
                     listener?.onSuccess()
-                    EventBus.getDefault().post(EBConcernChanged(gameId, false))
+                    EventBus.getDefault().post(
+                        EBConcernChanged(
+                            gameId,
+                            false
+                        )
+                    )
                 }
 
                 override fun onFailure(e: HttpException?) {

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

@@ -57,8 +57,7 @@ public class DataUtils {
             return;
         }
 
-        // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化
-        AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel));
+        initSentry(context, channel);
     }
 
     private static void initSentry(Context context, String channel) {

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

@@ -8,6 +8,7 @@ import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
+import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
@@ -24,6 +25,8 @@ import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 
+import java.util.Objects;
+
 /**
  * Created by khy on 27/06/17.
  * 详情下载工具类
@@ -42,9 +45,7 @@ public class DetailDownloadUtils {
             viewHolder.mMultiVersionDownloadTv.setVisibility(View.GONE);
         }
 
-        if (viewHolder.gameEntity != null
-                && Config.isShowDownload(viewHolder.gameEntity.getId())
-                && !"光环助手".equals(viewHolder.gameEntity.getName())) {
+        if (viewHolder.gameEntity != null && Config.isShowDownload(viewHolder.gameEntity.getId()) && !"光环助手".equals(viewHolder.gameEntity.getName())) {
             viewHolder.downloadBottom.setVisibility(View.VISIBLE);
         } else {
             viewHolder.downloadBottom.setVisibility(View.GONE);
@@ -233,6 +234,13 @@ public class DetailDownloadUtils {
         DownloadEntity downloadEntity = viewHolder.downloadEntity;
         String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
 
+        if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus) && XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
+            viewHolder.mDownloadPb.setText("游戏安装中");
+            viewHolder.mDownloadPb.setProgress(100);
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+            return;
+        }
+
         if (XapkUnzipStatus.UNZIPPING.name().equals(xapkStatus)) {
             String percent = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_PERCENT);
             viewHolder.mDownloadPb.setText("游戏解压中 " + percent + "%");
@@ -286,7 +294,7 @@ public class DetailDownloadUtils {
                         viewHolder.mDownloadPb.setText(R.string.launch);
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     } else {
-                        if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) {
+                        if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
                             viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                         } else {
                             viewHolder.mDownloadPb.setText(R.string.install);
@@ -307,13 +315,12 @@ public class DetailDownloadUtils {
                         }
                     }
                 } else {
-                    if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) {
+                    if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
                         viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                     } else {
                         viewHolder.mDownloadPb.setText(R.string.install);
                     }
-                    if (downloadEntity.isPluggable()
-                            && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
+                    if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                     } else {
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);

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

@@ -57,6 +57,7 @@ import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;

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

@@ -9,6 +9,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
@@ -21,6 +22,7 @@ import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_NAME
 import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
 import com.gh.gamecenter.common.constant.CommonConsts
 import com.gh.gamecenter.common.constant.Constants
@@ -28,17 +30,19 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.EntranceConsts.*
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.*
-import com.gh.gamecenter.common.entity.Display
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.discovery.DiscoveryActivity
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
-import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameDetailServer
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.LibaoEntity
 import com.gh.gamecenter.feature.entity.MeEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
@@ -51,12 +55,14 @@ import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActi
 import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailActivity
 import com.gh.gamecenter.game.upload.GameSubmissionActivity
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
+import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
 import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
+import com.gh.gamecenter.libao.view.LibaoFragment
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
@@ -90,6 +96,7 @@ import org.greenrobot.eventbus.EventBus
 import retrofit2.HttpException
 import java.net.URLEncoder
 import java.util.*
+import kotlin.collections.ArrayList
 import kotlin.math.roundToInt
 
 /**
@@ -219,8 +226,9 @@ object DirectUtils {
                     )
                 } else {
                     directToGameDetail(
-                        context, linkEntity.link
-                            ?: "", BaseActivity.mergeEntranceAndPath(entrance, path)
+                        context,
+                        linkEntity.link ?: "",
+                        entrance = BaseActivity.mergeEntranceAndPath(entrance, path)
                     )
                 }
             }
@@ -316,7 +324,7 @@ object DirectUtils {
                 )
             }
 
-            "column_collection", "专题合集" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance)
+            "column_collection", "专题合集" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance, "", exposureEvent)
 
             "server", "game_server", "开服表" -> directToGameServers(context, entrance, path, exposureEvent)
 
@@ -444,7 +452,7 @@ object DirectUtils {
                 context,
                 linkEntity.link ?: "",
                 entrance,
-                exposureEvent = exposureEvent
+                traceEvent = exposureEvent
             )
 
             "explore_column", "game_explore" -> context.startActivity(
@@ -513,7 +521,8 @@ object DirectUtils {
         id: String,
         position: Int = -1,
         entrance: String,
-        columnName: String = ""
+        columnName: String = "",
+        exposureEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
@@ -522,6 +531,9 @@ object DirectUtils {
         bundle.putString(KEY_COLLECTION_ID, id)
         bundle.putString(KEY_COLUMNNAME, columnName)
         bundle.putInt(KEY_POSITION, position)
+        if (exposureEvent != null) {
+            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST ,ArrayList(exposureEvent.source))
+        }
         jumpActivity(context, bundle)
     }
 
@@ -1000,29 +1012,6 @@ object DirectUtils {
 
     }
 
-    /**
-     * 跳转到 礼包详情
-     */
-    @JvmStatic
-    fun directToGiftDetail(context: Context, giftId: String, entrance: String? = null) {
-        if (giftId.isEmpty()) return
-        val bundle = Bundle()
-        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName)
-        bundle.putString(EntranceConsts.KEY_ID, giftId)
-        HaloApp.put(LibaoEntity.TAG, null)
-        jumpActivity(context, bundle)
-    }
-
-    /**
-     * 跳转到礼包中心，请不要随意修改方法名
-     */
-    @JvmStatic
-    fun directToGift(context: Context, entrance: String) {
-        val intent = LibaoActivity.getIntent(context, entrance)
-        context.startActivity(intent)
-    }
-
     /**
      * 切换到社区页面（旧社区页面已经没有了，处理为跳转到论坛详情）
      */
@@ -1877,7 +1866,9 @@ object DirectUtils {
         entrance: String = "",
         forumName: String = "",
         gameCollectionTitle: String = "",
-        gameCollectionId: String = ""
+        gameCollectionId: String = "",
+        collectionName: String = "",
+        collectionId: String = ""
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_TO, GameCollectionSquareActivity::class.java.name)
@@ -1885,6 +1876,19 @@ object DirectUtils {
         bundle.putString(KEY_FORUM_NAME, forumName)
         bundle.putString(KEY_GAME_COLLECTION_TITLE, gameCollectionTitle)
         bundle.putString(KEY_GAME_COLLECTION_ID, gameCollectionId)
+        bundle.putString(KEY_COLLECTION_ID, collectionId)
+        bundle.putString(KEY_COLLECTION_NAME, collectionName)
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转至游戏单热榜
+     */
+    @JvmStatic
+    fun directToGameCollectionHotList(context: Context, entrance: String = "") {
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, GameCollectionHotListActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, entrance)
         jumpActivity(context, bundle)
     }
 
@@ -1897,15 +1901,20 @@ object DirectUtils {
         id: String,
         entrance: String? = null,
         path: String? = null,
-        exposureEvent: ExposureEvent? = null
+        traceEvent: ExposureEvent? = null,
     ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
+        val exposureSourceList = traceEvent?.source
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_TO, GameCollectionDetailActivity::class.java.name)
         bundle.putString(KEY_GAME_COLLECTION_ID, id)
-        exposureEvent?.let { bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source)) }
+        if (exposureSourceList is ArrayList) {
+            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, exposureSourceList)
+        } else if (exposureSourceList != null) {
+            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureSourceList))
+        }
         jumpActivity(context, bundle)
     }
 
@@ -2030,4 +2039,75 @@ object DirectUtils {
             platform = platform
         )
     }
+
+    /**
+     * 跳转到礼包页
+     * @param context 上下文
+     * @param entrance
+     */
+    @JvmStatic
+    fun directToGift(
+        context: Context,
+        entrance: String
+    ) {
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withString(NORMAL_FRAGMENT_NAME, LibaoFragment::class.java.canonicalName)
+            .navigation(context)
+    }
+
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param libaoEntity 礼包信息
+     * @param isClickReceiveBtnIn
+     * @param entrance
+     */
+    @JvmStatic
+    @JvmOverloads
+    fun directToGiftDetail(
+        context: Context,
+        libaoEntity: LibaoEntity,
+        isClickReceiveBtnIn: Boolean = false,
+        entrance: String,
+        requestCode: Int = -1,
+    ) {
+        if (context !is Activity) return
+
+        HaloApp.put(LibaoEntity.TAG, libaoEntity)
+
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoDetailActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withBoolean(KEY_IS_CLICK_RECEIVE_BTN, isClickReceiveBtnIn)
+            .navigation(context, requestCode, null)
+    }
+
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param id 礼包ID
+     * @param entrance
+     */
+    @JvmStatic
+    fun directToGiftDetail(
+        context: Context,
+        giftId: String,
+        entrance: String? = null
+    ) {
+        if (giftId.isEmpty()) return
+
+        HaloApp.put(LibaoEntity.TAG, null)
+
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoDetailActivity)
+            .withString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+            .withString(KEY_ID, giftId)
+            .navigation(context)
+
+    }
 }

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

@@ -3,6 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import android.os.Build
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity

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

@@ -18,13 +18,14 @@ import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkInstaller.cancelUnzipTask
+import com.gh.common.xapk.XapkInstaller.isInstalling
 import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
+import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
-import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@@ -163,6 +164,8 @@ object DownloadItemUtils {
         briefStyle: String? = null,
         isShowRecommendStar: Boolean = false
     ) {
+        holder.gameDownloadBtn.putObject(gameEntity)
+
         // 显示预约
         if (gameEntity.isReservable) {
             holder.multiVersionDownloadTv?.visibility = View.GONE
@@ -263,18 +266,17 @@ object DownloadItemUtils {
                 }
             }
         } else if (gameEntity.getApk().size == 1) {
+            // 优先从下载管理获取 downloadEntity
             var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
 
+            // 找不到时，若类型为畅玩，尝试从畅玩数据库的快照中获取 downloadEntity。若存在，代表游戏已下载并成功安装
             if (downloadEntity == null && gameEntity.isVGame()) {
                 downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
             }
 
+            // 还是找不到时，尝试从 gameEntity 里找已绑定的 downloadEntity
             if (downloadEntity == null) {
-                val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
-                val apkEntity = gameEntity.getApk()[0]
-                if (entryMap.isNotEmpty()) {
-                    downloadEntity = entryMap[apkEntity.getPlatform()]
-                }
+                downloadEntity = gameEntity.getEntryMap().getOrDefault(gameEntity.getUniquePlatform(), null)
             }
 
             if (downloadEntity != null) {
@@ -297,6 +299,25 @@ object DownloadItemUtils {
                                         DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
                                     }
                             } else {
+                                val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
+                                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
+                                    progress = 100
+                                    setText(R.string.installing)
+                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
+                                    return
+                                }
+                                if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
+                                    val percent = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_PERCENT]
+                                    progress = (java.lang.Float.valueOf(percent) * 10).toInt()
+                                    text = "$percent%"
+                                    buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
+                                    return
+                                } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
+                                    setText(R.string.install)
+                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
+                                    return
+                                }
+
                                 buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                 setText(R.string.install)
                             }
@@ -307,6 +328,7 @@ object DownloadItemUtils {
                                     DownloadButton.ButtonStyle.NORMAL
                                 }
                         }
+
                         DownloadStatus.pause,
                         DownloadStatus.timeout,
                         DownloadStatus.neterror,
@@ -317,9 +339,11 @@ object DownloadItemUtils {
                             buttonStyle = DownloadButton.ButtonStyle.NORMAL
                             setText(R.string.resume)
                         }
+
                         DownloadStatus.cancel -> {
                             GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
                         }
+
                         else -> {
                             // do nothing
                         }
@@ -396,7 +420,7 @@ object DownloadItemUtils {
     }
 
     // 更改进度条和提示文本的状态
-    fun changeStatus(
+    private fun changeStatus(
         context: Context,
         holder: GameViewHolder,
         downloadEntity: DownloadEntity,
@@ -421,6 +445,7 @@ object DownloadItemUtils {
                     holder.gameDownloadBtn.text = downloadEntity.percent.toString() + "%"
                 }
             }
+
             DownloadStatus.waiting -> {
                 if (isMultiVersion) {
                     holder.gameDownloadTips?.visibility = View.VISIBLE
@@ -429,6 +454,7 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.WAITING
                 holder.gameDownloadBtn.text = context.getString(R.string.waiting)
             }
+
             DownloadStatus.pause,
             DownloadStatus.timeout,
             DownloadStatus.neterror,
@@ -443,6 +469,7 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 holder.gameDownloadBtn.text = context.getString(R.string.resume)
             }
+
             DownloadStatus.done -> {
                 if (isMultiVersion) {
                     holder.gameDownloadTips?.visibility = View.VISIBLE
@@ -462,6 +489,7 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn.progress = 1000
                 holder.gameDownloadBtn.setText(R.string.hundred_percent)
             }
+
             else -> {
                 holder.gameDownloadTips?.visibility = View.GONE
             }
@@ -592,13 +620,15 @@ object DownloadItemUtils {
         refreshCallback: EmptyCallback?,
         allStateClickCallback: EmptyCallback?
     ) {
+        // 为 downloadButton 添加游戏实体，供点击的时候上报用
+        downloadBtn.putObject(gameEntity)
+
         val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
             GamePermissionDialogFragment::class.java.name
         ) as GamePermissionDialogFragment?
         gamePermissionDialogFragment?.dismissAllowingStateLoss()
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
             downloadBtn.setOnClickListener {
-                logDownloadButtonClick(gameEntity, downloadBtn)
                 DialogHelper.showDialog(
                     context,
                     "提示",
@@ -618,7 +648,6 @@ object DownloadItemUtils {
         if (gameEntity.isSpecialDownload()) {
             val info = RegionSettingHelper.getGameSpecialDownloadInfo(gameEntity.id) ?: return
             downloadBtn.setOnClickListener {
-                logDownloadButtonClick(gameEntity, downloadBtn)
                 DialogHelper.showDialog(
                     context,
                     "提示",
@@ -659,14 +688,12 @@ object DownloadItemUtils {
                         ReservationHelper.reserve(
                             context,
                             gameEntity.id,
-                            gameEntity.name ?: "",
-                            object : EmptyCallback {
-                                override fun onCallback() {
-                                    LogUtils.logReservation(gameEntity, traceEvent)
-                                    adapter?.notifyItemChanged(position)
-                                    refreshCallback?.onCallback()
-                                }
-                            })
+                            gameEntity.name ?: ""
+                        ) {
+                            LogUtils.logReservation(gameEntity, traceEvent)
+                            adapter?.notifyItemChanged(position)
+                            refreshCallback?.onCallback()
+                        }
                     }
                 }
             } else {
@@ -708,16 +735,13 @@ object DownloadItemUtils {
         val gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id)
         if (gameH5Download != null) {
             downloadBtn.setOnClickListener {
-                logDownloadButtonClick(gameEntity, downloadBtn)
                 DialogUtils.showGameH5DownloadDialog(context, gameEntity, gameH5Download)
             }
             return
         }
         if (gameEntity.getApk().size == 0 && gameEntity.h5Link != null) {
             downloadBtn.setOnClickListener {
-                logDownloadButtonClick(gameEntity, downloadBtn)
                 allStateClickCallback?.onCallback()
-                MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.name)
                 val linkEntity = gameEntity.h5Link
                 val isPlay = "play" == linkEntity!!.type // 是否为开始玩
                 if (isPlay) {
@@ -734,7 +758,6 @@ object DownloadItemUtils {
             }
         } else if (gameEntity.getApk().size == 1) {
             downloadBtn.setOnClickListener {
-                logDownloadButtonClick(gameEntity, downloadBtn)
                 val clickRunnable = EmptyCallback {
                     allStateClickCallback?.onCallback()
                     clickCallback?.onCallback()
@@ -795,6 +818,7 @@ object DownloadItemUtils {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
         if (str == context.getString(R.string.download)) {
             ChainBuilder().apply {
+                addHandler(UnsupportedFeatureHandler())
                 addHandler(UpdateNewSimulatorHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(BrowserInstallHandler())
@@ -812,6 +836,7 @@ object DownloadItemUtils {
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.attempt)) {
             ChainBuilder().apply {
+                addHandler(UnsupportedFeatureHandler())
                 addHandler(UpdateNewSimulatorHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(BrowserInstallHandler())
@@ -830,6 +855,7 @@ object DownloadItemUtils {
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.smooth)) {
             ChainBuilder().apply {
+                addHandler(UnsupportedFeatureHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(PackageCheckHandler())
                 addHandler(DownloadDialogHelperHandler())
@@ -846,9 +872,6 @@ object DownloadItemUtils {
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity)
         } else if (str.contains("化")) {
-            if (entrance.contains("我的游戏")) {
-                MtaHelper.onEvent("我的游戏_启动", "插件化", gameEntity.name)
-            }
             if (gameEntity.pluggableCollection != null) {
                 DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
             } else {
@@ -913,42 +936,40 @@ object DownloadItemUtils {
                 VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
                 return
             }
-
-            if (entrance.contains("我的游戏")) {
-                MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
-            }
-            PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
+            PackageLauncher.launchApp(context, gameEntity, gameEntity.getApk()[0].packageName)
         } else if (str == context.getString(R.string.update)) {
-            if (entrance.contains("我的游戏")) {
-                MtaHelper.onEvent("我的游戏_启动", "更新", gameEntity.name)
-            }
             if (gameEntity.isVGame()) {
                 VHelper.updateOrReDownload(gameEntity)
                 return
             }
-            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-                override fun onCallback() {
-                    DialogUtils.checkDownload(
-                        context,
-                        apk.size,
-                        gameEntity.id,
-                        gameEntity.name
-                    ) { isSubscribe: Boolean ->
-                        update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
-                    }
-                }
-            })
-        } else {
-            var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
-            if (downloadEntity == null && gameEntity.getApk().size == 1) {
-                val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
-                val apkEntity = gameEntity.getApk()[0]
-                if (entryMap.isNotEmpty()) {
-                    downloadEntity = entryMap[apkEntity.getPlatform()]
+            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
+                DialogUtils.checkDownload(
+                    context,
+                    apk.size,
+                    gameEntity.id,
+                    gameEntity.name
+                ) { isSubscribe: Boolean ->
+                    update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
                 }
             }
+        } else {
+            var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+
+            // 找不到时，若类型为畅玩，尝试从畅玩数据库的快照中获取 downloadEntity。若存在，代表游戏已下载并成功安装
+            if (downloadEntity == null && gameEntity.isVGame()) {
+                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+            }
+
+            // 还是找不到时，尝试从 gameEntity 里找已绑定的 downloadEntity
+            if (downloadEntity == null) {
+                downloadEntity = gameEntity.getEntryMap().getOrDefault(gameEntity.getUniquePlatform(), null)
+            }
+
             if (downloadEntity != null) {
                 val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
+                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {// 安装过程中避免重复点击
+                    return
+                }
                 if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
                     cancelUnzipTask(downloadEntity)
                     return
@@ -957,9 +978,11 @@ object DownloadItemUtils {
                     context.getString(R.string.resume) -> {
                         DownloadManager.getInstance().resume(downloadEntity, true)
                     }
+
                     context.getString(R.string.waiting) -> {
                         Utils.toast(context, "最多只能同时下载三个任务，请稍等")
                     }
+
                     else -> {
                         DownloadManager.getInstance().pause(downloadEntity.url)
                     }
@@ -980,7 +1003,7 @@ object DownloadItemUtils {
     ) {
         if (gameEntity.getApk().isEmpty()) return
 
-        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
+        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size ?: "")
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(
                 context,
@@ -991,6 +1014,9 @@ object DownloadItemUtils {
                 isSubscribe,
                 traceEvent
             )
+            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+            }
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             if (downloadBtn is DownloadButton) {
                 downloadBtn.text = "0%"
@@ -1012,9 +1038,12 @@ object DownloadItemUtils {
         isSubscribe: Boolean,
         traceEvent: ExposureEvent?
     ) {
-        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
+        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size ?: "")
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
+            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+            }
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             if (downloadBtn is DownloadButton) {
                 downloadBtn.setText(R.string.downloading)
@@ -1045,9 +1074,11 @@ object DownloadItemUtils {
                     adapter?.notifyItemChanged(position)
                     refreshCallback?.onCallback()
                 }
+
                 PackageUtils.isCanPluggable(apkEntity) -> {
-                    DialogHelper.showPluginDialog(context) { PackageInstaller.uninstall(context, path) }
+                    DialogHelper.showPluginDialog(context, gameEntity.pluginDesc) { PackageInstaller.uninstall(context, path) }
                 }
+
                 else -> {
                     PackageInstaller.install(context, downloadEntity)
                 }
@@ -1066,23 +1097,4 @@ object DownloadItemUtils {
     ) {
         DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
     }
-
-    private fun logDownloadButtonClick(gameEntity: GameEntity, downloadBtn: View) {
-        val buttonName = if (downloadBtn is DownloadButton) downloadBtn.text else ""
-        SensorsBridge.trackEvent(
-            "DownLoadbuttonClick",
-            "game_id", gameEntity.id,
-            "game_name", gameEntity.name ?: "",
-            "game_type", gameEntity.categoryChinese,
-            "download_status", gameEntity.downloadStatusChinese,
-            "button_name", buttonName,
-            "game_schema_type", gameEntity.gameBitChinese,
-            "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
-            "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
-            "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
-            "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
-            "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
-            "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
-        )
-    }
 }

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

@@ -16,26 +16,20 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.eventbus.EBShowDialog
-import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
-import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.pkg.PkgHelper
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.*
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import okhttp3.MediaType
-import okhttp3.RequestBody
 import org.greenrobot.eventbus.EventBus
-import org.json.JSONObject
 
 object DownloadObserver {
 
@@ -45,7 +39,7 @@ object DownloadObserver {
     // TODO 修复因为更改内存对象造成的双重下载完成事件问题，具体触发代码见 DownloadDao.updateSnapshotList
     private var mDoneDebouncePair: Pair<String, Long>? = null
 
-    private const val TEA_EVENT_DOWNLOAD_COMPLETE = "game_addiction"
+    private const val CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED = "CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED"
 
     // 如果在WIFI状态下,下载自动暂停,则再重试一遍
     @JvmStatic
@@ -210,10 +204,7 @@ object DownloadObserver {
         } else {
             statDoneEvent(downloadEntity)
 
-            if (!SPUtils.getBoolean(TEA_EVENT_DOWNLOAD_COMPLETE)) {
-                HaloApp.getInstance().flavorProvider.logEvent(TEA_EVENT_DOWNLOAD_COMPLETE)
-                SPUtils.setBoolean(TEA_EVENT_DOWNLOAD_COMPLETE, true)
-            }
+            logCoreEventIfNeeded(downloadEntity.getGameCategory())
 
             GameActivityDownloadHelper.clear()
 
@@ -226,7 +217,8 @@ object DownloadObserver {
                         EventBus.getDefault().post(
                             EBShowDialog(
                                 BaseActivity.PLUGGABLE,
-                                downloadEntity.path
+                                downloadEntity.path,
+                                downloadEntity.pluginDesc
                             )
                         )
                     downloadEntity.isPlugin -> Utils.toast(
@@ -296,7 +288,8 @@ object DownloadObserver {
                                     EventBus.getDefault().post(
                                         EBShowDialog(
                                             BaseActivity.PLUGGABLE,
-                                            downloadEntity.path
+                                            downloadEntity.path,
+                                            downloadEntity.pluginDesc
                                         )
                                     )
                                 } else {
@@ -392,7 +385,7 @@ object DownloadObserver {
                 "DownloadProcessFinish",
                 "game_id", downloadEntity.gameId,
                 "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
-                "game_type", downloadEntity.meta[Constants.GAME_TYPE] ?: "",
+                "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
                 "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位",
                 "page_name", getCurrentPageEntity().pageName,
                 "page_id", getCurrentPageEntity().pageId,
@@ -452,4 +445,21 @@ object DownloadObserver {
         DataLogUtils.uploadHijack(mApplication, downloadEntity)
     }
 
+    /**
+     * 根据预设的游戏类型上报关键事件(下载完成事件)
+     */
+    private fun logCoreEventIfNeeded(gameCategory: String) {
+        val category = PkgHelper.getCoreEventGameCategory()
+        val categoryMatched = if (category == "standard" || category.isNullOrEmpty()) {
+            true
+        } else {
+            gameCategory == category
+        }
+
+        if (!SPUtils.getBoolean(CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED) && categoryMatched) {
+            HaloApp.getInstance().flavorProvider.logCoreEvent()
+            SPUtils.setBoolean(CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED, true)
+        }
+    }
+
 }

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

@@ -18,7 +18,6 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.ErrorEntity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.login.user.LoginTag
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.halo.assistant.fragment.user.VerifyPhoneFragment
 import com.lightgame.utils.AppManager

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

@@ -15,16 +15,14 @@ import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
+import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.retrofit.ApiResponse
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.common.utils.DataLogUtils
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.observableToMain
-import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.EmptyCallback
@@ -182,6 +180,9 @@ object GameActivityDownloadHelper {
             str != context.getString(R.string.install) &&
             str != context.getString(R.string.launch)
         ) {
+            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+            }
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             when {
@@ -204,6 +205,9 @@ object GameActivityDownloadHelper {
                     handleUpdateStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
                 else -> {
+                    if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+                        ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+                    }
                     ToastUtils.toast("${gameEntity.name}已加入下载队列")
                 }
             }
@@ -348,7 +352,7 @@ object GameActivityDownloadHelper {
         if (entrance.contains("我的游戏")) {
             MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
         }
-        PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
+        PackageLauncher.launchApp(context, gameEntity, gameEntity.getApk()[0].packageName)
     }
 
     // 处理更新状态
@@ -423,6 +427,9 @@ object GameActivityDownloadHelper {
                     R.string.download
                 ), entrance, location, isSubscribe, traceEvent
             )
+            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+            }
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
@@ -442,6 +449,9 @@ object GameActivityDownloadHelper {
         val msg = FileUtils.isCanDownload(context, apk.size)
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, apk, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
+            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+            }
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
@@ -463,7 +473,7 @@ object GameActivityDownloadHelper {
                 gameEntity.getEntryMap().remove(apkEntity.getPlatform())
             }
             PackageUtils.isCanPluggable(apkEntity) -> {
-                DialogHelper.showPluginDialog(context) { PackageInstaller.uninstall(context, path) }
+                DialogHelper.showPluginDialog(context, gameEntity.pluginDesc) { PackageInstaller.uninstall(context, path) }
             }
             else -> {
                 PackageInstaller.install(context, downloadEntity)
@@ -482,6 +492,9 @@ object GameActivityDownloadHelper {
         traceEvent: ExposureEvent?
     ) {
         DownloadManager.createDownload(context, apk, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
+        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+        }
         ToastUtils.toast("${gameEntity.name}已加入下载队列")
     }
 

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

@@ -8,6 +8,7 @@ import androidx.annotation.WorkerThread;
 
 import com.gh.common.constant.Config;
 import com.gh.common.simulator.SimulatorGameManager;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
@@ -180,7 +181,8 @@ public class GameUtils {
             if (gameEntity.isVGame()) {
                 return context.getString(R.string.smooth);
             } else {
-                if ("smooth".equals(gameEntity.getDownloadStatus())) {
+                if (Constants.V_GAME.equals(gameEntity.getDownloadStatus())
+                        || Constants.V_GAME_32.equals(gameEntity.getDownloadStatus())) {
                     GameEntity.GameCategory gameCategory = gameEntity.getGameCategory();
                     if (gameCategory.equals(GameEntity.GameCategory.ONLINE_GAME)
                             || gameCategory.equals(GameEntity.GameCategory.INTERNATIONAL_ONLINE_GAME)) {

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

@@ -10,7 +10,9 @@ import android.os.Message;
 import android.text.TextUtils;
 
 import com.gh.download.DownloadManager;
-import com.gh.gamecenter.eventbus.EBPackage;
+import com.gh.common.util.PackageUtils;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.common.eventbus.EBPackage;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.DownloadEntity;
 

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

@@ -23,6 +23,9 @@ object NewFlatLogUtils {
     private const val KEY_TEXT = "text"
     private const val KEY_BUTTON_TYPE = "button_type"
     private const val KEY_BBS_ID = "bbs_id"
+    private const val KEY_GAME_CATEGORY = "game_category"
+    private const val KEY_DOWNLOAD_STATE = "download_state"
+    private const val KEY_LOCATION = "location"
 
     private const val EVENT_LOGIN_FROM_GHZS_SHOW = "halo_fun_login_from_ghzs_show"
     private const val EVENT_LOGIN_FROM_GHZS_CLICK = "halo_fun_login_from_ghzs_click"
@@ -118,7 +121,7 @@ object NewFlatLogUtils {
     fun logHaloFunGameDetailJumpClick(downloadStatus: String, gameId: String) {
         val json = json {
             KEY_EVENT to "halo_fun_game_detail_jump_click"
-            "download_state" to downloadStatus
+            KEY_DOWNLOAD_STATE to downloadStatus
             KEY_GAME_ID to gameId
             parseAndPutMeta().invoke(this)
         }
@@ -684,7 +687,7 @@ object NewFlatLogUtils {
         val json = json {
             KEY_EVENT to "halo_self_publish_content"
             "tab_name" to tabName
-            "location" to location
+            KEY_LOCATION to location
             parseAndPutMeta().invoke(this)
         }
         log(json)
@@ -1052,10 +1055,11 @@ object NewFlatLogUtils {
     }
 
     //游戏单广场浏览时长
-    fun logGameCollectSquareStayTime(interval: Long) {
+    fun logGameCollectSquareStayTime(interval: Long, source: String) {
         val json = json {
             KEY_EVENT to "game_collect_square_stay_time"
             "interval" to interval
+            "source" to source
             parseAndPutMeta().invoke(this)
         }
         log(json)
@@ -1479,7 +1483,7 @@ object NewFlatLogUtils {
     ) {
         val json = json {
             KEY_EVENT to "game_detail_comment_tab_game_comment_click"
-            "location" to location
+            KEY_LOCATION to location
             "tag" to tag
             "filter_tag_name" to filter
             "button" to button
@@ -1521,7 +1525,7 @@ object NewFlatLogUtils {
     ) {
         val json = json {
             KEY_EVENT to "game_detail_comment_tab_game_comment_detail_click"
-            "location" to location
+            KEY_LOCATION to location
             "tag" to tag
             "filter_tag_name" to filter
             "button" to button
@@ -1623,7 +1627,7 @@ object NewFlatLogUtils {
         val json = json {
             "event" to "game_test_detail_game_category_click"
             "tab_name" to tabName
-            "game_category" to gameCategory
+            KEY_GAME_CATEGORY to gameCategory
             "game_test_start_type" to gameTestStartType
             parseAndPutMeta().invoke(this)
         }
@@ -1658,7 +1662,7 @@ object NewFlatLogUtils {
         val json = json {
             "event" to "game_test_home_more_click"
             "text" to text //右上角文案，包括：全部、更多
-            "location" to location //新游开测所处位置，包括：首页、版块
+            KEY_LOCATION to location //新游开测所处位置，包括：首页、版块
             "block_id" to blockId //新游开测所处位置为“版块”，上报版块ID
             "block_name" to blockName //新游开测所处位置为“版块”，上报版块名称
             "link_type" to linkType //右上角文案为“更多”时的链接类型
@@ -1685,7 +1689,7 @@ object NewFlatLogUtils {
     ) {
         val json = json {
             "event" to "game_test_home_recommend_tag_click"
-            "location" to location //新游开测所处位置，包括：首页、版块
+            KEY_LOCATION to location //新游开测所处位置，包括：首页、版块
             "block_id" to blockId //新游开测所处位置为“版块”，上报版块ID
             "block_name" to blockName //新游开测所处位置为“版块”，上报版块名称
             "tag_id" to tagId //点击推荐标签的ID
@@ -1733,7 +1737,7 @@ object NewFlatLogUtils {
     ) {
         val json = json {
             "event" to "game_test_home_view"
-            "location" to location //新游开测所处位置，包括：首页、版块
+            KEY_LOCATION to location //新游开测所处位置，包括：首页、版块
             "block_id" to blockId //新游开测所处位置为“版块”，上报版块ID
             "block_name" to blockName //新游开测所处位置为“版块”，上报版块名称
             "interval" to interval //内容在屏幕可见范围完整展示的时长
@@ -1988,7 +1992,7 @@ object NewFlatLogUtils {
             "type" to homeSubSlide.cardType
             "text" to homeSubSlide.cardText
             "count_num" to countNum
-            "location" to location
+            KEY_LOCATION to location
             "link_type" to homeSubSlide.linkType
             "link_id" to homeSubSlide.linkId
             "link_text" to homeSubSlide.linkText
@@ -2185,4 +2189,155 @@ object NewFlatLogUtils {
         }
         log(json, "event", false)
     }
+
+    // 游戏单广场刷新
+    @JvmStatic
+    fun logGameCollectionSquareFlush(action: String, countNum: Int) {
+        val json = json {
+            KEY_EVENT to "game_list_square_flush"
+            "action" to action
+            "count_num" to countNum
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 游戏详情点击公告文章
+    @JvmStatic
+    fun logGameDetailNoticeClick(gameId: String, gameName: String, linkId: String, linkType: String, linkText: String) {
+        val json = json {
+            KEY_EVENT to "game_detail_notice_click"
+            KEY_GAME_ID to gameId
+            KEY_GAME_NAME to gameName
+            "link_id" to linkId
+            "link_type" to linkType
+            "link_text" to linkText
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 启动游戏(UI被点击)
+    fun logGameLaunchButtonClicked(
+        gameId: String,
+        gameName: String,
+        location: String,
+        gameCategory: String,
+        downloadStatus: String
+    ) {
+        val json = json {
+            KEY_EVENT to "game_launch_button_click"
+            KEY_GAME_ID to gameId
+            KEY_GAME_NAME to gameName
+            KEY_LOCATION to location
+            KEY_GAME_CATEGORY to gameCategory
+            KEY_DOWNLOAD_STATE to downloadStatus
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 启动游戏(具体实现逻辑)
+    fun logGameLaunch(
+        gameId: String,
+        gameName: String,
+        gameCategory: String,
+        downloadStatus: String
+    ) {
+        val json = json {
+            KEY_EVENT to "game_launch"
+            KEY_GAME_ID to gameId
+            KEY_GAME_NAME to gameName
+            KEY_GAME_CATEGORY to gameCategory
+            KEY_DOWNLOAD_STATE to downloadStatus
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 进入游戏单热榜
+    @JvmStatic
+    fun logGameCollectionHotListEnter(entrance: String) {
+        val json = json {
+            KEY_EVENT to "game_list_hot_rank_enter"
+            "entrance" to entrance
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 离开游戏单热榜
+    @JvmStatic
+    fun logGameCollectionHotListExit(interval: Long, tabName: String) {
+        val json = json {
+            KEY_EVENT to "game_list_hot_rank_exit"
+            "interval" to interval
+            "tab_name" to tabName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 游戏热榜点击tab
+    @JvmStatic
+    fun logGameCollectionHotListTabClick(tabName: String, collectionId: String, collectionName: String) {
+        val json = json {
+            KEY_EVENT to "game_hot_rank_tab_click"
+            "tab_name" to tabName
+            "game_list_collection_id" to collectionId
+            "game_list_collection_name" to collectionName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 游戏热榜tab浏览
+    @JvmStatic
+    fun logGameCollectionHotListTabView(interval: Int, tabName: String, collectionId: String, collectionName: String) {
+        val json = json {
+            KEY_EVENT to "game_hot_rank_tab_view"
+            "interval" to interval
+            "tab_name" to tabName
+            "game_list_collection_id" to collectionId
+            "game_list_collection_name" to collectionName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 游戏单热榜点击
+    @JvmStatic
+    fun logGameCollectionHotListClick(tabName: String, collectionId: String, collectionName: String, text: String) {
+        val json = json {
+            KEY_EVENT to "game_list_hot_rank_click"
+            "tab_name" to tabName
+            "game_list_collection_id" to collectionId
+            "game_list_collection_name" to collectionName
+            "text" to text
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
+    // 游戏单合集点击
+    fun logGameListCollectionClick(
+        source: String,
+        blockName: String,
+        blockId: String,
+        collectionName: String,
+        collectionId: String,
+        text: String
+    ) {
+        val json = json {
+            KEY_EVENT to "game_list_collection_click"
+            "source" to source
+            "block_name" to blockName
+            "block_id" to blockId
+            "game_list_collection_id" to collectionId
+            "game_list_collection_name" to collectionName
+            "text" to text
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
 }

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

@@ -1657,13 +1657,22 @@ object NewLogUtils {
     }
 
     //进入游戏单广场
-    fun logEnterGameCollectionSquare(entrance: String, forumName: String = "", title: String = "", id: String = "") {
+    fun logEnterGameCollectionSquare(
+        entrance: String,
+        forumName: String = "",
+        gameCollectionTitle: String = "",
+        gameCollectionId: String = "",
+        collectionName: String = "",
+        collectionId: String = ""
+    ) {
         val json = json {
             KEY_EVENT to "enter_game_collect_square"
             KEY_ENTRANCE to entrance
             "forum_name" to forumName
-            "game_collect_title" to title
-            "game_collect_id" to id
+            "game_collect_title" to gameCollectionTitle
+            "game_collect_id" to gameCollectionId
+            "game_list_collection_name" to collectionName
+            "game_list_collection_id" to collectionId
             KEY_TIMESTAMP to System.currentTimeMillis() / 1000
             parseAndPutMeta().invoke(this)
         }
@@ -1671,9 +1680,10 @@ object NewLogUtils {
     }
 
     //进入选择标签
-    fun logEnterGameCollectionTag() {
+    fun logEnterGameCollectionTag(source: String) {
         val json = json {
             KEY_EVENT to "enter_game_collect_tag_location"
+            "source" to source
             KEY_TIMESTAMP to System.currentTimeMillis() / 1000
             parseAndPutMeta().invoke(this)
         }
@@ -1681,11 +1691,12 @@ object NewLogUtils {
     }
 
     //筛选游戏单标签
-    fun logFilterGameCollectionTag(tagCategory: String, tagName: String) {
+    fun logFilterGameCollectionTag(tagCategory: String, tagName: String, source: String) {
         val json = json {
             KEY_EVENT to "filter_game_collect_tag"
             "filter_tag_category" to tagCategory
             "filter_tag_name" to tagName
+            "source" to source
             KEY_TIMESTAMP to System.currentTimeMillis() / 1000
             parseAndPutMeta().invoke(this)
         }
@@ -1693,9 +1704,10 @@ object NewLogUtils {
     }
 
     //点击安利墙卡片
-    fun logClickGameCollectionAmway() {
+    fun logClickGameCollectionAmway(tabName: String) {
         val json = json {
             KEY_EVENT to "click_game_collect_recommend_card"
+            "tab_name" to tabName
             KEY_TIMESTAMP to System.currentTimeMillis() / 1000
             parseAndPutMeta().invoke(this)
         }

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

@@ -3,6 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import com.gh.common.constant.Config
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.halo.assistant.HaloApp
 

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

@@ -1,6 +1,7 @@
 package com.gh.common.util
 
 import android.app.Activity
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -9,11 +10,13 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
 import com.gh.common.dialog.InstallPermissionDialogFragment
+import com.gh.common.xapk.XapkInstallReceiver
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.utils.getExtension
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
@@ -118,7 +121,7 @@ object PackageInstaller {
                 }
             } else {
                 if (isPluggin) {
-                    DialogHelper.showPluginDialog(context) {
+                    DialogHelper.showPluginDialog(context, downloadEntity?.pluginDesc) {
                         uninstall(context, pkgPath)
                     }
                 } else {
@@ -142,6 +145,33 @@ object PackageInstaller {
         context.startActivity(installIntent)
     }
 
+    fun installMultiple(
+        context: Context,
+        pkgPath: String,
+        sessionId: Int = -1
+    ) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return
+        }
+        val installer = context.packageManager.packageInstaller
+        val session = installer.openSession(sessionId)
+        // 监听安装回调的组件，可以是Activity、Service或者是BroadcastReceiver
+        val intent = Intent(context, XapkInstallReceiver::class.java)
+            .also {
+                it.putExtra(XapkInstallReceiver.KEY_PACKAGE_PATH, pkgPath)
+            }
+
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+        val pendingIntent = PendingIntent.getBroadcast(context, 0, intent, flags)
+        // 提交数据流并执行安装
+        session.commit(pendingIntent.intentSender)
+        session.close()
+    }
+
     /**
      * 获取启动安装意图
      *
@@ -216,7 +246,8 @@ object PackageInstaller {
     }
 
     private fun getFileSuffixByFormat(format: String?): String {
-        return if (format == XapkInstaller.XAPK_EXTENSION_NAME) {
+        return if (format == Constants.XAPK_FORMAT
+            || format == Constants.XAPK_APKS_FORMAT) {
             XapkInstaller.XAPK_EXTENSION_NAME
         } else {
             "apk"

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

@@ -0,0 +1,54 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.entity.GameInstall
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.packagehelper.PackageRepository
+
+object PackageLauncher {
+
+    /*
+     * 启动应用
+     */
+    @JvmStatic
+    fun launchApp(
+        context: Context,
+        gameEntity: GameEntity? = null,
+        packageName: String?
+    ) {
+
+        if (packageName.isNullOrEmpty()) {
+            ToastUtils.toast("启动失败")
+            return
+        }
+
+        // 获取 GameInstall 实体，用于记录启动日志用
+        val gameInstall = if (gameEntity != null) {
+            GameInstall.transformGameInstall(gameEntity, packageName)
+        } else {
+            PackageRepository.gameInstalled.find { it.packageName == packageName }
+        }
+
+        if (gameInstall != null) {
+            NewFlatLogUtils.logGameLaunch(
+                gameId = gameInstall.id ?: "unknown",
+                gameName =  gameInstall.name ?: "unknown",
+                gameCategory = gameInstall.category ?: "unknown",
+                downloadStatus = if (gameInstall.downloadStatus == "demo") "试玩" else "下载"
+            )
+        }
+
+        try {
+            val intent = context.applicationContext.packageManager.getLaunchIntentForPackage(packageName)
+            if (intent != null) {
+                context.startActivity(intent)
+            } else {
+                ToastUtils.toast("启动失败")
+            }
+        } catch (e: Exception) {
+            ToastUtils.toast( "启动失败")
+        }
+    }
+
+}

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

@@ -746,9 +746,11 @@ public class PackageUtils {
     }
 
 
-    /*
+    /**
      * 启动应用
+     * 请使用 PackageLauncher.launchApp()
      */
+    @Deprecated
     public static void launchApplicationByPackageName(Context context, String packageName) {
         try {
             Intent intent = context.getApplicationContext().getPackageManager().getLaunchIntentForPackage(packageName);

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

@@ -66,7 +66,7 @@ object RealNameHelper {
             "game_name",
             downloadEntity.name ?: "",
             "game_type",
-            downloadEntity.meta[Constants.GAME_TYPE] ?: ""
+            downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: ""
         )
 
         val contentText = if (downloadEntity.status == DownloadStatus.done) {

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

@@ -2,6 +2,7 @@ package com.gh.common.util
 
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.dialog.DeviceRemindDialog
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils

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

@@ -0,0 +1,44 @@
+package com.gh.common.xapk
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import android.content.pm.PackageInstaller.SessionInfo
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class XapkInstallReceiver : BroadcastReceiver() {
+
+    companion object {
+        const val KEY_PACKAGE_PATH = "package_path"
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        when (intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999)) {
+            PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                val installIntent = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
+                if (installIntent != null) {
+                    val installPackagePath = intent.getStringExtra(KEY_PACKAGE_PATH)
+                    val installSessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1)
+                    XapkInstaller.onPendingUserAction(installPackagePath!!, installSessionId)
+                    installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(installIntent)
+                }
+            }
+            PackageInstaller.STATUS_FAILURE,
+            PackageInstaller.STATUS_FAILURE_ABORTED,
+            PackageInstaller.STATUS_FAILURE_BLOCKED,
+            PackageInstaller.STATUS_FAILURE_CONFLICT,
+            PackageInstaller.STATUS_FAILURE_INCOMPATIBLE,
+            PackageInstaller.STATUS_FAILURE_INVALID,
+            PackageInstaller.STATUS_FAILURE_STORAGE -> {
+                val installPackagePath = intent.getStringExtra(KEY_PACKAGE_PATH)
+                if (!installPackagePath.isNullOrEmpty()) {
+                    XapkInstaller.onInstallCanceled(installPackagePath)
+                }
+            }
+        }
+    }
+}

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

@@ -2,20 +2,29 @@ package com.gh.common.xapk
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.Build
 import com.gh.common.util.*
 import com.gh.download.DownloadDataHelper
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.utils.debugOnly
 import com.gh.gamecenter.common.utils.getExtension
 import com.gh.gamecenter.common.utils.throwExceptionInDebug
-import com.gh.gamecenter.common.utils.tryCatchInRelease
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.SentryHelper
+import com.gh.gamecenter.xapk.XApkUnZipper
+import com.gh.gamecenter.xapk.core.XApkFile
+import com.gh.gamecenter.xapk.core.XApkUnZipCallback
+import com.gh.gamecenter.xapk.core.XApkUnZipEntry
+import com.gh.gamecenter.xapk.core.XApkUnZipOutputFactory
+import com.gh.gamecenter.xapk.io.NonSplitApksOutput
+import com.gh.gamecenter.xapk.io.OBBFileOutput
+import com.gh.gamecenter.xapk.io.SplitApksOutput
+import com.gh.gamecenter.xapk.io.XApkFileOutput
+import com.gh.gamecenter.xapk.pi.IPackageInstaller
 import com.gh.ndownload.NDataChanger
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
-import java.text.DecimalFormat
+import java.io.File
 import java.util.*
 
 /**
@@ -28,7 +37,8 @@ import java.util.*
  * apk文件这解压的gh-files文件夹中
  */
 @SuppressLint("StaticFieldLeak")
-object XapkInstaller : IXapkUnzipListener {
+object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
+
     private const val XAPK_PACKAGE_PATH_TAG = "xapk_package_path"
 
     const val XAPK_EXTENSION_NAME = "xapk"
@@ -42,8 +52,16 @@ object XapkInstaller : IXapkUnzipListener {
 
     private var mContext = HaloApp.getInstance().application.applicationContext
 
-    // 是否需要开启特定线程处理
-    private val mXapkUnzipThreadMap = Collections.synchronizedMap(HashMap<String, XapkUnzipThread>())
+    private val mXApkUnZipper = XApkUnZipper(this)
+        .also {
+            it.registerCallback(this)
+        }
+
+    private val mDownloadEntityMap = Collections.synchronizedMap(HashMap<String, DownloadEntity>())
+
+    private val mInstallingPath = Collections.synchronizedList(mutableListOf<String>())
+
+    private val mPendingSessionIdMap = Collections.synchronizedMap(HashMap<String, Int>())
 
     // 按并行解压
     @JvmStatic
@@ -63,71 +81,60 @@ object XapkInstaller : IXapkUnzipListener {
     }
 
     private fun unzipXapkFile(downloadEntity: DownloadEntity) {
-        if (mXapkUnzipThreadMap[downloadEntity.path] == null) {
-            DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压开始")
-            val xapkUnzipThread = XapkUnzipThread(downloadEntity, this)
-            xapkUnzipThread.start()
-            mXapkUnzipThreadMap[downloadEntity.path] = xapkUnzipThread
-        } else {
-            debugOnly {
-                Utils.log("unzip", "重复解压,该文件解压已在队列中")
-            }
+        mXApkUnZipper.unzip(
+            XApkUnZipEntry(
+                downloadEntity.path,
+                File(downloadEntity.path)
+            )
+        )
+        mDownloadEntityMap[downloadEntity.path] = downloadEntity
+    }
+
+    @JvmStatic
+    fun cancelUnzipTask(downloadEntity: DownloadEntity) {
+        mXApkUnZipper.cancel(downloadEntity.path)
+    }
+
+    override fun onProgress(apk: XApkFile, progress: Float) {
+        val downloadEntity = mDownloadEntityMap[apk.file.path] ?: return
+        downloadEntity.meta[XAPK_UNZIP_PERCENT] = String.format("%.2f", progress * 100)
+        downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.UNZIPPING.name
+        NDataChanger.notifyDataChanged(downloadEntity)
+        debugOnly {
+            Utils.log("unzip", "onProgress->$progress")
         }
     }
 
-    override fun onProgress(downloadEntity: DownloadEntity, unzipPath: String, unzipSize: Long, unzipProgress: Long) {
-        AppExecutor.uiExecutor.execute {
-            val df = DecimalFormat("#.0")
-            var percent = 0.0
-            tryCatchInRelease {
-                percent = df.format((unzipProgress / unzipSize.toFloat()) * 100).toDouble()
-            }
-            downloadEntity.meta[XAPK_UNZIP_PERCENT] = percent.toString()
-            downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.UNZIPPING.name
-            NDataChanger.notifyDataChanged(downloadEntity)
-        }
+    override fun onSuccess(apk: XApkFile, installer: IPackageInstaller) {
+        val downloadEntity = mDownloadEntityMap[apk.file.path] ?: return
+
+        downloadEntity.meta[XAPK_UNZIP_PERCENT] = "100.0"
+        downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.SUCCESS.name
+        NDataChanger.notifyDataChanged(downloadEntity)
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压成功")
 
         debugOnly {
-            Utils.log("unzip", "onProgress->" + (unzipProgress / unzipSize.toFloat()))
+            Utils.log("unzip", "onSuccess->${downloadEntity.path}")
         }
+
+        if (!mInstallingPath.contains(downloadEntity.path)) {
+            mInstallingPath.add(downloadEntity.path)
+        }
+
+        NDataChanger.notifyDataChanged(downloadEntity)
+
+        XapkInstallerLooper.add(downloadEntity.path, installer)
+        XapkInstallerLooper.install(mContext)
     }
 
-    override fun onNext(downloadEntity: DownloadEntity, unzipPath: String) {
-        if (PACKAGE_EXTENSION_NAME == unzipPath.getExtension()) {
-            downloadEntity.meta[XAPK_PACKAGE_PATH_TAG] = unzipPath
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-        }
-
-        debugOnly {
-            Utils.log("unzip", "onNext->$unzipPath")
-        }
-    }
-
-    /**
-     * 取消解压回调
-     *
-     * 取消后的表现与下载完成一致
-     */
-    override fun onCancel(downloadEntity: DownloadEntity) {
-        mXapkUnzipThreadMap.remove(downloadEntity.path)
-
-        AppExecutor.uiExecutor.execute {
-            downloadEntity.meta[XAPK_UNZIP_PERCENT] = "0.0"
-            downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.CANCEL.name
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-        }
-    }
-
-    override fun onFailure(downloadEntity: DownloadEntity, exception: Exception) {
-        mXapkUnzipThreadMap.remove(downloadEntity.path)
-
-        AppExecutor.uiExecutor.execute {
-            downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.FAILURE.name
-            DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-        }
+    override fun onError(apk: XApkFile, exception: Throwable) {
+        val downloadEntity = mDownloadEntityMap[apk.file.path] ?: return
+        downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.FAILURE.name
+        DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
+        NDataChanger.notifyDataChanged(downloadEntity)
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
 
         // 仅官网渠道上报 XAPK 异常信息
         if (HaloApp.getInstance().channel == "GH_206") {
@@ -145,40 +152,176 @@ object XapkInstaller : IXapkUnzipListener {
         }
     }
 
-    override fun onSuccess(downloadEntity: DownloadEntity) {
-        mXapkUnzipThreadMap.remove(downloadEntity.path)
-
-        AppExecutor.uiExecutor.execute {
-            val pkgPath = downloadEntity.meta[XAPK_PACKAGE_PATH_TAG]
-
-            if (pkgPath == null) {
-                Utils.toast(mContext, "下载出错，请重新下载！")
-
-                return@execute
-            }
-
-            PackageInstaller.install(mContext, downloadEntity.isPlugin, pkgPath, downloadEntity)
-
-            downloadEntity.meta[XAPK_UNZIP_PERCENT] = "100.0"
-            downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.SUCCESS.name
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-        }
-
-        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压成功")
+    override fun onCancel(apk: XApkFile) {
+        val downloadEntity = mDownloadEntityMap.remove(apk.file.path) ?: return
+        downloadEntity.meta[XAPK_UNZIP_PERCENT] = "0.0"
+        downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.CANCEL.name
+        NDataChanger.notifyDataChanged(downloadEntity)
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+    }
 
+    override fun onNext(apk: XApkFile, fileName: String) {
         debugOnly {
-            Utils.log("unzip", "onSuccess->${downloadEntity.path}")
+            Utils.log("unzip", "onNext->$fileName")
         }
     }
 
-    @JvmStatic
-    fun cancelUnzipTask(downloadEntity: DownloadEntity) {
-        val xapkUnzipThread = mXapkUnzipThreadMap[downloadEntity.path]
-        if (xapkUnzipThread != null) {
-            xapkUnzipThread.canceled = true
+    fun isInstalling(packagePath: String): Boolean = mInstallingPath.contains(packagePath)
+
+    fun onPendingUserAction(packagePath: String, sessionId: Int) {
+        mPendingSessionIdMap[packagePath] = sessionId
+    }
+
+    /**
+     * 通知XAPK安装完成
+     */
+    fun onInstalled(packagePath: String) {
+        val downloadEntity = mDownloadEntityMap.remove(packagePath) ?: return
+
+        mPendingSessionIdMap.remove(packagePath)
+        mInstallingPath.remove(packagePath)
+
+        downloadEntity.meta[XAPK_UNZIP_PERCENT] = "100.0"
+        downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.INSTALLED.name
+
+        NDataChanger.notifyDataChanged(downloadEntity)
+
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk安装成功")
+
+        XapkInstallerLooper.remove(downloadEntity.path)
+        XapkInstallerLooper.install(mContext)
+    }
+
+    fun onInstallCanceled(packagePath: String) {
+
+        val downloadEntity = mDownloadEntityMap.remove(packagePath) ?: return
+
+        mPendingSessionIdMap.remove(packagePath)
+
+        mInstallingPath.remove(packagePath)
+
+        downloadEntity.meta[XAPK_UNZIP_PERCENT] = "0.0"
+        downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.CANCEL.name
+
+        NDataChanger.notifyDataChanged(downloadEntity)
+
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk安装取消")
+
+        XapkInstallerLooper.remove(downloadEntity.path)
+        XapkInstallerLooper.install(mContext)
+    }
+
+    /**
+     * 更新当前XAPK安装状态, 主要针对以下出现安装结果回调异常的情况：
+     * 1. 用户触碰安装弹窗(原生Android系统)区域外导致安装取消
+     */
+    fun updateCurrentInstallStatus() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || mPendingSessionIdMap.isEmpty()) {
+            return
+        }
+
+        val installer = mContext.packageManager.packageInstaller
+
+        for (pendingSessionEntry in mPendingSessionIdMap) {
+            val sessionInfo = installer.getSessionInfo(pendingSessionEntry.value)
+
+            // 1. 用户点击了取消按钮时，sessionInfo为空
+            // 2. 用户点击了确定按钮时，sessionInfo的progress大于0.8
+            if (sessionInfo == null || sessionInfo.progress > 0.8F) {
+                continue
+            }
+
+            installer.abandonSession(sessionInfo.sessionId)
+
+            val downloadEntity = mDownloadEntityMap[pendingSessionEntry.key] ?: return
+
+            if (!PackageUtils.isInstalled(mContext, downloadEntity.packageName)) {
+                onInstallCanceled(downloadEntity.path)
+            } else {
+                onInstalled(downloadEntity.path)
+            }
+        }
+    }
+
+    override fun onCreateOBBOutput(apk: XApkFile): XApkFileOutput<Unit> {
+        return OBBFileOutput()
+    }
+
+    override fun onCreateApkOutput(apk: XApkFile): XApkFileOutput<IPackageInstaller> {
+        val isMultiApks = apk.manifest.isMultiApks
+        return if (isMultiApks) {
+            SplitApksOutput(mContext.applicationContext) {
+                SplitApksInstaller(apk, it)
+            }
         } else {
-            onCancel(downloadEntity) // 刷新页面
+            NonSplitApksOutput {
+                NonSplitApkInstaller(apk, it)
+            }
+        }
+    }
+
+    private class SplitApksInstaller(
+        private val xApkFile: XApkFile,
+        private val sessionId: Int,
+    ) : IPackageInstaller {
+        override fun install(context: Context) {
+            val downloadEntity = mDownloadEntityMap[xApkFile.file.path] ?: return
+            PackageInstaller.installMultiple(context, downloadEntity.path, sessionId)
+        }
+    }
+
+    private class NonSplitApkInstaller(
+        private val xApkFile: XApkFile,
+        private val file: File
+    ) : IPackageInstaller {
+        override fun install(context: Context) {
+            val downloadEntity = mDownloadEntityMap[xApkFile.file.path] ?: return
+            PackageInstaller.install(
+                context,
+                downloadEntity.isPlugin,
+                file.absolutePath,
+                downloadEntity
+            )
+        }
+    }
+
+    /**
+     * XAPK安装每次只能执行一个安装流程，因此添加一个安装队列
+     */
+    private object XapkInstallerLooper {
+
+        private val packagePathList = mutableListOf<String>()
+
+        private val installerList = mutableListOf<IPackageInstaller>()
+
+        fun add(packagePath: String, installer: IPackageInstaller) {
+            if (packagePathList.contains(packagePath)) {
+                return
+            }
+            packagePathList.add(packagePath)
+            installerList.add(installer)
+        }
+
+        fun install(context: Context) {
+            if (installerList.isEmpty()) {
+                return
+            }
+            installerList.first().install(context)
+        }
+
+        fun remove(packagePath: String) {
+            if (!packagePathList.contains(packagePath)) {
+                return
+            }
+            val index = packagePathList.indexOf(packagePath)
+            if (index != -1) {
+                packagePathList.removeAt(index)
+                installerList.removeAt(index)
+            }
         }
     }
 }
@@ -187,5 +330,7 @@ enum class XapkUnzipStatus(status: String) {
     UNZIPPING("unzipping"),
     SUCCESS("success"),
     CANCEL("cancel"),
+    INSTALLING("installing"),
+    INSTALLED("installed"),
     FAILURE("failure");
 }

app/src/main/java/com/gh/download/DownloadDataHelper.kt

@@ -128,7 +128,7 @@ object DownloadDataHelper {
             payloadObject.put("package", downloadEntity.packageName)
             payloadObject.put("certification", RealNameHelper.getCertificationStatus())
             payloadObject.put("filename", getFileName(downloadEntity))
-            payloadObject.put("task_num", NDataChanger.downloadingTasks.size)
+            payloadObject.put("task_num", NDataChanger.downloadingTaskUrlSet.size)
             jsonObject.put("payload", payloadObject)
         } catch (e: Exception) {
             e.printStackTrace()
@@ -214,7 +214,7 @@ object DownloadDataHelper {
             payloadObject.put("certification", RealNameHelper.getCertificationStatus())
             payloadObject.put("filename", getFileName(downloadEntity))
             payloadObject.put("launch_ms", startupTime)
-            payloadObject.put("task_num", NDataChanger.downloadingTasks.size)
+            payloadObject.put("task_num", NDataChanger.downloadingTaskUrlSet.size)
             if (parallel != null) {
                 payloadObject.put("parallel",  parallel)
             }
@@ -276,7 +276,7 @@ object DownloadDataHelper {
                     payloadObject.put("speed", speed)
                 }
             } else {
-                payloadObject.put("task_num", NDataChanger.downloadingTasks.size)
+                payloadObject.put("task_num", NDataChanger.downloadingTaskUrlSet.size)
             }
             payloadObject.put("completed_size", downloadEntity.progress / 1024 / 1024)
             if (downloadEntity.status == DownloadStatus.resume) {
@@ -329,7 +329,7 @@ object DownloadDataHelper {
             if (parallel != null) {
                 payloadObject.put("parallel",  parallel)
             }
-            payloadObject.put("task_num", NDataChanger.downloadingTasks.size)
+            payloadObject.put("task_num", NDataChanger.downloadingTaskUrlSet.size)
             jsonObject.put("payload", payloadObject)
         } catch (e: Exception) {
             e.printStackTrace()
@@ -352,7 +352,8 @@ object DownloadDataHelper {
              * 在后台唤醒的情况下 下载状态可能无法修正
              * see [DownloadManager.initDownloadService]
              */
-            if (downloadEntity.status == DownloadStatus.downloading && NDataChanger.downloadingTasks[downloadEntity.url] != null) {
+            if (downloadEntity.status == DownloadStatus.downloading
+                && NDataChanger.downloadingTaskUrlSet.contains(downloadEntity.url)) {
                 var sheet = mDownloadHeartbeatSheet[downloadEntity.url]
                 if (sheet == null) {
                     sheet = JSONObject()

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

@@ -45,7 +45,7 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.HomePluggableFilterEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.packagehelper.PackageRepository;
@@ -61,7 +61,6 @@ import com.lightgame.download.DownloadDao;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 import com.lightgame.download.DownloadStatusListener;
-import com.lightgame.download.DownloadTask;
 import com.lightgame.download.FileUtils;
 import com.lightgame.download.HttpDnsManager;
 import com.lightgame.utils.Utils;
@@ -284,6 +283,7 @@ public class DownloadManager implements DownloadStatusListener {
 
         String path;
         String downloadId = PackageInstaller.createDownloadId(gameEntity.getName());
+        String gameCategory = gameEntity.getCategory();
         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
             path = SimulatorGameManager.getPathByType(gameEntity.getSimulatorType()) + "/" + gameEntity.getName() + "." + apkEntity.getFormat();
 
@@ -309,6 +309,7 @@ public class DownloadManager implements DownloadStatusListener {
         downloadEntity.setUrl(apkEntity.getUrl());
         downloadEntity.setName(gameEntity.getName());
         downloadEntity.setPath(path);
+        downloadEntity.setPluginDesc(gameEntity.getPluginDesc());
         downloadEntity.setETag(apkEntity.getEtag());
         downloadEntity.setIcon(gameEntity.getIcon());
         downloadEntity.setPlatform(apkEntity.getPlatform());
@@ -316,6 +317,7 @@ public class DownloadManager implements DownloadStatusListener {
         downloadEntity.setGameId(gameEntity.getId());
         downloadEntity.setEntrance(entrance);
         downloadEntity.setLocation(location);
+        downloadEntity.setFormat(apkEntity.getFormat());
         downloadEntity.setVersionName(apkEntity.getVersion());
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.APK_MD5, apkEntity.getMd5());
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.DOWNLOAD_ID, downloadId);
@@ -323,9 +325,11 @@ public class DownloadManager implements DownloadStatusListener {
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.GAME_ICON_SUBSCRIPT, gameEntity.getIconSubscript());
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.IS_PLATFORM_RECOMMEND, apkEntity.getRecommend() != null ? "true" : "false");
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.GAME_NAME, gameEntity.getName());
-        ExtensionsKt.addMetaExtra(downloadEntity, Constants.GAME_TYPE, gameEntity.getCategoryChinese());
+        ExtensionsKt.addMetaExtra(downloadEntity, Constants.GAME_CATEGORY_IN_CHINESE, gameEntity.getCategoryChinese());
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.AD_ICON_ACTIVE, String.valueOf(gameEntity.getAdIconActive()));
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.IS_AD_DATA, String.valueOf(gameEntity.isAdData()));
+        ExtensionsKt.putGameCategory(downloadEntity, gameCategory != null ? gameCategory : "");
+        ExtensionsKt.addMetaExtra(downloadEntity, Constants.APK_SIZE, apkEntity.getSize());
         if (gameEntity.getIconFloat() != null) {
             ExtensionsKt.addMetaExtra(downloadEntity, Constants.GAME_ICON_FLOAT_TOP_TEXT, gameEntity.getIconFloat().getUpperLeftText());
             ExtensionsKt.addMetaExtra(downloadEntity, Constants.GAME_ICON_FLOAT_TOP_COLOR, gameEntity.getIconFloat().getUpperLeftColor());
@@ -545,7 +549,7 @@ public class DownloadManager implements DownloadStatusListener {
      * 任务是否已经下载中
      */
     public boolean isTaskDownloading(String url) {
-        if (NDataChanger.INSTANCE.getDownloadingTasks().get(url) != null) {
+        if (NDataChanger.INSTANCE.getDownloadingTaskUrlSet().contains(url)) {
             Utils.log(DownloadManager.class.getSimpleName(), url + "正在下载!");
             return true;
         }
@@ -867,12 +871,8 @@ public class DownloadManager implements DownloadStatusListener {
     private void cancelAndNotify(DownloadEntity entry, boolean cancelSilently) {
         mDownloadDao.removeErrorMessage(entry.getUrl());
 
-        DownloadTask task = NDataChanger.INSTANCE.getDownloadingTasks().get(entry.getUrl());
-        if (task != null) {
-            task.cancel();
-            // 改任务队列的状态
-            NDataChanger.INSTANCE.getDownloadingTasks().remove(entry.getUrl());
-        }
+        // 改任务队列的状态
+        NDataChanger.INSTANCE.getDownloadingTaskUrlSet().remove(entry.getUrl());
         NDataChanger.INSTANCE.getDownloadEntries().remove(entry.getUrl());
         if (!cancelSilently) {
             NDataChanger.INSTANCE.notifyDataChanged(entry);
@@ -886,8 +886,10 @@ public class DownloadManager implements DownloadStatusListener {
      * 暂停所有正在下载的任务
      */
     public void pauseAll() {
-        for (DownloadEntity entity : NDataChanger.INSTANCE.getDownloadEntries().values()) {
-            pause(entity.getUrl());
+        synchronized (NDataChanger.INSTANCE.getDownloadEntries()) {
+            for (DownloadEntity entity : NDataChanger.INSTANCE.getDownloadEntries().values()) {
+                pause(entity.getUrl());
+            }
         }
         Utils.log(DownloadManager.class.getSimpleName(), "pause all");
     }
@@ -913,10 +915,10 @@ public class DownloadManager implements DownloadStatusListener {
      * 3.检查是否显示下载通知栏
      */
     public void initDownloadService() {
-        final List<String> urlList = new ArrayList<>(NDataChanger.INSTANCE.getDownloadingTasks().keySet());
+        final Set<String> urlSet = NDataChanger.INSTANCE.getDownloadingTaskUrlSet();
         for (DownloadEntity downloadEntity : getAllDownloadEntity()) {
-            if (!urlList.contains(downloadEntity.getUrl()) &&
-                    (downloadEntity.getStatus().equals(DownloadStatus.downloading)
+            if (!urlSet.contains(downloadEntity.getUrl())
+                    && (downloadEntity.getStatus().equals(DownloadStatus.downloading)
                             || downloadEntity.getStatus().equals(DownloadStatus.waiting))) {
                 downloadEntity.setStatus(DownloadStatus.subscribe);
                 mDownloadDao.newOrUpdate(downloadEntity);

app/src/main/java/com/gh/download/PackageObserver.kt

@@ -6,8 +6,10 @@ import com.gh.common.util.ConcernUtils
 import com.gh.common.util.DataCollectionUtils
 import com.gh.common.util.PackageInstaller
 import com.gh.common.util.PackageUtils
+import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
@@ -17,7 +19,6 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.GameDigestEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel
@@ -110,6 +111,11 @@ object PackageObserver {
                     runOnIoThread { FileUtils.deleteFile(mDownloadEntity.path) }
                 }
 
+                if (mDownloadEntity.format == Constants.XAPK_FORMAT
+                    || mDownloadEntity.format == Constants.XAPK_APKS_FORMAT) {
+                    XapkInstaller.onInstalled(mDownloadEntity.path)
+                }
+
                 DownloadManager.getInstance().cancel(mDownloadEntity.url, false, true, false)
 
                 if (SPUtils.getBoolean(Constants.SP_CONCERN_GAME, true)) { //设置页面控制是否安装后自动关注

app/src/main/java/com/gh/download/dialog/DownloadDialog.kt

@@ -22,6 +22,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.observeNonNull
 import com.gh.gamecenter.common.utils.throwExceptionInDebug
@@ -30,7 +31,8 @@ import com.gh.gamecenter.core.utils.TimeElapsedHelper
 import com.gh.gamecenter.databinding.DialogDownloadBinding
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
@@ -178,9 +180,18 @@ class DownloadDialog : BaseDraggableDialogFragment() {
                 for (i in 0 until it.itemCount) {
                     val apkEntity = itemList[i].normal ?: continue
                     val apkCollection = apkEntity.apkCollection
-                    if (apkCollection != null && apkCollection.name == mPlatformName) {
-                        scrollAndDownload(recyclerView, false, i)
-                        break
+                    if (apkCollection != null) {
+                        if (apkCollection.name == mPlatformName) {
+                            scrollAndDownload(recyclerView, false, i)
+                            break
+                        } else {
+                            apkCollection.saveApkEntity?.forEach { entity ->
+                                if (entity.getPlatformName() == mPlatformName || entity.packageName == mPackageName) {
+                                    scrollAndDownload(recyclerView, false, i)
+                                }
+                            }
+                            break
+                        }
                     }
                     if (apkEntity.getPlatformName() == mPlatformName || apkEntity.packageName == mPackageName) {
                         scrollAndDownload(recyclerView, true, i)

app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt

@@ -3,14 +3,14 @@ package com.gh.download.dialog
 import android.view.View
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.common.constant.Config
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.common.util.*
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.throwExceptionInDebug
 import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.databinding.DownloadDialogInstalledItemBinding
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.lightgame.download.DownloadStatus

app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt

@@ -10,12 +10,9 @@ import com.gh.common.constant.Config
 import com.gh.common.dialog.CertificationDialog
 import com.gh.common.dialog.DeviceRemindDialog
 import com.gh.common.dialog.PackageCheckDialogFragment
+import com.gh.common.util.*
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.common.util.DialogUtils
 import com.gh.common.util.DirectUtils.directToLinkPage
-import com.gh.common.util.DownloadDialogHelper
-import com.gh.common.util.PackageInstaller
-import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.DownloadManagerActivity
@@ -244,7 +241,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
                         mtaValue = gameEntity.name + "_" + apkEntity.getPlatformName() + "_下载"
                     }
                     DownloadDialogItemStatus.LAUNCH -> {
-                        PackageUtils.launchApplicationByPackageName(it.context, apkEntity.packageName)
+                        PackageLauncher.launchApp(it.context, gameEntity, apkEntity.packageName)
 
                         mtaValue = gameEntity.name + "_" + apkEntity.getPlatformName() + "_启动"
                     }
@@ -282,7 +279,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
                             DownloadManager.getInstance().cancel(apkEntity.url)
                         } else {
                             if (PackageUtils.isCanPluggable(apkEntity)) {
-                                DialogHelper.showPluginDialog(it.context) {
+                                DialogHelper.showPluginDialog(it.context, gameEntity.pluginDesc) {
                                     PackageInstaller.uninstall(it.context, downloadEntity.path)
                                 }
                             } else {
@@ -352,54 +349,46 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
             if (msg.isNullOrEmpty()) {
                 BrowserInstallHelper.showBrowserInstallHintDialog(
                     context,
-                    gameEntity.isVGame(),
-                    object : EmptyCallback {
-                        override fun onCallback() {
-                            DownloadDialogHelper.findAvailableDialogAndShow(
+                    gameEntity.isVGame() || gameEntity.isSplitXApk()
+                ) {
+                    DownloadDialogHelper.findAvailableDialogAndShow(
+                        context,
+                        gameEntity,
+                        apkEntity
+                    ) {
+                        PackageCheckDialogFragment.show(
+                            context as AppCompatActivity,
+                            gameEntity
+                        ) {
+                            CertificationDialog.showCertificationDialog(
                                 context,
-                                gameEntity,
-                                apkEntity,
-                                object : EmptyCallback {
-                                    override fun onCallback() {
-                                        PackageCheckDialogFragment.show(
-                                            context as AppCompatActivity,
-                                            gameEntity,
-                                            object : ConfirmListener {
-                                                override fun onConfirm() {
-                                                    CertificationDialog.showCertificationDialog(
-                                                        context,
-                                                        gameEntity,
-                                                        object : ConfirmListener {
-                                                            override fun onConfirm() {
-                                                                DialogUtils.checkDownload(
-                                                                    context,
-                                                                    apkEntity.size,
-                                                                    gameEntity.id,
-                                                                    gameEntity.name
-                                                                ) { isSubscribe ->
-                                                                    DownloadManager.createDownload(
-                                                                        context,
-                                                                        apkEntity,
-                                                                        gameEntity,
-                                                                        downloadMethod,
-                                                                        entrance,
-                                                                        location,
-                                                                        isSubscribe, traceEvent
-                                                                    )
+                                gameEntity
+                            ) {
+                                DialogUtils.checkDownload(
+                                    context,
+                                    apkEntity.size,
+                                    gameEntity.id,
+                                    gameEntity.name
+                                ) { isSubscribe ->
+                                    DownloadManager.createDownload(
+                                        context,
+                                        apkEntity,
+                                        gameEntity,
+                                        downloadMethod,
+                                        entrance,
+                                        location,
+                                        isSubscribe, traceEvent
+                                    )
 
-                                                                    DeviceRemindDialog.showDeviceRemindDialog(
-                                                                        context,
-                                                                        gameEntity
-                                                                    )
-                                                                }
-                                                            }
-                                                        })
-                                                }
-                                            })
-                                    }
-                                })
+                                    DeviceRemindDialog.showDeviceRemindDialog(
+                                        context,
+                                        gameEntity
+                                    )
+                                }
+                            }
                         }
-                    })
+                    }
+                }
             } else {
                 Utils.toast(context, msg)
             }

app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt

@@ -17,6 +17,7 @@ import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.google.gson.JsonObject
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
@@ -93,6 +94,10 @@ object BrowserInstallHelper {
         return false
     }
 
+    @JvmStatic
+    fun shouldAutoSwitchAssistantInstall(gameEntity: GameEntity): Boolean =
+        isUseBrowserToInstallEnabled() && shouldUseBrowserToInstall() && gameEntity.isSplitXApk()
+
     /**
      * 是否显示使用浏览器来安装弹窗
      */
@@ -144,7 +149,8 @@ object BrowserInstallHelper {
         val manufacturer = Build.MANUFACTURER.toUpperCase(Locale.CHINA)
         var contentText = "当前安装方式为助手安装，如果出现游戏无法安装的问题，可选择切换安装方式为“浏览器安装”"
         if (manufacturer == "OPPO" || manufacturer == "VIVO") {
-            contentText = "当前安装方式为助手安装，下载安装游戏需要验证账户密码或指纹。如需免密码安装，可选择切换安装方式为“浏览器安装”"
+            contentText =
+                "当前安装方式为助手安装，下载安装游戏需要验证账户密码或指纹。如需免密码安装，可选择切换安装方式为“浏览器安装”"
         }
 
         DialogHelper.showDialog(

app/src/main/java/com/gh/download/simple/DownloadMessageHandler.kt

@@ -165,7 +165,7 @@ object DownloadMessageHandler : InnerDownloadListener {
      * @param error 错误类型
      * @param exception 包裹错误的 Exception
      */
-    override fun onError(id: String, error: DownloadError?, exception: Exception) {
+    override fun onError(id: String, error: DownloadError?, exception: Exception?) {
         error ?: return
 
         when (error) {

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

@@ -7,14 +7,21 @@ import com.gh.base.DownloadToolbarActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.game.GameFragment
 
 class BlockActivity : DownloadToolbarActivity() {
 
     companion object {
-        fun getIntent(context: Context, blockData: SubjectRecommendEntity, entrance: String): Intent {
+        fun getIntent(context: Context,
+                      blockData: SubjectRecommendEntity,
+                      exposureSourceList: ArrayList<ExposureSource>? = null,
+                      entrance: String): Intent {
             val args = Bundle()
             args.putParcelable(EntranceConsts.KEY_BLOCK_DATA, blockData)
+            if (exposureSourceList != null) {
+                args.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST, exposureSourceList)
+            }
             args.putString(EntranceConsts.KEY_ENTRANCE, entrance)
             return getTargetIntent(context, BlockActivity::class.java, GameFragment::class.java, args)
         }

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

@@ -319,6 +319,8 @@ public class MainActivity extends BaseActivity {
         // 默认配置为空时重试
         if (Config.getSettings() == null) {
             Config.getGhzsSettings();
+        } else if (Config.getVSettingEntity() == null) {
+            Config.refreshVSettingEntity();
         }
 
         // 耗时操作
@@ -803,6 +805,15 @@ public class MainActivity extends BaseActivity {
                                     ToastUtils.showToast("游戏启动失败，请联系客服反馈相关信息");
                                     return;
                                 }
+
+                                VHelper.INSTANCE.logLaunchButtonClicked(
+                                        gamePackageName,
+                                        null,
+                                        null,
+                                        null,
+                                        "桌面快捷图标"
+                                );
+
                                 ToastUtils.showToast("游戏启动中，请稍后~");
                                 handler.postDelayed(() -> {
                                     VHelper.postOnInitialized(() -> {
@@ -1064,6 +1075,8 @@ public class MainActivity extends BaseActivity {
         if (busNetworkState.isNetworkConnected()) {
             if (Config.getSettings() == null) {
                 Config.getGhzsSettings();
+            } else if (Config.getVSettingEntity() == null) {
+                Config.refreshVSettingEntity();
             }
 
             mPackageViewModel.checkData();

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

@@ -10,7 +10,7 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.entity.CommentEntity;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.message.MessageDetailFragment;
 import com.halo.assistant.HaloApp;
 

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

@@ -40,7 +40,10 @@ import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
 import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.eventbus.EBConcernChanged;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.common.eventbus.EBNetworkState;
+import com.gh.gamecenter.common.eventbus.EBPackage;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
@@ -51,11 +54,8 @@ import com.gh.gamecenter.core.utils.ClickUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.entity.NewsDetailEntity;
-import com.gh.gamecenter.eventbus.EBConcernChanged;
 import com.gh.gamecenter.eventbus.EBAddComment;
 import com.gh.gamecenter.eventbus.EBDeleteComment;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBPackage;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.feature.entity.NewsEntity;

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

@@ -23,7 +23,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.MessageShareUtils;
 import com.gh.common.util.QRCodeUtils;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 
 import java.io.File;
 

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

@@ -32,7 +32,7 @@ import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.MessageShareUtils;
 import com.gh.common.util.QRCodeUtils;
 import com.gh.gamecenter.core.utils.StringUtils;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.common.retrofit.ObservableUtil;
 
 import java.io.File;

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

@@ -320,7 +320,7 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directCategoryDirectory(this, path, title, ENTRANCE_BROWSER, "浏览器");
                             break;
                         case HOST_COLUMN_COLLECTION:
-                            DirectUtils.directToColumnCollection(this, path, -1, ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directToColumnCollection(this, path, -1, ENTRANCE_BROWSER, "", null);
                             break;
                         case EntranceConsts.HOST_BLOCK:
                             name = uri.getQueryParameter("name");
@@ -403,7 +403,7 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToGameCollectionDetail(this, path, ENTRANCE_BROWSER, "", null);
                             break;
                         case HOST_GAME_COLLECTION_SQUARE:
-                            DirectUtils.directToGameCollectionSquare(this, ENTRANCE_BROWSER, "", "", "");
+                            DirectUtils.directToGameCollectionSquare(this, ENTRANCE_BROWSER, "", "", "", "", "");
                             break;
                         default:
                             EntranceUtils.jumpActivity(this, new Bundle()); // 跳转至首页

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

@@ -51,6 +51,7 @@ import java.io.IOException
 import java.io.InputStreamReader
 import java.text.SimpleDateFormat
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * 引导页面
@@ -79,6 +80,7 @@ class SplashScreenActivity : BaseActivity() {
         mIsNewForThisVersion =
             mSharedPreferences!!.getBoolean("isNewFirstLaunchV" + PackageUtils.getGhVersionName(), true)
         HaloApp.getInstance().isNewForThisVersion = mIsNewForThisVersion
+        HaloApp.getInstance().isBrandNewInstall = SPUtils.getBoolean(Constants.SP_BRAND_NEW_USER, true)
 
         // 用户不是新版本，但应用最后更新时间不是上次的时间代表用户重新安装了当前版本
         if (!mIsNewForThisVersion) {
@@ -104,12 +106,11 @@ class SplashScreenActivity : BaseActivity() {
             guideLayout.adapter = GuidePagerAdapter()
 
             // 判断是不是光环的新用户
-            if (SPUtils.getBoolean(Constants.SP_BRAND_NEW_USER, true)) {
+            if (HaloApp.getInstance().isBrandNewInstall) {
                 // 引导页需用户点击 “立即体验” 按钮才进入首页，所以这里不能置为true
                 // https://git.ghzs.com/pm/halo-app-issues/-/issues/1422（第3点）
 //                mStartMainActivityDirectly = true;
                 SPUtils.setLong(Constants.SP_INITIAL_USAGE_TIME, System.currentTimeMillis())
-                HaloApp.getInstance().isBrandNewInstall = true
                 if (!PackageFlavorHelper.IS_TEST_FLAVOR) {
                     showPrivacyDialog(guideLayout)
                 } else {
@@ -188,20 +189,6 @@ class SplashScreenActivity : BaseActivity() {
     private fun showPrivacyDialog(guideLayout: ViewPager) {
         NewPrivacyPolicyDialogFragment.show(this, null) { isSuccess: Boolean ->
             if (isSuccess) {
-//                guideLayout.visibility = View.VISIBLE
-//                SPUtils.setBoolean(Constants.SP_BRAND_NEW_USER, false)
-//
-//                // 恢复畅玩数据
-//                VHelper.recoverVDataIfPossible()
-//
-//                requestPermission()
-//
-//                // 检查是否有旧版本光环，有就删掉
-//                AppExecutor.ioExecutor.execute { deleteOutdatedUpdatePackage() }
-//                if (mStartMainActivityDirectly) {
-//                    launchMainActivity()
-//                }
-
                 mShouldPrefetchData = false
                 prefetchData()
 
@@ -226,12 +213,10 @@ class SplashScreenActivity : BaseActivity() {
             } else {
                 DialogUtils.showPrivacyPolicyDisallowDialog(
                     this,
-                    PrivacyPolicyEntity.createDefaultData(),
-                    object : EmptyCallback {
-                        override fun onCallback() {
-                            showPrivacyDialog(guideLayout)
-                        }
-                    })
+                    PrivacyPolicyEntity.createDefaultData()
+                ) {
+                    showPrivacyDialog(guideLayout)
+                }
             }
         }
     }
@@ -440,11 +425,8 @@ class SplashScreenActivity : BaseActivity() {
     @AfterPermissionGranted(REQUEST_PERMISSION_TAG)
     private fun checkAndRequestPermission() {
         if (EasyPermissions.hasPermissions(this, *mPermissions)) {
-            // 恢复畅玩数据
-            VHelper.recoverVDataIfPossible()
+            onPermissionsGranted(REQUEST_PERMISSION_TAG, ArrayList(mPermissions.toList()))
 
-            // 检查是否有旧版本光环，有就删掉
-            runOnIoThread { deleteOutdatedUpdatePackage() }
             if (mStartMainActivityDirectly) {
                 if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) {
                     showGitLogDialogIfNeeded()
@@ -467,6 +449,17 @@ class SplashScreenActivity : BaseActivity() {
         }
     }
 
+    override fun onPermissionsGranted(requestCode: Int, perms: MutableList<String>?) {
+        super.onPermissionsGranted(requestCode, perms)
+
+        if (perms?.contains(Manifest.permission.READ_EXTERNAL_STORAGE) == true) {
+            // 恢复畅玩数据
+            VHelper.recoverVDataIfPossible()
+            // 检查是否有旧版本光环，有就删掉
+            runOnIoThread { deleteOutdatedUpdatePackage() }
+        }
+    }
+
     // 检查下载文件夹下是否有旧版本的光环助手的包，有则删除
     private fun deleteOutdatedUpdatePackage() {
         try {

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

@@ -13,7 +13,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.EnvHelper
 import com.gh.gamecenter.common.utils.updateStatusBarColor
-import com.gh.gamecenter.entity.ConcernEntity
+import com.gh.gamecenter.feature.entity.ConcernEntity
 import com.gh.gamecenter.feature.entity.NewsEntity
 import com.gh.gamecenter.common.entity.ToolBoxEntity
 import com.halo.assistant.fragment.WebFragment

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

@@ -259,7 +259,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback {
         if ("NORMAL".equals(mShareStyle)) {
             com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success",
                     ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
-            EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
+            EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance, "新浪微博"));
             if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.inviteFriends) {
                 IntegralLogHelper.INSTANCE.logInviteResult("成功", "微博");
             }

app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java

@@ -41,7 +41,7 @@ import com.gh.gamecenter.databinding.CommentHeadItemBinding;
 import com.gh.gamecenter.databinding.NewsDigestItemBinding;
 import com.gh.gamecenter.entity.ArticleCommentParent;
 import com.gh.gamecenter.entity.CommentEntity;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.eventbus.EBDeleteComment;
 import com.gh.gamecenter.manager.VisitManager;
 import com.gh.gamecenter.common.retrofit.JSONObjectResponse;

app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java

@@ -12,6 +12,9 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.airbnb.lottie.LottieAnimationView;
+import com.gh.common.chain.AutoSwitchAssistantInstallHandler;
+import com.gh.common.chain.UnsupportedFeatureHandler;
+import com.gh.common.util.PackageLauncher;
 import com.gh.gamecenter.common.base.GlobalActivityManager;
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CertificationHandler;
@@ -29,6 +32,7 @@ import com.gh.common.chain.VersionNumberHandler;
 import com.gh.common.constant.Config;
 import com.gh.common.dialog.DeviceRemindDialog;
 import com.gh.common.dialog.GameOffServiceDialogFragment;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.common.filter.RegionSetting;
@@ -48,7 +52,6 @@ import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.common.util.DialogUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.common.util.LogUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.common.utils.PermissionHelper;
@@ -72,7 +75,6 @@ import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity;
 import com.gh.vspace.VDownloadManagerActivity;
 import com.gh.vspace.VHelper;
-import com.gh.vspace.VSpaceLoadingActivity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
@@ -121,6 +123,8 @@ public class DetailViewHolder {
 
         final OnDetailDownloadClickListener listener = new OnDetailDownloadClickListener(this, entrance, name, title, traceEvent);
         mDownloadPb.setOnClickListener(listener);
+        ExtensionsKt.putWidgetBusinessName(mDownloadPb, "游戏详情页");
+        ExtensionsKt.putObject(mDownloadPb, gameEntity);
 
         restoreDialogFragment();
     }
@@ -138,13 +142,13 @@ public class DetailViewHolder {
     }
 
     static class OnDetailDownloadClickListener implements View.OnClickListener {
-        private DetailViewHolder mViewHolder;
-        private GameEntity mGameEntity;
+        private final DetailViewHolder mViewHolder;
+        private final GameEntity mGameEntity;
         private DownloadEntity mDownloadEntity;
-        private String mEntrance;
-        private String mName;
-        private String mTitle;
-        private ExposureEvent mTraceEvent;
+        private final String mEntrance;
+        private final String mName;
+        private final String mTitle;
+        private final ExposureEvent mTraceEvent;
 
         public OnDetailDownloadClickListener(DetailViewHolder viewHolder, String entrance, String name, String title, ExposureEvent traceEvent) {
             mViewHolder = viewHolder;
@@ -158,67 +162,7 @@ public class DetailViewHolder {
 
         @Override
         public void onClick(View v) {
-            if (mViewHolder.mDownloadPb.getButtonStyle() != DownloadButton.ButtonStyle.RESERVABLE && mViewHolder.mDownloadPb.getButtonStyle() != DownloadButton.ButtonStyle.RESERVED) {
-                SensorsBridge.trackEvent(
-                        "DownLoadbuttonClick",
-                        "game_id", mGameEntity.getId(),
-                        "game_name", mGameEntity.getName(),
-                        "game_type", mGameEntity.getCategoryChinese(),
-                        "download_status", mGameEntity.getDownloadStatusChinese(),
-                        "button_name", mViewHolder.mDownloadPb.getText(),
-                        "game_schema_type", mGameEntity.getGameBitChinese(),
-                        "page_name", GlobalActivityManager.getCurrentPageEntity().getPageName(),
-                        "page_id", GlobalActivityManager.getCurrentPageEntity().getPageId(),
-                        "page_business_id", GlobalActivityManager.getCurrentPageEntity().getPageBusinessId(),
-                        "last_page_name", GlobalActivityManager.getLastPageEntity().getPageName(),
-                        "last_page_id", GlobalActivityManager.getLastPageEntity().getPageId(),
-                        "last_page_business_id", GlobalActivityManager.getLastPageEntity().getPageBusinessId()
-                );
-            }
-
-            // 这个 switch 纯粹是为了 MTA和上报光能任务 统计用的
-            switch (mViewHolder.mDownloadPb.getButtonStyle()) {
-                case DOWNLOADING_PLUGIN:
-                    MtaHelper.onEvent("游戏详情_新", "插件化中", mGameEntity.getName());
-                    break;
-                case DOWNLOADING_NORMAL:
-                    MtaHelper.onEvent("游戏详情_新", "下载中", mGameEntity.getName());
-                    break;
-                case NONE:
-                    MtaHelper.onEvent("游戏详情_新", "关闭下载", mGameEntity.getName());
-                    break;
-                case NORMAL:
-                    MtaHelper.onEvent("游戏详情_新", "下载", mGameEntity.getName());
-                    break;
-                case PLUGIN:
-                    MtaHelper.onEvent("游戏详情_新", "插件化", mGameEntity.getName());
-                    break;
-                case INSTALL_PLUGIN:
-                    MtaHelper.onEvent("游戏详情_新", "安装插件化", mGameEntity.getName());
-                    break;
-                case INSTALL_NORMAL:
-                    MtaHelper.onEvent("游戏详情_新", "安装", mGameEntity.getName());
-                    break;
-                case RESERVABLE:
-                    MtaHelper.onEvent("游戏详情_新", "预约", mGameEntity.getName());
-                    break;
-                case LAUNCH_OR_OPEN:
-                    if (!mGameEntity.getApk().isEmpty()) {
-                    }
-                    break;
-            }
-            // 由于部分状态不包含在 downloadType 里，所以还是需要手动获取下载按钮文字判断点击时的状态
-            String downloadText = mViewHolder.mDownloadPb.getText().toString();
-            if (downloadText.contains("打开")) {
-                MtaHelper.onEvent("游戏详情_新", "打开", mGameEntity.getName());
-            } else if (downloadText.contains("启动")) {
-                MtaHelper.onEvent("游戏详情_新", "启动", mGameEntity.getName());
-            } else if (downloadText.contains("更新")) {
-                MtaHelper.onEvent("游戏详情_新", "更新", mGameEntity.getName());
-            }
-
             v.setTag(null);
-
             if (mViewHolder.mDownloadPb.getButtonStyle() != DownloadButton.ButtonStyle.INSTALL_NORMAL
                     && mViewHolder.mDownloadPb.getButtonStyle() != DownloadButton.ButtonStyle.INSTALL_PLUGIN
                     && mViewHolder.mDownloadPb.getButtonStyle() != DownloadButton.ButtonStyle.LAUNCH_OR_OPEN) {
@@ -236,6 +180,9 @@ public class DetailViewHolder {
 
             if (mDownloadEntity != null) {
                 String xapkStatus = mDownloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
+                if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus) && XapkInstaller.INSTANCE.isInstalling(mDownloadEntity.getPath())) {// 安装过程中避免重复点击
+                    return;
+                }
                 if (XapkUnzipStatus.UNZIPPING.name().equals(xapkStatus)) {
                     XapkInstaller.cancelUnzipTask(mDownloadEntity);
                     return;
@@ -261,15 +208,12 @@ public class DetailViewHolder {
                     String offStatus = mGameEntity.getDownloadOffStatus();
                     if (offStatus != null && !"off".equals(offStatus)) {
                         if ("dialog".equals(offStatus)) {
-//                            MtaHelper.onEvent("游戏下载状态按钮", "查看详情", mGameEntity.getName());
                             showOffServiceDialog(mGameEntity.getDownloadOffDialog());
                         } else if ("toast".equals(offStatus)) {
-//                            MtaHelper.onEvent("游戏下载状态按钮", "关闭且toast", mGameEntity.getName());
                             EventBus.getDefault().post(new EBReuse(GameDetailFragment.SKIP_RATING));
                             Utils.toast(mViewHolder.context, "该游戏因故暂不提供下载，具体详情可在相关评论中查看，敬请谅解～");
                         }
                     } else {
-//                        MtaHelper.onEvent("游戏下载状态按钮", "暂无下载", mGameEntity.getName());
                         Utils.toast(mViewHolder.context, "该游戏已关闭下载");
                     }
                     break;
@@ -282,9 +226,9 @@ public class DetailViewHolder {
                         DataLogUtils.uploadGameLog(mViewHolder.context, mGameEntity.getId(), mGameEntity.getName(), mEntrance);
                     }
                 case PLUGIN:
-
-
                     ChainBuilder builder = new ChainBuilder();
+                    builder.addHandler(new AutoSwitchAssistantInstallHandler());
+                    builder.addHandler(new UnsupportedFeatureHandler());
                     builder.addHandler(new UpdateNewSimulatorHandler());
                     builder.addHandler(new GamePermissionHandler());
                     builder.addHandler(new CheckStoragePermissionHandler());
@@ -347,11 +291,11 @@ public class DetailViewHolder {
                         }
 
                         if (mGameEntity.isVGame()) {
-                            VHelper.installOrLaunch(mViewHolder.context, mGameEntity);
+                            VHelper.installOrLaunch(mViewHolder.context, mGameEntity, null);
                             return;
                         }
 
-                        PackageUtils.launchApplicationByPackageName(mViewHolder.context, mGameEntity.getApk().get(0).getPackageName());
+                        PackageLauncher.launchApp(mViewHolder.context, mGameEntity, mGameEntity.getApk().get(0).getPackageName());
                     } else {
                         GamePermissionDialogFragment.show((AppCompatActivity) mViewHolder.context, mGameEntity, mGameEntity.getInfo(), () -> {
                             PermissionHelper.checkStoragePermissionBeforeAction(mViewHolder.context, () -> {
@@ -389,7 +333,7 @@ public class DetailViewHolder {
                     }
 
                     if (mGameEntity.isVGame()) {
-                        VHelper.installOrLaunch(v.getContext(), mGameEntity);
+                        VHelper.installOrLaunch(v.getContext(), mGameEntity, null);
                         return;
                     }
 
@@ -436,7 +380,6 @@ public class DetailViewHolder {
                     }
                     break;
                 case H5_GAME:
-                    MtaHelper.onEvent("H5页面", "入口", "详情页_" + mGameEntity.getName());
                     LinkEntity linkEntity = mGameEntity.getH5Link();
 
                     boolean isPlay = "play".equals(linkEntity.getType()); // 是否为开始玩
@@ -482,7 +425,7 @@ public class DetailViewHolder {
                     }
 
                     if (mDownloadEntity != null) {
-                        if (downloadText.contains("继续加载")) {
+                        if (mViewHolder.mDownloadPb.getText().contains("继续加载")) {
                             DownloadManager.getInstance().resume(mDownloadEntity, true);
                         } else {
                             DownloadManager.getInstance().pause(mDownloadEntity.getUrl());

app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt

@@ -31,6 +31,8 @@ class GameHeadViewHolder(var binding: GameHeadItemBinding) :
         binding.arrowIv.visibility = View.GONE
         val text = if ("change" == subject.home) {
             "换一批"
+        } else if (subject.type == "game_list_collection" && subject.style?.contains("slide") == true) {
+            "游戏单广场"
         } else {
             when (subject.home) {
                 "more" -> "更多"
@@ -62,7 +64,7 @@ class GameHeadViewHolder(var binding: GameHeadItemBinding) :
         } else {
             binding.headMore.visibility = View.VISIBLE
         }
-        if (binding.headMore.visibility == View.VISIBLE && (binding.headMore.text == "更多" || binding.headMore.text == "全部")) {
+        if (binding.headMore.visibility == View.VISIBLE && (binding.headMore.text == "更多" || binding.headMore.text == "全部" || binding.headMore.text == "游戏单广场")) {
             binding.arrowIv.visibility = View.VISIBLE
         }
         binding.headTitle.setTextColor(R.color.text_title.toColor(binding.root.context))

app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java

@@ -3,7 +3,7 @@ package com.gh.gamecenter.adapter.viewholder;
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder;
 import com.gh.gamecenter.common.callback.OnListClickListener;
 import com.gh.gamecenter.databinding.NewsDigestItemBinding;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 
 /**
  * Created by Administrator on 2016/9/8.

app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt

@@ -24,7 +24,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.NumberUtils
 import com.gh.gamecenter.databinding.AmwayCommentItemBinding
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.feature.game.GameItemViewHolder
@@ -42,7 +42,8 @@ import java.util.regex.Pattern
 class AmwayAdapter(
     context: Context,
     private var mViewModel: AmwayViewModel,
-    private var mBasicExposureSource: List<ExposureSource>,
+    private var mBasicExposureSource: ArrayList<ExposureSource>,
+    private var mUseAlternativeLayout: Boolean,
     private var mLayoutManager: RecyclerView.LayoutManager
 ) : ListAdapter<AmwayListItemData>(context), IExposable {
 
@@ -102,6 +103,7 @@ class AmwayAdapter(
                         mViewModel,
                         mEntityList[position],
                         mEntityList[position].blockPosition,
+                        mUseAlternativeLayout,
                         mBasicExposureSource
                     )
                 }
@@ -203,6 +205,7 @@ class AmwayAdapter(
             viewModel: AmwayViewModel,
             itemData: AmwayListItemData,
             blockPosition: Int,
+            useAlternativeLayout: Boolean,
             basicExposureSource: List<ExposureSource>
         ) {
             val context = binding.root.context
@@ -269,9 +272,22 @@ class AmwayAdapter(
             }
 
             binding.commentContainer.setOnClickListener {
+                val exposureSource = if (useAlternativeLayout) {
+                    arrayListOf(ExposureSource("新首页"), ExposureSource("安利墙"))
+                } else {
+                    arrayListOf(ExposureSource("安利墙"))
+                }.toJson()
+
                 val intent = RatingReplyActivity.getIntent(
-                    context, amway.game.id, amway.comment, false, viewModel.entrance
-                        ?: "", EntranceConsts.ENTRANCE_AMWAY
+                    context = context,
+                    gameId = amway.game.id,
+                    gameEntity = null,
+                    comment = amway.comment,
+                    commentId = amway.comment.id,
+                    showKeyboardIfReplyListIsEmpty = false,
+                    exposureSource = exposureSource,
+                    entrance = viewModel.entrance ?: "",
+                    path = EntranceConsts.ENTRANCE_AMWAY
                 )
                 SyncDataBetweenPageHelper.startActivityForResult(
                     binding.root.context,

app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt

@@ -32,8 +32,8 @@ import com.gh.gamecenter.core.utils.TimeElapsedHelper
 import com.gh.gamecenter.databinding.FragmentAmwayAlBinding
 import com.gh.gamecenter.databinding.FragmentAmwayBinding
 import com.gh.gamecenter.entity.RatingComment
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment
 import com.gh.gamecenter.gamedetail.rating.RatingFragment
 import com.google.android.material.appbar.AppBarLayout
@@ -145,7 +145,8 @@ class AmwayFragment : LazyListFragment<AmwayListItemData, AmwayViewModel>() {
                 }
                 add(ExposureSource("安利墙", ""))
             }
-            mAdapter = AmwayAdapter(requireContext(), mViewModel, basicExposureSource, mLayoutManager)
+            mAdapter =
+                AmwayAdapter(requireContext(), mViewModel, basicExposureSource, mUseAlternativeLayout, mLayoutManager)
         }
         return mAdapter!!
     }

app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt

@@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toBinding
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.core.utils.StringUtils
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt

@@ -21,8 +21,8 @@ import com.gh.gamecenter.databinding.FragmentCatalogListBinding
 import com.gh.gamecenter.entity.CatalogEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt

@@ -184,6 +184,7 @@ class SpecialCatalogAdapter(
                                 specialLink.link,
                                 specialLink.text,
                                 false,
+                                null,
                                 "(游戏-专题:" + specialLink.text + "-全部)"
                             )
                         }

app/src/main/java/com/gh/gamecenter/category/NewCategoryListAdapter.kt

@@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toBinding
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.core.utils.StringUtils
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt

@@ -23,8 +23,8 @@ import com.gh.gamecenter.databinding.FragmentTagsBinding
 import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe

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

@@ -24,7 +24,7 @@ import com.gh.gamecenter.core.utils.PageSwitchDataHelper
 import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.databinding.CategoryGameItemBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.game.GameItemViewHolder
 import com.lightgame.download.DownloadEntity
 import org.json.JSONException
@@ -193,6 +193,8 @@ class CategoryV2ListAdapter(
                 true,
                 "star&brief"
             )
+
+            holder.binding.downloadBtn.putWidgetBusinessName("分类列表")
         } else if (holder is FooterViewHolder) {
             holder.run {
                 initItemPadding()

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

@@ -20,8 +20,8 @@ import com.gh.gamecenter.databinding.LayoutSelectedCategoryBinding
 import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.google.android.flexbox.FlexboxLayout
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.ColorDrawable
+import android.util.SparseArray
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -13,6 +14,7 @@ import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
+import com.gh.common.exposure.IExposable
 import com.gh.gamecenter.common.constant.ItemViewType
 import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler
 import com.gh.common.util.*
@@ -30,6 +32,10 @@ import com.gh.gamecenter.databinding.ItemGameCollectionFlexTagBinding
 import com.gh.gamecenter.databinding.PopupHistoryOptionBinding
 import com.gh.gamecenter.entity.GamesCollectionEntity
 import com.gh.gamecenter.entity.TagInfoEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
+import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
 import com.gh.gamecenter.history.ManageOption
@@ -39,12 +45,19 @@ import com.google.android.flexbox.FlexboxLayout
 class GamesCollectionAdapter(
     context: Context,
     private val mViewModel: GamesCollectionViewModel,
-) : ListAdapter<GamesCollectionEntity>(context), ISyncAdapterHandler {
+) : ListAdapter<GamesCollectionEntity>(context), ISyncAdapterHandler, IExposable {
 
     private var mCurrentOption = ManageOption.OPTION_MANAGER
     private var mPopWindow: PopupWindow? = null
     private var mPopupBinding: PopupHistoryOptionBinding? = null
     var selectItems = arrayListOf<String>()
+    private var mExposureEventArray: SparseArray<ExposureEvent>? = null
+
+
+    override fun setListData(updateData: MutableList<GamesCollectionEntity>?) {
+        mExposureEventArray = SparseArray(updateData?.size ?: 0)
+        super.setListData(updateData)
+    }
 
     override fun getItemCount(): Int {
         return if (mEntityList == null || mEntityList.isEmpty()) return 0 else mEntityList.size + 1
@@ -102,6 +115,19 @@ class GamesCollectionAdapter(
         when (holder) {
             is GameCollectionItemViewHolder -> {
                 val itemEntity = mEntityList[position]
+                val exposureEvent = ExposureEvent.createEvent(
+                    GameEntity().apply {
+                        sequence = position
+                    },
+                    listOf(
+                        ExposureSource("个人主页", ""),
+                        ExposureSource("游戏单", "${itemEntity.title}+${itemEntity.id}")
+                    ),
+                    null,
+                    ExposureType.EXPOSURE
+                )
+                mExposureEventArray?.put(position, exposureEvent)
+
                 holder.binding.run {
                     ImageUtils.display(poster, itemEntity.cover)
                     nameTv.text = itemEntity.title
@@ -117,7 +143,7 @@ class GamesCollectionAdapter(
                         gameThree.goneIf(it < 3)
                     }
 
-                    moreNumTv.goneIf((itemEntity.count?.game ?: 0) < 4)
+                    moreNumTv.goneIf((itemEntity.count?.game ?: 0) < 4 || itemEntity.games?.size == 0)
                     moreNumTv.text = "+ " + ((itemEntity.count?.game ?: 0) - 3)
                     tagContainer.goneIf(itemEntity.count?.game != 0)
                     timeTv.text = TimeUtils.getFormatTime(itemEntity.time?.update ?: 0, "MM - dd")
@@ -235,7 +261,8 @@ class GamesCollectionAdapter(
                                 GameCollectionDetailActivity.getIntent(
                                     mContext,
                                     itemEntity.id,
-                                    isScrollToCommentArea = true
+                                    isScrollToCommentArea = true,
+                                    exposureSourceList = ArrayList(exposureEvent.source)
                                 )
                             )
                         }
@@ -294,7 +321,13 @@ class GamesCollectionAdapter(
                         } else {
                             if (mCurrentOption == ManageOption.OPTION_MANAGER) {
                                 NewLogUtils.logEnterGameCollectionDetail(itemEntity.title, itemEntity.id)
-                                mContext.startActivity(GameCollectionDetailActivity.getIntent(mContext, itemEntity.id))
+                                mContext.startActivity(
+                                    GameCollectionDetailActivity.getIntent(
+                                        mContext,
+                                        itemEntity.id,
+                                        exposureSourceList = ArrayList(exposureEvent.source)
+                                    )
+                                )
                             } else {
                                 if (selectItems.contains(itemEntity.id)) {
                                     selectItems.remove(itemEntity.id)
@@ -459,4 +492,8 @@ class GamesCollectionAdapter(
             checkAllCb.isChecked = selectItems.size == mEntityList.size
         }
     }
+
+    override fun getEventByPosition(pos: Int): ExposureEvent? = mExposureEventArray!!.get(pos)
+
+    override fun getEventListByPosition(pos: Int): List<ExposureEvent>? = null
 }

app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt

@@ -3,6 +3,7 @@ package com.gh.gamecenter.collection
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
+import com.gh.common.exposure.ExposureListener
 import com.gh.gamecenter.common.constant.EntranceConsts.*
 import com.gh.gamecenter.common.view.SpacingItemDecoration
 import com.gh.gamecenter.R
@@ -76,6 +77,8 @@ class GamesCollectionFragment : ListFragment<GamesCollectionEntity, GamesCollect
         mListViewModel.publishLiveData.observe(viewLifecycleOwner) {
             mListViewModel.load(LoadType.REFRESH)
         }
+
+        mListRv.addOnScrollListener(ExposureListener(this, provideListAdapter()))
     }
 
     override fun onLoadEmpty() {

app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt

@@ -31,7 +31,7 @@ import com.gh.gamecenter.databinding.ItemRecommendInterestImageBinding
 import com.gh.gamecenter.discovery.DiscoveryFragment.Companion.INTERESTED_GAME_REQUEST_CODE
 import com.gh.gamecenter.discovery.interestedgame.InterestedGameActivity
 import com.gh.gamecenter.entity.DiscoveryGameCardLabel
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
@@ -223,7 +223,7 @@ class DiscoveryAdapter(
                         val navBar = MainWrapperRepository.getInstance().getNavBarLiveData().value
                         if (navBar == null || mContext is DiscoveryActivity) {
                             val blockData = HomeBottomBarHelper.getDefaultGameBarData()
-                            mContext.startActivity(BlockActivity.getIntent(mContext, blockData, mEntrance))
+                            mContext.startActivity(BlockActivity.getIntent(mContext, blockData, mBaseExposureSource, mEntrance))
                         } else {
                             EventBus.getDefault()
                                 .post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_GAME))

app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt

@@ -32,8 +32,8 @@ import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.databinding.LayoutDiscoveryGuideBinding
 import com.gh.gamecenter.databinding.LayoutPopupDiscoveryDislikeBinding
 import com.gh.gamecenter.eventbus.EBDiscoverChanged
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.google.android.flexbox.FlexboxLayout
 import com.lightgame.download.DataWatcher

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

@@ -23,7 +23,7 @@ import com.gh.gamecenter.entity.HomePluggableFilterEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.eventbus.EBDownloadChanged
 import com.gh.gamecenter.eventbus.EBSkip
-import com.gh.gamecenter.eventbus.EBUISwitch
+import com.gh.gamecenter.common.eventbus.EBUISwitch
 import com.gh.gamecenter.manager.PackagesManager
 import com.lightgame.download.DownloadStatus
 import org.greenrobot.eventbus.EventBus
@@ -122,7 +122,12 @@ class DownloadFragment : BaseFragment_TabLayout() {
     }
 
     override fun onPageSelected(index: Int) {
-        EventBus.getDefault().post(EBUISwitch(DownloadManagerActivity.TAG, index))
+        EventBus.getDefault().post(
+            EBUISwitch(
+                DownloadManagerActivity.TAG,
+                index
+            )
+        )
 
         if (index == INDEX_UPDATE) {
             mIsUpdateTabHasBeenSelected = true

app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java

@@ -8,36 +8,36 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gh.common.xapk.XapkDialogHelper;
-import com.gh.gamecenter.common.base.fragment.BaseFragment;
-import com.gh.gamecenter.common.utils.DialogHelper;
-import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.xapk.XapkDialogHelper;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.MainActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.common.base.fragment.BaseFragment;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.eventbus.EBMiPush;
+import com.gh.gamecenter.common.eventbus.EBPackage;
+import com.gh.gamecenter.common.eventbus.EBUISwitch;
+import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.databinding.DownloadmanagerBinding;
 import com.gh.gamecenter.eventbus.EBDownloadChanged;
-import com.gh.gamecenter.common.eventbus.EBMiPush;
-import com.gh.gamecenter.eventbus.EBPackage;
-import com.gh.gamecenter.eventbus.EBUISwitch;
 import com.gh.gamecenter.fragment.MainWrapperFragment;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.DataWatcher;
 import com.lightgame.download.DownloadConfig;
+import com.lightgame.download.DownloadDao;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 
@@ -222,6 +222,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi
     protected void initView(View view) {
         super.initView(view);
         String path = getActivity().getIntent().getStringExtra(EntranceConsts.KEY_PATH);
+        String pluginDesc = getActivity().getIntent().getStringExtra(EntranceConsts.KEY_PLUGIN_DESC);
         url = getActivity().getIntent().getStringExtra(EntranceConsts.KEY_URL);
 
         isScroll = false;
@@ -297,7 +298,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi
         });
 
         if (path != null) {
-            adapter.showPluginDialog(path);
+            adapter.showPluginDialog(path, pluginDesc);
         }
         mBinding.downloadmanagerTvAllstart.setOnClickListener(this);
     }
@@ -342,8 +343,8 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(EBMiPush mipush) {
         if ("plugin_install".equals(mipush.getFrom())) {
-            String path = (String) mipush.getObj();
-            adapter.showPluginDialog(path);
+            DownloadEntity downloadEntity = (DownloadEntity) mipush.getObj();
+            adapter.showPluginDialog(downloadEntity.getPath(), downloadEntity.getPluginDesc());
         }
     }
 

app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.PackageInstaller;
+import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.xapk.XapkDialogHelper;
 import com.gh.gamecenter.common.entity.IconFloat;
@@ -210,7 +211,11 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                 } else if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus)) {
                     viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.XAPK_SUCCESS);
                     viewHolder.binding.dmItemTvStartorpause.setProgress(1000);
-                    viewHolder.binding.dmItemTvStartorpause.setText(R.string.hundred_percent);
+                    if (XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
+                        viewHolder.binding.dmItemTvStartorpause.setText(R.string.installing);
+                    } else {
+                        viewHolder.binding.dmItemTvStartorpause.setText(R.string.install);
+                    }
                 }
                 if (xapkStatus != null && !xapkStatus.isEmpty()) {
                     xapkStatusMap.put(downloadEntity.getUrl(), xapkStatus);
@@ -264,17 +269,20 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
             viewHolder.binding.dmItemTvStartorpause.setOnClickListener(v -> {
                 String str = ((DownloadButton) v).getText();
                 final String url = downloadEntity.getUrl();
+                final String currentXApkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
                 DownloadManager.getInstance().put(url, System.currentTimeMillis());
-                if (XapkUnzipStatus.UNZIPPING.name().equals(xapkStatus)) {
+                if (XapkUnzipStatus.SUCCESS.name().equals(currentXApkStatus) && XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
+                    return;
+                } else if (XapkUnzipStatus.UNZIPPING.name().equals(currentXApkStatus)) {
                     XapkInstaller.cancelUnzipTask(downloadEntity);
                     return;
-                } else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)
-                        || XapkUnzipStatus.SUCCESS.name().equals(xapkStatus)) {
+                } else if (XapkUnzipStatus.FAILURE.name().equals(currentXApkStatus)
+                        || XapkUnzipStatus.SUCCESS.name().equals(currentXApkStatus)) {
                     PermissionHelper.checkStoragePermissionBeforeAction(mContext, () -> {
                         final String path = downloadEntity.getPath();
                         if (downloadEntity.isPluggable()
                                 && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
-                            showPluginDialog(downloadEntity.getPath());
+                            showPluginDialog(downloadEntity.getPath(), downloadEntity.getPluginDesc());
                         } else {
                             if (FileUtils.isEmptyFile(path)) {
                                 Utils.toast(mContext, R.string.install_failure_hint);
@@ -323,7 +331,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                 final String path = downloadEntity.getPath();
                                 if (downloadEntity.isPluggable()
                                         && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
-                                    showPluginDialog(downloadEntity.getPath());
+                                    showPluginDialog(downloadEntity.getPath(), downloadEntity.getPluginDesc());
                                 } else {
                                     if (FileUtils.isEmptyFile(path)) {
                                         Utils.toast(mContext, R.string.install_failure_hint);
@@ -334,7 +342,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                 }
                             });
                         } else if (str.equals(mContext.getString(R.string.launch))) {
-                            PackageUtils.launchApplicationByPackageName(mContext, downloadEntity.getPackageName());
+                            PackageLauncher.launchApp(mContext, null, downloadEntity.getPackageName());
                         }
                         break;
                     case redirected:
@@ -469,8 +477,8 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
     }
 
     // 显示插件化
-    void showPluginDialog(final String path) {
-        DialogHelper.showPluginDialog(mContext, () -> {
+    void showPluginDialog(final String path, final String pluginDesc) {
+        DialogHelper.showPluginDialog(mContext, pluginDesc, () -> {
             if (FileUtils.isEmptyFile(path)) {
                 Utils.toast(mContext, R.string.install_failure_hint);
             } else {
@@ -629,8 +637,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
             statusMap.put(downloadEntity.getUrl(), downloadEntity.getStatus().name());
             if (DownloadStatus.done.equals(downloadEntity.getStatus())) {
                 if (!ExtensionsKt.isSimulatorGame(downloadEntity)) {
-                    urlMap.put(PackageUtils.getPackageNameByPath(mContext,
-                            downloadEntity.getPath()), downloadEntity.getUrl());
+                    urlMap.put(downloadEntity.getPackageName(), downloadEntity.getUrl());
                     mDownloadedList.add(downloadEntity);
                 }
             } else {

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

@@ -24,8 +24,8 @@ import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.databinding.FragmentMyGameBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.GameInstall
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository

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

@@ -15,12 +15,11 @@ import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.common.exposure.IExposable
 import com.gh.common.simulator.SimulatorGameManager.isSimulatorGame
 import com.gh.common.util.*
-import com.gh.common.util.DownloadItemUtils.setOnClickListener
-import com.gh.common.util.DownloadItemUtils.updateItem
 import com.gh.gamecenter.GameDetailActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
+import com.gh.gamecenter.common.utils.putWidgetBusinessName
 import com.gh.gamecenter.common.utils.safelyGetInRelease
 import com.gh.gamecenter.feature.databinding.GameItemBinding
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -92,17 +91,18 @@ class NewInstalledGameFragmentAdapter(context: Context, private var mViewModel:
         }
         binding.gameName.text = name
         generateExposureEvent(gameEntity)
-        setOnClickListener(
+        DownloadItemUtils.setOnClickListener(
             binding.root.context,
             binding.downloadBtn,
             gameEntity,
             1,
             this@NewInstalledGameFragmentAdapter,
             "(我的光环-已安装)", "我的光环-已安装" + ":" + gameEntity.name,
-            gameEntity.exposureEvent //            , () -> MtaHelper.onEvent("下载管理", "已安装", binding.downloadBtn.getText().toString())
+            gameEntity.exposureEvent
         )
-        updateItem(binding.root.context, gameEntity, GameViewHolder(binding), !gameEntity.isPluggable)
-        holder.itemView.setOnClickListener { v: View? ->
+        binding.downloadBtn.putWidgetBusinessName("下载管理")
+        DownloadItemUtils.updateItem(binding.root.context, gameEntity, GameViewHolder(binding), !gameEntity.isPluggable)
+        holder.itemView.setOnClickListener {
             DataCollectionUtils.uploadClick(binding.root.context, "列表", "我的光环-我的游戏", gameEntity.name)
             GameDetailActivity.startGameDetailActivity(
                 binding.root.context,

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

@@ -8,25 +8,23 @@ import android.widget.LinearLayout
 import androidx.core.view.setPadding
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
-import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.common.exposure.IExposable
 import com.gh.common.util.*
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
 import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.databinding.*
 import com.gh.gamecenter.entity.GameUpdateEntity
 import com.gh.gamecenter.eventbus.EBSkip
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
+import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.home.BlankDividerViewHolder
 import com.gh.gamecenter.manager.PackagesManager
 import com.lightgame.download.DownloadEntity
@@ -335,6 +333,8 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) :
             }
         }
 
+        updateBtn.putWidgetBusinessName("下载管理")
+        updateBtn.putObject(update)
         updateBtn.setOnClickListener {
             val str: String = updateBtn.text.toString()
             if ("更新" == str || str.contains("化")) {
@@ -380,7 +380,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) :
                     }
                 }
             } else if (updateBtn.context.getString(R.string.launch) == str) {
-                PackageUtils.launchApplicationByPackageName(updateBtn.context, update.packageName)
+                PackageLauncher.launchApp(updateBtn.context, packageName = update.packageName)
             } else if (updateBtn.context.getString(R.string.resume) == str) {
                 if (downloadEntity != null) {
                     DownloadManager.getInstance().resume(downloadEntity, true)
@@ -401,21 +401,6 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) :
                     updateBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 }
             }
-
-            SensorsBridge.trackEvent(
-                "DownLoadbuttonClick",
-                "game_id", update.id,
-                "game_name", update.name ?: "",
-                "game_type", update.categoryChinese,
-                "download_status", update.downloadStatusChinese,
-                "button_name", str,
-                "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
-                "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
-                "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
-                "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
-                "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
-                "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
-            )
         }
     }
 

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

@@ -13,7 +13,7 @@ import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.databinding.FragmentGameUpdatableBinding
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel

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

@@ -16,11 +16,8 @@ import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
 import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.SensorsBridge.trackEvent
-import com.gh.gamecenter.common.utils.addMetaExtra
-import com.gh.gamecenter.common.utils.secondOrNull
-import com.gh.gamecenter.common.utils.toProperReadableSize
-import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.utils.GsonUtils.toJson
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.UrlFilterUtils
@@ -78,7 +75,9 @@ class UpdatableGameViewModel(
                 // 有闪退日志说这个 update 实体可能为空，实在看不原因 ：(
                 if (update == null) continue
                 // 筛选仅下载管理出现的插件化更新
-                if (update.isShowPlugin(PluginLocation.only_index) && update.downloadStatus != "smooth") {
+                if (update.isShowPlugin(PluginLocation.only_index)
+                    && update.downloadStatus != Constants.V_GAME
+                    && update.downloadStatus != Constants.V_GAME_32) {
                     val platform =
                         PlatformUtils.getInstance(getApplication()).getPlatformName(update.platform)
                     if (!platform.isNullOrEmpty() && "官方版" != platform) {
@@ -590,7 +589,8 @@ class UpdatableGameViewModel(
         downloadEntity.addMetaExtra(Constants.DOWNLOAD_ID, downloadId)
         downloadEntity.addMetaExtra(Constants.APK_MD5, update.md5)
         downloadEntity.addMetaExtra(Constants.GAME_NAME, update.name)
-        downloadEntity.addMetaExtra(Constants.GAME_TYPE, update.categoryChinese)
+        downloadEntity.addMetaExtra(Constants.GAME_CATEGORY_IN_CHINESE, update.categoryChinese)
+        downloadEntity.putGameCategory(update.category ?: "")
         if (update.iconFloat != null) {
             downloadEntity.addMetaExtra(Constants.GAME_ICON_FLOAT_TOP_TEXT, update.iconFloat?.upperLeftText)
             downloadEntity.addMetaExtra(Constants.GAME_ICON_FLOAT_TOP_COLOR, update.iconFloat?.upperLeftColor)