Commit 8442397f authored by wanglei's avatar wanglei

...

parent 7514a003
...@@ -5,8 +5,10 @@ import android.content.ClipboardManager ...@@ -5,8 +5,10 @@ import android.content.ClipboardManager
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.graphics.Typeface import android.graphics.Typeface
import android.view.View
import android.widget.Toast import android.widget.Toast
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.view.isVisible
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
...@@ -68,10 +70,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -68,10 +70,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
if (!checkStorePermission()) { if (!checkStorePermission()) {
if (dialog == null) { if (dialog == null) {
dialog = showPermissionBottomSheet(launcher) { dialog = showPermissionBottomSheet(launcher) {
binding.flBanner.visibility = View.VISIBLE
AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner) AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner)
} }
} }
} else { } else {
binding.flBanner.visibility = View.VISIBLE
AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner) AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner)
} }
......
...@@ -49,6 +49,7 @@ object AdmobBannerUtils { ...@@ -49,6 +49,7 @@ object AdmobBannerUtils {
} }
private fun loadCollapsibleBanner(parent: ViewGroup) { private fun loadCollapsibleBanner(parent: ViewGroup) {
val extras = Bundle() val extras = Bundle()
extras.putString("collapsible", "bottom") extras.putString("collapsible", "bottom")
extras.putString("collapsible_request_id", UUID.randomUUID().toString()) extras.putString("collapsible_request_id", UUID.randomUUID().toString())
...@@ -56,7 +57,14 @@ object AdmobBannerUtils { ...@@ -56,7 +57,14 @@ object AdmobBannerUtils {
AdRequest.Builder().addNetworkExtrasBundle(AdMobAdapter::class.java, extras).build() AdRequest.Builder().addNetworkExtrasBundle(AdMobAdapter::class.java, extras).build()
adView?.adListener = adView?.adListener =
object : AdListener() { object : AdListener() {
override fun onAdLoaded() {} override fun onAdLoaded() {
LogEx.logDebug(TAG, "onAdLoaded")
}
override fun onAdOpened() {
LogEx.logDebug(TAG, "onAdOpened")
}
override fun onAdClosed() { override fun onAdClosed() {
super.onAdClosed() super.onAdClosed()
LogEx.logDebug(TAG, "onAdClosed") LogEx.logDebug(TAG, "onAdClosed")
......
...@@ -120,9 +120,10 @@ ...@@ -120,9 +120,10 @@
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:visibility="gone"
android:id="@+id/fl_banner" android:id="@+id/fl_banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll" /> app:layout_constraintTop_toBottomOf="@id/ll" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment