Просмотр исходного кода

Merge branch 'upgradeSdk1.0.8.3_2019-02-12'

cooperku_kdanmobile 6 лет назад
Родитель
Сommit
1e168e9ccf

BIN
KMPDFSDK/arm64-v8a/libkmpdf.so


BIN
KMPDFSDK/armeabi-v7a/libkmpdf.so


BIN
KMPDFSDK/armeabi/libkmpdf.so


BIN
libs/kmpdfkit-1.0.8.1 2019-01-15.aar


BIN
KMPDFSDK/mips/libkmpdf.so


BIN
KMPDFSDK/x86/libkmpdf.so


+ 1 - 1
build.gradle

@@ -46,5 +46,5 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
 
-    api(name: 'kmpdfkit-1.0.8.1 2019-01-15', ext: 'aar')
+    api(name: 'kmpdfkit-1.0.8.3 2019-02-12', ext: 'aar')
 }

BIN
KMPDFSDK/kmpdfkit-1.0.8.1 2019-01-11.aar


+ 2 - 1
src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

@@ -19,6 +19,7 @@ import com.kdanmobile.kmpdfkit.manager.KMPDFFactory
 import com.kdanmobile.kmpdfkit.manager.controller.*
 import com.kdanmobile.kmpdfkit.manager.listener.KMPDFAddAnnotCallback
 import com.kdanmobile.kmpdfkit.manager.listener.KMPDFAnnotEditModeChangeListener
+import com.kdanmobile.kmpdfkit.manager.listener.KMPDFErrorMessageCallback
 import com.kdanmobile.kmpdfkit.pdfcommon.*
 import com.kdanmobile.reader.annotationattribute.AnnotationAttribute
 import com.kdanmobile.reader.annotationattribute.Brush
@@ -623,7 +624,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
         val kmpdfStampAnnotationBean = when (attr.isStandardStamp()) {
             true -> KMPDFStampAnnotationBean("", KMPDFStampAnnotationBean.StampType.STANDARD, KMPDFStampAnnotationBean.StandardStamp(attr.resId))
-            false -> KMPDFStampAnnotationBean("", KMPDFStampAnnotationBean.StampType.TEXT, KMPDFStampAnnotationBean.TextStamp(attr.rect, attr.config))
+            false -> KMPDFStampAnnotationBean("", KMPDFStampAnnotationBean.StampType.TEXT, KMPDFStampAnnotationBean.TextStamp(attr.config))
         }
         kmpdfFactory?.setAnnotationAttribute(kmpdfStampAnnotationBean)
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.STAMP)