Commit dd78444f authored by wanglei's avatar wanglei

...

parent 758d85e0
...@@ -85,8 +85,8 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() { ...@@ -85,8 +85,8 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() {
mediaAdapter.toggleAllSelect(binding.ivSelectAll.isSelected) mediaAdapter.toggleAllSelect(binding.ivSelectAll.isSelected)
} }
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
AdmobInterstitialUtils.showInterstitialAd(this, isShowInterVal = false) { showDeletePermanentlyDialog {
showDeletePermanentlyDialog { AdmobInterstitialUtils.showInterstitialAd(this, isShowInterVal = false) {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
mediaAdapter.getSelectData().second.forEach { mediaAdapter.getSelectData().second.forEach {
runCatching { runCatching {
......
...@@ -108,8 +108,8 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -108,8 +108,8 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
} }
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
val files = screenShotAdapter.getSelectData() val files = screenShotAdapter.getSelectData()
AdmobInterstitialUtils.showInterstitialAd(this, isShowInterVal = false) { showDeletePermanentlyDialog {
showDeletePermanentlyDialog { AdmobInterstitialUtils.showInterstitialAd(this, isShowInterVal = false) {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
async { async {
files.forEach { screenFile -> files.forEach { screenFile ->
...@@ -125,6 +125,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -125,6 +125,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
} }
} }
} }
} }
} }
......
...@@ -8,6 +8,7 @@ import android.widget.Toast ...@@ -8,6 +8,7 @@ import android.widget.Toast
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.adapter.MediaSubAdapter import com.base.datarecovery.adapter.MediaSubAdapter
import com.base.datarecovery.ads.AdmobInterstitialUtils
import com.base.datarecovery.bean.MediaBean import com.base.datarecovery.bean.MediaBean
import com.base.datarecovery.databinding.ActivityPrivacyManageBinding import com.base.datarecovery.databinding.ActivityPrivacyManageBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
...@@ -68,14 +69,16 @@ class PrivacyManageActivity : BaseActivity<ActivityPrivacyManageBinding>() { ...@@ -68,14 +69,16 @@ class PrivacyManageActivity : BaseActivity<ActivityPrivacyManageBinding>() {
private fun deleteFilesDirMedia() { private fun deleteFilesDirMedia() {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
lifecycleScope.launch(Dispatchers.IO) { AdmobInterstitialUtils.showInterstitialAd(this) {
val list = mediaSubAdapter.getSelectData() lifecycleScope.launch(Dispatchers.IO) {
list.forEach { val list = mediaSubAdapter.getSelectData()
runCatching { File(it.path).delete() } list.forEach {
} runCatching { File(it.path).delete() }
launch(Dispatchers.Main) { }
Toast.makeText(this@PrivacyManageActivity, "success", Toast.LENGTH_SHORT).show() launch(Dispatchers.Main) {
mediaSubAdapter.removeData(list) Toast.makeText(this@PrivacyManageActivity, "success", Toast.LENGTH_SHORT).show()
mediaSubAdapter.removeData(list)
}
} }
} }
} }
......
...@@ -129,6 +129,7 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() { ...@@ -129,6 +129,7 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
} else { } else {
binding.ivIcon.setImageResource(R.mipmap.queshengye)
dialogClass.stopScan(scanType, pathList) dialogClass.stopScan(scanType, pathList)
} }
......
...@@ -3,6 +3,7 @@ package com.base.datarecovery.ads ...@@ -3,6 +3,7 @@ package com.base.datarecovery.ads
import android.app.Activity import android.app.Activity
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.base.datarecovery.R
import com.base.datarecovery.ads.AdmobCommonUtils.isMultiClick import com.base.datarecovery.ads.AdmobCommonUtils.isMultiClick
import com.base.datarecovery.ads.AdmobEvent.clickAd import com.base.datarecovery.ads.AdmobEvent.clickAd
import com.base.datarecovery.ads.AdmobEvent.pullAd import com.base.datarecovery.ads.AdmobEvent.pullAd
...@@ -74,7 +75,7 @@ object AdmobNativeUtils { ...@@ -74,7 +75,7 @@ object AdmobNativeUtils {
} }
fun showNativeAd(activity: Activity?, parent: ViewGroup) { fun showNativeAd(activity: Activity?, parent: ViewGroup, layout: Int = R.layout.layout_native_custom) {
val obj = JSONObject() val obj = JSONObject()
obj.put("ad_unit", "NativeAd") obj.put("ad_unit", "NativeAd")
// EventUtils.event("ad_prepare_show", ext = obj) // EventUtils.event("ad_prepare_show", ext = obj)
...@@ -84,7 +85,7 @@ object AdmobNativeUtils { ...@@ -84,7 +85,7 @@ object AdmobNativeUtils {
loadingListener = { loadingListener = {
if (System.currentTimeMillis() - nativeLoadTime <= 1000 * 60 * 60) { if (System.currentTimeMillis() - nativeLoadTime <= 1000 * 60 * 60) {
nativeAd?.let { nativeAd?.let {
NativeView(parent.context).run { NativeView(parent.context, layout).run {
parent.removeAllViews() parent.removeAllViews()
setNativeAd(it) setNativeAd(it)
parent.addView(this) parent.addView(this)
......
...@@ -14,7 +14,7 @@ import com.google.android.gms.ads.nativead.NativeAd ...@@ -14,7 +14,7 @@ import com.google.android.gms.ads.nativead.NativeAd
import com.google.android.gms.ads.nativead.NativeAdView import com.google.android.gms.ads.nativead.NativeAdView
class NativeView @JvmOverloads constructor( class NativeView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null context: Context, val layout: Int, attrs: AttributeSet? = null
) : FrameLayout(context, attrs) { ) : FrameLayout(context, attrs) {
init { init {
...@@ -28,7 +28,7 @@ class NativeView @JvmOverloads constructor( ...@@ -28,7 +28,7 @@ class NativeView @JvmOverloads constructor(
nativeAd ?: return nativeAd ?: return
val adView = LayoutInflater.from(context) val adView = LayoutInflater.from(context)
.inflate(R.layout.layout_native_custom, this, false) as NativeAdView .inflate(layout, this, false) as NativeAdView
adView.mediaView = adView.findViewById(R.id.ad_media) adView.mediaView = adView.findViewById(R.id.ad_media)
adView.headlineView = adView.findViewById(R.id.ad_headline) adView.headlineView = adView.findViewById(R.id.ad_headline)
......
...@@ -7,7 +7,6 @@ import android.content.Intent ...@@ -7,7 +7,6 @@ import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.R import com.base.datarecovery.R
...@@ -59,7 +58,7 @@ class FileScanDialog( ...@@ -59,7 +58,7 @@ class FileScanDialog(
a1.cancel() a1.cancel()
} }
AdmobNativeUtils.showNativeAd(activity, binding.flAd) AdmobNativeUtils.showNativeAd(activity, binding.flAd, R.layout.layout_native_custom_big)
activity.lifecycleScope.launch(Dispatchers.Main) { activity.lifecycleScope.launch(Dispatchers.Main) {
sharedFlow.collectLatest { path -> sharedFlow.collectLatest { path ->
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FDA409" /> <solid android:color="#1B1B1B" />
<corners android:radius="10dp" /> <corners android:radius="10dp" />
</shape> </shape>
\ No newline at end of file
<com.google.android.gms.ads.nativead.NativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/bg_ad_border"
android:baselineAligned="false"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/ad_app_icon"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_gravity="center_vertical"
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="8dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="#FF923E"
android:padding="2dp"
android:text="Ad"
android:textColor="@color/white"
android:textSize="12sp"
tools:ignore="HardcodedText" />
<TextView
android:layout_marginStart="8dp"
android:id="@+id/ad_headline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/ad_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<com.google.android.gms.ads.nativead.MediaView
android:id="@+id/ad_media"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_gravity="center_vertical"
android:layout_marginVertical="10dp" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_gravity="center_vertical"
android:background="@drawable/bg_ad_button"
android:gravity="center"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="15sp"
tools:text="Install" />
</LinearLayout>
</com.google.android.gms.ads.nativead.NativeAdView>
\ No newline at end of file
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