Commit efd153f0 authored by wanglei's avatar wanglei

...

parent 6d870c3a
...@@ -87,7 +87,7 @@ class DocumentFragment( ...@@ -87,7 +87,7 @@ class DocumentFragment(
if (hidden) { if (hidden) {
return return
} }
// currentPage.refreshData() currentPage.refreshData()
} }
private fun initSearchAdapter() { private fun initSearchAdapter() {
......
...@@ -62,8 +62,8 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -62,8 +62,8 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
} }
fun refreshData() = lifecycleScope.launch(Dispatchers.IO) { fun refreshData() = lifecycleScope.launch(Dispatchers.IO) {
LogEx.logDebug(TAG, "type=$type refreshData")
if (isInitialized && !isHidden) { if (isInitialized && !isHidden) {
LogEx.logDebug(TAG, "type=$type refreshData dataType=$dataType")
val list = val list =
(requireActivity() as MainActivity).mainPresenter.getDataByType(type, dataType) (requireActivity() as MainActivity).mainPresenter.getDataByType(type, dataType)
val dataType = (parentFragment as DocumentFragment).dataType val dataType = (parentFragment as DocumentFragment).dataType
...@@ -134,7 +134,7 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -134,7 +134,7 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
} }
requireActivity().jumpDocument(item) requireActivity().jumpDocument(item)
} }
}else{ } else {
requireActivity().jumpDocument(item) requireActivity().jumpDocument(item)
} }
} }
......
...@@ -75,6 +75,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView { ...@@ -75,6 +75,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
addDeskShortCut() addDeskShortCut()
} }
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent) super.onNewIntent(intent)
actionId = intent?.extras?.getString("actionId") ?: "" actionId = intent?.extras?.getString("actionId") ?: ""
......
...@@ -65,6 +65,7 @@ class MainPresenter( ...@@ -65,6 +65,7 @@ class MainPresenter(
private lateinit var scannerLauncher: ActivityResultLauncher<IntentSenderRequest> private lateinit var scannerLauncher: ActivityResultLauncher<IntentSenderRequest>
fun initAllDocumentData() = lifecycleScope.launch(Dispatchers.IO) { fun initAllDocumentData() = lifecycleScope.launch(Dispatchers.IO) {
val start = System.currentTimeMillis()
Log.d("glc", "pdfs 清理前:" + pdfDocuments.size) Log.d("glc", "pdfs 清理前:" + pdfDocuments.size)
context.upDateDemoStore() context.upDateDemoStore()
if (!ConstObject.haveSaveDemo) { if (!ConstObject.haveSaveDemo) {
...@@ -84,6 +85,9 @@ class MainPresenter( ...@@ -84,6 +85,9 @@ class MainPresenter(
excelDocuments.addAll(initAllExcelData()) excelDocuments.addAll(initAllExcelData())
pptDocuments.addAll(initAllPptData()) pptDocuments.addAll(initAllPptData())
lifecycleScope.launch(Dispatchers.Main) { lifecycleScope.launch(Dispatchers.Main) {
val end = System.currentTimeMillis()
val time = end - start
LogEx.logDebug(TAG, "time=$time")
mainView.refreshPageList() mainView.refreshPageList()
} }
} }
...@@ -100,6 +104,7 @@ class MainPresenter( ...@@ -100,6 +104,7 @@ class MainPresenter(
TYPE_PDF -> { TYPE_PDF -> {
pdfDocuments.forEach { pdfDocuments.forEach {
it.isBookmarked = bookmarkList.contains(it.path) it.isBookmarked = bookmarkList.contains(it.path)
it.state = PdfBoxUtils.checkPdfEncryption(it.path)
} }
when (dataType) { when (dataType) {
DOCUMENT_DATA_TYPE -> { DOCUMENT_DATA_TYPE -> {
...@@ -107,7 +112,6 @@ class MainPresenter( ...@@ -107,7 +112,6 @@ class MainPresenter(
} }
RECENT_DATA_TYPE -> { RECENT_DATA_TYPE -> {
pdfDocuments.forEach { recentFilter(recentList, it) }
return pdfDocuments.filter { it.lastViewTime != 0L }.sortedByDescending { it.lastViewTime } return pdfDocuments.filter { it.lastViewTime != 0L }.sortedByDescending { it.lastViewTime }
} }
......
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