Commit 8d88e1ac authored by wanglei's avatar wanglei Committed by songjianyu

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

parent 03ba12b0
...@@ -5,13 +5,13 @@ package com.base.appzxhy ...@@ -5,13 +5,13 @@ package com.base.appzxhy
*/ */
object GlobalConfig { object GlobalConfig {
//包名 //包名
const val PACKAGE_NAME = "com.dumpster.cleaner.tbt" const val PACKAGE_NAME = "com.easy.clean.tvb.cool"
// 域名 // 域名
/** /**
* Url Event 上报接口 * Url Event 上报接口
*/ */
const val URL_EVENT = "https://rp.kubukubanten.xyz" const val URL_EVENT = "https://rp.danehyjudydanehy1310.xyz"
/** /**
* Url Api 业务接口 * Url Api 业务接口
......
...@@ -2,6 +2,7 @@ package com.base.appzxhy.business.ads ...@@ -2,6 +2,7 @@ package com.base.appzxhy.business.ads
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import com.applovin.sdk.AppLovinMediationProvider import com.applovin.sdk.AppLovinMediationProvider
...@@ -167,6 +168,11 @@ object AdsMgr { ...@@ -167,6 +168,11 @@ object AdsMgr {
) { ) {
eventAdUt() eventAdUt()
if (!adsConfigBean.isAdShow) {
showCallBack?.failed()
return
}
if (configBean.isInBlackList) { if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", "isInBlackList=${configBean.isInBlackList}") EventUtils.event("isInBlackList", "isInBlackList=${configBean.isInBlackList}")
showCallBack?.failed() showCallBack?.failed()
...@@ -208,6 +214,11 @@ object AdsMgr { ...@@ -208,6 +214,11 @@ object AdsMgr {
) { ) {
eventAdUt() eventAdUt()
if (!adsConfigBean.isAdShow) {
showCallBack?.failed()
return
}
if (configBean.isInBlackList) { if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", configBean.isInBlackList.toString()) EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
showCallBack?.failed() showCallBack?.failed()
...@@ -233,6 +244,12 @@ object AdsMgr { ...@@ -233,6 +244,12 @@ object AdsMgr {
@LayoutRes layout: Int, @LayoutRes layout: Int,
nativeCallBack: ((Any?) -> Unit)? = null nativeCallBack: ((Any?) -> Unit)? = null
) { ) {
if (!adsConfigBean.isAdShow) {
nativeCallBack?.invoke(null)
nativeView.visibility = View.GONE
return
}
nativeView.visibility = View.VISIBLE
if (configBean.isInBlackList) { if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", configBean.isInBlackList.toString()) EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
return return
...@@ -260,6 +277,11 @@ object AdsMgr { ...@@ -260,6 +277,11 @@ object AdsMgr {
* @param parent 展示广告的父布局容器 * @param parent 展示广告的父布局容器
*/ */
fun showBanner(parent: ViewGroup, collapsible: Boolean = true, adClose: (() -> Unit)? = null) { 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) { if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", configBean.isInBlackList.toString()) EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
return return
......
...@@ -33,7 +33,7 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>(ActivityGuideBinding::i ...@@ -33,7 +33,7 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>(ActivityGuideBinding::i
override fun initView() { override fun initView() {
super.initView() super.initView()
if (AdConfigBean.adsConfigBean.fullNativeShow) { if (AdConfigBean.adsConfigBean.fullNativeShow && AdConfigBean.adsConfigBean.isAdShow) {
fragments.add(2, pageNative) fragments.add(2, pageNative)
} }
......
...@@ -3,8 +3,10 @@ package com.base.appzxhy.ui.main ...@@ -3,8 +3,10 @@ package com.base.appzxhy.ui.main
import android.graphics.Color import android.graphics.Color
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.FrameLayout
import android.widget.TextView import android.widget.TextView
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
...@@ -15,6 +17,7 @@ import com.base.appzxhy.R ...@@ -15,6 +17,7 @@ import com.base.appzxhy.R
import com.base.appzxhy.SpConstObject.mainPageCount import com.base.appzxhy.SpConstObject.mainPageCount
import com.base.appzxhy.base.BaseActivity import com.base.appzxhy.base.BaseActivity
import com.base.appzxhy.bean.HomeTabUIBean import com.base.appzxhy.bean.HomeTabUIBean
import com.base.appzxhy.bean.config.AdConfigBean
import com.base.appzxhy.business.ads.AdsMgr import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.ActivityMainBinding import com.base.appzxhy.databinding.ActivityMainBinding
import com.base.appzxhy.databinding.ItemHomeTabBinding import com.base.appzxhy.databinding.ItemHomeTabBinding
...@@ -61,6 +64,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -61,6 +64,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
exitDialog = ExitDialog(this) exitDialog = ExitDialog(this)
exitDialog.init() exitDialog.init()
setStatusBarColor(getColor(R.color.colorPrimary)) setStatusBarColor(getColor(R.color.colorPrimary))
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() { private fun initDialogFlow() {
...@@ -101,11 +112,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -101,11 +112,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
binding.viewPager2.adapter = viewPagerAdapter binding.viewPager2.adapter = viewPagerAdapter
binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
// if (position == 0) {
// setStatusBarColor(getColor(R.color.colorPrimary))
// } else {
// setStatusBarColor(getColor(R.color.transparent))
// }
val defaultTab = binding.tabLayout.getTabAt(position) val defaultTab = binding.tabLayout.getTabAt(position)
defaultTab?.select() defaultTab?.select()
defaultTab?.setSelected() defaultTab?.setSelected()
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
android:id="@+id/flBottom" android:id="@+id/flBottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="60dp" android:layout_marginBottom="@dimen/dp_60"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/fl_container"> 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