From 8854c1576b28c92933b70dc1abdf71a963d9ae83 Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Fri, 5 Dec 2025 17:35:34 +0800 Subject: [PATCH] update --- .../pdf/reader/ui/act/MainActivity.kt | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt index 03d4688..0d40a11 100644 --- a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt @@ -275,7 +275,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback val promptDialogFragment = PromptDialogFragment.newInstance( title = title, desc = desc ) - promptDialogFragment.onOkClick ={ + promptDialogFragment.onOkClick = { viewModel.deleteFiles(filesToDelete) exitAllMultiSelect() } @@ -301,7 +301,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback val filePaths = selectedItems.map { it.filePath } val promptDialogFragment = PromptDialogFragment.newInstance( - title = getString(R.string.remove_dialog_title), + title = getString(R.string.remove_dialog_title), desc = getString(R.string.remove_dialog_desc), okBtnText = getString(R.string.remove) ) @@ -364,18 +364,16 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback } private fun updateSelectedNav(fragment: Fragment) { - if (fragment is ToolsFrag) {//工具界面不展示权限与搜索和多选 - binding.pnLayout.visibility = View.GONE - binding.topButtonLayout.visibility = View.GONE - } else { - binding.topButtonLayout.visibility = View.VISIBLE - if (!StoragePermissionHelper.hasBasicStoragePermission(this)) { - binding.pnLayout.visibility = View.VISIBLE - } - } + //有权限隐藏下方的权限提示,反之 if (StoragePermissionHelper.hasBasicStoragePermission(this)) { - binding.topButtonLayout.visibility = View.VISIBLE + binding.pnLayout.visibility = View.GONE + if (fragment is ToolsFrag) {//在有权限的情况下,工具界面不展示搜索和多选 + binding.topButtonLayout.visibility = View.GONE + } else { + binding.topButtonLayout.visibility = View.VISIBLE + } } else { + binding.pnLayout.visibility = View.VISIBLE binding.topButtonLayout.visibility = View.GONE } when (fragment) { @@ -590,15 +588,13 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback override fun onResume() { super.onResume() - BannerManager.onResume(this,AdsInsUtil.AdPlacement.BAN_AND_HOMEPAGE) + BannerManager.onResume(this, AdsInsUtil.AdPlacement.BAN_AND_HOMEPAGE) logDebug("main onResume") if (StoragePermissionHelper.hasBasicStoragePermission(this)) { // 有授权才初始化文件变化监听器 PRApp.getInstance().startFileChangeObserving() scanningStrategy() - binding.pnLayout.visibility = View.GONE } else { - binding.pnLayout.visibility = View.VISIBLE val dialog = PermissionDialogFragment() //如果之前展示过授权对话框,则不再展示 if (!appStore.isShowPermissionsDialogPrompt) { @@ -609,12 +605,12 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback } override fun onPause() { - BannerManager.onPause(this,AdsInsUtil.AdPlacement.BAN_AND_HOMEPAGE) + BannerManager.onPause(this, AdsInsUtil.AdPlacement.BAN_AND_HOMEPAGE) super.onPause() } override fun onDestroy() { - BannerManager.onDestroy(this,AdsInsUtil.AdPlacement.BAN_AND_HOMEPAGE) + BannerManager.onDestroy(this, AdsInsUtil.AdPlacement.BAN_AND_HOMEPAGE) super.onDestroy() }