Commit 0fd22711 authored by wanglei's avatar wanglei

...

parent 167e11ba
...@@ -127,6 +127,7 @@ class StayNotificationService : Service() { ...@@ -127,6 +127,7 @@ class StayNotificationService : Service() {
return START_NOT_STICKY return START_NOT_STICKY
} }
if (!isRunning) { if (!isRunning) {
LogEx.logDebug(TAG, "onStartCommand startForeground")
startForeground() startForeground()
isRunning = true isRunning = true
} }
......
...@@ -70,8 +70,6 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -70,8 +70,6 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
mainPresenter = MainPresenter(this, this, lifecycleScope) mainPresenter = MainPresenter(this, this, lifecycleScope)
mainPresenter.initScannerLauncher(this) mainPresenter.initScannerLauncher(this)
addDeskShortCut() addDeskShortCut()
} }
...@@ -82,6 +80,11 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -82,6 +80,11 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
actionIdOperation() actionIdOperation()
} }
private fun closeScanGuide() {
binding.flScanGuide.visibility = View.GONE
showPermissionThenBanner()
}
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
...@@ -103,30 +106,33 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -103,30 +106,33 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
return return
} }
//scan guide //scan guide
if (mainStartTimes == 1) { if (mainStartTimes == 1) {
binding.flScanGuide.visibility = View.VISIBLE binding.flScanGuide.visibility = View.VISIBLE
return return
} }
//banner
showMainBanner()
//permission //permission
if (checkStorePermission() && needRefresh) { if (checkStorePermission() && needRefresh) {
mainPresenter.initAllDocumentData() mainPresenter.initAllDocumentData()
} else { } else {
showStoragePermission(launcher, allowAction = {}) showPermissionThenBanner()
} }
} }
private fun showPermissionThenBanner() {
showStoragePermission(launcher,
allowAction = {
showMainBanner()
},
denyAction = {
showMainBanner()
})
}
private fun showMainBanner() { private fun showMainBanner() {
if (!bannerShowed) { if (!bannerShowed) {
AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner) { AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner) {
if (!checkStorePermission()) {
showStoragePermission(launcher)
}
bannerShowed = true bannerShowed = true
} }
} }
...@@ -275,10 +281,6 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -275,10 +281,6 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
actionIdOperation() actionIdOperation()
} }
private fun closeScanGuide() {
binding.flScanGuide.visibility = View.GONE
showMainBanner()
}
private fun actionIdOperation() { private fun actionIdOperation() {
if (actionId == SHORTCUT_SCAN_PDF) { if (actionId == SHORTCUT_SCAN_PDF) {
......
...@@ -15,7 +15,6 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.ifAgreePrivacy ...@@ -15,7 +15,6 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.ifAgreePrivacy
import com.base.pdfviewerscannerwhite.bean.ConstObject.isFirstStart import com.base.pdfviewerscannerwhite.bean.ConstObject.isFirstStart
import com.base.pdfviewerscannerwhite.databinding.ActivitySplash2Binding import com.base.pdfviewerscannerwhite.databinding.ActivitySplash2Binding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.helper.MyApplication.Companion.umpCanAd import com.base.pdfviewerscannerwhite.helper.MyApplication.Companion.umpCanAd
import com.base.pdfviewerscannerwhite.service.StayNotificationService.Companion.startStayNotification import com.base.pdfviewerscannerwhite.service.StayNotificationService.Companion.startStayNotification
import com.base.pdfviewerscannerwhite.ui.main.MainActivity import com.base.pdfviewerscannerwhite.ui.main.MainActivity
...@@ -155,12 +154,12 @@ class SplashActivity : BaseActivity<ActivitySplash2Binding>(), SplashView { ...@@ -155,12 +154,12 @@ class SplashActivity : BaseActivity<ActivitySplash2Binding>(), SplashView {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
val recreate = updateAppLanguage(MyApplication.splashLanguage, TAG) { // val recreate = updateAppLanguage(MyApplication.splashLanguage, TAG) {
MyApplication.splashLanguage = it // MyApplication.splashLanguage = it
} // }
if (!recreate) { // if (!recreate) {
splashPresenter.startJumpJob(lifecycleScope) // }
} splashPresenter.startJumpJob(lifecycleScope)
} }
......
...@@ -72,6 +72,7 @@ object DialogView { ...@@ -72,6 +72,7 @@ object DialogView {
} }
binding.tvContinue.setOnClickListener { binding.tvContinue.setOnClickListener {
dialog.dismiss() dialog.dismiss()
denyAction?.invoke()
} }
} }
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#B3000000" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
...@@ -370,12 +370,11 @@ ...@@ -370,12 +370,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"> android:visibility="gone">
<FrameLayout <FrameLayout
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="#B3000000" android:background="@drawable/bg_b3000000_10"
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