...

app/src/main/java/com/base/pdfoneread/bean/DocumentBean.kt

@@ -8,7 +8,7 @@ data class DocumentBean(
     var type: String = "",
     var isBookmarked: Boolean = false,
 ) {
-    var uiType: Int = 0//0浏览模式 1合并选择模式 2拆分模式 3解锁加锁模式 4搜索模式
+    var uiType: Int = 0//0主页浏览模式 1合并选择模式 2拆分模式  3搜索模式 4加锁模式 5解锁模式
     var isSelect: Boolean = false
     var state: Int = -1//0正常状态 1 锁定
     var password: String = ""

app/src/main/java/com/base/pdfoneread/ui/document/DocumentAdapter.kt

@@ -70,7 +70,7 @@ class DocumentAdapter(
             binding.tvInfo.text = file.lastModified().toFormatTime5() + "  " + file.length().toFormatSize()
             //DocumentPdfAdapter
             when (item.uiType) {
-                0 -> {
+                DOCUMENT_UI_HOME -> {
                     binding.flSelect.visibility = View.GONE
                     binding.flBookmark.visibility = View.VISIBLE
                     binding.flMore.visibility = View.VISIBLE
@@ -93,7 +93,7 @@ class DocumentAdapter(
                     }
                 }
 
-                1 -> {
+                DOCUMENT_UI_MERGE_SELECT -> {
                     binding.flSelect.visibility = View.VISIBLE
                     binding.flBookmark.visibility = View.GONE
                     binding.flMore.visibility = View.GONE
@@ -106,7 +106,7 @@ class DocumentAdapter(
 
                 }
 
-                2 -> {//拆分选择
+                DOCUMENT_UI_SPLIT_SELECT -> {//拆分选择
                     binding.flBookmark.visibility = View.INVISIBLE
                     binding.flSelect.visibility = View.INVISIBLE
                     binding.flMore.visibility = View.VISIBLE
@@ -118,15 +118,25 @@ class DocumentAdapter(
                     }
                 }
 
-                3 -> {//解锁模式选择
+                DOCUMENT_UI_LOCK -> {//加解模式
                     binding.flBookmark.visibility = View.GONE
                     binding.flMore.visibility = View.INVISIBLE
+                    binding.flSelect.visibility = View.INVISIBLE
                     binding.root.setOnClickListener {
                         itemClick?.invoke(item)
                     }
                 }
 
-                4 -> {//搜索选择
+                DOCUMENT_UI_UNLOCK -> {//解锁模式
+                    binding.flBookmark.visibility = View.GONE
+                    binding.flMore.visibility = View.INVISIBLE
+                    binding.flSelect.visibility = View.INVISIBLE
+                    binding.root.setOnClickListener {
+                        itemClick?.invoke(item)
+                    }
+                }
+
+                DOCUMENT_UI_SEARCH -> {//搜索选择
                     binding.flBookmark.visibility = View.GONE
                     binding.flMore.setOnClickListener {
                         moreAction?.invoke(item)
@@ -156,4 +166,13 @@ class DocumentAdapter(
             DocumentViewHolder(R.layout.item_ad.inflate(parent))
         }
     }
+
+    companion object {
+        const val DOCUMENT_UI_HOME = 0
+        const val DOCUMENT_UI_MERGE_SELECT = 1
+        const val DOCUMENT_UI_SPLIT_SELECT = 2
+        const val DOCUMENT_UI_SEARCH = 3
+        const val DOCUMENT_UI_LOCK = 4
+        const val DOCUMENT_UI_UNLOCK = 5
+    }
 }
\ No newline at end of file

app/src/main/java/com/base/pdfoneread/ui/main/HomeFragment.kt

@@ -283,13 +283,13 @@ class HomeFragment() : Fragment() {
                 tittle = "Tools"
             },
 
-            HomeUIBean(KEY_IMAGE_TO_PDF, R.mipmap.h_pdf_edit, "Image to PDF"),
+//            HomeUIBean(KEY_IMAGE_TO_PDF, R.mipmap.h_pdf_edit, "Image to PDF"),
             HomeUIBean(KEY_MERGE_PDF, R.mipmap.h_pdf_merge, "Merge PDF"),
             HomeUIBean(KEY_SPLIT_PDF, R.mipmap.h_pdf_split, "Split PDF"),
             HomeUIBean(KEY_LOCK_PDF, R.mipmap.h_pdf_lock, "Lock PDF"),
             HomeUIBean(KEY_UNLOCK_PDF, R.mipmap.h_pdf_unlock, "UnLock PDF"),
-            HomeUIBean(KEY_SCAN_PDF, R.mipmap.h_pdf_scan, "Scan PDF"),
-            HomeUIBean(KEY_IMAGE_PDF, R.mipmap.h_pdf_image, "Image PDF"),
+//            HomeUIBean(KEY_SCAN_PDF, R.mipmap.h_pdf_scan, "Scan PDF"),
+//            HomeUIBean(KEY_IMAGE_PDF, R.mipmap.h_pdf_image, "Image PDF"),
         )
     }
 }
\ No newline at end of file

app/src/main/java/com/base/pdfoneread/ui/pdf/PdfSelectActivity.kt

@@ -21,6 +21,10 @@ import com.base.pdfoneread.bean.DocumentBean
 import com.base.pdfoneread.databinding.ActivityPdfSelectBinding
 import com.base.pdfoneread.ui.BaseActivity
 import com.base.pdfoneread.ui.document.DocumentAdapter
+import com.base.pdfoneread.ui.document.DocumentAdapter.Companion.DOCUMENT_UI_LOCK
+import com.base.pdfoneread.ui.document.DocumentAdapter.Companion.DOCUMENT_UI_MERGE_SELECT
+import com.base.pdfoneread.ui.document.DocumentAdapter.Companion.DOCUMENT_UI_SPLIT_SELECT
+import com.base.pdfoneread.ui.document.DocumentAdapter.Companion.DOCUMENT_UI_UNLOCK
 import com.base.pdfoneread.ui.document.getPdfDocument
 import com.base.pdfoneread.ui.views.PwdDialog.showPdfPwdDialog
 import com.base.pdfoneread.utils.BarUtils
@@ -66,28 +70,28 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>() {
         initAdapter()
 
         when (doWhat) {
+            DO_MERGE_PDF -> {
+                binding.tvSelectTip.text = getString(R.string.select_a_project_merge)
+                getPdfData(DOCUMENT_UI_MERGE_SELECT)
+            }
+
             DO_SPLIT_PDF -> {
                 binding.tvBtnNext.visibility = View.GONE
                 binding.tvSelectTip.text = getString(R.string.select_a_project_split)
-                getPdfData(2)
-
-            }
+                getPdfData(DOCUMENT_UI_SPLIT_SELECT)
 
-            DO_MERGE_PDF -> {
-                binding.tvSelectTip.text = getString(R.string.select_a_project_merge)
-                getPdfData(1)
             }
 
             DO_LOCK_PDF -> {
                 binding.tvBtnNext.visibility = View.GONE
                 binding.tvSelectTip.text = getString(R.string.select_a_project_lock)
-                getPdfData(3)
+                getPdfData(DOCUMENT_UI_LOCK)
             }
 
             DO_UNLOCK_PDF -> {
                 binding.tvBtnNext.visibility = View.GONE
                 binding.tvSelectTip.text = getString(R.string.select_a_project_unlock)
-                getPdfData(3)
+                getPdfData(DOCUMENT_UI_UNLOCK)
             }
 
         }
@@ -97,7 +101,13 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>() {
     private fun getPdfData(uiType: Int) {
         LogEx.logDebug(TAG, "uiType=$uiType")
         lifecycleScope.launch(Dispatchers.IO) {
-            val list = getPdfDocument(this@PdfSelectActivity)
+            var list = getPdfDocument(this@PdfSelectActivity)
+            if (uiType == DOCUMENT_UI_LOCK) {
+                list = list.filter { it.state == 0 }.toMutableList()
+            }
+            if (uiType == DOCUMENT_UI_UNLOCK) {
+                list = list.filter { it.state == 1 }.toMutableList()
+            }
             list.forEach { it.uiType = uiType }
             launch(Dispatchers.Main) {
                 refreshUI(list)