Commit 90f75617 authored by wanglei's avatar wanglei

...

parent 386b363c
...@@ -101,6 +101,9 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV ...@@ -101,6 +101,9 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV
binding.flMore.setOnClickListener { binding.flMore.setOnClickListener {
moreAction?.invoke(item) moreAction?.invoke(item)
} }
binding.root.setOnClickListener {
itemClick?.invoke(item)
}
} }
1 -> { 1 -> {
...@@ -114,22 +117,31 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV ...@@ -114,22 +117,31 @@ class DocumentAdapter : BaseQuickAdapter<DocumentBean, DocumentAdapter.DocumentV
notifyItemChanged(position, "aaa") notifyItemChanged(position, "aaa")
selectAction?.invoke(items.filter { it.isSelect }.size) selectAction?.invoke(items.filter { it.isSelect }.size)
} }
binding.root.setOnClickListener {
item.isSelect = !item.isSelect
notifyItemChanged(position, "aaa")
selectAction?.invoke(items.filter { it.isSelect }.size)
}
} }
2 -> { 2 -> {
binding.flBookmark.visibility = View.GONE binding.flBookmark.visibility = View.GONE
binding.flMore.visibility = View.INVISIBLE binding.flMore.visibility = View.INVISIBLE
binding.root.setOnClickListener {
itemClick?.invoke(item)
}
} }
3 -> { 3 -> {
binding.flBookmark.visibility = View.GONE binding.flBookmark.visibility = View.GONE
binding.flMore.visibility = View.INVISIBLE binding.flMore.visibility = View.INVISIBLE
binding.root.setOnClickListener {
itemClick?.invoke(item)
}
} }
} }
binding.root.setOnClickListener {
itemClick?.invoke(item)
}
} }
private fun checkPwd(item: DocumentBean, iv: ImageView) { private fun checkPwd(item: DocumentBean, iv: ImageView) {
......
...@@ -83,12 +83,12 @@ class ExcelActivity : BaseActivity<ActivityExcelBinding>() { ...@@ -83,12 +83,12 @@ class ExcelActivity : BaseActivity<ActivityExcelBinding>() {
LogEx.logDebug(TAG, "show") LogEx.logDebug(TAG, "show")
} }
} }
lifecycleScope.launch { // lifecycleScope.launch {
delay(5000) // delay(5000)
val ssControl = binding.mDocView.iOffice?.control?.appControl as SSControl // val ssControl = binding.mDocView.iOffice?.control?.appControl as SSControl
toast("转换") // toast("转换")
binding.mDocView.iOffice?.control?.sysKit // binding.mDocView.iOffice?.control?.sysKit
} // }
} }
private fun switchOrientation() { private fun switchOrientation() {
......
...@@ -162,5 +162,14 @@ class DocumentFragment() : BaseFragment<FragmentDocumentBinding>(), DocumentView ...@@ -162,5 +162,14 @@ class DocumentFragment() : BaseFragment<FragmentDocumentBinding>(), DocumentView
adapter.notifyDataSetChanged() adapter.notifyDataSetChanged()
} }
fun getSelectItems(): List<DocumentBean> {
return adapter.items.filter { it.isSelect }
}
fun removeList(list: List<DocumentBean>) {
list.forEach {
adapter.remove(it)
}
}
} }
\ No newline at end of file
package com.base.pdfviewerscannerwhite.ui.main package com.base.pdfviewerscannerwhite.ui.main
import android.app.Activity import android.app.Activity
import android.content.Context
import android.content.IntentSender import android.content.IntentSender
import android.net.Uri import android.net.Uri
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.IntentSenderRequest import androidx.activity.result.IntentSenderRequest
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.utils.ToastUtils.toast import com.base.pdfviewerscannerwhite.utils.ToastUtils.toast
import com.base.pdfviewerscannerwhite.utils.updateMediaStore
import com.google.mlkit.vision.documentscanner.GmsDocumentScannerOptions import com.google.mlkit.vision.documentscanner.GmsDocumentScannerOptions
import com.google.mlkit.vision.documentscanner.GmsDocumentScanning import com.google.mlkit.vision.documentscanner.GmsDocumentScanning
import com.google.mlkit.vision.documentscanner.GmsDocumentScanningResult import com.google.mlkit.vision.documentscanner.GmsDocumentScanningResult
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.launch
import java.io.File
class MainPresenter( class MainPresenter(
val context: Context,
val mainView: MainView val mainView: MainView
) { ) {
...@@ -61,4 +69,16 @@ class MainPresenter( ...@@ -61,4 +69,16 @@ class MainPresenter(
} }
} }
fun deleteList(list: List<DocumentBean>) {
MainScope().launch(Dispatchers.IO) {
list.forEach {
runCatching {
val file = File(it.path)
file.delete()
}
}
context.updateMediaStore()
}
}
} }
\ No newline at end of file
...@@ -14,6 +14,23 @@ ...@@ -14,6 +14,23 @@
android:layout_height="60dp" android:layout_height="60dp"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<FrameLayout
android:id="@+id/fl_fanhui"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="15dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/fanhui_b"
tools:ignore="ContentDescription" />
</FrameLayout>
<TextView <TextView
android:id="@+id/tv_tittle" android:id="@+id/tv_tittle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -98,7 +115,7 @@ ...@@ -98,7 +115,7 @@
<FrameLayout <FrameLayout
android:id="@+id/cl_tabLayout" android:id="@+id/cl_tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:background="#00000000"> android:background="#00000000">
<com.angcyo.tablayout.DslTabLayout <com.angcyo.tablayout.DslTabLayout
...@@ -164,6 +181,14 @@ ...@@ -164,6 +181,14 @@
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</com.angcyo.tablayout.DslTabLayout> </com.angcyo.tablayout.DslTabLayout>
<View
android:id="@+id/v_tabLayout_place"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</FrameLayout> </FrameLayout>
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
...@@ -360,17 +385,16 @@ ...@@ -360,17 +385,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="9dp" android:layout_marginTop="9dp"
android:src="@drawable/bg_selector_tool" android:src="@mipmap/x_delete"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="2.5dp" android:layout_marginTop="2.5dp"
android:text="Tool" android:text="Delete"
android:textColor="@color/color_tab_selector" android:textColor="#333333"
android:textSize="11sp" android:textSize="11sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
...@@ -396,17 +420,16 @@ ...@@ -396,17 +420,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="9dp" android:layout_marginTop="9dp"
android:src="@drawable/bg_selector_tool" android:src="@mipmap/x_share"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="2.5dp" android:layout_marginTop="2.5dp"
android:text="Tool" android:text="Share"
android:textColor="@color/color_tab_selector" android:textColor="#333333"
android:textSize="11sp" android:textSize="11sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<FrameLayout <FrameLayout
android:id="@+id/fl_more" android:id="@+id/fl_more"
android:layout_width="45dp" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<FrameLayout <FrameLayout
android:id="@+id/fl_select" android:id="@+id/fl_select"
android:layout_width="45dp" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
<FrameLayout <FrameLayout
android:id="@+id/fl_bookmark" android:id="@+id/fl_bookmark"
android:layout_width="45dp" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
......
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