Commit b762cd2f authored by wanglei's avatar wanglei

...

parent 3a91883f
...@@ -58,9 +58,10 @@ dependencies { ...@@ -58,9 +58,10 @@ dependencies {
//第三方UI //第三方UI
implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4") implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4")
implementation("com.github.lukelorusso:VerticalSeekBar:1.2.7") implementation("com.github.lukelorusso:VerticalSeekBar:1.2.5")
implementation("com.github.angcyo.DslTablayout:TabLayout:3.5.5") implementation("com.github.angcyo.DslTablayout:TabLayout:3.5.5")
implementation("com.github.angcyo.DslTablayout:ViewPager2Delegate:3.5.5") implementation("com.github.angcyo.DslTablayout:ViewPager2Delegate:3.5.5")
implementation("com.github.bosphere:android-verticalslider:1.0.3")
//mlkit //mlkit
implementation("com.google.android.gms:play-services-mlkit-document-scanner:16.0.0-beta1") implementation("com.google.android.gms:play-services-mlkit-document-scanner:16.0.0-beta1")
......
...@@ -7,13 +7,13 @@ import android.annotation.SuppressLint ...@@ -7,13 +7,13 @@ import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.graphics.Color import android.graphics.Color
import android.net.Uri
import android.util.DisplayMetrics import android.util.DisplayMetrics
import android.view.View import android.view.View
import android.view.animation.Animation import android.view.animation.Animation
import android.view.animation.TranslateAnimation import android.view.animation.TranslateAnimation
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.content.ContextCompat
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import com.artifex.mupdfdemo.Annotation import com.artifex.mupdfdemo.Annotation
import com.artifex.mupdfdemo.Hit import com.artifex.mupdfdemo.Hit
...@@ -24,6 +24,7 @@ import com.artifex.mupdfdemo.MuPDFReaderViewListener ...@@ -24,6 +24,7 @@ import com.artifex.mupdfdemo.MuPDFReaderViewListener
import com.artifex.mupdfdemo.MuPDFView import com.artifex.mupdfdemo.MuPDFView
import com.artifex.mupdfdemo.SearchTask import com.artifex.mupdfdemo.SearchTask
import com.artifex.mupdfdemo.SearchTaskResult import com.artifex.mupdfdemo.SearchTaskResult
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_SAVE_PDF import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_SAVE_PDF
import com.base.pdfviewerscannerwhite.bean.PdfPageBean import com.base.pdfviewerscannerwhite.bean.PdfPageBean
import com.base.pdfviewerscannerwhite.databinding.ActivityPdfBinding import com.base.pdfviewerscannerwhite.databinding.ActivityPdfBinding
...@@ -107,6 +108,36 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -107,6 +108,36 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
} }
private fun iniSetVerticalSeekbar(max: Int) {
binding.verticalSeekbar.visibility = View.VISIBLE
binding.verticalSeekbar.showThumb = true
binding.verticalSeekbar.barBackgroundStartColor=Color.TRANSPARENT
// binding.verticalSeekbar.barProgressEndColor = Color.TRANSPARENT
// binding.verticalSeekbar.barProgressStartColor = Color.TRANSPARENT
// binding.verticalSeekbar.barProgressDrawable = ContextCompat.getDrawable(this, R.drawable.bg_transparent)
// binding.verticalSeekbar.barBackgroundStartColor = Color.TRANSPARENT
// binding.verticalSeekbar.barBackgroundStartColor = Color.TRANSPARENT
// binding.verticalSeekbar.barBackgroundEndColor = Color.TRANSPARENT
// binding.verticalSeekbar.setBackgroundColor(Color.TRANSPARENT)
// binding.verticalSeekbar.background = ContextCompat.getDrawable(this, R.drawable.bg_transparent)
// binding.verticalSeekbar.barBackgroundDrawable = ContextCompat.getDrawable(this, R.drawable.bg_transparent)
binding.verticalSeekbar.thumbContainerColor = Color.TRANSPARENT
binding.verticalSeekbar.thumbPlaceholderDrawable =
ContextCompat.getDrawable(this, R.mipmap.fanye)
if (binding.verticalSeekbar.maxValue != max - 1) {
binding.verticalSeekbar.maxValue = max - 1
}
}
private fun setVerticalSeekbar(current: Int, max: Int) {
val process = max - current
LogEx.logDebug(TAG, "process=$process $current $max")
binding.verticalSeekbar.progress = process
}
override fun initListener() { override fun initListener() {
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
hideKeyboard(binding.editSearch) hideKeyboard(binding.editSearch)
...@@ -377,6 +408,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -377,6 +408,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
override fun onMoveToChild(i: Int) { override fun onMoveToChild(i: Int) {
binding.tvPageCount.text = "${i + 1}/${muPDFCore?.countPages()}" binding.tvPageCount.text = "${i + 1}/${muPDFCore?.countPages()}"
pdfPageAdapter.changeSelectPager(i) pdfPageAdapter.changeSelectPager(i)
setVerticalSeekbar(i + 1, muPDFCore?.countPages() ?: 0)
} }
override fun onTapMainDocArea() { override fun onTapMainDocArea() {
...@@ -530,6 +562,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -530,6 +562,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
override fun initPdfPageRv(items: List<PdfPageBean>) { override fun initPdfPageRv(items: List<PdfPageBean>) {
pdfPageAdapter.submitList(items) pdfPageAdapter.submitList(items)
pdfPageAdapter.changeSelectPager(0) pdfPageAdapter.changeSelectPager(0)
iniSetVerticalSeekbar(items.size)
} }
} }
\ No newline at end of file
...@@ -75,7 +75,7 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -75,7 +75,7 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
private fun setVerticalSeekbar(current: Int, max: Int) { private fun setVerticalSeekbar(current: Int, max: Int) {
binding.verticalSeekbar.showThumb = true binding.verticalSeekbar.showThumb = true
binding.verticalSeekbar.thumbContainerColor = Color.TRANSPARENT binding.verticalSeekbar.thumbContainerColor= Color.TRANSPARENT
binding.verticalSeekbar.thumbPlaceholderDrawable = binding.verticalSeekbar.thumbPlaceholderDrawable =
ContextCompat.getDrawable(this, R.mipmap.fanye) ContextCompat.getDrawable(this, R.mipmap.fanye)
if (binding.verticalSeekbar.maxValue != max - 1) { if (binding.verticalSeekbar.maxValue != max - 1) {
......
...@@ -7,10 +7,32 @@ ...@@ -7,10 +7,32 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.document.pdf.PdfActivity"> tools:context=".ui.document.pdf.PdfActivity">
<com.artifex.mupdfdemo.MuPDFReaderView <FrameLayout
android:id="@+id/mupdf_reader_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/v_animator_bottom"
app:layout_constraintTop_toBottomOf="@id/v_animator_top">
<com.artifex.mupdfdemo.MuPDFReaderView
android:id="@+id/mupdf_reader_view"
android:layout_width="match_parent"
android:layout_height="match_parent">
</com.artifex.mupdfdemo.MuPDFReaderView>
<com.lukelorusso.verticalseekbar.VerticalSeekBar
android:id="@+id/vertical_seekbar"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginEnd="10dp"
android:visibility="gone"
app:vsb_bar_background="#00FA6146"
app:vsb_bar_progress="#00FA6146"
app:vsb_show_thumb="true" />
</FrameLayout>
<ViewAnimator <ViewAnimator
android:id="@+id/v_animator_top" android:id="@+id/v_animator_top"
...@@ -162,7 +184,7 @@ ...@@ -162,7 +184,7 @@
android:id="@+id/iv_bianji" android:id="@+id/iv_bianji"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="15dp" android:layout_marginEnd="35dp"
android:layout_marginBottom="108dp" android:layout_marginBottom="108dp"
android:src="@mipmap/bianji" android:src="@mipmap/bianji"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
app:vsb_bar_background_gradient_end="@color/transparent" app:vsb_bar_background_gradient_end="@color/transparent"
app:vsb_bar_background_gradient_start="@color/transparent" app:vsb_bar_background_gradient_start="@color/transparent"
app:vsb_bar_progress="@drawable/bg_transparent" app:vsb_bar_progress="@drawable/bg_transparent"
app:vsb_max_value="10"
app:vsb_show_thumb="true" /> app:vsb_show_thumb="true" />
</FrameLayout> </FrameLayout>
......
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