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 f17b789..54ab8e6 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 @@ -9,17 +9,19 @@ import android.webkit.WebView import android.webkit.WebViewClient import androidx.activity.addCallback import androidx.activity.viewModels +import androidx.lifecycle.lifecycleScope import com.ama.core.architecture.appBase.AppViewsActivity -import com.ama.core.architecture.ext.toast import com.ama.core.architecture.util.AndroidUtil import com.gamedog.vididin.VidiConst -import com.viddin.videos.free.R import com.gamedog.vididin.main.interfaces.OnTabStyleListener +import com.viddin.videos.free.R import dagger.hilt.android.AndroidEntryPoint -import kotlin.getValue -import com.viddin.videos.free.databinding.ActivityGameBinding as ViewBinding +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import com.gamedog.vididin.main.MainUiState as UiState import com.gamedog.vididin.main.MainViewModel as ViewModel +import com.viddin.videos.free.databinding.ActivityGameBinding as ViewBinding @AndroidEntryPoint @@ -27,10 +29,12 @@ class GameCenterActivity : AppViewsActivity(), override val mViewModel: ViewModel by viewModels() override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater) + override var mEnableBannerAd = false @SuppressLint("SetJavaScriptEnabled") override fun ViewBinding.initViews() { + with(binding) { titlebar.setBackIconColor(R.color.black) titlebar.setTitleText(R.string.game_center, R.color.black) @@ -67,9 +71,31 @@ class GameCenterActivity : AppViewsActivity(), return true } } + } - webView.loadUrl(String.format(VidiConst.URL_GAME, AndroidUtil.getGaid())) + loadGameCenterWeb() + } + + } + + + + private fun loadGameCenterWeb() { + var gaid: String? = "" + + showLoading(false) + lifecycleScope.launch { + withContext(Dispatchers.IO) { + gaid = AndroidUtil.getGaid() + } + + if (!gaid.isNullOrBlank()) { + binding.webView.loadUrl(String.format(VidiConst.URL_GAME, gaid)) + hideLoading() + } else { + hideLoading() + } } } diff --git a/core/architecture/build.gradle b/core/architecture/build.gradle index f168559..75a2d0e 100644 --- a/core/architecture/build.gradle +++ b/core/architecture/build.gradle @@ -34,5 +34,6 @@ dependencies { api 'io.github.pengxurui:modular-eventbus-api:1.0.5' api 'io.github.pengxurui:modular-eventbus-compiler:1.0.5' implementation project(':bill') + api 'com.google.android.gms:play-services-ads-identifier:18.0.1' } \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt b/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt index 5df60b5..d615bae 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt @@ -19,6 +19,7 @@ import android.widget.Toast import androidx.core.app.NotificationManagerCompat import androidx.core.graphics.createBitmap import com.ama.core.architecture.BaseApp +import com.google.android.gms.ads.identifier.AdvertisingIdClient import com.google.gson.Gson import com.google.gson.reflect.TypeToken import java.util.UUID @@ -214,7 +215,13 @@ class AndroidUtil private constructor() { } fun getGaid(): String? { - return "ff498e7d-b737-4f36-b16e-25f1186c12f8" + try { + val adInfo = AdvertisingIdClient.getAdvertisingIdInfo(BaseApp.appContext()) + return adInfo.id + } catch (e: Exception) { + + } + return null } }