v2.4.4

xiaolongrick · xiaolongrick · commit 0484c9a20448 · 2025-07-02T10:26:41.000+08:00
diff --git a/ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar b/ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar
diff --git a/ComPDFKit_Repo/compdfkit/ComPDFKit.aar b/ComPDFKit_Repo/compdfkit/ComPDFKit.aar
diff --git a/ComPDFKit_Tools/build.gradle b/ComPDFKit_Tools/build.gradle
@@ -54,8 +54,8 @@ dependencies {
     api project(path:':ComPDFKit_Repo:compdfkit')
     api project(path:':ComPDFKit_Repo:compdfkit-ui')
     // or use
-//    api ('com.compdf:compdfkit:2.4.3')
-//    api ('com.compdf:compdfkit-ui:2.4.3')
+//    api ('com.compdf:compdfkit:2.4.4')
+//    api ('com.compdf:compdfkit-ui:2.4.4')
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
     api 'androidx.documentfile:documentfile:1.0.1'
diff --git a/ComPDFKit_Tools/src/main/assets/tools_default_configuration.json b/ComPDFKit_Tools/src/main/assets/tools_default_configuration.json
@@ -271,6 +271,11 @@
       "saveAsNewFile" : true,
       "outsideBackgroundColor" : ""
     },
+    "thumbnail": {
+      "title" : "",
+      "backgroundColor": "",
+      "editMode" : true
+    },
     "signatureType": "manual",
     "enableExitSaveTips" : true
   },
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/basic/fragment/CBasicPDFFragment.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/basic/fragment/CBasicPDFFragment.java
@@ -187,13 +187,14 @@ public void setPageEditDialogOnBackListener(
         this.pageEditDialogOnBackListener = pageEditDialogOnBackListener;
     }
 
