...

app/src/main/java/com/base/pdfviewerscannerwhite/ui/adapter/DocumentAdapter.kt

@@ -113,7 +113,6 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV
                 binding.flBookmark.visibility = View.INVISIBLE
                 binding.flSelect.visibility = View.VISIBLE
                 binding.ivSelector.isSelected = item.isSelect
-
                 binding.flSelect.setOnClickListener {
                     item.isSelect = !item.isSelect
                     notifyItemChanged(position, "aaa")

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

@@ -16,9 +16,11 @@ import com.base.pdfviewerscannerwhite.ui.adapter.DocumentAdapter
 import com.base.pdfviewerscannerwhite.ui.main.DocumentPresenter
 import com.base.pdfviewerscannerwhite.ui.main.DocumentView
 import com.base.pdfviewerscannerwhite.ui.view.DialogView.showPdfPwdDialog
+import com.base.pdfviewerscannerwhite.utils.LogEx
 
 class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView {
 
+    private val TAG = "PdfSelectActivity"
     private lateinit var documentPresenter: DocumentPresenter
 
     private lateinit var adapter: DocumentAdapter
@@ -43,6 +45,11 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
                 documentPresenter.initData()
             }
 
+            DO_MERGE_PDF -> {
+                binding.tvSelectTip.text = "Select a project"
+                documentPresenter.initData()
+            }
+
             DO_LOCK_PDF -> {
                 binding.tvBtnNext.visibility = View.GONE
                 binding.tvSelectTip.text = "Select a project"
@@ -55,6 +62,7 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
                 documentPresenter.initLoadData()
             }
 
+
         }
 
     }
@@ -69,12 +77,12 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
         }
 
         binding.tvBtnNext.setOnClickListener {
-            val selectList = adapter.items.filter { it.isSelect }
-
-            PdfMergeActivity.mergePdfList.clear()
-            PdfMergeActivity.mergePdfList.addAll(selectList)
-
-            startActivity(Intent(this, PdfMergeActivity::class.java))
+            if (doWhat == DO_MERGE_PDF) {
+                val selectList = adapter.items.filter { it.isSelect }
+                PdfMergeActivity.mergePdfList.clear()
+                PdfMergeActivity.mergePdfList.addAll(selectList)
+                startActivity(Intent(this, PdfMergeActivity::class.java))
+            }
         }
     }
 
@@ -87,7 +95,6 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
                     putExtra("path", it.path)
                 })
             }
-
             if (doWhat == DO_LOCK_PDF) {
                 showPdfPwdDialog(state = it.state, path = it.path, encryptionAction = {
                     adapter.remove(it)
@@ -100,6 +107,7 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
             }
         }
         adapter.selectAction = {
+            LogEx.logDebug(TAG, "selectAction $it")
             if (it == 0) {
                 binding.tvSelectTip.visibility = View.INVISIBLE
                 binding.tvBtnNext.isEnabled = false
@@ -115,12 +123,15 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
     override fun refreshDocumentRv(documentList: List<DocumentBean>, isRefresh: Boolean) {
         binding.progressBar.visibility = View.GONE
         if (doWhat == DO_MERGE_PDF) {
+            LogEx.logDebug(TAG, "refreshDocumentRv 1")
             documentList.map { it.uiType = 1 }
         }
         if (doWhat == DO_SPLIT_PDF) {
+            LogEx.logDebug(TAG, "refreshDocumentRv 2")
             documentList.map { it.uiType = 2 }
         }
         if (doWhat == DO_LOCK_PDF || doWhat == DO_UNLOCK_PDF) {
+            LogEx.logDebug(TAG, "refreshDocumentRv 3")
             documentList.map { it.uiType = 3 }
         }
         adapter.submitList(documentList)

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentFragment.kt

@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.lifecycle.lifecycleScope
+import com.base.pdfviewerscannerwhite.bean.ConstObject
 import com.base.pdfviewerscannerwhite.bean.DocumentBean
 import com.base.pdfviewerscannerwhite.bean.DocumentBean.Companion.TYPE_EXCEL
 import com.base.pdfviewerscannerwhite.bean.DocumentBean.Companion.TYPE_PDF
@@ -17,6 +18,7 @@ import com.base.pdfviewerscannerwhite.helper.BaseFragment
 import com.base.pdfviewerscannerwhite.ui.adapter.DocumentAdapter
 import com.base.pdfviewerscannerwhite.ui.document.excel.ExcelActivity
 import com.base.pdfviewerscannerwhite.ui.document.pdf.PdfActivity
+import com.base.pdfviewerscannerwhite.ui.document.pdf.PdfSelectActivity
 import com.base.pdfviewerscannerwhite.ui.document.pdf.PdfSplitActivity
 import com.base.pdfviewerscannerwhite.ui.document.ppt.PptActivity
 import com.base.pdfviewerscannerwhite.ui.document.word.WordActivity
@@ -98,6 +100,12 @@ class DocumentFragment() : BaseFragment<FragmentDocumentBinding>(), DocumentView
         })
     }
 
+    override fun mergePdf(path: String) {
+        startActivity(Intent(requireContext(), PdfSelectActivity::class.java).apply {
+            putExtra("doWhat", ConstObject.DO_MERGE_PDF)
+        })
+    }
+
     override fun deleteDocument(item: DocumentBean) {
         val list = documentList.toMutableList()
         documentPresenter.deleteDocumentBean(item)

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentView.kt

@@ -10,4 +10,6 @@ interface DocumentView {
     fun splitPdf(path: String) = Unit
 
     fun deleteDocument(item: DocumentBean) = Unit
+    fun mergePdf(path: String) = Unit
+
 }
\ No newline at end of file

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/MainActivity.kt

@@ -24,6 +24,7 @@ import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentRenameDialo
 import com.base.pdfviewerscannerwhite.ui.view.DialogView.showStoragePermission
 import com.base.pdfviewerscannerwhite.ui.view.RateDialog.showRateDialog
 import com.base.pdfviewerscannerwhite.utils.IntentShareUtils.shareMutDocuments
+import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.hideKeyboard
 import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.showKeyBoard
 import com.base.pdfviewerscannerwhite.utils.KotlinExt.toFormatTime2
 import com.base.pdfviewerscannerwhite.utils.LogEx
@@ -206,15 +207,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
 
         }
         onBackPressedDispatcher.addCallback(callback)
-
         binding.flFanhui.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()
         }
-
         binding.llDocument.setOnClickListener {
             changeDocumentUI()
         }
-
         binding.llRecent.setOnClickListener {
             changeRecentUI()
         }
@@ -510,8 +508,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
         binding.flFanhui.visibility = View.GONE
         binding.flSearch.visibility = View.GONE
         binding.editSearch.visibility = View.GONE
+        binding.llEmpty.visibility = View.GONE
         searchAdapter.submitList(listOf())
         binding.editSearch.setText("")
+        hideKeyboard(binding.editSearch)
 
         binding.tvTittle.visibility = View.VISIBLE
         binding.ivPaixu.visibility = View.VISIBLE

app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/DialogView.kt

@@ -214,6 +214,10 @@ object DialogView {
             dialog.dismiss()
             documentView.splitPdf(item.path)
         }
+        binding.llMerge.setOnClickListener {
+            dialog.dismiss()
+            documentView.mergePdf(item.path)
+        }
         binding.llDelete.setOnClickListener {
             dialog.dismiss()
             showDeleteDialog {

app/src/main/res/layout/dialog_pdf_home_more.xml

@@ -118,6 +118,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/ll_merge"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:background="?android:selectableItemBackground"