diff --git a/app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt b/app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt index bc1c3494dd..ec49bdd34d 100644 --- a/app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt @@ -1,8 +1,10 @@ package com.gh.common.util import com.gh.gamecenter.common.json.JsonObjectBuilder +import com.gh.gamecenter.common.json.json import com.gh.gamecenter.common.loghub.LoghubUtils import com.lightgame.utils.Utils +import org.json.JSONArray import org.json.JSONObject /** @@ -25,4 +27,97 @@ object NewFlatLogUtils { key to value } } + + // 畅玩助手相关事件(下载弹窗展示事件/隐私政策点击事件/下载点击事件/授权弹窗展示事件/更新弹窗展示事件) + // 畅玩管理删除游戏弹窗展示事件/畅玩管理-畅玩广场入口点击事件/退出畅玩助手提示弹窗展示事件 + @JvmStatic + fun logHaloFunEvent(event: String) { + val json = json { + "event" to event + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 关联游戏跳转icon点击事件 + @JvmStatic + fun logHaloFunGameDetailJumpClick(downloadStatus: String, gameId: String) { + val json = json { + "event" to "halo_fun_game_detail_jump_click" + "download_state" to downloadStatus + "game_id" to gameId + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 下载完成提示条点击事件 + @JvmStatic + fun logHaloFunDownloadCompleteTipClick(buttonType: String, gameId: String) { + val json = json { + "event" to "halo_fun_download_complete_tip_click" + "button_type" to buttonType + "game_id" to gameId + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 畅玩助手更新弹窗点击事件 + @JvmStatic + fun logHaloFunUpdateDialogClick(dialogType: String, buttonType: String) { + val json = json { + "event" to "halo_fun_update_dialog_click" + "dialog_type" to dialogType + "button_type" to buttonType + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 畅玩管理展示事件 + @JvmStatic + fun logHaloFunManageShow(entrance: String) { + val json = json { + "event" to "halo_fun_manage_show" + "entrance" to entrance + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 畅玩管理-最近在玩板块展示管理事件 + @JvmStatic + fun logHaloFunManageRecentGameSwitch(isOn: Boolean) { + val json = json { + "event" to "halo_fun_manage_recent_game_switch" + "is_on" to isOn + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 畅玩管理删除游戏弹窗点击事件 + @JvmStatic + fun logHaloFunManageGameDeleteDialogClick(buttonType: String, gamesArray: JSONArray) { + val json = json { + "event" to "halo_fun_manage_game_delete_dialog_click" + "button_type" to buttonType + "games_array" to gamesArray + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + // 退出畅玩助手提示弹窗反馈收集事件 + @JvmStatic + fun logHaloFunGameExitDialogSubmitClick(detail: String, typeTags: JSONArray) { + val json = json { + "event" to "halo_fun_game_exit_dialog_submit_click" + "detail" to detail + "type_tags" to typeTags + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/NewLogUtils.kt b/app/src/main/java/com/gh/common/util/NewLogUtils.kt index db9e98a443..8356c34eff 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -2437,97 +2437,4 @@ object NewLogUtils { } log(json, "event", false) } - - // 畅玩助手相关事件(下载弹窗展示事件/隐私政策点击事件/下载点击事件/授权弹窗展示事件/更新弹窗展示事件) - // 畅玩管理删除游戏弹窗展示事件/畅玩管理-畅玩广场入口点击事件/退出畅玩助手提示弹窗展示事件 - @JvmStatic - fun logHaloFunEvent(event: String) { - val json = json { - "event" to event - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 关联游戏跳转icon点击事件 - @JvmStatic - fun logHaloFunGameDetailJumpClick(downloadStatus: String, gameId: String) { - val json = json { - "event" to "halo_fun_game_detail_jump_click" - "download_state" to downloadStatus - "game_id" to gameId - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 下载完成提示条点击事件 - @JvmStatic - fun logHaloFunDownloadCompleteTipClick(buttonType: String, gameId: String) { - val json = json { - "event" to "halo_fun_download_complete_tip_click" - "button_type" to buttonType - "game_id" to gameId - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 畅玩助手更新弹窗点击事件 - @JvmStatic - fun logHaloFunUpdateDialogClick(dialogType: String, buttonType: String) { - val json = json { - "event" to "halo_fun_update_dialog_click" - "dialog_type" to dialogType - "button_type" to buttonType - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 畅玩管理展示事件 - @JvmStatic - fun logHaloFunManageShow(entrance: String) { - val json = json { - "event" to "halo_fun_manage_show" - "entrance" to entrance - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 畅玩管理-最近在玩板块展示管理事件 - @JvmStatic - fun logHaloFunManageRecentGameSwitch(isOn: Boolean) { - val json = json { - "event" to "halo_fun_manage_recent_game_switch" - "is_on" to isOn - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 畅玩管理删除游戏弹窗点击事件 - @JvmStatic - fun logHaloFunManageGameDeleteDialogClick(buttonType: String, gamesArray: JSONArray) { - val json = json { - "event" to "halo_fun_manage_game_delete_dialog_click" - "button_type" to buttonType - "games_array" to gamesArray - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } - - // 退出畅玩助手提示弹窗反馈收集事件 - @JvmStatic - fun logHaloFunGameExitDialogSubmitClick(detail: String, typeTags: JSONArray) { - val json = json { - "event" to "halo_fun_game_exit_dialog_submit_click" - "detail" to detail - "type_tags" to typeTags - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index fb44002ccb..4c9520c5e9 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -6,7 +6,7 @@ import android.os.Bundle; import android.view.MenuItem; import com.gh.common.util.DirectUtils; -import com.gh.common.util.NewLogUtils; +import com.gh.common.util.NewFlatLogUtils; import com.gh.gamecenter.common.base.activity.ToolBarActivity; import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.constant.EntranceConsts; @@ -63,7 +63,7 @@ public class DownloadManagerActivity extends ToolBarActivity { @Override public boolean onMenuItemClick(MenuItem item) { - NewLogUtils.logHaloFunManageShow("下载管理"); + NewFlatLogUtils.logHaloFunManageShow("下载管理"); DirectUtils.directToVGameDownload(this, false); return true; } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index e0a904c051..ca7622142e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -1644,7 +1644,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { "demo" -> "试玩" else -> "下载" } - NewLogUtils.logHaloFunGameDetailJumpClick(downloadStatus, simpleGame.id ?: "") + NewFlatLogUtils.logHaloFunGameDetailJumpClick(downloadStatus, simpleGame.id ?: "") DirectUtils.directToGameDetail(requireContext(), it.id ?: "", mEntrance) } } diff --git a/app/src/main/java/com/gh/vspace/HomeRecentVGameViewHolder.kt b/app/src/main/java/com/gh/vspace/HomeRecentVGameViewHolder.kt index 847490e333..4132606046 100644 --- a/app/src/main/java/com/gh/vspace/HomeRecentVGameViewHolder.kt +++ b/app/src/main/java/com/gh/vspace/HomeRecentVGameViewHolder.kt @@ -5,7 +5,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.OnScrollListener -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.DiffUtilAdapter @@ -43,7 +43,7 @@ class HomeRecentVGameViewHolder(var binding: ItemHomeRecentVgameBinding) : }) binding.moreTv.setOnClickListener { - NewLogUtils.logHaloFunManageShow("最近在玩") + NewFlatLogUtils.logHaloFunManageShow("最近在玩") binding.root.context.startActivity( VDownloadManagerActivity.getIntent( binding.root.context, @@ -54,7 +54,7 @@ class HomeRecentVGameViewHolder(var binding: ItemHomeRecentVgameBinding) : } binding.vspaceIv.setOnClickListener { - NewLogUtils.logHaloFunEvent("halo_fun_manage_square_entrance_click") + NewFlatLogUtils.logHaloFunEvent("halo_fun_manage_square_entrance_click") } } diff --git a/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt b/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt index 43ea3fc825..0c0c4ed6c4 100644 --- a/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt +++ b/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt @@ -13,7 +13,7 @@ import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.common.view.DownloadProgressBar import com.gh.download.DownloadManager import com.gh.gamecenter.GameDetailActivity @@ -200,7 +200,7 @@ class VDownloadManagerAdapter( ) mPopupBinding?.itemDelete?.setOnClickListener { - NewLogUtils.logHaloFunEvent("halo_fun_manage_game_delete_dialog_show") + NewFlatLogUtils.logHaloFunEvent("halo_fun_manage_game_delete_dialog_show") DialogHelper.showDialog( mContext, "是否删除${selectItems.size}条记录？", @@ -211,13 +211,13 @@ class VDownloadManagerAdapter( mViewModel.removeItems(selectItems) selectItems.clear() checkSelectItems() - NewLogUtils.logHaloFunManageGameDeleteDialogClick("删除", JSONArray(selectItems)) + NewFlatLogUtils.logHaloFunManageGameDeleteDialogClick("删除", JSONArray(selectItems)) AppExecutor.uiExecutor.executeWithDelay({ mViewModel.load(LoadType.REFRESH) }, 200) }, - { NewLogUtils.logHaloFunManageGameDeleteDialogClick("再看看", JSONArray(selectItems)) }, + { NewFlatLogUtils.logHaloFunManageGameDeleteDialogClick("再看看", JSONArray(selectItems)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } diff --git a/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt b/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt index 7d173b0ed3..655630083d 100644 --- a/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt +++ b/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt @@ -5,7 +5,7 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.gh.common.exposure.ExposureListener -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter @@ -96,7 +96,7 @@ class VDownloadManagerFragment : } lottieView.playAnimation() SPUtils.setBoolean(Constants.SP_HOME_VGAME_AREA_ENABLED, !status) - NewLogUtils.logHaloFunManageRecentGameSwitch(!status) + NewFlatLogUtils.logHaloFunManageRecentGameSwitch(!status) DownloadManager.getInstance().notifyDownloadLiveDataChanged() } diff --git a/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt b/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt index e319c1c413..bb75cdd47e 100644 --- a/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doOnTextChanged import androidx.lifecycle.ViewModel -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.common.util.PackageUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.base.fragment.BaseDialogFragment @@ -83,7 +83,7 @@ class VFeedbackDialogFragment : BaseDialogFragment() { } mBinding.submitTv.setOnClickListener { mViewModel.postFeedback(mGame!!.id, mBinding.feedbackEt.text.toString(), getSelectedTagString()) - NewLogUtils.logHaloFunGameExitDialogSubmitClick(mBinding.feedbackEt.text.toString(), JSONArray(getSelectedTagString())) + NewFlatLogUtils.logHaloFunGameExitDialogSubmitClick(mBinding.feedbackEt.text.toString(), JSONArray(getSelectedTagString())) dismissAllowingStateLoss() } checkLabel() @@ -157,7 +157,7 @@ class VFeedbackDialogFragment : BaseDialogFragment() { activity: AppCompatActivity, game: GameEntity? ) { - NewLogUtils.logHaloFunEvent("halo_fun_game_exit_dialog_show") + NewFlatLogUtils.logHaloFunEvent("halo_fun_game_exit_dialog_show") VFeedbackDialogFragment().apply { arguments = Bundle().apply { putParcelable(KEY_GAME, game) diff --git a/app/src/main/java/com/gh/vspace/VHelper.kt b/app/src/main/java/com/gh/vspace/VHelper.kt index 41db293700..07f9d9f162 100644 --- a/app/src/main/java/com/gh/vspace/VHelper.kt +++ b/app/src/main/java/com/gh/vspace/VHelper.kt @@ -14,7 +14,7 @@ import com.gh.common.constant.Config import com.gh.common.exposure.ExposureUtils import com.gh.common.history.HistoryHelper import com.gh.common.util.DataCollectionUtils -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.common.util.PackageUtils import com.gh.download.DownloadManager import com.gh.download.PackageObserver @@ -252,7 +252,7 @@ object VHelper { if (containsUpdate) { val dialogType = if (mUpdateEntity!!.isForce) "强制更新" else "提示更新" - NewLogUtils.logHaloFunEvent("halo_fun_update_dialog_show") + NewFlatLogUtils.logHaloFunEvent("halo_fun_update_dialog_show") SPUtils.setString( KEY_LAST_ALERT_UPDATE_URL, mUpdateEntity!!.url + mUpdateEntity!!.alert @@ -264,7 +264,7 @@ object VHelper { cancelText = "立即更新", confirmText = "继续游戏", cancelClickCallback = { - NewLogUtils.logHaloFunUpdateDialogClick(dialogType, "立即更新") + NewFlatLogUtils.logHaloFunUpdateDialogClick(dialogType, "立即更新") VSpaceDialogFragment.showDownloadDialog( context, getVSpaceDownloadEntity(true), @@ -273,7 +273,7 @@ object VHelper { ) }, confirmClickCallback = { - NewLogUtils.logHaloFunUpdateDialogClick(dialogType, "继续游戏") + NewFlatLogUtils.logHaloFunUpdateDialogClick(dialogType, "继续游戏") callback.invoke() }, extraConfig = DialogHelper.Config(centerTitle = true), @@ -347,7 +347,7 @@ object VHelper { if (isStoragePermissionGranted) { callback.invoke() } else { - NewLogUtils.logHaloFunEvent("halo_fun_access_dialog_show") + NewFlatLogUtils.logHaloFunEvent("halo_fun_access_dialog_show") context.startActivity(mDelegateManager.requestPermissionIntent) } } catch (e: RuntimeException) { diff --git a/app/src/main/java/com/gh/vspace/VLoadCompleteWindowHelper.kt b/app/src/main/java/com/gh/vspace/VLoadCompleteWindowHelper.kt index 811b748ce0..dfe4b2f4ad 100644 --- a/app/src/main/java/com/gh/vspace/VLoadCompleteWindowHelper.kt +++ b/app/src/main/java/com/gh/vspace/VLoadCompleteWindowHelper.kt @@ -13,7 +13,7 @@ import androidx.core.view.get import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toBinding @@ -139,14 +139,14 @@ object VLoadCompleteWindowHelper { } mBinding.closeIv.setOnClickListener { if (!ClickUtils.isFastDoubleClick(it.id)) { - NewLogUtils.logHaloFunDownloadCompleteTipClick("关闭", mAdapter.gameEntityList[mBinding.viewPager.currentItem].id) + NewFlatLogUtils.logHaloFunDownloadCompleteTipClick("关闭", mAdapter.gameEntityList[mBinding.viewPager.currentItem].id) mBinding.viewPager.removeCallbacks(mLoopTask) mBinding.viewPager.removeCallbacks(mDismissTask) EasyFloat.dismiss(LOAD_COMPLETE_WINDOW) } } mBinding.launchTv.setOnClickListener { - NewLogUtils.logHaloFunDownloadCompleteTipClick("启动", mAdapter.gameEntityList[mBinding.viewPager.currentItem].id) + NewFlatLogUtils.logHaloFunDownloadCompleteTipClick("启动", mAdapter.gameEntityList[mBinding.viewPager.currentItem].id) VHelper.installOrLaunch(activity, mAdapter.gameEntityList[mBinding.viewPager.currentItem].getApk()[0].packageName) } } diff --git a/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt b/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt index 80afb4428e..1ef23fcf72 100644 --- a/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt +++ b/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt @@ -17,7 +17,7 @@ import com.gh.common.exposure.ExposureUtils import com.gh.common.exposure.ExposureUtils.DownloadType.DOWNLOAD import com.gh.common.exposure.ExposureUtils.DownloadType.UPDATE import com.gh.common.util.DataCollectionUtils -import com.gh.common.util.NewLogUtils +import com.gh.common.util.NewFlatLogUtils import com.gh.common.util.PackageInstaller import com.gh.common.view.DownloadProgressBar import com.gh.download.DownloadManager @@ -94,10 +94,10 @@ class VSpaceDialogFragment : BaseDraggableDialogFragment() { mBinding.downloadBtn.downloadType = DownloadProgressBar.DownloadType.NORMAL mBinding.descTv.text = spanBuilder mBinding.privacyPolicyTv.setOnClickListener { - NewLogUtils.logHaloFunEvent("halo_fun_download_dialog_privacy_click") + NewFlatLogUtils.logHaloFunEvent("halo_fun_download_dialog_privacy_click") } mBinding.downloadBtn.setOnClickListener { - NewLogUtils.logHaloFunEvent("halo_fun_download_dialog_download_click") + NewFlatLogUtils.logHaloFunEvent("halo_fun_download_dialog_download_click") val name = "畅玩助手V" + mAppEntity?.version val downloadId = PackageInstaller.createDownloadId(name) @@ -231,7 +231,7 @@ class VSpaceDialogFragment : BaseDraggableDialogFragment() { // 防止重复弹出 if (hasDialogDisplayedInCurrentActivity(fragmentActivity)) return - NewLogUtils.logHaloFunEvent("halo_fun_download_dialog_show") + NewFlatLogUtils.logHaloFunEvent("halo_fun_download_dialog_show") val downloadDialog = VSpaceDialogFragment().apply { arguments = Bundle().apply {