Commit d34c4815 authored by wanglei's avatar wanglei

...

parent 0f56cb81
...@@ -189,6 +189,10 @@ class DocumentFragment( ...@@ -189,6 +189,10 @@ class DocumentFragment(
configTabLayoutConfig { configTabLayoutConfig {
onSelectIndexChange = { fromIndex, selectIndexList, reselect, fromUser -> onSelectIndexChange = { fromIndex, selectIndexList, reselect, fromUser ->
LogEx.logDebug(TAG, "onSelectIndexChange")
if (uiMode == UI_MODE_SELECT) {
changeSelectUI(false)
}
val toIndex = selectIndexList.first() val toIndex = selectIndexList.first()
when (toIndex) { when (toIndex) {
0 -> { 0 -> {
......
...@@ -33,7 +33,6 @@ import com.base.pdfviewerscannerwhite.bean.DocumentBean ...@@ -33,7 +33,6 @@ import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityMainBinding import com.base.pdfviewerscannerwhite.databinding.ActivityMainBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.appprocess.AppProcessActivity
import com.base.pdfviewerscannerwhite.ui.appprocess.AppProcessLoadingActivity import com.base.pdfviewerscannerwhite.ui.appprocess.AppProcessLoadingActivity
import com.base.pdfviewerscannerwhite.ui.cleanjunk.ScanJunkActivity import com.base.pdfviewerscannerwhite.ui.cleanjunk.ScanJunkActivity
import com.base.pdfviewerscannerwhite.ui.document.excel.ExcelActivity import com.base.pdfviewerscannerwhite.ui.document.excel.ExcelActivity
...@@ -416,12 +415,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -416,12 +415,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
binding.ivScan.visibility = View.INVISIBLE binding.ivScan.visibility = View.INVISIBLE
} }
binding.llDelete.setOnClickListener { binding.llDelete.setOnClickListener {
if (currentFragment is DocumentPageFragment) { if (currentFragment is DocumentFragment) {
val fragment = (currentFragment as DocumentPageFragment) val pageFragment = (currentFragment as DocumentFragment).currentPage
showDeleteDialog { showDeleteDialog {
val list = fragment.getSelectItems() val list = pageFragment.getSelectItems()
mainPresenter.deleteList(list) mainPresenter.deleteList(list)
fragment.removeList(list) pageFragment.removeList(list)
} }
} }
} }
...@@ -451,11 +450,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -451,11 +450,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
private fun shareDocument() { private fun shareDocument() {
if (currentFragment is DocumentPageFragment) { if (currentFragment is DocumentFragment) {
val documentFragment = (currentFragment as DocumentPageFragment) val documentPageFragment = (currentFragment as DocumentFragment).currentPage
val items = documentFragment.getSelectItems() val items = documentPageFragment.getSelectItems()
if (items.isNotEmpty()) { if (items.isNotEmpty()) {
shareMutDocuments(documentFragment.type, items.map { it.uri } as ArrayList<Uri>) shareMutDocuments(documentPageFragment.type, items.map { it.uri } as ArrayList<Uri>)
} }
} }
......
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