Commit 172e1810 authored by wanglei's avatar wanglei

[修改]处理广告开关关闭时,原生和banner占位问题

parent 9edb3f3e
......@@ -2,6 +2,7 @@ package com.base.appzxhy.business.ads
import android.app.Activity
import android.content.Context
import android.view.View
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import com.applovin.sdk.AppLovinMediationProvider
......@@ -246,8 +247,10 @@ object AdsMgr {
) {
if (!adsConfigBean.isAdShow) {
nativeCallBack?.invoke(null)
nativeView.visibility = View.GONE
return
}
nativeView.visibility = View.VISIBLE
if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
return
......@@ -276,8 +279,10 @@ object AdsMgr {
*/
fun showBanner(parent: ViewGroup, collapsible: Boolean = true, adClose: (() -> Unit)? = null) {
if (!adsConfigBean.isAdShow) {
parent.visibility = View.GONE
return
}
parent.visibility = View.VISIBLE
if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
return
......
......@@ -33,7 +33,7 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>(ActivityGuideBinding::i
override fun initView() {
super.initView()
if (AdConfigBean.adsConfigBean.fullNativeShow) {
if (AdConfigBean.adsConfigBean.fullNativeShow && AdConfigBean.adsConfigBean.isAdShow) {
fragments.add(2, pageNative)
}
......
......@@ -3,7 +3,9 @@ package com.base.appzxhy.ui.main
import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
......@@ -15,6 +17,7 @@ import com.base.appzxhy.SpConstObject.mainPageCount
import com.base.appzxhy.base.BaseActivity
import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN
import com.base.appzxhy.bean.HomeTabUIBean
import com.base.appzxhy.bean.config.AdConfigBean
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.ActivityMainBinding
import com.base.appzxhy.databinding.ItemHomeTabBinding
......@@ -56,6 +59,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
initViewPager2()
initDialogFlow()
AdsMgr.showBanner(binding.flBanner, false)
val lp = binding.flBottom.layoutParams as ConstraintLayout.LayoutParams
if (!AdConfigBean.adsConfigBean.isAdShow) {
lp.setMargins(0, 0, 0, 0)
} else {
lp.setMargins(0, 0, 0, resources.getDimensionPixelSize(R.dimen.dp_60))
}
binding.flBottom.layoutParams = lp
}
private fun initDialogFlow() {
......
......@@ -24,7 +24,7 @@
android:id="@+id/flBottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="60dp"
android:layout_marginBottom="@dimen/dp_60"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/fl_container">
......
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