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)