Commit 3a91883f authored by wanglei's avatar wanglei

...

parent d12ec596
...@@ -58,7 +58,7 @@ dependencies { ...@@ -58,7 +58,7 @@ dependencies {
//第三方UI //第三方UI
implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4") implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4")
implementation("com.h6ah4i.android.widget.verticalseekbar:verticalseekbar:1.0.0") implementation("com.github.lukelorusso:VerticalSeekBar:1.2.7")
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")
......
...@@ -4,13 +4,16 @@ import android.annotation.SuppressLint ...@@ -4,13 +4,16 @@ import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.graphics.Color
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.view.isVisible import androidx.core.view.isVisible
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
...@@ -52,6 +55,7 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -52,6 +55,7 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
currentPageNumber = current currentPageNumber = current
totalPageNumber = total totalPageNumber = total
binding.tvPageCount.text = "$current/$total" binding.tvPageCount.text = "$current/$total"
setVerticalSeekbar(current, total)
} }
binding.mDocView.singleTapAction = { binding.mDocView.singleTapAction = {
LogEx.logDebug(TAG, "actionDownCallBack") LogEx.logDebug(TAG, "actionDownCallBack")
...@@ -65,6 +69,21 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -65,6 +69,21 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
LogEx.logDebug(TAG, "show") LogEx.logDebug(TAG, "show")
} }
} }
}
private fun setVerticalSeekbar(current: Int, max: Int) {
binding.verticalSeekbar.showThumb = true
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
}
val process = max - current
LogEx.logDebug(TAG, "process=$process $current $max")
binding.verticalSeekbar.progress = process
} }
override fun initListener() { override fun initListener() {
...@@ -121,6 +140,18 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -121,6 +140,18 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
val wpControl: WPControl = (binding.mDocView.iOffice?.control?.appControl as WPControl) val wpControl: WPControl = (binding.mDocView.iOffice?.control?.appControl as WPControl)
(wpControl.find as WPFind).findForward() (wpControl.find as WPFind).findForward()
} }
binding.verticalSeekbar.setOnReleaseListener { progress ->
val wpControl: WPControl = (binding.mDocView.iOffice?.control?.appControl as WPControl)
LogEx.logDebug(TAG, "progress=$progress")
val pageIndex = totalPageNumber - 1 - progress
if (progress > currentPageNumber) {
wpControl.wpView.showPage(pageIndex, APP_PAGE_DOWN_ID)
} else {
wpControl.wpView.showPage(pageIndex, APP_PAGE_UP_ID)
}
}
} }
private var haveSearchResult: Boolean = false private var haveSearchResult: Boolean = false
......
...@@ -5,7 +5,6 @@ import android.content.Intent ...@@ -5,7 +5,6 @@ import android.content.Intent
import android.net.Uri import android.net.Uri
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentMore
import java.io.File import java.io.File
object IntentShareUtils { object IntentShareUtils {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/transparent" />
</shape>
\ No newline at end of file
...@@ -12,17 +12,6 @@ ...@@ -12,17 +12,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<com.h6ah4i.android.widget.verticalseekbar.VerticalSeekBar
android:layout_width="wrap_content"
android:layout_height="350dp"
android:layout_marginEnd="16dp"
android:splitTrack="false"
app:layout_constraintBottom_toTopOf="@id/v_animator_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_animator_top"
app:seekBarRotation="CW90" />
<ViewAnimator <ViewAnimator
android:id="@+id/v_animator_top" android:id="@+id/v_animator_top"
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -112,17 +112,38 @@ ...@@ -112,17 +112,38 @@
</ViewAnimator> </ViewAnimator>
<com.cherry.lib.doc.widget.DocView <FrameLayout
android:id="@+id/mDocView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:dv_engine="internal"
app:dv_moving_orientation="vertical"
app:dv_page_pb_color="@color/yellow"
app:dv_page_pb_height="2dp"
app:dv_show_page_num="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_animator_top" /> app:layout_constraintTop_toBottomOf="@id/v_animator_top">
<com.cherry.lib.doc.widget.DocView
android:id="@+id/mDocView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:dv_engine="internal"
app:dv_moving_orientation="vertical"
app:dv_page_pb_color="@color/yellow"
app:dv_page_pb_height="2dp"
app:dv_show_page_num="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_animator_top" />
<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:background="@color/transparent"
app:vsb_bar_background="@color/transparent"
app:vsb_bar_background_gradient_end="@color/transparent"
app:vsb_bar_background_gradient_start="@color/transparent"
app:vsb_bar_progress="@drawable/bg_transparent"
app:vsb_max_value="10"
app:vsb_show_thumb="true" />
</FrameLayout>
<TextView <TextView
...@@ -143,12 +164,12 @@ ...@@ -143,12 +164,12 @@
tools:text="1/3" /> tools:text="1/3" />
<ViewAnimator <ViewAnimator
android:visibility="gone"
android:id="@+id/v_animator_bottom" android:id="@+id/v_animator_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_50" android:layout_height="@dimen/dp_50"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="@color/white" android:background="@color/white"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<FrameLayout <FrameLayout
......
...@@ -37,8 +37,6 @@ public class WPPageListItem extends APageListItem ...@@ -37,8 +37,6 @@ public class WPPageListItem extends APageListItem
/** /**
* *
* @param content
* @param parentSize
*/ */
public WPPageListItem(APageListView listView, IControl control, int pageWidth, int pageHeight) public WPPageListItem(APageListView listView, IControl control, int pageWidth, int pageHeight)
{ {
...@@ -66,7 +64,6 @@ public class WPPageListItem extends APageListItem ...@@ -66,7 +64,6 @@ public class WPPageListItem extends APageListItem
/** /**
* *
* @param pageIndex page index (base 0)
* @param pageWidth page width of after scaled * @param pageWidth page width of after scaled
* @param pageHeight page height of after scaled * @param pageHeight page height of after scaled
*/ */
......
...@@ -121,7 +121,6 @@ public class WPDocument extends STDocument ...@@ -121,7 +121,6 @@ public class WPDocument extends STDocument
/** /**
* 得到页眉、页脚元素 * 得到页眉、页脚元素
* @param area 区域
* @param type Element类型,首页、奇数页、偶数页 * @param type Element类型,首页、奇数页、偶数页
*/ */
public IElement getHFElement(long offset, byte type) public IElement getHFElement(long offset, byte type)
...@@ -136,7 +135,6 @@ public class WPDocument extends STDocument ...@@ -136,7 +135,6 @@ public class WPDocument extends STDocument
/** /**
* 得到脚注、尾注元素 * 得到脚注、尾注元素
* @param area 区域
*/ */
public IElement getFEElement(long offset) public IElement getFEElement(long offset)
{ {
...@@ -211,8 +209,6 @@ public class WPDocument extends STDocument ...@@ -211,8 +209,6 @@ public class WPDocument extends STDocument
/** /**
* 添加段落 * 添加段落
* @param sectionElement 章节元素
* @param paraElement 段落无素
*/ */
public void appendParagraph(IElement element, long area) public void appendParagraph(IElement element, long area)
{ {
...@@ -424,7 +420,6 @@ public class WPDocument extends STDocument ...@@ -424,7 +420,6 @@ public class WPDocument extends STDocument
/** /**
* *
* @param offset
* @return * @return
*/ */
public IElement getTextboxSectionElementForIndex(int index) public IElement getTextboxSectionElementForIndex(int index)
......
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