Upgrade SDK to 1.0.8.9 2019-08-29

build.gradle

@@ -51,6 +51,6 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
 
-    api(name: 'kmpdfkit-1.0.8.8 2019-06-24', ext: 'aar')
+    api(name: 'kmpdfkit-1.0.8.9 2019-08-29', ext: 'aar')
     implementation project(path: ':KdanBaseModule')
 }

src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -18,6 +18,7 @@ import android.view.*
 import android.view.animation.AnimationUtils
 import android.widget.*
 import com.kdanmobile.base.KdanBaseActivity
+import com.kdanmobile.kmpdfkit.pdfcommon.IKMReaderViewCallback
 import com.kdanmobile.kmpdfkit.pdfcommon.KMPDFReaderView
 import com.kdanmobile.kmpdfkit.pdfcommon.PDFInfo
 import com.kdanmobile.reader.Utils.applyConstraintSet
@@ -462,38 +463,45 @@ abstract class ReaderActivity :
                 }
                 return super.onTouchEvent(motionEvent)
             }
-
-            override fun onTapMainDocArea() {
-                super.onTapMainDocArea()
-                if (viewModel.annotationEitModeLiveData.value == ReaderViewModel.AnnotationEitMode.FORMTEXT_MODIFY) {
-                    return
+        }.apply {
+            setIKMReaderViewCallback(object : IKMReaderViewCallback {
+                override fun onMoveToChild(pageIndex: Int) {
+                    viewModel.setPageIndex(pageIndex)
                 }
-                when (isHideToolbar) {
-                    true -> {
-                        showAllToolbars()
-                        viewModel.clearSelection()
+
+                override fun onScrolling() {
+                    val isEditMode = viewModel.annotationModeLiveData.value != ReaderViewModel.AnnotationMode.NONE
+                    val isCopyMode = viewModel.isCopyModeLiveData.value != false
+
+                    if (!isEditMode && !isCopyMode && !isHideToolbar) {
+                        hideAllToolbars()
+                        isHideToolbar = true
                     }
-                    false -> hideAllToolbars()
+                    isHidePdfPage = isEditMode || isCopyMode
                 }
-                isHideToolbar = !isHideToolbar
-            }
 
-            override fun onMoveToChild(pageIndex: Int) {
-                super.onMoveToChild(pageIndex)
-                viewModel.setPageIndex(pageIndex)
-            }
+                override fun onTapMainDocArea() {
+                    if (viewModel.annotationEitModeLiveData.value == ReaderViewModel.AnnotationEitMode.FORMTEXT_MODIFY) {
+                        return
+                    }
+                    when (isHideToolbar) {
+                        true -> {
+                            showAllToolbars()
+                            viewModel.clearSelection()
+                        }
+                        false -> hideAllToolbars()
+                    }
+                    isHideToolbar = !isHideToolbar
+                }
 
-            override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean {
-                val isEditMode = viewModel.annotationModeLiveData.value != ReaderViewModel.AnnotationMode.NONE
-                val isCopyMode = viewModel.isCopyModeLiveData.value != false
+                override fun onRecordLastJumpPageNum(p0: Int) {
+                    // Do nothing
+                }
 
-                if (!isEditMode && !isCopyMode && !isHideToolbar) {
-                    hideAllToolbars()
-                    isHideToolbar = true
+                override fun onEndScroll() {
+                    // Do nothing
                 }
-                isHidePdfPage = isEditMode || isCopyMode
-                return super.onScroll(e1, e2, distanceX, distanceY)
-            }
+            })
         }
         viewModel.setReaderView(readerView)
         if (!filePath.isNullOrEmpty()) {

src/main/java/com/kdanmobile/reader/screen/view/SearchView.kt

@@ -395,7 +395,7 @@ class SearchView: RelativeLayout, View.OnClickListener, LeftToolbarView {
                                     for (w in chars[bIndex][lIndex]) {
                                         if (w.isEmpty()) continue
                                         for (c in w) {
-                                            builder.append(c.c)
+                                            builder.append(c.chars)
                                         }
                                     }
                                 }