diff --git a/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt b/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt index 9422971e48..c84e744b31 100644 --- a/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt @@ -30,7 +30,6 @@ import com.halo.assistant.fragment.SettingsFragment.AUTO_INSTALL_SP_KEY import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity import com.lightgame.download.DownloadStatus -import com.lightgame.utils.Utils import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.dialog_device_remind.view.* import java.lang.ref.WeakReference @@ -179,7 +178,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g inner class BannerAdapter : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { - return object : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_ad_banner, parent, false)) {} + return object : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)) {} } override fun getItemCount(): Int = if (mDatas.size == 1) mDatas.size else Int.MAX_VALUE diff --git a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt index 3cbd8cb5e6..e23dd64dc9 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt @@ -1,5 +1,6 @@ package com.gh.common.exposure +import com.gh.common.constant.Constants import com.gh.common.util.PackageUtils import com.gh.common.util.toObject import com.gh.gamecenter.entity.ApkEntity @@ -15,6 +16,11 @@ object ExposureUtils { traceEvent: ExposureEvent?, downloadType: DownloadType): ExposureEvent { val gameEntity = entity.clone() + gameEntity.id = if (entity.id.contains(Constants.GAME_ID_DIVIDER)) { + entity.id.split(Constants.GAME_ID_DIVIDER).toTypedArray()[0] + } else { + entity.id + } gameEntity.platform = platform gameEntity.downloadType = downloadType.toString() val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity, diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java index e74f146052..c802bf3eef 100644 --- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java +++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java @@ -3,6 +3,7 @@ package com.gh.common.util; import android.content.Context; import android.os.Build; +import com.gh.common.constant.Constants; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.NewsDetailEntity; import com.gh.gamecenter.manager.DataCollectionManager; @@ -32,7 +33,7 @@ public class DataCollectionUtils { public static void uploadDownload(Context context, DownloadEntity downloadEntity, String status) { Map map = new HashMap<>(); map.put("game", downloadEntity.getName()); - map.put("game_id", downloadEntity.getGameId()); + map.put("game_id", downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER)); if (downloadEntity.isPluggable()) { map.put("method", "插件化"); map.put("btn_status", "插件化"); diff --git a/app/src/main/java/com/gh/common/util/DownloadObserver.kt b/app/src/main/java/com/gh/common/util/DownloadObserver.kt index 4770b5e262..b8fd4377bf 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -221,7 +221,7 @@ object DownloadObserver { } ExposureUtils.logADownloadCompleteExposureEvent( - GameEntity(downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER), downloadEntity.name), + GameEntity(id = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER), mName = downloadEntity.name), downloadEntity.platform, downloadEntity.exposureTrace, type) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index af6afd2d1d..c131be7bb8 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -443,7 +443,7 @@ class DescAdapter(context: Context, MtaHelper.onEvent("历史版本", "进入", gameName) MtaHelper.onEvent("游戏详情_新", "更新内容_历史版本", gameName) val intent = HistoryApkListActivity.getIntent(mContext, mViewModel.game - ?: GameEntity(), mEntrance, "更新内容") + ?: GameEntity(), mEntrance, "游戏详情[${gameName}]:更新内容") mContext.startActivity(intent) } holder.binding.historyVersionTv.visibility = if (updateContent?.historyApkStatus == "on" && updateContent.historyApkCount != 0) View.VISIBLE else View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt index 327e718309..bb7d8ebb90 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt @@ -25,7 +25,9 @@ import com.lightgame.download.DownloadEntity import com.lightgame.download.DownloadStatus import com.lightgame.utils.Utils -class HistoryApkListAdapter(context: Context, private var mViewModel: HistoryApkListViewModel) : ListAdapter(context) { +class HistoryApkListAdapter(context: Context, + private var mViewModel: HistoryApkListViewModel, + private var mEntrance: String) : ListAdapter(context) { private var mExpandSparseBooleanArray = SparseBooleanArray() private var mDescExpandedMarginRight = -1 @@ -74,7 +76,7 @@ class HistoryApkListAdapter(context: Context, private var mViewModel: HistoryApk gameEntity, 0, this@HistoryApkListAdapter, - "历史版本", + "$mEntrance+(历史版本)", "", null, object : EmptyCallback { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt index 2c562f1d87..de082fa22d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt @@ -84,7 +84,7 @@ class HistoryApkListFragment : ListFragment override fun provideListAdapter(): ListAdapter<*> { if (mAdapter == null) { - mAdapter = HistoryApkListAdapter(requireContext(), mViewModel!!) + mAdapter = HistoryApkListAdapter(requireContext(), mViewModel!!, mEntrance) } return mAdapter!! } diff --git a/app/src/main/res/layout/item_device_remind_banner.xml b/app/src/main/res/layout/item_device_remind_banner.xml new file mode 100644 index 0000000000..4a24a88328 --- /dev/null +++ b/app/src/main/res/layout/item_device_remind_banner.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file