Commit 167e11ba authored by wanglei's avatar wanglei

...

parent 610ad075
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<application <application
android:name=".helper.MyApplication" android:name=".helper.MyApplication"
android:allowBackup="true" android:allowBackup="true"
......
...@@ -93,7 +93,7 @@ object AdmobHelper { ...@@ -93,7 +93,7 @@ object AdmobHelper {
} }
} }
//主页启动次数 //上次scan展示ad时间
var lastScanShowAd = 0L var lastScanShowAd = 0L
get() { get() {
return AppPreferences.getInstance().getLong("lastScanShowAd", field) return AppPreferences.getInstance().getLong("lastScanShowAd", field)
...@@ -108,4 +108,35 @@ object AdmobHelper { ...@@ -108,4 +108,35 @@ object AdmobHelper {
val interval = AppPreferences.getInstance().getString("scan_ad_interval", "10").toInt() val interval = AppPreferences.getInstance().getString("scan_ad_interval", "10").toInt()
return System.currentTimeMillis() - lastScanShowAd > interval * 1000L return System.currentTimeMillis() - lastScanShowAd > interval * 1000L
} }
//上次打开文档展示ad时间
var lastOpenDocumentShowAd = 0L
get() {
return AppPreferences.getInstance().getLong("lastOpenDocumentShowAd", field)
}
set(value) {
field = value
AppPreferences.getInstance().put("lastOpenDocumentShowAd", value, true)
}
//打开文档是否展示广告
fun isShowOpenDocumentInter(): Boolean {
val interval = AppPreferences.getInstance().getString("open_document_ad_interval", "10").toInt()
return System.currentTimeMillis() - lastOpenDocumentShowAd > interval * 1000L
}
var lastCloseDocumentShowAd = 0L
get() {
return AppPreferences.getInstance().getLong("lastCloseDocumentShowAd", field)
}
set(value) {
field = value
AppPreferences.getInstance().put("lastCloseDocumentShowAd", value, true)
}
fun isShowCloseDocumentInter(): Boolean {
val interval = AppPreferences.getInstance().getString("close_document_ad_interval", "10").toInt()
return System.currentTimeMillis() - lastCloseDocumentShowAd > interval * 1000L
}
} }
\ No newline at end of file
...@@ -90,7 +90,14 @@ object ConstObject { ...@@ -90,7 +90,14 @@ object ConstObject {
AppPreferences.getInstance().put("changeLanguageSp", value, true) AppPreferences.getInstance().put("changeLanguageSp", value, true)
} }
var haveSelectLanguage = false
get() {
return AppPreferences.getInstance().getBoolean("selectFollowLanguage", field)
}
set(value) {
field = value
AppPreferences.getInstance().put("selectFollowLanguage", value, true)
}
var selectFollowLanguage = false var selectFollowLanguage = false
get() { get() {
return AppPreferences.getInstance().getBoolean("selectFollowLanguage", field) return AppPreferences.getInstance().getBoolean("selectFollowLanguage", field)
......
...@@ -11,6 +11,8 @@ import android.view.inputmethod.EditorInfo ...@@ -11,6 +11,8 @@ import android.view.inputmethod.EditorInfo
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.pdfviewerscannerwhite.ads.AdmobHelper
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityExcelBinding import com.base.pdfviewerscannerwhite.databinding.ActivityExcelBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
...@@ -72,7 +74,16 @@ class ExcelActivity : BaseActivity<ActivityExcelBinding>() { ...@@ -72,7 +74,16 @@ class ExcelActivity : BaseActivity<ActivityExcelBinding>() {
cancelSearchUI() cancelSearchUI()
return@addCallback return@addCallback
} }
finishToMain() if (AdmobHelper.isShowCloseDocumentInter()) {
AdmobInterstitialUtils.showInterstitialAd(this@ExcelActivity) {
if (it) {
AdmobHelper.lastCloseDocumentShowAd = System.currentTimeMillis()
}
finishToMain()
}
} else {
finishToMain()
}
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -25,7 +25,9 @@ import com.artifex.mupdfdemo.MuPDFView ...@@ -25,7 +25,9 @@ import com.artifex.mupdfdemo.MuPDFView
import com.artifex.mupdfdemo.SearchTask import com.artifex.mupdfdemo.SearchTask
import com.artifex.mupdfdemo.SearchTaskResult import com.artifex.mupdfdemo.SearchTaskResult
import com.base.pdfviewerscannerwhite.R import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.AdmobHelper
import com.base.pdfviewerscannerwhite.ads.admob.AdmobBannerUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobBannerUtils
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_SAVE_PDF import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_SAVE_PDF
import com.base.pdfviewerscannerwhite.bean.ConstObject.haveGuideGesture import com.base.pdfviewerscannerwhite.bean.ConstObject.haveGuideGesture
import com.base.pdfviewerscannerwhite.bean.PdfPageBean import com.base.pdfviewerscannerwhite.bean.PdfPageBean
...@@ -158,7 +160,16 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -158,7 +160,16 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
return@addCallback return@addCallback
} }
finishToMain() if (AdmobHelper.isShowCloseDocumentInter()) {
AdmobInterstitialUtils.showInterstitialAd(this@PdfActivity) {
if (it) {
AdmobHelper.lastCloseDocumentShowAd = System.currentTimeMillis()
}
finishToMain()
}
} else {
finishToMain()
}
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -9,6 +9,8 @@ import android.view.animation.Animation ...@@ -9,6 +9,8 @@ import android.view.animation.Animation
import android.view.animation.TranslateAnimation import android.view.animation.TranslateAnimation
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.base.pdfviewerscannerwhite.ads.AdmobHelper
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityPptBinding import com.base.pdfviewerscannerwhite.databinding.ActivityPptBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
...@@ -82,7 +84,16 @@ class PptActivity : BaseActivity<ActivityPptBinding>() { ...@@ -82,7 +84,16 @@ class PptActivity : BaseActivity<ActivityPptBinding>() {
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMain() if (AdmobHelper.isShowCloseDocumentInter()) {
AdmobInterstitialUtils.showInterstitialAd(this@PptActivity) {
if (it) {
AdmobHelper.lastCloseDocumentShowAd = System.currentTimeMillis()
}
finishToMain()
}
} else {
finishToMain()
}
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -14,6 +14,8 @@ import androidx.core.content.ContextCompat ...@@ -14,6 +14,8 @@ import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import com.base.pdfviewerscannerwhite.R import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.AdmobHelper
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
...@@ -100,7 +102,16 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -100,7 +102,16 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
return@addCallback return@addCallback
} }
LogEx.logDebug(TAG, "finishToMain") LogEx.logDebug(TAG, "finishToMain")
finishToMain() if (AdmobHelper.isShowCloseDocumentInter()) {
AdmobInterstitialUtils.showInterstitialAd(this@WordActivity) {
if (it) {
AdmobHelper.lastCloseDocumentShowAd = System.currentTimeMillis()
}
finishToMain()
}
} else {
finishToMain()
}
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -6,6 +6,9 @@ import android.view.View ...@@ -6,6 +6,9 @@ import android.view.View
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.pdfviewerscannerwhite.R import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.AdmobHelper
import com.base.pdfviewerscannerwhite.ads.AdmobHelper.lastOpenDocumentShowAd
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject import com.base.pdfviewerscannerwhite.bean.ConstObject
import com.base.pdfviewerscannerwhite.bean.ConstObject.UI_SORT_FINAL_MODIFIED import com.base.pdfviewerscannerwhite.bean.ConstObject.UI_SORT_FINAL_MODIFIED
...@@ -124,7 +127,16 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -124,7 +127,16 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
documentPresenter.saveBookmarkChange(addRemove, path) documentPresenter.saveBookmarkChange(addRemove, path)
} }
adapter.itemClick = { item -> adapter.itemClick = { item ->
requireActivity().jumpDocument(item) if (AdmobHelper.isShowOpenDocumentInter()) {
AdmobInterstitialUtils.showInterstitialAd(requireActivity()) {
if (it) {
lastOpenDocumentShowAd = System.currentTimeMillis()
}
requireActivity().jumpDocument(item)
}
}else{
requireActivity().jumpDocument(item)
}
} }
adapter.moreAction = { item -> adapter.moreAction = { item ->
documentMoreAction.invoke(item) documentMoreAction.invoke(item)
......
...@@ -6,6 +6,7 @@ import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils ...@@ -6,6 +6,7 @@ import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject import com.base.pdfviewerscannerwhite.bean.ConstObject
import com.base.pdfviewerscannerwhite.bean.ConstObject.appLanguageSp import com.base.pdfviewerscannerwhite.bean.ConstObject.appLanguageSp
import com.base.pdfviewerscannerwhite.bean.ConstObject.changeLanguageSp import com.base.pdfviewerscannerwhite.bean.ConstObject.changeLanguageSp
import com.base.pdfviewerscannerwhite.bean.ConstObject.haveSelectLanguage
import com.base.pdfviewerscannerwhite.bean.LanguageBean import com.base.pdfviewerscannerwhite.bean.LanguageBean
import com.base.pdfviewerscannerwhite.databinding.ActivitySetLanguageBinding import com.base.pdfviewerscannerwhite.databinding.ActivitySetLanguageBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
...@@ -75,13 +76,14 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() { ...@@ -75,13 +76,14 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
LanguageBean(LanguageBean.繁體中文, Locale("zh", "TW").language), LanguageBean(LanguageBean.繁體中文, Locale("zh", "TW").language),
LanguageBean(LanguageBean.Türk, Locale("tr", "TR").language), LanguageBean(LanguageBean.Türk, Locale("tr", "TR").language),
) )
if (ConstObject.selectFollowLanguage) { if (ConstObject.selectFollowLanguage || !ConstObject.haveSelectLanguage) {
list.first().isSelect = true list.first().isSelect = true
} else { } else {
list.findLast { it.language == appLanguageSp }?.isSelect = true list.findLast { it.language == appLanguageSp }?.isSelect = true
} }
adapter.submitList(list) adapter.submitList(list)
haveSelectLanguage = true
} }
} }
\ No newline at end of file
...@@ -266,6 +266,7 @@ ...@@ -266,6 +266,7 @@
android:id="@+id/fl_scan_guide" android:id="@+id/fl_scan_guide"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/fl_banner" app:layout_constraintBottom_toTopOf="@id/fl_banner"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
......
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="#336C677C" android:background="#B3000000"
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<com.base.pdfviewerscannerwhite.ui.view.XmlLottieAnimationView <com.base.pdfviewerscannerwhite.ui.view.XmlLottieAnimationView
......
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