Commit 168ea930 authored by wanglei's avatar wanglei

...

parent 7ad1d6f5
...@@ -42,6 +42,7 @@ import com.base.pdfviewerscannerwhite.ui.view.PdfDialog.showPdfPwdDialog ...@@ -42,6 +42,7 @@ import com.base.pdfviewerscannerwhite.ui.view.PdfDialog.showPdfPwdDialog
import com.base.pdfviewerscannerwhite.ui.view.RateDialog.showRateDialog import com.base.pdfviewerscannerwhite.ui.view.RateDialog.showRateDialog
import com.base.pdfviewerscannerwhite.utils.IntentShareUtils.shareMutDocuments import com.base.pdfviewerscannerwhite.utils.IntentShareUtils.shareMutDocuments
import com.base.pdfviewerscannerwhite.utils.LogEx import com.base.pdfviewerscannerwhite.utils.LogEx
import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkNotificationPermission
import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkStorePermission import com.base.pdfviewerscannerwhite.utils.PermissionUtils.checkStorePermission
import com.base.pdfviewerscannerwhite.utils.ShortcutUtils.addDeskShortCut import com.base.pdfviewerscannerwhite.utils.ShortcutUtils.addDeskShortCut
import com.base.pdfviewerscannerwhite.utils.updateMediaStore import com.base.pdfviewerscannerwhite.utils.updateMediaStore
...@@ -115,7 +116,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -115,7 +116,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
private fun closeScanGuide() { private fun closeScanGuide() {
binding.flScanGuide.visibility = View.GONE binding.flScanGuide.visibility = View.GONE
showPermissionDialog() dialogRequestStep()
} }
override fun handleActivityGmsScanResult(imageUri: Uri?, pdfUri: Uri?) { override fun handleActivityGmsScanResult(imageUri: Uri?, pdfUri: Uri?) {
...@@ -190,7 +191,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -190,7 +191,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
return return
} }
//通知弹窗 //通知弹窗
if (!todayShowNotificationDialog) { if (!todayShowNotificationDialog && !checkNotificationPermission()) {
todayShowNotificationDialog = true todayShowNotificationDialog = true
showNotificationDialog(launcher) showNotificationDialog(launcher)
} else { } else {
...@@ -221,7 +222,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -221,7 +222,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
bannerShowed = true bannerShowed = true
AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner) { AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flBanner) {
//通知弹窗 //通知弹窗
if (!todayShowNotificationDialog) { if (!todayShowNotificationDialog && !checkNotificationPermission()) {
todayShowNotificationDialog = true todayShowNotificationDialog = true
showNotificationDialog(launcher) showNotificationDialog(launcher)
} else { } else {
......
...@@ -355,6 +355,7 @@ ...@@ -355,6 +355,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -382,8 +383,7 @@ ...@@ -382,8 +383,7 @@
android:layout_gravity="center" android:layout_gravity="center"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true"
app:lottie_rawRes="@raw/enlarge" app:lottie_rawRes="@raw/enlarge" />
app:lottie_repeatCount="0" />
</FrameLayout> </FrameLayout>
......
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