Commit d7d24562 authored by wanglei's avatar wanglei

...ad

parent c4a7ebc4
...@@ -33,7 +33,7 @@ class CompressionPhotoListActivity : BaseActivity<ActivityCompressionPhotoListBi ...@@ -33,7 +33,7 @@ class CompressionPhotoListActivity : BaseActivity<ActivityCompressionPhotoListBi
} }
onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
showDialogFunctionExit(AFunOb.PHOTO_COMPRESS){ showDialogFunctionExit(AFunOb.PHOTO_COMPRESS) {
AdmobUtils.showInterstitialAd(this@CompressionPhotoListActivity, isShowInterVal = false) { AdmobUtils.showInterstitialAd(this@CompressionPhotoListActivity, isShowInterVal = false) {
PhotoCache.getInstance().clearCache() PhotoCache.getInstance().clearCache()
finishToMain() finishToMain()
......
...@@ -60,10 +60,10 @@ class PhotoListManager(val context: Activity) : OnItemClickListener<PhotoBean>, ...@@ -60,10 +60,10 @@ class PhotoListManager(val context: Activity) : OnItemClickListener<PhotoBean>,
} }
override fun onUpdateBtn(isChecked: Boolean, entity: PhotoBean) { override fun onUpdateBtn(isChecked: Boolean, entity: PhotoBean) {
if (entity.size > 6 || mustShowNativeAd) { // if (entity.size > 6 || mustShowNativeAd) {
val flAd = context.findViewById<FrameLayout>(R.id.fl_ad) // val flAd = context.findViewById<FrameLayout>(R.id.fl_ad)
AdmobUtils.showNativeAd(context, flAd) // AdmobUtils.showNativeAd(context, flAd)
} // }
PhotoCache.getInstance().let { PhotoCache.getInstance().let {
if (isChecked) it.addPhoto(entity) else it.removePhoto(entity) if (isChecked) it.addPhoto(entity) else it.removePhoto(entity)
} }
......
...@@ -77,7 +77,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -77,7 +77,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
val sizeF = size.toFormatSize().split(" ") val sizeF = size.toFormatSize().split(" ")
binding.tvSize.text = sizeF[0] binding.tvSize.text = sizeF[0]
binding.tvUnit.text = sizeF[1] binding.tvUnit.text = sizeF[1]
if (list.size > 6|| mustShowNativeAd) { if (list.sumOf { it.screenPhotoBean.size } > 6 || mustShowNativeAd) {
AdmobUtils.showNativeAd(this@ScreenShotActivity, binding.flAd) AdmobUtils.showNativeAd(this@ScreenShotActivity, binding.flAd)
} }
} }
...@@ -117,6 +117,8 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -117,6 +117,8 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
}.await() }.await()
launch(Dispatchers.Main) { launch(Dispatchers.Main) {
screenShotAdapter.removeData(files) screenShotAdapter.removeData(files)
binding.tvSize.text = "0"
binding.tvUnit.text = "B"
} }
} }
} }
......
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