diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 040203ff68..07c845e89b 100644 --- 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 \ No newline at end of file + - feat/GHZSCY-6644 \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/SpecialDownloadDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/SpecialDownloadDialogFragment.kt index 0b09133069..a4b5939f68 100644 --- 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 "本地下载", diff --git a/app/src/main/java/com/gh/gamecenter/hud/HeadUpDisplayLogHelper.kt b/app/src/main/java/com/gh/gamecenter/hud/HeadUpDisplayLogHelper.kt index 0a56e82d4c..ccf25e74ba 100644 --- 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 diff --git a/app/src/main/java/com/gh/ndownload/suspendwindow/NDownloadDrawOverlayPermissionWindowController.kt b/app/src/main/java/com/gh/ndownload/suspendwindow/NDownloadDrawOverlayPermissionWindowController.kt index f854d8a263..b9a78fca0d 100644 --- 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 "本地下载" diff --git 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 index 1949644fef..2f3e28f92d 100644 --- 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