Commit 0a1f8906 authored by wanglei's avatar wanglei

...

parent bfe56a87
...@@ -6,30 +6,32 @@ import android.app.AlertDialog ...@@ -6,30 +6,32 @@ import android.app.AlertDialog
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.databinding.DialogAdPreparingBinding
object AdDialog { object AdDialog {
// fun Context.showAdPreparingDialog(): AlertDialog { fun Context.showAdPreparingDialog(): AlertDialog {
// val binding = DialogAdPreparingBinding.inflate(LayoutInflater.from(this)) val binding = DialogAdPreparingBinding.inflate(LayoutInflater.from(this))
// val dialog = AlertDialog.Builder(this).create() val dialog = AlertDialog.Builder(this).create()
// dialog.setView(binding.root) dialog.setView(binding.root)
// dialog.setCancelable(false) dialog.setCancelable(false)
// dialog.setCanceledOnTouchOutside(false) dialog.setCanceledOnTouchOutside(false)
//
// dialog.show() dialog.show()
// val params = dialog.window?.attributes val params = dialog.window?.attributes
// params?.width = resources.getDimensionPixelOffset(R.dimen.dp_200) params?.width = resources.getDimensionPixelOffset(R.dimen.dp_200)
// params?.height = resources.getDimensionPixelOffset(R.dimen.dp_146) params?.height = resources.getDimensionPixelOffset(R.dimen.dp_146)
// dialog.window?.attributes = params dialog.window?.attributes = params
// dialog.window?.setBackgroundDrawableResource(android.R.color.transparent) dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
//
// // 创建一个旋转动画 // 创建一个旋转动画
// val rotateAnimator = ObjectAnimator.ofFloat(binding.iv, "rotation", 0f, -360f) val rotateAnimator = ObjectAnimator.ofFloat(binding.iv, "rotation", 0f, -360f)
// rotateAnimator.setDuration(1000) // 设置动画持续时间为1000毫秒 rotateAnimator.setDuration(1000) // 设置动画持续时间为1000毫秒
// rotateAnimator.repeatCount = INFINITE rotateAnimator.repeatCount = INFINITE
// rotateAnimator.interpolator = LinearInterpolator() // 设置插值器为线性插值 rotateAnimator.interpolator = LinearInterpolator() // 设置插值器为线性插值
// rotateAnimator.start() rotateAnimator.start()
//
// return dialog return dialog
// } }
} }
\ No newline at end of file
...@@ -4,6 +4,7 @@ import android.app.Activity ...@@ -4,6 +4,7 @@ import android.app.Activity
import android.app.Dialog import android.app.Dialog
import android.widget.Toast import android.widget.Toast
import com.base.pdfviewerscannerwhite.BuildConfig import com.base.pdfviewerscannerwhite.BuildConfig
import com.base.pdfviewerscannerwhite.ads.AdDialog.showAdPreparingDialog
import com.base.pdfviewerscannerwhite.ads.AdDisplayUtils import com.base.pdfviewerscannerwhite.ads.AdDisplayUtils
import com.base.pdfviewerscannerwhite.ads.admob.AdmobEvent.clickAd import com.base.pdfviewerscannerwhite.ads.admob.AdmobEvent.clickAd
import com.base.pdfviewerscannerwhite.ads.admob.AdmobEvent.pullAd import com.base.pdfviewerscannerwhite.ads.admob.AdmobEvent.pullAd
...@@ -66,7 +67,7 @@ object AdmobInterstitialUtils { ...@@ -66,7 +67,7 @@ object AdmobInterstitialUtils {
if (interAd != null) { if (interAd != null) {
if (!activity.isFinishing && !activity.isDestroyed) { if (!activity.isFinishing && !activity.isDestroyed) {
// dialog = activity.showAdPreparingDialog() dialog = activity.showAdPreparingDialog()
} }
displayInterstitialAd(activity, onHidden) displayInterstitialAd(activity, onHidden)
} else { } else {
......
...@@ -11,6 +11,7 @@ import androidx.activity.result.IntentSenderRequest ...@@ -11,6 +11,7 @@ import androidx.activity.result.IntentSenderRequest
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject import com.base.pdfviewerscannerwhite.bean.ConstObject
import com.base.pdfviewerscannerwhite.bean.ConstObject.BOOKMARK_DATA_TYPE import com.base.pdfviewerscannerwhite.bean.ConstObject.BOOKMARK_DATA_TYPE
import com.base.pdfviewerscannerwhite.bean.ConstObject.DOCUMENT_DATA_TYPE import com.base.pdfviewerscannerwhite.bean.ConstObject.DOCUMENT_DATA_TYPE
...@@ -298,6 +299,7 @@ class MainPresenter( ...@@ -298,6 +299,7 @@ class MainPresenter(
} }
fun starGmsScan(activity: Activity) { fun starGmsScan(activity: Activity) {
AdmobInterstitialUtils.showInterstitialAd(activity) {
val options = val options =
GmsDocumentScannerOptions.Builder() GmsDocumentScannerOptions.Builder()
.setScannerMode(GmsDocumentScannerOptions.SCANNER_MODE_BASE) .setScannerMode(GmsDocumentScannerOptions.SCANNER_MODE_BASE)
...@@ -317,7 +319,7 @@ class MainPresenter( ...@@ -317,7 +319,7 @@ class MainPresenter(
} }
.addOnFailureListener { e: Exception -> .addOnFailureListener { e: Exception ->
} }
}
} }
fun deleteList(list: List<DocumentBean>) { fun deleteList(list: List<DocumentBean>) {
......
...@@ -17,7 +17,7 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() { ...@@ -17,7 +17,7 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
override val binding: ActivitySetLanguageBinding by lazy { override val binding: ActivitySetLanguageBinding by lazy {
ActivitySetLanguageBinding.inflate(layoutInflater) ActivitySetLanguageBinding.inflate(layoutInflater)
} }
private val TAG = "" private val TAG = "SetLanguageActivity"
private lateinit var adapter: LanguageAdapter private lateinit var adapter: LanguageAdapter
private var from: String = "" private var from: String = ""
override fun initView() { override fun initView() {
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="180dp"
android:layout_height="136dp"
android:layout_margin="5dp"
app:cardCornerRadius="25dp"
app:cardElevation="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="23dp"
android:src="@mipmap/jiazai_ad"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="18dp"
android:layout_marginBottom="22dp"
android:includeFontPadding="false"
android:text="@string/preparing_advertisement"
android:textColor="@color/black"
android:textSize="13sp"
tools:ignore="HardcodedText" />
</LinearLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
...@@ -2,4 +2,6 @@ ...@@ -2,4 +2,6 @@
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="dp_50">50dp</dimen> <dimen name="dp_50">50dp</dimen>
<dimen name="dp_4">4dp</dimen> <dimen name="dp_4">4dp</dimen>
<dimen name="dp_200">200dp</dimen>
<dimen name="dp_146">146dp</dimen>
</resources> </resources>
\ No newline at end of file
...@@ -82,5 +82,6 @@ ...@@ -82,5 +82,6 @@
<string name="permission_tip_2">will only be used on the current device.</string> <string name="permission_tip_2">will only be used on the current device.</string>
<string name="click_this_button_to_use_the_scanning_feature">Click this button to use the\nscanning feature</string> <string name="click_this_button_to_use_the_scanning_feature">Click this button to use the\nscanning feature</string>
<string name="try_using_it">Try using it</string> <string name="try_using_it">Try using it</string>
<string name="preparing_advertisement">Preparing advertisement...</string>
</resources> </resources>
\ 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