Commit b627119e authored by 周文华's avatar 周文华

【修复】修复首页删除与搜索模式下的侧滑返回问题。

parent a6dedc73
...@@ -244,7 +244,7 @@ class DocumentFragment( ...@@ -244,7 +244,7 @@ class DocumentFragment(
fun changeSelectUI(show: Boolean) { fun changeSelectUI(show: Boolean) {
if (show) { if (show) {
binding.viewPager2.isUserInputEnabled = false binding.viewPager2.isUserInputEnabled = false
(requireActivity() as MainActivity).callback.isEnabled = true //(requireActivity() as MainActivity).callback.isEnabled = true
uiMode = UI_MODE_SELECT uiMode = UI_MODE_SELECT
binding.ivPaixu.visibility = View.INVISIBLE binding.ivPaixu.visibility = View.INVISIBLE
...@@ -260,7 +260,7 @@ class DocumentFragment( ...@@ -260,7 +260,7 @@ class DocumentFragment(
currentPage.changeSelectUi(true) currentPage.changeSelectUi(true)
} else { } else {
binding.viewPager2.isUserInputEnabled = true binding.viewPager2.isUserInputEnabled = true
(requireActivity() as MainActivity).callback.isEnabled = false // (requireActivity() as MainActivity).callback.isEnabled = false
uiMode = UI_MODE_NORMAL uiMode = UI_MODE_NORMAL
binding.flFanhui.visibility = View.INVISIBLE binding.flFanhui.visibility = View.INVISIBLE
binding.ivAllSelector.visibility = View.INVISIBLE binding.ivAllSelector.visibility = View.INVISIBLE
...@@ -288,7 +288,7 @@ class DocumentFragment( ...@@ -288,7 +288,7 @@ class DocumentFragment(
fun changeSearchUI(show: Boolean) { fun changeSearchUI(show: Boolean) {
if (show) { if (show) {
uiMode = UI_MODE_SEARCH uiMode = UI_MODE_SEARCH
(requireActivity() as MainActivity).callback.isEnabled = true // (requireActivity() as MainActivity).callback.isEnabled = true
binding.card.elevation = 0f binding.card.elevation = 0f
binding.tvTittle.visibility = View.INVISIBLE binding.tvTittle.visibility = View.INVISIBLE
...@@ -308,7 +308,7 @@ class DocumentFragment( ...@@ -308,7 +308,7 @@ class DocumentFragment(
} else { } else {
uiMode = UI_MODE_NORMAL uiMode = UI_MODE_NORMAL
(requireActivity() as MainActivity).callback.isEnabled = false // (requireActivity() as MainActivity).callback.isEnabled = false
binding.card.elevation = resources.getDimension(R.dimen.dp_5) binding.card.elevation = resources.getDimension(R.dimen.dp_5)
binding.editSearch.visibility = View.INVISIBLE binding.editSearch.visibility = View.INVISIBLE
......
...@@ -326,18 +326,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -326,18 +326,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
var isBookmarkAdd: Boolean = false var isBookmarkAdd: Boolean = false
var isToolAdd: Boolean = false var isToolAdd: Boolean = false
@SuppressLint("MissingSuperCall")
override fun onBackPressed() {
LogEx.logDebug(TAG, "onBackPressed")
showAppExitDialog()
}
//OnBackPressedCallback 并将 isEnabled 设置为 false 时,默认的返回键行为将被禁用。 //OnBackPressedCallback 并将 isEnabled 设置为 false 时,默认的返回键行为将被禁用。
lateinit var callback: OnBackPressedCallback val callback: OnBackPressedCallback by lazy(LazyThreadSafetyMode.NONE) {
override fun initListener() { object : OnBackPressedCallback(true) {
super.initListener()
callback = object : OnBackPressedCallback(false) {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
LogEx.logDebug(TAG, "handleOnBackPressed") LogEx.logDebug(TAG, "handleOnBackPressed")
if (currentFragment is DocumentFragment) { if (currentFragment is DocumentFragment) {
...@@ -345,13 +336,20 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -345,13 +336,20 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
LogEx.logDebug(TAG, "handleOnBackPressed uiMode=${documentFragment.uiMode}") LogEx.logDebug(TAG, "handleOnBackPressed uiMode=${documentFragment.uiMode}")
if (documentFragment.uiMode == ConstObject.UI_MODE_SELECT) { if (documentFragment.uiMode == ConstObject.UI_MODE_SELECT) {
documentFragment.changeSelectUI(false) documentFragment.changeSelectUI(false)
return
} }
if (documentFragment.uiMode == ConstObject.UI_MODE_SEARCH) { if (documentFragment.uiMode == ConstObject.UI_MODE_SEARCH) {
documentFragment.changeSearchUI(false) documentFragment.changeSearchUI(false)
return
}
} }
showAppExitDialog()
} }
} }
} }
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback(callback) onBackPressedDispatcher.addCallback(callback)
binding.llDocument.setOnClickListener { binding.llDocument.setOnClickListener {
......
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