v2.4.3

Author: xiaolongrick

ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar

@@ -51,11 +51,11 @@ dependencies {
 
     api fileTree(include: ['*.jar'], dir: 'libs')
     // use this
-//    api project(path:':ComPDFKit_Repo:compdfkit')
-//    api project(path:':ComPDFKit_Repo:compdfkit-ui')
+    api project(path:':ComPDFKit_Repo:compdfkit')
+    api project(path:':ComPDFKit_Repo:compdfkit-ui')
     // or use
-    api ('com.compdf:compdfkit:2.4.0')
-    api ('com.compdf:compdfkit-ui:2.4.0')
+//    api ('com.compdf:compdfkit:2.4.3')
+//    api ('com.compdf:compdfkit-ui:2.4.3')
     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'

ComPDFKit_Repo/compdfkit/ComPDFKit.aar

@@ -60,10 +60,13 @@ public class CAnnotationToolbar extends FrameLayout {
 
     private RecyclerView rvAnnotationList;
 
+    @Nullable
     private AppCompatImageView ivSetting;
 
+    @Nullable
     private AppCompatImageView ivUndo;
 
+    @Nullable
     private AppCompatImageView ivRedo;
 
     public CPDFAnnotationToolListAdapter toolListAdapter;
@@ -145,8 +148,12 @@ private void setUndoManagerType(UndoManagerType undoManagerType) {
         this.undoManagerType = undoManagerType;
         if (undoManagerType == UndoManagerType.InkUndo) {
             CPDFReaderView.TInkDrawHelper helper = pdfView.getCPdfReaderView().getInkDrawHelper();
-            ivUndo.setEnabled(helper.canUndo());
-            ivRedo.setEnabled(helper.canRedo());
+            if (ivUndo != null) {
+                ivUndo.setEnabled(helper.canUndo());
+            }
+            if (ivRedo != null) {
+                ivRedo.setEnabled(helper.canRedo());
+            }
         } else {
             CPDFUndoManager undoManager = pdfView.getCPdfReaderView().getUndoManager();
             if (ivRedo != null) {
@@ -509,5 +516,9 @@ public void setAnnotationList(CAnnotationType... types) {
         toolListAdapter.setList(list);
     }
 
-
+    public void reset() {
+        toolListAdapter.selectByType(CAnnotationType.UNKNOWN);
+        rvAnnotationList.scrollToPosition(0);
+        redoUndoManager();
+    }
 }

ComPDFKit_Tools/build.gradle

@@ -31,6 +31,7 @@
 import com.compdfkit.tools.annotation.pdfproperties.pdfstamp.bean.CTextStampBean;
 import com.compdfkit.tools.annotation.pdfproperties.pdfstamp.data.CStampDatas;
 import com.compdfkit.tools.common.pdf.CPDFApplyConfigUtil;
+import com.compdfkit.tools.common.pdf.config.CPDFConfiguration;
 import com.compdfkit.tools.common.views.CToolBar;
 import com.compdfkit.tools.common.views.pdfproperties.colorlist.ColorListView;
 import com.compdfkit.tools.common.views.pdfproperties.stamp.CPDFStampTextView;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationbar/CAnnotationToolbar.java

@@ -43,6 +43,7 @@
 import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 import com.compdfkit.tools.common.views.pdfview.CPreviewMode;
 import com.compdfkit.tools.docseditor.pdfpageedit.CPDFPageEditDialogFragment;
+import com.compdfkit.tools.docseditor.pdfpageedit.CPDFPageEditDialogFragment.OnBackLisener;
 import com.compdfkit.tools.forms.pdfproperties.pdfcombobox.CustomComboBoxWidgetImpl;
 import com.compdfkit.tools.forms.pdfproperties.pdflistbox.CustomListBoxWidgetImpl;
 import com.compdfkit.tools.forms.pdfproperties.pdfsign.CustomSignatureWidgetImpl;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfproperties/pdfstamp/CAddCustomStampActivity.java

@@ -62,6 +62,7 @@
 import com.compdfkit.tools.common.utils.dialog.CAlertDialog;
 import com.compdfkit.tools.common.utils.dialog.CExitTipsDialog;
 import com.compdfkit.tools.common.utils.dialog.CLoadingDialog;
+import com.compdfkit.tools.common.utils.glide.CPDFGlideInitializer;
 import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
 import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.utils.window.CPopupMenuWindow;
@@ -180,11 +181,13 @@ public static CPDFDocumentFragment newInstance(Uri uri, String password, CPDFCon
                 readerView.getContextMenuShowListener().dismissContextMenu();
             }
             CFileUtils.takeUriPermission(getContext(), uri);
+            pdfView.getCPdfReaderView().getUndoManager().clearHistory();
+            setPreviewMode(cpdfConfiguration.modeConfig.initialViewMode);
             pdfView.resetAnnotationType();
             formToolBar.reset();
             editToolBar.resetStatus();
             signatureToolBar.reset();
-            setPreviewMode(cpdfConfiguration.modeConfig.initialViewMode);
+            annotationToolbar.reset();
             screenManager.changeWindowStatus(cpdfConfiguration.modeConfig.initialViewMode);
             screenManager.constraintHide(signStatusView);
             pdfView.openPDF(uri, null, () -> editToolBar.setEditMode(false));
@@ -273,6 +276,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         Context wrapper = new ContextThemeWrapper(getContext(), themeId);
         LayoutInflater themedInflater = inflater.cloneInContext(wrapper);
         View rootView = themedInflater.inflate(R.layout.tools_pdf_document_fragment, container, false);
+        CPDFGlideInitializer.register(getContext());
         clRoot = rootView.findViewById(R.id.cl_root);
         pdfView = rootView.findViewById(R.id.pdf_view);
         flTool = rootView.findViewById(R.id.fl_tool);

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/basic/fragment/CBasicPDFFragment.java

@@ -612,16 +612,12 @@ public static void copyAssetsDirToPhone(Activity activity, String assetsPath, St
                 file.mkdirs();//如果文件夹不存在，则递归
                 for (String fileName:fileList){
                     assetsPath=assetsPath+File.separator+fileName;
-
                     copyAssetsDirToPhone(activity,assetsPath, outPutParentDir);
-
                     assetsPath=assetsPath.substring(0,assetsPath.lastIndexOf(File.separator));
-                    Log.e("oldPath",assetsPath);
                 }
             } else {//如果是文件
                 InputStream inputStream=activity.getAssets().open(assetsPath);
                 File file=new File(outPutParentDir+ File.separator+assetsPath);
-                Log.i("copyAssets2Phone","file:"+file);
                 if(!file.exists() || file.length()==0) {
                     FileOutputStream fos=new FileOutputStream(file);
                     int len=-1;

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

@@ -0,0 +1,28 @@
+package com.compdfkit.tools.common.utils.glide;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.Registry;
+
+/**
+ * @classname:
+ * @author: LiuXiaoLong
+ * @date: 2025/6/23
+ * description:
+ */
+public class CPDFGlideInitializer {
+
+    private static boolean registered = false;
+
+    public static synchronized void register(Context context) {
+        if (registered){
+            return;
+        }
+        Glide glide = Glide.get(context);
+        Registry registry = glide.getRegistry();
+        registry.append(CPDFWrapper.class, Bitmap.class, new CPDFModelLoader.Factory(context));
+        registered = true;
+    }
+}