chore: va组件2.0.5-debug

chore: va组件2.0.5
Revert "feat:同步商业版代码至：dbc3b8ecaca3e774b1e63f41e70b651f4acfaee1"
2024-09-10 16:43:57 +08:00 · 2024-09-10 13:46:15 +08:00 · 2024-09-05 15:22:32 +08:00 · 2024-09-04 17:03:37 +08:00 · 2024-09-04 16:00:00 +08:00 · 2024-09-04 15:54:34 +08:00
9 changed files with 37 additions and 38 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -72,7 +72,7 @@ android_build:
  only:
    - dev
    - release
-    - feat/GHZSCY-6578
+    - feat/GHZSCY-6644

 # 代码检查
 sonarqube_analysis:
@ -158,4 +158,4 @@ oss-upload&send-email:
    only:
        - dev
        - release
-        - feat/GHZSCY-6578
+        - feat/GHZSCY-6644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/SpecialDownloadDialogFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/SpecialDownloadDialogFragment.kt
@ -394,7 +394,7 @@ class SpecialDownloadDialogFragment : BaseDraggableDialogFragment() {
            SensorsBridge.trackDownloadComponentsContentClick(
                gameId = gameEntity.id,
                gameName = gameEntity.name ?: "unknown",
-                gameSchemeType = gameEntity.gameBitChinese,
+                gameSchemaType = gameEntity.gameBitChinese,
                downloadStatus = gameEntity.downloadStatusChinese,
                gameType = gameEntity.categoryChinese,
                downloadType = if (asVGame) "畅玩下载" else "本地下载",
@ -405,7 +405,7 @@ class SpecialDownloadDialogFragment : BaseDraggableDialogFragment() {
            SensorsBridge.trackDownloadComponentsShow(
                gameId = gameEntity.id,
                gameName = gameEntity.name ?: "unknown",
-                gameSchemeType = gameEntity.gameBitChinese,
+                gameSchemaType = gameEntity.gameBitChinese,
                downloadStatus = gameEntity.downloadStatusChinese,
                gameType = gameEntity.categoryChinese,
                downloadType = if (asVGame) "畅玩下载" else "本地下载",
--- a/app/src/main/java/com/gh/gamecenter/hud/HeadUpDisplayLogHelper.kt
+++ b/app/src/main/java/com/gh/gamecenter/hud/HeadUpDisplayLogHelper.kt
@ -13,7 +13,7 @@ object HeadUpDisplayLogHelper {
            source = source,
            downloadType = if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
            downloadStatus =  downloadEntity.getMetaExtra(Constants.DOWNLOAD_STATUS_IN_CHINESE),
-            gameSchemeType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+            gameSchemaType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
            gameType = downloadEntity.getMetaExtra(Constants.GAME_CATEGORY_IN_CHINESE),
            gameId = downloadEntity.gameId,
            gameName = downloadEntity.name
@ -25,7 +25,7 @@ object HeadUpDisplayLogHelper {
            source = source,
            downloadType = if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
            downloadStatus =  downloadEntity.getMetaExtra(Constants.DOWNLOAD_STATUS_IN_CHINESE),
-            gameSchemeType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+            gameSchemaType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
            gameType = downloadEntity.getMetaExtra(Constants.GAME_CATEGORY_IN_CHINESE),
            gameId = downloadEntity.gameId,
            gameName = downloadEntity.name
@ -36,7 +36,7 @@ object HeadUpDisplayLogHelper {
        SensorsBridge.trackAutomaticInstallationPromptBarShow(
            downloadType = if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
            downloadStatus =  downloadEntity.getMetaExtra(Constants.DOWNLOAD_STATUS_IN_CHINESE),
-            gameSchemeType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+            gameSchemaType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
            gameType = downloadEntity.getMetaExtra(Constants.GAME_CATEGORY_IN_CHINESE),
            gameId = downloadEntity.gameId,
            gameName = downloadEntity.name
@ -47,7 +47,7 @@ object HeadUpDisplayLogHelper {
        SensorsBridge.trackAutomaticInstallationPromptBarClick(
            downloadType = if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
            downloadStatus =  downloadEntity.getMetaExtra(Constants.DOWNLOAD_STATUS_IN_CHINESE),
-            gameSchemeType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+            gameSchemaType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
            gameType = downloadEntity.getMetaExtra(Constants.GAME_CATEGORY_IN_CHINESE),
            gameId = downloadEntity.gameId,
            gameName = downloadEntity.name
--- a/app/src/main/java/com/gh/ndownload/suspendwindow/NDownloadDrawOverlayPermissionWindowController.kt
+++ b/app/src/main/java/com/gh/ndownload/suspendwindow/NDownloadDrawOverlayPermissionWindowController.kt
@ -3,7 +3,6 @@ package com.gh.ndownload.suspendwindow
 import android.app.Activity
 import android.app.Application
 import android.app.Application.ActivityLifecycleCallbacks
-import android.os.Build
 import android.os.Bundle
 import androidx.core.view.ViewCompat
 import com.gh.gamecenter.common.constant.Constants
@ -128,7 +127,7 @@ class NDownloadDrawOverlayPermissionWindowController(val application: Applicatio
            SensorsBridge.trackDownloadSuspendedWindowGuideShow(
                gameId = downloadEntity.gameId,
                gameName = downloadEntity.name,
-                gameSchemeType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+                gameSchemaType = if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
                gameType = downloadEntity.categoryChinese,
                downloadStatus = downloadEntity.getMetaExtra(Constants.DOWNLOAD_STATUS_IN_CHINESE),
                downloadType = if (downloadEntity.asVGame()) "畅玩下载" else "本地下载"
--- a/build.gradle
+++ b/build.gradle
@ -17,8 +17,8 @@ buildscript {
                password("u9gZYH4MQEwLLQZK")
            }
        }
-        maven { url 'https://jitpack.io' }
        maven { url "https://maven.google.com" }
+        maven { url 'https://jitpack.io' }
    }

    dependencies {
@ -41,7 +41,6 @@ allprojects {
        google()
        jcenter()
        mavenCentral()
-        maven { url 'https://jitpack.io' }
        maven { url 'https://maven.aliyun.com/repository/public' }
        maven { url 'https://maven.aliyun.com/repository/central'}
        maven { url 'https://maven.aliyun.com/nexus/content/repositories/releases/' }
@ -55,6 +54,7 @@ allprojects {
        // 配置HMS Core SDK的Maven仓地址。
        maven { url 'https://developer.huawei.com/repo/' }
        maven { url 'https://developer.hihonor.com/repo' }
+        maven { url 'https://jitpack.io' }
    }
 }
 task clean(type: Delete) {
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -7,8 +7,8 @@ ext {
    targetSdkVersion = 30

    // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 1094
-    versionName = "5.37.4"
+    versionCode = 1095
+    versionName = "5.37.5"
    applicationId = "com.gh.gamecenter"
    applicationIdGat = "com.gh.gamecenter.intl"

--- a/dependencies_vasdk.gradle
+++ b/dependencies_vasdk.gradle
@ -1,5 +1,5 @@
 ext {
-    vaCompileSdkVersion = 33
+    vaCompileSdkVersion = 34
    vaMinSdkVersion = 21
    vaTargetSdkVersion = 28
 }
--- a/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt
@ -26,7 +26,7 @@ object SensorsBridge {
    private const val KEY_LAST_PAGE_BUSINESS_ID = "last_page_business_id"
    private const val KEY_DOWNLOAD_STATUS = "download_status"
    private const val KEY_DOWNLOAD_TYPE = "download_type"
-    private const val KEY_GAME_SCHEME_TYPE = "game_scheme_type"
+    private const val KEY_GAME_SCHEMA_TYPE = "game_schema_type"
    private const val KEY_GAME_TYPE = "game_type"
    const val KEY_POSITION = "position"
    const val KEY_TAB_CONTENT = "tab_content"
@ -4070,7 +4070,7 @@ object SensorsBridge {
     * 触发时机：当下载悬浮窗引导图展示时触发上报
     * @param gameId 游戏ID
     * @param gameName 游戏名称
-     * @param gameSchemeType 游戏架构类型：64位/32位
+     * @param gameSchemaType 游戏架构类型：64位/32位
     * @param downloadStatus 游戏下载状态
     * @param gameType 游戏的类型：单机、网游等
     * @param downloadType 实际下载方式：本地下载/畅玩下载
@ -4079,7 +4079,7 @@ object SensorsBridge {
    fun trackDownloadSuspendedWindowGuideShow(
        gameId: String,
        gameName: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        downloadStatus: String,
        gameType: String,
        downloadType: String
@ -4087,7 +4087,7 @@ object SensorsBridge {
        val json = json {
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_DOWNLOAD_STATUS to downloadStatus
            KEY_GAME_TYPE to gameType
            KEY_DOWNLOAD_TYPE to downloadType
@ -4126,7 +4126,7 @@ object SensorsBridge {
     * @param source 来源：游戏下载\重启APP
     * @param downloadType 所上报游戏的实际下载方式：本地下载/畅玩下载
     * @param downloadStatus 所上报游戏下载状态
-     * @param gameSchemeType 所上报游戏架构类型：64位/32位
+     * @param gameSchemaType 所上报游戏架构类型：64位/32位
     * @param gameType 游戏的类型：单机、网游等
     * @param gameId 游戏ID
     * @param gameName 游戏名称
@ -4135,7 +4135,7 @@ object SensorsBridge {
        source: String,
        downloadType: String,
        downloadStatus: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        gameType: String,
        gameId: String,
        gameName: String
@ -4144,7 +4144,7 @@ object SensorsBridge {
            KEY_SOURCE to source
            KEY_DOWNLOAD_TYPE to downloadType
            KEY_DOWNLOAD_STATUS to downloadStatus
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_GAME_TYPE to gameType
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
@ -4159,7 +4159,7 @@ object SensorsBridge {
     * @param source 来源：游戏下载\重启APP
     * @param downloadType 所上报游戏的实际下载方式：本地下载/畅玩下载
     * @param downloadStatus 所上报游戏下载状态
-     * @param gameSchemeType 所上报游戏架构类型：64位/32位
+     * @param gameSchemaType 所上报游戏架构类型：64位/32位
     * @param gameType 游戏的类型：单机、网游等
     * @param gameId 游戏ID
     * @param gameName 游戏名称
@ -4168,7 +4168,7 @@ object SensorsBridge {
        source: String,
        downloadType: String,
        downloadStatus: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        gameType: String,
        gameId: String,
        gameName: String
@ -4177,7 +4177,7 @@ object SensorsBridge {
            KEY_SOURCE to source
            KEY_DOWNLOAD_TYPE to downloadType
            KEY_DOWNLOAD_STATUS to downloadStatus
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_GAME_TYPE to gameType
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
@ -4191,7 +4191,7 @@ object SensorsBridge {
     * 触发时机：触发自动下载提示条展示时上报
     * @param downloadType 所上报游戏的实际下载方式：本地下载/畅玩下载
     * @param downloadStatus 所上报游戏下载状态
-     * @param gameSchemeType 所上报游戏架构类型：64位/32位
+     * @param gameSchemaType 所上报游戏架构类型：64位/32位
     * @param gameType 游戏的类型：单机、网游等
     * @param gameId 游戏ID
     * @param gameName 游戏名称
@ -4199,7 +4199,7 @@ object SensorsBridge {
    fun trackAutomaticInstallationPromptBarShow(
        downloadType: String,
        downloadStatus: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        gameType: String,
        gameId: String,
        gameName: String
@ -4207,7 +4207,7 @@ object SensorsBridge {
        val json = json {
            KEY_DOWNLOAD_TYPE to downloadType
            KEY_DOWNLOAD_STATUS to downloadStatus
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_GAME_TYPE to gameType
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
@ -4221,7 +4221,7 @@ object SensorsBridge {
     * 触发时机：触发自动下载提示条点击时上报
     * @param downloadType 所上报游戏的实际下载方式：本地下载/畅玩下载
     * @param downloadStatus 所上报游戏下载状态
-     * @param gameSchemeType 所上报游戏架构类型：64位/32位
+     * @param gameSchemaType 所上报游戏架构类型：64位/32位
     * @param gameType 游戏的类型：单机、网游等
     * @param gameId 游戏ID
     * @param gameName 游戏名称
@ -4229,7 +4229,7 @@ object SensorsBridge {
    fun trackAutomaticInstallationPromptBarClick(
        downloadType: String,
        downloadStatus: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        gameType: String,
        gameId: String,
        gameName: String
@ -4237,7 +4237,7 @@ object SensorsBridge {
        val json = json {
            KEY_DOWNLOAD_TYPE to downloadType
            KEY_DOWNLOAD_STATUS to downloadStatus
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_GAME_TYPE to gameType
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
@ -4251,7 +4251,7 @@ object SensorsBridge {
     * 触发时机：下载组件展示时上报
     * @param gameId 游戏ID
     * @param gameName 游戏名称
-     * @param gameSchemeType 游戏架构类型：64位/32位
+     * @param gameSchemaType 游戏架构类型：64位/32位
     * @param downloadStatus 所上报游戏下载状态
     * @param gameType 游戏的类型：单机、网游等
     * @param downloadType 所上报游戏的实际下载方式：本地下载/畅玩下载
@ -4259,7 +4259,7 @@ object SensorsBridge {
    fun trackDownloadComponentsShow(
        gameId: String,
        gameName: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        downloadStatus: String,
        gameType: String,
        downloadType: String,
@ -4267,7 +4267,7 @@ object SensorsBridge {
        val json = json {
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_DOWNLOAD_STATUS to downloadStatus
            KEY_GAME_TYPE to gameType
            KEY_DOWNLOAD_TYPE to downloadType
@ -4281,7 +4281,7 @@ object SensorsBridge {
     * 触发时机：下载组件点击时上报
     * @param gameId 游戏ID
     * @param gameName 游戏名称
-     * @param gameSchemeType 游戏架构类型：64位/32位
+     * @param gameSchemaType 游戏架构类型：64位/32位
     * @param downloadStatus 所上报游戏下载状态
     * @param gameType 游戏的类型：单机、网游等
     * @param downloadType 所上报游戏的实际下载方式：本地下载/畅玩下载
@ -4291,7 +4291,7 @@ object SensorsBridge {
    fun trackDownloadComponentsContentClick(
        gameId: String,
        gameName: String,
-        gameSchemeType: String,
+        gameSchemaType: String,
        downloadStatus: String,
        gameType: String,
        downloadType: String,
@ -4301,7 +4301,7 @@ object SensorsBridge {
        val json = json {
            KEY_GAME_ID to gameId
            KEY_GAME_NAME to gameName
-            KEY_GAME_SCHEME_TYPE to gameSchemeType
+            KEY_GAME_SCHEMA_TYPE to gameSchemaType
            KEY_DOWNLOAD_STATUS to downloadStatus
            KEY_GAME_TYPE to gameType
            KEY_DOWNLOAD_TYPE to downloadType
--- a/2
+++ b/2
Author	SHA1	Message	Date
yangfei	d194f969e4	chore: va组件2.0.5-debug	2024-09-10 16:43:57 +08:00
yangfei	95f66344fb	chore: va组件2.0.5	2024-09-10 13:46:15 +08:00
juntao	570e2fa9bc	Revert "feat:同步商业版代码至：dbc3b8ecaca3e774b1e63f41e70b651f4acfaee1" This reverts commit `811d42457c`.	2024-09-05 15:22:32 +08:00
juntao	9e07080043	feat: 调整依赖源顺序	2024-09-04 17:03:37 +08:00
juntao	e10a329159	chore: 版本更新至 5.37.5	2024-09-04 16:00:00 +08:00
yangfei	b3bc7b43f7	Merge branch 'feat/v5.37.5-1095/update-va' into 'release' feat:同步商业版代码至：dbc3b8ecaca3e774b1e63f41e70b651f4acfaee1 See merge request halo/android/assistant-android!1875	2024-09-04 15:54:34 +08:00
yangfei	811d42457c	feat:同步商业版代码至：dbc3b8ecaca3e774b1e63f41e70b651f4acfaee1	2024-09-04 15:52:46 +08:00
曾祥俊	ac0b819ea9	Merge branch 'feat/GHZSCY-6644' into 'release' feat: 【光环助手】安装相关优化功能埋点事件的属性字段英文错误的问题 https://jira.shanqu.cc/browse/GHZSCY-6644 See merge request halo/android/assistant-android!1874	2024-09-04 15:43:47 +08:00
曾祥俊	d931fb5940	feat: 【光环助手】安装相关优化功能埋点事件的属性字段英文错误的问题 https://jira.shanqu.cc/browse/GHZSCY-6644	2024-09-04 14:42:17 +08:00