Commit 22d9e001 authored by wanglei's avatar wanglei

...

parent b164a487
......@@ -9,10 +9,12 @@ import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.adapter.MediaAdapter
import com.base.datarecovery.adapter.MediaSubAdapter
import com.base.datarecovery.ads.AdmobInterstitialUtils
import com.base.datarecovery.ads.AdmobNativeUtils
import com.base.datarecovery.bean.MediaBean
import com.base.datarecovery.bean.MediaTimeBean
import com.base.datarecovery.databinding.ActivityRepeatBinding
import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.help.KotlinExt.toFormatSize
import com.base.datarecovery.help.KotlinExt.toFormatTime
import com.base.datarecovery.help.MediaStoreHelp.getImageMedia
......@@ -119,6 +121,9 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() {
launch(Dispatchers.Main) {
binding.progressBar.visibility = View.GONE
mediaAdapter.setData(beanList)
if (beanList.sumOf { it.beans.size } > 6 || ConfigHelper.mustShowNativeAd) {
AdmobNativeUtils.showNativeAd(this@RepeatActivity, binding.flAd)
}
}
}
......
......@@ -8,10 +8,12 @@ import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.adapter.ScreenShotAdapter
import com.base.datarecovery.ads.AdmobInterstitialUtils
import com.base.datarecovery.ads.AdmobNativeUtils
import com.base.datarecovery.bean.ScreenPhotoBean
import com.base.datarecovery.bean.ScreenshotBean
import com.base.datarecovery.databinding.ActivityScreenShotBinding
import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.help.FileHelp
import com.base.datarecovery.help.KotlinExt.toFormatSize
import com.base.datarecovery.help.PermissionHelp.checkStorePermission
......@@ -84,6 +86,9 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
val sizeF = size.toFormatSize().split(" ")
binding.tvSize.text = sizeF[0]
binding.tvUnit.text = sizeF[1]
if (list.sumOf { it.screenPhotoBean.size } > 6 || ConfigHelper.mustShowNativeAd) {
AdmobNativeUtils.showNativeAd(this@ScreenShotActivity, binding.flAd)
}
}
}
......
......@@ -25,7 +25,6 @@ import com.base.datarecovery.view.DialogViews.showGerPermission
import com.base.datarecovery.view.FileScanDialog
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.launch
......@@ -127,8 +126,9 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
pathList.add(file.absolutePath)
if (!oneShowAd) {
oneShowAd = true
dialogClass.scanShowUI()
lifecycleScope.launch(Dispatchers.Main) {
AdmobInterstitialUtils.showInterstitialAd(this@FileScanActivity,true,false) { }
AdmobInterstitialUtils.showInterstitialAd(this@FileScanActivity, true, false) { }
}
}
},
......@@ -136,7 +136,7 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
if (pathList.isEmpty()) {
scanDialog.dismiss()
binding.ivIcon.setImageResource(R.mipmap.queshengye)
binding.tvBtn.text = "Finish"
binding.tvBtn.text = "Finished"
binding.tvBtn.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
......
......@@ -16,6 +16,9 @@ object ConfigHelper {
const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696110"
const val openAdmobId = "/6499/example/app-open"
//一定展示大图广告
var mustShowNativeAd: Boolean = false
// 正式包名
const val packageName = "com.kuke.photosrecovery.allrecovery.acbcali"
......
......@@ -31,8 +31,6 @@ class FileScanDialog(
sharedFlow: SharedFlow<String>,
foundFlow: SharedFlow<Int>
): AlertDialog {
dialog?.setView(binding.root)
dialog?.setCanceledOnTouchOutside(false)
dialog?.setCancelable(false)
......@@ -80,7 +78,7 @@ class FileScanDialog(
a1.cancel()
binding.tvBtn.visibility = View.VISIBLE
binding.iv.visibility = View.GONE
binding.tvPath.visibility=View.GONE
binding.tvPath.visibility = View.GONE
binding.tvTitle.text = "Scan Completed"
binding.tvBtn.setOnClickListener {
activity.startActivity(Intent(activity, FileScanResultActivity::class.java).apply {
......@@ -90,4 +88,8 @@ class FileScanDialog(
activity.finish()
}
}
fun scanShowUI() {
binding.tvPath.visibility = View.VISIBLE
}
}
\ No newline at end of file
......@@ -115,6 +115,10 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:layout_width="match_parent"
......
......@@ -115,6 +115,11 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv"
android:layout_width="match_parent"
......
......@@ -46,22 +46,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:layout_marginVertical="5dp"
android:text="Found 0 files"
android:textColor="#333333"
android:textSize="15sp"
tools:text="Found 100 files" />
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/tv_path"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="25dp"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="#666666"
android:textSize="12sp" />
android:textSize="12sp"
android:visibility="gone" />
<FrameLayout
android:id="@+id/fl_ad"
......
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