Browse Source

PDFTool(Android) - p2 bug修复

liuxiaolong 7 months ago
parent
commit
c5550299e1

BIN
ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar


BIN
ComPDFKit_Repo/compdfkit/ComPDFKit.aar


+ 2 - 2
ComPDFKit_Tools/src/main/assets/tools_default_configuration.json

@@ -1,6 +1,6 @@
 {
 {
   "modeConfig": {
   "modeConfig": {
-    "initialViewMode": "annotations",
+    "initialViewMode": "viewer",
     "availableViewModes": [
     "availableViewModes": [
       "viewer",
       "viewer",
       "annotations",
       "annotations",
@@ -39,7 +39,6 @@
   },
   },
   "annotationsConfig": {
   "annotationsConfig": {
     "availableTypes": [
     "availableTypes": [
-      "freetext",
       "note",
       "note",
       "highlight",
       "highlight",
       "underline",
       "underline",
@@ -50,6 +49,7 @@
       "square",
       "square",
       "arrow",
       "arrow",
       "line",
       "line",
+      "freetext",
       "signature",
       "signature",
       "stamp",
       "stamp",
       "pictures",
       "pictures",

+ 3 - 0
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/view/sliderbar/CSliderBar.java

@@ -156,6 +156,9 @@ public class CSliderBar extends FrameLayout implements SeekBar.OnSeekBarChangeLi
 
 
     private void updateSeekBarValue(int value, boolean stop) {
     private void updateSeekBarValue(int value, boolean stop) {
         int v = value + sliderBarMinValue;
         int v = value + sliderBarMinValue;
+        if (v > sliderBarMaxValue){
+            v = sliderBarMaxValue;
+        }
         int currentPercentage = Math.round((float) v / (float) sliderBarMaxValue * 100F);
         int currentPercentage = Math.round((float) v / (float) sliderBarMaxValue * 100F);
         sliderBarValueView.setShowType(showType);
         sliderBarValueView.setShowType(showType);
         sliderBarValueView.setValue(v);
         sliderBarValueView.setValue(v);

+ 0 - 2
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/manager/provider/CEditSelectionsProvider.java

@@ -74,11 +74,9 @@ public class CEditSelectionsProvider implements CStyleProvider {
                         textSelections.setAlign(CPDFEditTextArea.PDFEditAlignType.PDFEditAlignRight);
                         textSelections.setAlign(CPDFEditTextArea.PDFEditAlignType.PDFEditAlignRight);
                     }
                     }
                 } else if (type == CAnnotStyle.EditUpdatePropertyType.FontType) {
                 } else if (type == CAnnotStyle.EditUpdatePropertyType.FontType) {
-                    CLog.e("字体", "内容编辑Provider:Font:" + getAnnotStyleFontName(style) + ", isBold:"+ style.isFontBold() +", isItalic:" + style.isFontItalic());
                     textSelections.setFontName(getAnnotStyleFontName(style));
                     textSelections.setFontName(getAnnotStyleFontName(style));
                     textSelections.setBold(style.isFontBold());
                     textSelections.setBold(style.isFontBold());
                     textSelections.setItalic(style.isFontItalic());
                     textSelections.setItalic(style.isFontItalic());
-                    CLog.e("字体", "内容编辑Provider after:Font:" + textSelections.getFontName() + ", isBold:"+ textSelections.isBold() +", isItalic:" + textSelections.isItalic());
 
 
                 } else {
                 } else {
                     textSelections.setColor(style.getTextColor());
                     textSelections.setColor(style.getTextColor());