diff --git a/.gitignore b/.gitignore index f8b794a..306afc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures diff --git a/.gitignore b/.gitignore index f8b794a..306afc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures diff --git a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt index 77791eb..677aac7 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt @@ -1,11 +1,15 @@ package com.casic.br.ar.app.view import android.os.Bundle +import android.util.Log +import android.view.KeyEvent import android.view.View import com.casic.br.ar.app.databinding.ActivityPreviewPdfBinding import com.casic.br.ar.app.extensions.combineFilePath import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub @@ -13,8 +17,19 @@ import java.io.FileInputStream class PreviewPdfActivity : KotlinBaseActivity() { - override fun initEvent() { + private val kTag = "PreviewPdfActivity" + private val screenWidth by lazy { getScreenWidth() } + private val screenHeight by lazy { getScreenHeight() } + + override fun initEvent() { + binding.topMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, screenHeight / 6f) + } + + binding.bottomMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, -screenHeight / 6f) + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -42,6 +57,31 @@ } }).build().start() + + Log.d(kTag, "initOnCreate: [$screenWidth, $screenHeight]") + } + + private var scale = 1f + + override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { + when (keyCode) { + 22 -> { + scale += 0.1f + if (scale >= 3f) { + scale = 3f + } + } + + 21 -> { + scale -= 0.1f + if (scale <= 1f) { + scale = 1f + } + } + } + + binding.pdfView.zoomWithAnimation(screenWidth / 2f, screenHeight / 2f, scale) + return super.onKeyDown(keyCode, event) } override fun initViewBinding(): ActivityPreviewPdfBinding { diff --git a/.gitignore b/.gitignore index f8b794a..306afc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures diff --git a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt index 77791eb..677aac7 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt @@ -1,11 +1,15 @@ package com.casic.br.ar.app.view import android.os.Bundle +import android.util.Log +import android.view.KeyEvent import android.view.View import com.casic.br.ar.app.databinding.ActivityPreviewPdfBinding import com.casic.br.ar.app.extensions.combineFilePath import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub @@ -13,8 +17,19 @@ import java.io.FileInputStream class PreviewPdfActivity : KotlinBaseActivity() { - override fun initEvent() { + private val kTag = "PreviewPdfActivity" + private val screenWidth by lazy { getScreenWidth() } + private val screenHeight by lazy { getScreenHeight() } + + override fun initEvent() { + binding.topMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, screenHeight / 6f) + } + + binding.bottomMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, -screenHeight / 6f) + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -42,6 +57,31 @@ } }).build().start() + + Log.d(kTag, "initOnCreate: [$screenWidth, $screenHeight]") + } + + private var scale = 1f + + override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { + when (keyCode) { + 22 -> { + scale += 0.1f + if (scale >= 3f) { + scale = 3f + } + } + + 21 -> { + scale -= 0.1f + if (scale <= 1f) { + scale = 1f + } + } + } + + binding.pdfView.zoomWithAnimation(screenWidth / 2f, screenHeight / 2f, scale) + return super.onKeyDown(keyCode, event) } override fun initViewBinding(): ActivityPreviewPdfBinding { diff --git a/app/src/main/res/drawable/ic_move_page.xml b/app/src/main/res/drawable/ic_move_page.xml new file mode 100644 index 0000000..e190b84 --- /dev/null +++ b/app/src/main/res/drawable/ic_move_page.xml @@ -0,0 +1,12 @@ + + + + diff --git a/.gitignore b/.gitignore index f8b794a..306afc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures diff --git a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt index 77791eb..677aac7 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt @@ -1,11 +1,15 @@ package com.casic.br.ar.app.view import android.os.Bundle +import android.util.Log +import android.view.KeyEvent import android.view.View import com.casic.br.ar.app.databinding.ActivityPreviewPdfBinding import com.casic.br.ar.app.extensions.combineFilePath import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub @@ -13,8 +17,19 @@ import java.io.FileInputStream class PreviewPdfActivity : KotlinBaseActivity() { - override fun initEvent() { + private val kTag = "PreviewPdfActivity" + private val screenWidth by lazy { getScreenWidth() } + private val screenHeight by lazy { getScreenHeight() } + + override fun initEvent() { + binding.topMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, screenHeight / 6f) + } + + binding.bottomMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, -screenHeight / 6f) + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -42,6 +57,31 @@ } }).build().start() + + Log.d(kTag, "initOnCreate: [$screenWidth, $screenHeight]") + } + + private var scale = 1f + + override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { + when (keyCode) { + 22 -> { + scale += 0.1f + if (scale >= 3f) { + scale = 3f + } + } + + 21 -> { + scale -= 0.1f + if (scale <= 1f) { + scale = 1f + } + } + } + + binding.pdfView.zoomWithAnimation(screenWidth / 2f, screenHeight / 2f, scale) + return super.onKeyDown(keyCode, event) } override fun initViewBinding(): ActivityPreviewPdfBinding { diff --git a/app/src/main/res/drawable/ic_move_page.xml b/app/src/main/res/drawable/ic_move_page.xml new file mode 100644 index 0000000..e190b84 --- /dev/null +++ b/app/src/main/res/drawable/ic_move_page.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml index 8e82bdd..c24437b 100644 --- a/app/src/main/res/layout/activity_preview_pdf.xml +++ b/app/src/main/res/layout/activity_preview_pdf.xml @@ -15,25 +15,38 @@ android:textColor="@color/white" android:textSize="@dimen/sp_18" /> - - - + android:layout_width="match_parent" + android:layout_height="match_parent" /> - - + + + + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index f8b794a..306afc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures diff --git a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt index 77791eb..677aac7 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/PreviewPdfActivity.kt @@ -1,11 +1,15 @@ package com.casic.br.ar.app.view import android.os.Bundle +import android.util.Log +import android.view.KeyEvent import android.view.View import com.casic.br.ar.app.databinding.ActivityPreviewPdfBinding import com.casic.br.ar.app.extensions.combineFilePath import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub @@ -13,8 +17,19 @@ import java.io.FileInputStream class PreviewPdfActivity : KotlinBaseActivity() { - override fun initEvent() { + private val kTag = "PreviewPdfActivity" + private val screenWidth by lazy { getScreenWidth() } + private val screenHeight by lazy { getScreenHeight() } + + override fun initEvent() { + binding.topMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, screenHeight / 6f) + } + + binding.bottomMoveButton.setOnClickListener { + binding.pdfView.moveRelativeTo(screenWidth / 2f, -screenHeight / 6f) + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -42,6 +57,31 @@ } }).build().start() + + Log.d(kTag, "initOnCreate: [$screenWidth, $screenHeight]") + } + + private var scale = 1f + + override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { + when (keyCode) { + 22 -> { + scale += 0.1f + if (scale >= 3f) { + scale = 3f + } + } + + 21 -> { + scale -= 0.1f + if (scale <= 1f) { + scale = 1f + } + } + } + + binding.pdfView.zoomWithAnimation(screenWidth / 2f, screenHeight / 2f, scale) + return super.onKeyDown(keyCode, event) } override fun initViewBinding(): ActivityPreviewPdfBinding { diff --git a/app/src/main/res/drawable/ic_move_page.xml b/app/src/main/res/drawable/ic_move_page.xml new file mode 100644 index 0000000..e190b84 --- /dev/null +++ b/app/src/main/res/drawable/ic_move_page.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml index 8e82bdd..c24437b 100644 --- a/app/src/main/res/layout/activity_preview_pdf.xml +++ b/app/src/main/res/layout/activity_preview_pdf.xml @@ -15,25 +15,38 @@ android:textColor="@color/white" android:textSize="@dimen/sp_18" /> - - - + android:layout_width="match_parent" + android:layout_height="match_parent" /> - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_layout_page_indicator.xml b/app/src/main/res/layout/include_layout_page_indicator.xml index da2c15d..85b8b2e 100644 --- a/app/src/main/res/layout/include_layout_page_indicator.xml +++ b/app/src/main/res/layout/include_layout_page_indicator.xml @@ -11,7 +11,6 @@ android:id="@+id/lastPageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:clickable="true" android:paddingHorizontal="@dimen/dp_15" android:text="上一页" android:textColor="@color/white" /> @@ -27,7 +26,6 @@ android:id="@+id/nextPageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:clickable="true" android:paddingHorizontal="@dimen/dp_15" android:text="下一页" android:textColor="@color/white" />