-    protected void showPageEdit(CPDFViewCtrl pdfView, boolean enterEdit, CPDFPageEditDialogFragment.OnBackLisener backListener) {
+    protected void showPageEdit(CPDFViewCtrl pdfView, boolean enterEdit, boolean enableEditMode, CPDFPageEditDialogFragment.OnBackLisener backListener) {
         curEditMode = pdfView.getCPdfReaderView().getLoadType();
         pdfView.exitEditMode();
         pdfView.getCPdfReaderView().getContextMenuShowListener().dismissContextMenu();
         CPDFPageEditDialogFragment pageEditDialogFragment = CPDFPageEditDialogFragment.newInstance();
         pageEditDialogFragment.initWithPDFView(pdfView);
         pageEditDialogFragment.setEnterEdit(enterEdit);
+        pageEditDialogFragment.setEnableEditMode(enableEditMode);
         pageEditDialogFragment.setOnBackListener(backListener);
         pageEditDialogFragment.setOnEnterBackPressedListener(()->{
             if (pageEditDialogOnBackListener != null) {
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFApplyConfigUtil.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFApplyConfigUtil.java
@@ -174,7 +174,7 @@ private void applyModeConfig(CPDFDocumentFragment fragment, CPDFConfiguration co
                 }
             } else {
                 fragment.setPreviewMode(CPreviewMode.Viewer);
-                fragment.showPageEdit(true);
+                fragment.showPageEdit(true, true);
             }
 
         }
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFConfigurationUtils.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFConfigurationUtils.java
@@ -740,6 +740,12 @@ private static GlobalConfig parseGlobalConfig(@Nullable JSONObject jsonObject) {
             globalConfig.watermark.saveAsNewFile = watermark.optBoolean("saveAsNewFile",true);
             globalConfig.watermark.outsideBackgroundColor = watermark.optString("outsideBackgroundColor", "");
         }
+        JSONObject thumbnailJsonObject = jsonObject.optJSONObject("thumbnail");
+        if (thumbnailJsonObject != null) {
+            globalConfig.thumbnail.title = thumbnailJsonObject.optString("title", "");
+            globalConfig.thumbnail.backgroundColor = thumbnailJsonObject.optString("backgroundColor", "");
+            globalConfig.thumbnail.editMode = thumbnailJsonObject.optBoolean("editMode", true);
+        }
 
         globalConfig.signatureType = GlobalConfig.CSignatureType.fromString(jsonObject.optString("signatureType", "manual"));
         return globalConfig;
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java
@@ -51,6 +51,7 @@
 import com.compdfkit.tools.common.basic.fragment.CBasicPDFFragment;
 import com.compdfkit.tools.common.contextmenu.CPDFContextMenuHelper;
 import com.compdfkit.tools.common.pdf.config.CPDFConfiguration;
+import com.compdfkit.tools.common.pdf.config.CPDFThumbnailConfig;
 import com.compdfkit.tools.common.pdf.config.ToolbarConfig;
 import com.compdfkit.tools.common.utils.CFileUtils;
 import com.compdfkit.tools.common.utils.CPermissionUtil;
@@ -455,7 +456,8 @@ protected void initToolBarView() {
                         break;
                     case Thumbnail:
                         pdfToolBar.addAction(R.drawable.tools_ic_thumbnail, v -> {
-                            showPageEdit(false);
+                            CPDFThumbnailConfig thumbnailConfig = cpdfConfiguration.globalConfig.thumbnail;
+                            showPageEdit(false, thumbnailConfig.editMode);
                         });
                         break;
                     case Search:
@@ -633,7 +635,9 @@ protected void showToolbarMenuDialog(View anchorView) {
                         menuWindow.addItem(R.drawable.tools_ic_preview_settings, R.string.tools_view_setting, v1 -> showDisplaySettings(pdfView));
                         break;
                     case DocumentEditor:
-                        menuWindow.addItem(R.drawable.tools_page_edit, R.string.tools_page_edit_toolbar_title, v1 -> showPageEdit(true));
+                        menuWindow.addItem(R.drawable.tools_page_edit, R.string.tools_page_edit_toolbar_title, v1 -> {
+                            showPageEdit(true, true);
+                        });
                         break;
                     case Security:
                         menuWindow.addItem(R.drawable.tools_ic_add_security, R.string.tools_security, v1 -> {
@@ -924,8 +928,8 @@ public void showBOTA() {
         dialogFragment.show(getChildFragmentManager(), "annotationList");
     }
 
-    public void showPageEdit(boolean enterEditMode) {
-        showPageEdit(pdfView, enterEditMode, this::restoreEdit);
+    public void showPageEdit(boolean enterEditMode, boolean enableEditMode) {
+        showPageEdit(pdfView, enterEditMode, enableEditMode, this::restoreEdit);
     }
 
     public void showSecurityDialog() {
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/config/CPDFThumbnailConfig.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/config/CPDFThumbnailConfig.java
@@ -0,0 +1,21 @@
+package com.compdfkit.tools.common.pdf.config;
+
+import android.graphics.Color;
+
+import java.io.Serializable;
+
+/**
+ * @classname:
+ * @author: LiuXiaoLong
+ * @date: 2025/2/7
+ * description:
+ */
+public class CPDFThumbnailConfig implements Serializable {
+
+    public String title;
+
+    public String backgroundColor = "";
+
+    public boolean editMode = true;
+
+}
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/config/GlobalConfig.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/config/GlobalConfig.java
@@ -57,4 +57,6 @@ public static CSignatureType fromString(String str) {
 
     public boolean enableExitSaveTips = true;
 
+    public CPDFThumbnailConfig thumbnail = new CPDFThumbnailConfig();
+
 }
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/docseditor/pdfpageedit/CPDFPageEditDialogFragment.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/docseditor/pdfpageedit/CPDFPageEditDialogFragment.java
@@ -14,8 +14,10 @@
 
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Environment;
+import android.text.TextUtils;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 import android.view.View;
@@ -28,6 +30,10 @@
 import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
+import com.compdfkit.tools.common.pdf.CPDFApplyConfigUtil;
+import com.compdfkit.tools.common.pdf.config.CPDFConfiguration;
+import com.compdfkit.tools.common.pdf.config.CPDFThumbnailConfig;
+import com.compdfkit.tools.common.pdf.config.GlobalConfig;
 import com.compdfkit.tools.common.utils.CFileUtils;
 import com.compdfkit.tools.common.utils.CToastUtil;
 import com.compdfkit.tools.common.utils.CUriUtil;
@@ -66,6 +72,7 @@ public class CPDFPageEditDialogFragment extends CBasicBottomSheetDialogFragment
     private boolean hasEdit = false;
 
     private boolean enterEdit = false;
+    private boolean enableEditMode = true;
     private List<Integer> refreshHQApList = new ArrayList<>();
 
     private ActivityResultLauncher<Intent> replaceSelectDocumentLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -121,6 +128,10 @@ public void setEnterEdit(boolean enterEdit) {
         this.enterEdit = enterEdit;
     }
 
+    public void setEnableEditMode(boolean enableEditMode) {
+        this.enableEditMode = enableEditMode;
+    }
+
     @Override
     protected int themeResId() {
         return R.attr.compdfkit_BottomSheetDialog_Theme;
@@ -197,10 +208,26 @@ protected int layoutId() {
     protected void onCreateView(View rootView) {
         toolBar = rootView.findViewById(R.id.tool_bar);
         editToolBar = rootView.findViewById(R.id.tool_page_edit_bar);
+        try {
+            CPDFConfiguration configuration = CPDFApplyConfigUtil.getInstance().getConfiguration();
+            if (configuration != null){
+                CPDFThumbnailConfig thumbnailConfig = configuration.globalConfig.thumbnail;
+                if (!TextUtils.isEmpty(thumbnailConfig.backgroundColor)){
+                    int bgColor = Color.parseColor(thumbnailConfig.backgroundColor);
+                    rootView.setBackgroundColor(bgColor);
+                }
+                if (!TextUtils.isEmpty(thumbnailConfig.title)) {
+                    toolBar.setTitle(thumbnailConfig.title);
+                }
+            }
+        }catch (Exception e){
+
+        }
         this.editThumbnailFragment = (CPDFEditThumbnailFragment) getChildFragmentManager().findFragmentById(R.id.id_edit_thumbnail_fragment);
         if (this.editThumbnailFragment != null) {
             editThumbnailFragment.setCPDFPageEditDialogFragment(this);
-            editThumbnailFragment.setEdit(enterEdit);
+            editThumbnailFragment.setEdit(enableEditMode && enterEdit);
+            editThumbnailFragment.setEnableEditMode(enableEditMode);
         }
 
         editThumbnailFragment.setPDFDisplayPageIndexListener(pageIndex -> {
@@ -245,7 +272,8 @@ protected void onCreateView(View rootView) {
         toolBar.setOnSelectAllCallback((select) -> {
             editThumbnailFragment.setSelectAll(select);
         });
-        if (enterEdit) {
+        toolBar.showEditButton(enableEditMode);
+        if (enableEditMode && enterEdit) {
             toolBar.enterEditMode();
         }
         editToolBar.setInsertPageListener(v -> {
diff --git a/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfthumbnail/CPDFEditThumbnailFragment.java b/ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfthumbnail/CPDFEditThumbnailFragment.java
@@ -37,6 +37,8 @@ public class CPDFEditThumbnailFragment extends CBasicThemeFragment {
 
     private boolean isEdit = false;
 
+    private boolean enableEditMode = true;
+
     private CPDFPageEditDialogFragment pageEditDialogFragment = null;
 
     public static final int UPDATE_TYPE_ROTATE = 1;
@@ -74,6 +76,10 @@ public void setEdit(boolean edit) {
         }
     }
 
+    public void setEnableEditMode(boolean enableEditMode) {
+        this.enableEditMode = enableEditMode;
+    }
+
     public boolean isEdit() {
         return this.isEdit;
     }
@@ -140,7 +146,7 @@ public void onItemClick(RecyclerView.ViewHolder vh) {
             });
             CProItemTouchHelper itemTouchHelper = new CProItemTouchHelper(thumbnailListAdapter);
             itemTouchHelper.attachToRecyclerView(rvThumbnailRecyclerView);
-            itemTouchHelper.setDragEnable(true);
+            itemTouchHelper.setDragEnable(enableEditMode);
             itemTouchHelper.setSwapEnable(false);
             itemTouchHelper.setSwipeEnable(false);
         }
diff --git a/PDFViewer/build.gradle b/PDFViewer/build.gradle
@@ -57,5 +57,5 @@ dependencies {
     api project(path: ':ComPDFKit_Tools')
 
     // or
-//  implementation ('com.compdf:compdfkit-tools:2.4.3')
+//  implementation ('com.compdf:compdfkit-tools:2.4.4')
 }
diff --git a/config.gradle b/config.gradle
@@ -3,10 +3,10 @@ ext {
             COMPILESDK: 34,
             MINSDK: 21,
             TARGETSDK: 34,
-            VERSIONCODE: 1022
+            VERSIONCODE: 1023
     ]
     sdk = [
-            COMPDFKIT_SDK_VERSION : "2.4.3",
+            COMPDFKIT_SDK_VERSION : "2.4.4",
             COMPDFKIT_SDK_BUILD_TAG : "build_dev_03226198_202506180957"
     ]
 }
diff --git a/settings.gradle b/settings.gradle
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
         mavenLocal()
     }
 }
-rootProject.name = "compdfki_demo_android"
+rootProject.name = "compdfkit_demo_android"
 include ':PDFViewer'
 include ':ComPDFKit_Tools'
 include ':ComPDFKit_Repo:compdfkit'

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private void applyModeConfig(CPDFDocumentFragment fragment, CPDFConfiguration co`
`174`	`174`	`}`
`175`	`175`	`} else {`
`176`	`176`	`fragment.setPreviewMode(CPreviewMode.Viewer);`
`177`		`- fragment.showPageEdit(true);`
	`177`	`+ fragment.showPageEdit(true, true);`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,6 @@ public static CSignatureType fromString(String str) {`
`57`	`57`
`58`	`58`	`public boolean enableExitSaveTips = true;`
`59`	`59`
	`60`	`+ public CPDFThumbnailConfig thumbnail = new CPDFThumbnailConfig();`
	`61`	`+`
`60`	`62`	`}`