PDFTool(Android) - 调整json参数

ComPDFKit_Tools/src/main/assets/tools_default_configuration.json

@@ -39,6 +39,7 @@
     ]
   },
   "annotationsConfig": {
+    "annotationAuthor": "Guest",
     "availableTypes": [
       "note",
       "highlight",
@@ -258,7 +259,6 @@
   },
   "global" : {
     "themeMode" : "system",
-    "fileSaveExtraFontSubset" : true,
-    "annotationAuthor": "Guest"
+    "fileSaveExtraFontSubset" : true
   }
 }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationlist/CPDFAnnotationListFragment.java

@@ -240,7 +240,7 @@ public class CPDFAnnotationListFragment extends Fragment {
             CPDFEditReplyDialogFragment editReplyDialogFragment = CPDFEditReplyDialogFragment.addReply();
             editReplyDialogFragment.setReplyContentListener(content -> {
                 CPDFReplyAnnotation replyAnnotation = item.getAttr().createReplyAnnotation();
-                replyAnnotation.setTitle(pdfView.getCPDFConfiguration().globalConfig.annotationAuthor);
+                replyAnnotation.setTitle(pdfView.getCPDFConfiguration().annotationsConfig.annotationAuthor);
                 replyAnnotation.setContent(content);
                 showReplyDetailsFragment(item, position);
             });
@@ -269,7 +269,7 @@ public class CPDFAnnotationListFragment extends Fragment {
     private void showReplyDetailsFragment(CPDFAnnotListItem item, int position){
         CPDFReplyDetailsDialogFragment replyDetailsDialogFragment = CPDFReplyDetailsDialogFragment.newInstance();
         replyDetailsDialogFragment.setCPDFAnnotation(item.getAttr());
-        replyDetailsDialogFragment.setAnnotAuthor(pdfView.getCPDFConfiguration().globalConfig.annotationAuthor);
+        replyDetailsDialogFragment.setAnnotAuthor(pdfView.getCPDFConfiguration().annotationsConfig.annotationAuthor);
         replyDetailsDialogFragment.setUpdateAnnotationListListener(()->{
             listAdapter.remove(position);
             ArrayList<Integer> pages = new ArrayList<>();

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/contextmenu/CPDFContextMenuHelper.java

@@ -90,7 +90,7 @@ public class CPDFContextMenuHelper extends CPDFContextMenuShowHelper {
     public CPDFContextMenuHelper(CPDFViewCtrl pdfView, ContextMenuProviderParams params) {
         super(pdfView.getCPdfReaderView());
         if (pdfView.getCPDFConfiguration() != null && pdfView.getCPDFConfiguration().globalConfig != null){
-            annotationAuthor = pdfView.getCPDFConfiguration().globalConfig.annotationAuthor;
+            annotationAuthor = pdfView.getCPDFConfiguration().annotationsConfig.annotationAuthor;
         }
         this.helperParams = params;
     }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFConfigurationUtils.java

@@ -178,7 +178,7 @@ public class CPDFConfigurationUtils {
 
     private static AnnotationsConfig parseAnnotationsConfig(@Nullable JSONObject jsonObject) {
         AnnotationsConfig annotationsConfig = new AnnotationsConfig();
-
+        annotationsConfig.annotationAuthor = jsonObject.optString("annotationAuthor", "");
         List<CAnnotationType> annotationTypes = new ArrayList<>();
         JSONArray availableAnnotTypes = jsonObject.optJSONArray("availableTypes");
         if (availableAnnotTypes != null) {
@@ -703,7 +703,6 @@ public class CPDFConfigurationUtils {
         GlobalConfig globalConfig = new GlobalConfig();
         globalConfig.themeMode = GlobalConfig.CThemeMode.fromString(jsonObject.optString("themeMode", "light"));
         globalConfig.fileSaveExtraFontSubset = jsonObject.optBoolean("fileSaveExtraFontSubset", true);
-        globalConfig.annotationAuthor = jsonObject.optString("annotationAuthor", "");
 
         return globalConfig;
     }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java

@@ -289,7 +289,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
         pdfView.getCPdfReaderView().setPdfAddAnnotCallback((cpdfPageView, cpdfBaseAnnot) -> {
             CLog.e("ComPDFKit","Add Annot Callback- type:" + cpdfBaseAnnot.getAnnotType().name());
             CPDFAnnotation annotation = cpdfBaseAnnot.onGetAnnotation();
-            annotation.setTitle(cpdfConfiguration.globalConfig.annotationAuthor);
+            annotation.setTitle(cpdfConfiguration.annotationsConfig.annotationAuthor);
             annotation.updateAp();
 
             CLog.e("ComPDFKit","Add Annot Callback- setTitle:"+annotation.getTitle());

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/config/AnnotationsConfig.java

@@ -33,6 +33,9 @@ public class AnnotationsConfig implements Serializable {
 
     }
 
+    public String annotationAuthor = "";
+
+
     /**
      * A collection of annotation functions enabled by the annotation list.
      * Annotation types not in the collection will be hidden.

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/config/GlobalConfig.java

@@ -33,7 +33,4 @@ public class GlobalConfig  implements Serializable {
      */
     public boolean fileSaveExtraFontSubset = true;
 
-
-    public String annotationAuthor = "";
-
 }

PDFViewer/src/main/java/com/compdfkit/pdfviewer/home/datas/FunDatas.java

@@ -97,7 +97,7 @@ public class FunDatas {
         readerViewConfig.linkHighlight = SettingDatas.isHighlightLink(context);
         readerViewConfig.formFieldHighlight = SettingDatas.isHighlightForm(context);
         configuration.globalConfig.fileSaveExtraFontSubset = SettingDatas.isExtraFontSet(context);
-        configuration.globalConfig.annotationAuthor = SettingDatas.getAnnotationAuthor(context);
+        configuration.annotationsConfig.annotationAuthor = SettingDatas.getAnnotationAuthor(context);
         return configuration;
     }
 }