Commit 5eba597d authored by wanglei's avatar wanglei

...

parent 783cec50
...@@ -163,7 +163,7 @@ object AdmobMaxHelper { ...@@ -163,7 +163,7 @@ object AdmobMaxHelper {
if (getSpAdmobTrueMaxFalse()) { if (getSpAdmobTrueMaxFalse()) {
// com.base.browserwhite.ads.admob.AdmobOpenUtils.loadAppOpenAd() // com.base.browserwhite.ads.admob.AdmobOpenUtils.loadAppOpenAd()
AdmobInterstitialUtils.loadInterstitialAd(activity) AdmobInterstitialUtils.loadInterstitialAd(activity)
AdmobNativeUtils.loadNativeList(3) AdmobNativeUtils.loadNativeList(4)
} else { } else {
if (isAdInit.get()) { if (isAdInit.get()) {
// com.base.browserwhite.ads.max.AdMaxOpenUtils.loadAppOpenAd(activity) // com.base.browserwhite.ads.max.AdMaxOpenUtils.loadAppOpenAd(activity)
......
...@@ -10,6 +10,7 @@ import com.base.browserwhite.ads.AdDisplayUtils ...@@ -10,6 +10,7 @@ import com.base.browserwhite.ads.AdDisplayUtils
import com.base.browserwhite.ads.admob.AdmobEvent.clickAd import com.base.browserwhite.ads.admob.AdmobEvent.clickAd
import com.base.browserwhite.ads.admob.AdmobEvent.pullAd import com.base.browserwhite.ads.admob.AdmobEvent.pullAd
import com.base.browserwhite.ads.admob.AdmobEvent.showAd import com.base.browserwhite.ads.admob.AdmobEvent.showAd
import com.base.browserwhite.bean.NewsBean
import com.base.browserwhite.help.ConfigHelper import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventUtils import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx import com.base.browserwhite.utils.LogEx
...@@ -162,4 +163,49 @@ object AdmobNativeUtils { ...@@ -162,4 +163,49 @@ object AdmobNativeUtils {
adLoader.loadAd(mRequest) adLoader.loadAd(mRequest)
} }
} }
fun addNativeAdNewsBean(it: List<NewsBean>): ArrayList<NewsBean> {
val list = arrayListOf<NewsBean>()
it.forEachIndexed { index, newsBean ->
list.add(newsBean)
if (index == 0) {
runCatching {
val ad = AdmobNativeUtils.readyNative[0]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
if (index == 4) {
runCatching {
val ad = AdmobNativeUtils.readyNative[1]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
if (index == 8) {
runCatching {
val ad = AdmobNativeUtils.readyNative[2]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
if (index == 12) {
runCatching {
val ad = AdmobNativeUtils.readyNative[3]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
}
AdmobNativeUtils.loadNativeList(4)
return list
}
} }
\ No newline at end of file
...@@ -7,6 +7,7 @@ import androidx.activity.addCallback ...@@ -7,6 +7,7 @@ import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.browserwhite.ads.AdmobMaxHelper import com.base.browserwhite.ads.AdmobMaxHelper
import com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter import com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
import com.base.browserwhite.ads.admob.AdmobNativeUtils
import com.base.browserwhite.bean.NewsCategory import com.base.browserwhite.bean.NewsCategory
import com.base.browserwhite.databinding.ActivityNewsBinding import com.base.browserwhite.databinding.ActivityNewsBinding
import com.base.browserwhite.databinding.ItemTabNewsBinding import com.base.browserwhite.databinding.ItemTabNewsBinding
...@@ -122,10 +123,11 @@ class NewsActivity : BaseActivity<ActivityNewsBinding>() { ...@@ -122,10 +123,11 @@ class NewsActivity : BaseActivity<ActivityNewsBinding>() {
if (it.isNotEmpty()) { if (it.isNotEmpty()) {
binding.ivPlaceHolder.visibility = View.GONE binding.ivPlaceHolder.visibility = View.GONE
} }
val newsAdList = AdmobNativeUtils.addNativeAdNewsBean(it)
if (lastNewsId == null || changeCategory) { if (lastNewsId == null || changeCategory) {
newsAdapter.submitList(it) newsAdapter.submitList(newsAdList)
} else { } else {
newsAdapter.addAll(it) newsAdapter.addAll(newsAdList)
} }
helper.trailingLoadState = LoadState.NotLoading(false) helper.trailingLoadState = LoadState.NotLoading(false)
} }
......
...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint ...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import androidx.activity.addCallback import androidx.activity.addCallback
import com.base.browserwhite.ads.admob.AdmobNativeUtils
import com.base.browserwhite.bean.ConstObject.APP_PROCESS import com.base.browserwhite.bean.ConstObject.APP_PROCESS
import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER
import com.base.browserwhite.databinding.ActivityResultBinding import com.base.browserwhite.databinding.ActivityResultBinding
...@@ -108,10 +109,11 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() { ...@@ -108,10 +109,11 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
isLoading = false isLoading = false
binding.root.post { binding.root.post {
LogEx.logDebug(TAG, "beanCallBack") LogEx.logDebug(TAG, "beanCallBack")
val newsAdList = AdmobNativeUtils.addNativeAdNewsBean(it)
if (lastNewsId == null) { if (lastNewsId == null) {
newsAdapter.submitList(it) newsAdapter.submitList(newsAdList)
} else { } else {
newsAdapter.addAll(it) newsAdapter.addAll(newsAdList)
} }
helper.trailingLoadState = LoadState.NotLoading(false) helper.trailingLoadState = LoadState.NotLoading(false)
} }
......
...@@ -220,7 +220,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() { ...@@ -220,7 +220,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
LogEx.logDebug(TAG, "errorCallBack") LogEx.logDebug(TAG, "errorCallBack")
}, beanCallBack = { }, beanCallBack = {
isLoading = false isLoading = false
val newsAdList = addNativeAdNewsBean(it) val newsAdList = AdmobNativeUtils.addNativeAdNewsBean(it)
binding.root.post { binding.root.post {
LogEx.logDebug(TAG, "beanCallBack") LogEx.logDebug(TAG, "beanCallBack")
if (lastNewsId == null) { if (lastNewsId == null) {
...@@ -234,41 +234,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() { ...@@ -234,41 +234,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
}) })
} }
private fun addNativeAdNewsBean(it: List<NewsBean>): ArrayList<NewsBean> {
val list = arrayListOf<NewsBean>()
it.forEachIndexed { index, newsBean ->
list.add(newsBean)
if (index == 1) {
runCatching {
val ad = AdmobNativeUtils.readyNative[0]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
if (index == 6) {
runCatching {
val ad = AdmobNativeUtils.readyNative[1]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
if (index == 1) {
runCatching {
val ad = AdmobNativeUtils.readyNative[3]
list.add(NewsBean().apply {
uiType = 1
nativeAd = ad
})
}
}
}
AdmobNativeUtils.loadNativeList(3)
return list
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
......
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