Commit 325b8d4a authored by wanglei's avatar wanglei

...

parent e935f3b4
...@@ -8,7 +8,7 @@ data class DocumentBean( ...@@ -8,7 +8,7 @@ data class DocumentBean(
val type: String = "", val type: String = "",
var isBookmarked: Boolean = false var isBookmarked: Boolean = false
) { ) {
var showSelect: Boolean = false var uiType: Int = 0//0首页模式 1合并选择模式 2拆分模式
var isSelect: Boolean = false var isSelect: Boolean = false
companion object { companion object {
......
...@@ -35,42 +35,50 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV ...@@ -35,42 +35,50 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV
binding.tvName.text = file.name binding.tvName.text = file.name
binding.tvInfo.text = file.lastModified().toFormatTime() + " " + file.length().toFormatSize() binding.tvInfo.text = file.lastModified().toFormatTime() + " " + file.length().toFormatSize()
if (item.showSelect) { when (item.uiType) {
binding.flMore.visibility = View.INVISIBLE 0 -> {
binding.flBookmark.visibility = View.INVISIBLE binding.flSelect.visibility = View.GONE
binding.flSelect.visibility = View.VISIBLE binding.flMore.visibility = View.VISIBLE
binding.ivSelector.isSelected = item.isSelect binding.flBookmark.visibility = View.VISIBLE
if (item.isBookmarked) {
binding.ivBookmark.setImageResource(R.mipmap.h_soucang_s)
} else {
binding.ivBookmark.setImageResource(R.mipmap.h_soucang_n)
}
binding.flSelect.setOnClickListener { binding.flBookmark.setOnClickListener {
item.isSelect = !item.isSelect if (item.isBookmarked) {
notifyItemChanged(position, "aaa") bookmarkAction?.invoke(false, item.path)
selectAction?.invoke(items.filter { it.isSelect }.size) } else {
} bookmarkAction?.invoke(true, item.path)
} else { }
binding.flSelect.visibility = View.GONE item.isBookmarked = !item.isBookmarked
binding.flMore.visibility = View.VISIBLE notifyItemChanged(position, "aaaa")
binding.flBookmark.visibility = View.VISIBLE }
if (item.isBookmarked) { binding.flMore.setOnClickListener {
binding.ivBookmark.setImageResource(R.mipmap.h_soucang_s) moreAction?.invoke(item)
} else { }
binding.ivBookmark.setImageResource(R.mipmap.h_soucang_n)
} }
binding.flBookmark.setOnClickListener { 1 -> {
if (item.isBookmarked) { binding.flMore.visibility = View.INVISIBLE
bookmarkAction?.invoke(false, item.path) binding.flBookmark.visibility = View.INVISIBLE
} else { binding.flSelect.visibility = View.VISIBLE
bookmarkAction?.invoke(true, item.path) binding.ivSelector.isSelected = item.isSelect
binding.flSelect.setOnClickListener {
item.isSelect = !item.isSelect
notifyItemChanged(position, "aaa")
selectAction?.invoke(items.filter { it.isSelect }.size)
} }
item.isBookmarked = !item.isBookmarked
notifyItemChanged(position, "aaaa")
} }
binding.flMore.setOnClickListener {
moreAction?.invoke(item) 2 -> {
binding.flBookmark.visibility = View.GONE
binding.flMore.visibility = View.INVISIBLE
} }
} }
binding.root.setOnClickListener { binding.root.setOnClickListener {
itemClick?.invoke(item) itemClick?.invoke(item)
} }
......
...@@ -5,6 +5,7 @@ import android.content.Intent ...@@ -5,6 +5,7 @@ import android.content.Intent
import android.view.View import android.view.View
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_MERGE_PDF import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_MERGE_PDF
import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_SPLIT_PDF
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityPdfSelectBinding import com.base.pdfviewerscannerwhite.databinding.ActivityPdfSelectBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
...@@ -48,6 +49,9 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView ...@@ -48,6 +49,9 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
private fun initAdapter() { private fun initAdapter() {
adapter = DocumentAdapter() adapter = DocumentAdapter()
adapter.itemClick = {
}
adapter.selectAction = { adapter.selectAction = {
if (it == 0) { if (it == 0) {
binding.tvSelectTip.visibility = View.INVISIBLE binding.tvSelectTip.visibility = View.INVISIBLE
...@@ -64,7 +68,10 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView ...@@ -64,7 +68,10 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
override fun refreshDocumentRv(documentList: List<DocumentBean>) { override fun refreshDocumentRv(documentList: List<DocumentBean>) {
super.refreshDocumentRv(documentList) super.refreshDocumentRv(documentList)
if (doWhat == DO_MERGE_PDF) { if (doWhat == DO_MERGE_PDF) {
documentList.map { it.showSelect = true } documentList.map { it.uiType = 1 }
}
if (doWhat == DO_SPLIT_PDF) {
documentList.map { it.uiType = 2 }
} }
adapter.submitList(documentList) adapter.submitList(documentList)
} }
......
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