From c1b7c380dadc6050da6adf5ffb16fd39bc3d039f Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 14 Sep 2021 16:21:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.3.0=E3=80=91=E6=9B=9D=E5=85=89=E4=BA=8B=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9F=8B=E7=82=B9=E4=BC=98=E5=8C=96=20https://git.ghz?= =?UTF-8?q?s.com/pm/halo-app-issues/-/issues/1322?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/exposure/ExposureEntity.kt | 3 +++ .../main/java/com/gh/common/exposure/ExposureEvent.kt | 10 ++++++++++ .../gh/gamecenter/catalog/NewCatalogListFragment.kt | 1 + .../gh/gamecenter/catalog/NewCatalogListViewModel.kt | 3 ++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt b/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt index 71e43b7999..76735e740c 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEntity.kt @@ -70,6 +70,9 @@ data class ExposureEntity( CATEGORY_ID -> categoryId = id CATEGORY_V2_ID -> categoryV2Id = id } + + containerId = null + containerType = null } companion object { diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt index c4ea49264b..4c78a89f64 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt @@ -74,10 +74,20 @@ data class ExposureEvent( eTrace = eTrace, event = event ).also { + it.payload.categoryId = eTrace?.firstOrNull()?.payload?.categoryId + it.payload.categoryV2Id = eTrace?.firstOrNull()?.payload?.categoryV2Id + it.payload.testServerId = eTrace?.firstOrNull()?.payload?.testServerId + it.payload.blockId = eTrace?.firstOrNull()?.payload?.blockId + it.payload.setContainerInfo( eTrace?.firstOrNull()?.payload?.containerId ?: gameEntity?.containerId, eTrace?.firstOrNull()?.payload?.containerType ?: gameEntity?.containerType ) + + it.payload.sourcePage = eTrace?.firstOrNull()?.payload?.sourcePage + it.payload.sourcePageId = eTrace?.firstOrNull()?.payload?.sourcePageId + it.payload.sourcePageName = eTrace?.firstOrNull()?.payload?.sourcePageName + gameEntity?.exposureEvent = it } } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt index af95192c31..ee7b32105c 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -75,6 +75,7 @@ class NewCatalogListFragment : ListFragment mViewModel.selectedCatalog = mSubCatalogList.find { entity -> entity.name == mInitCatalogName } ?: CatalogEntity.SubCatalogEntity() + mViewModel.primeCatalog = mPrimeCatalog initSortType() super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt index 06ad4dffd0..b830ea068e 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt @@ -22,6 +22,7 @@ class NewCatalogListViewModel(application: Application) : ListViewModel() var selectedCatalog = CatalogEntity.SubCatalogEntity() + var primeCatalog: CatalogEntity? = null var sortType = CatalogFilterView.SortType.RECOMMENDED var sortSize = SubjectSettingEntity.Size() private val sensitiveApi = RetrofitManager.getInstance(getApplication()).sensitiveApi @@ -41,7 +42,7 @@ class NewCatalogListViewModel(application: Application) : ListViewModel game.hideSizeInsideDes = true } ExposureUtils.updateExposureInfo( gameList = it, - containerId = selectedCatalog.link.link, + containerId = primeCatalog?.id, containerType = ExposureEntity.CATEGORY_ID ) mResultLiveData.postValue(it)