diff --git a/.gitignore b/.gitignore index a8b0d1d..982591f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ google-services.json # Android Profiling *.hprof +/.kotlin/sessions/kotlin-compiler-2258332710725417628.salive diff --git a/app/src/main/java/com/gamedog/vididin/features/game/GameCenterActivity.kt b/app/src/main/java/com/gamedog/vididin/features/game/GameCenterActivity.kt index b6fa112..a1aca5d 100644 --- a/app/src/main/java/com/gamedog/vididin/features/game/GameCenterActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/game/GameCenterActivity.kt @@ -39,10 +39,12 @@ class GameCenterActivity : AppViewsActivity(), override val mViewModel: ViewModel by viewModels() override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater) override var mEnableBannerAd = false + private var mHasSendStatistic: Boolean = false + @SuppressLint("SetJavaScriptEnabled") override fun ViewBinding.initViews() { - + showLoading(false) with(binding) { titlebar.setBackIconColor(R.color.black) @@ -62,6 +64,16 @@ class GameCenterActivity : AppViewsActivity(), webView.addJavascriptInterface(WebAppInterface(this@GameCenterActivity, webView), "com.viddin.videos.free") webViewClient = object : WebViewClient() { + override fun onPageFinished(view: WebView?, url: String?) { + super.onPageFinished(view, url) + if (!mHasSendStatistic) { + StatisticUtil.reportEvents(StatisticUtil.KEY_H5_Show) + mHasSendStatistic = true + } + + hideLoading() + } + override fun shouldOverrideUrlLoading( view: WebView?, request: WebResourceRequest @@ -97,9 +109,6 @@ class GameCenterActivity : AppViewsActivity(), loadGameCenterWeb() } - - - StatisticUtil.reportEvents(StatisticUtil.KEY_H5_Show) } diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt index 3c34f37..b8d531a 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt @@ -58,6 +58,7 @@ class BoxTaskHelper: BaseTaskHelper() { if (taskStateBeanInSp == null || taskStateBeanInSp.boxList.isNullOrEmpty() || isAllBoxExpiredOrFinished(taskStateBeanInSp)) { mStateBean = generateStateBeanFromConfig() saveState2Sp() + sendEnterNewSubBoxEvent(0) } else { mStateBean = taskStateBeanInSp calculateCurrentOngoingBox() @@ -77,7 +78,6 @@ class BoxTaskHelper: BaseTaskHelper() { task.reward_type, task.reward_value, task.is_one_time, task.status, boxSubTaskStateList, DateUtil.getCurTimeMs())) } - sendEnterNewSubBoxEvent(0) return TaskStateBoxRoot(boxStateList) }