PDFTool(Android) - 1.更换SDK License

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/directory/CFileDirectoryDialog.java

@@ -0,0 +1,34 @@
+package com.compdfkit.tools.common.views.directory;
+
+
+import android.view.View;
+
+import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
+
+public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
+
+    @Override
+    protected boolean fullScreen() {
+        return true;
+    }
+
+    @Override
+    protected boolean draggable() {
+        return false;
+    }
+
+    @Override
+    protected int layoutId() {
+        return 0;
+    }
+
+    @Override
+    protected void onCreateView(View rootView) {
+
+    }
+
+    @Override
+    protected void onViewCreate() {
+
+    }
+}

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/CertificateDigitalDatas.java

@@ -11,19 +11,17 @@ package com.compdfkit.tools.signature;
 
 
 import android.content.Context;
-import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
 import com.compdfkit.core.annotation.form.CPDFSignatureWidget;
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.document.signature.CPDFCertInfo;
-import com.compdfkit.core.document.signature.CPDFOwnerInfo;
-import com.compdfkit.core.document.signature.CPDFSignature;
-import com.compdfkit.core.document.signature.CPDFSigner;
-import com.compdfkit.core.document.signature.CPDFX509;
+import com.compdfkit.core.signature.CPDFCertInfo;
+import com.compdfkit.core.signature.CPDFOwnerInfo;
+import com.compdfkit.core.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFSigner;
+import com.compdfkit.core.signature.CPDFX509;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.utils.CUriUtil;
 import com.compdfkit.tools.signature.bean.CPDFDocumentSignInfo;
 import com.compdfkit.tools.signature.bean.CPDFSignatureStatusInfo;
 import com.compdfkit.tools.signature.pdfproperties.pdfsign.CDigitalSignStyleData;
@@ -163,11 +161,10 @@ public class CertificateDigitalDatas {
      *
      * @param context
      * @param signature
-     * @param signer
      * @return
      */
-    public static boolean verifyTimeStamp(Context context, CPDFSignature signature, CPDFSigner signer) {
-        return signature.veryfyTimestamp(context, signer);
+    public static boolean verifyTimeStamp(Context context, CPDFSignature signature) {
+        return signature.veryfyTimestamp(context);
     }
 
     public static CPDFDocumentSignInfo verifyDocumentSignStatus(CPDFDocument document) {

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/bean/CPDFOwnerItemData.java

@@ -12,8 +12,8 @@ package com.compdfkit.tools.signature.bean;
 
 import android.text.TextUtils;
 
-import com.compdfkit.core.document.signature.CPDFOwnerInfo;
-import com.compdfkit.core.document.signature.CPDFX509;
+import com.compdfkit.core.signature.CPDFOwnerInfo;
+import com.compdfkit.core.signature.CPDFX509;
 
 import java.util.ArrayList;
 import java.util.List;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/bean/CPDFSignatureItemData.java

@@ -1,7 +1,7 @@
 package com.compdfkit.tools.signature.bean;
 
 
-import com.compdfkit.core.document.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFSignature;
 import com.compdfkit.tools.signature.SignatureStatus;
 
 public class CPDFSignatureItemData {

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/bean/CPDFSignatureStatusInfo.java

@@ -11,7 +11,7 @@ package com.compdfkit.tools.signature.bean;
 
 import android.content.Context;
 
-import com.compdfkit.core.document.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFSignature;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.signature.SignatureStatus;
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CImportCertificateDigitalDialog.java

@@ -29,7 +29,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.compdfkit.core.document.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFSignature;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.utils.CFileUtils;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CreateCertificateDigitalDialog.java

@@ -33,7 +33,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.compdfkit.core.document.signature.CPDFOwnerInfo;
+import com.compdfkit.core.signature.CPDFOwnerInfo;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.utils.CFileUtils;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertAttrDatas.java

@@ -13,11 +13,11 @@ package com.compdfkit.tools.signature.info;
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.compdfkit.core.document.signature.CPDFAuinfoac;
-import com.compdfkit.core.document.signature.CPDFCertInfo;
-import com.compdfkit.core.document.signature.CPDFExtInfo;
-import com.compdfkit.core.document.signature.CPDFOwnerInfo;
-import com.compdfkit.core.document.signature.CPDFX509;
+import com.compdfkit.core.signature.CPDFAuinfoac;
+import com.compdfkit.core.signature.CPDFCertInfo;
+import com.compdfkit.core.signature.CPDFExtInfo;
+import com.compdfkit.core.signature.CPDFOwnerInfo;
+import com.compdfkit.core.signature.CPDFX509;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.date.CDateUtil;
 import com.compdfkit.tools.signature.bean.CPDFCertAttrDataItem;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertDetailsDialog.java

@@ -18,8 +18,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.compdfkit.core.document.signature.CPDFSignature;
-import com.compdfkit.core.document.signature.CPDFX509;
+import com.compdfkit.core.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFX509;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.interfaces.COnDialogDismissListener;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertDigitalSignAttributesDialog.java

@@ -18,8 +18,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.compdfkit.core.document.signature.CPDFSignature;
-import com.compdfkit.core.document.signature.CPDFX509;
+import com.compdfkit.core.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFX509;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.interfaces.COnDialogDismissListener;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertDigitalSignInfoDialog.java

@@ -20,10 +20,10 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.document.signature.CPDFCertInfo;
-import com.compdfkit.core.document.signature.CPDFSignature;
-import com.compdfkit.core.document.signature.CPDFSigner;
-import com.compdfkit.core.document.signature.CPDFX509;
+import com.compdfkit.core.signature.CPDFCertInfo;
+import com.compdfkit.core.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFSigner;
+import com.compdfkit.core.signature.CPDFX509;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.interfaces.COnDialogDismissListener;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/signlist/CPDFCertDigitalSignListDialog.java

@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.document.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFSignature;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.utils.dialog.CAlertDialog;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/signlist/adapter/CertDigitalSignListAdapter.java

@@ -7,8 +7,8 @@ import android.text.TextUtils;
 import android.view.ViewGroup;
 
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.document.signature.CPDFCertInfo;
-import com.compdfkit.core.document.signature.CPDFSigner;
+import com.compdfkit.core.signature.CPDFCertInfo;
+import com.compdfkit.core.signature.CPDFSigner;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/pdfproperties/pdfsign/CDigitalSignatureWidgetImpl.java

@@ -15,8 +15,8 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.compdfkit.core.annotation.CPDFImageScaleType;
 import com.compdfkit.core.annotation.form.CPDFSignatureWidget;
-import com.compdfkit.core.document.signature.CPDFCertInfo;
-import com.compdfkit.core.document.signature.CPDFSignature;
+import com.compdfkit.core.signature.CPDFCertInfo;
+import com.compdfkit.core.signature.CPDFSignature;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.CToastUtil;
 import com.compdfkit.tools.common.utils.image.CBitmapUtil;

ComPDFKit_Tools/src/main/res/layout/tools_file_directory_dialog.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.compdfkit.tools.common.views.CToolBar
+        android:id="@+id/tool_bar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:title="@string/tools_select_folder"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

ComPDFKit_Tools/src/main/res/layout/tools_sign_certificate_attributes_list_trusted_cert_item.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginVertical="16dp">

ComPDFKit_Tools/src/main/res/layout/tools_sign_style_preview_view_alignment_right.xml

@@ -51,7 +51,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintHorizontal_weight="0.50"
             app:layout_constraintEnd_toStartOf="@id/iv_sign"
-            tools:text="数字签名者：ComPDFKit\nDN：辨别名\n原因：我是本文档的作者\n位置：长沙\n日期：2023.08.15 10:00:00\nComPDFKit Version:1.9.0" />
+            tools:text="Name：ComPDFKit\nDN：DN\nReason：I am the owner of the document\nLocation：Changsha\nDate：2023.08.15 10:00:00\nComPDFKit Version:2.0.0" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 

ComPDFKit_Tools/src/main/res/values/tools_strings.xml

@@ -416,5 +416,6 @@
     <string name="tools_trusted_5">Perform privileged system operations (networking, printing, file access, etc.)</string>
     <string name="tools_trust">Trust</string>
     <string name="tools_add_to_trusted_cert">Add to Trusted Certificates</string>
+    <string name="tools_select_folder">Select folder</string>
 
 </resources>

DigitalSignature/build.gradle

@@ -7,7 +7,7 @@ android {
     compileSdk 33
 
     defaultConfig {
-        applicationId "com.compdfkit.viewer"
+        applicationId "com.compdfkit.digitalsignature"
         minSdk rootProject.ext.android.MINSDK
         targetSdk rootProject.ext.android.TARGETSDK
         versionCode rootProject.ext.android.VERSIONCODE as int

config.gradle

@@ -6,7 +6,7 @@ ext {
             VERSIONCODE: 1004
     ]
     sdk = [
-            COMPDFKIT_SDK_VERSION : "1.9.1",
+            COMPDFKIT_SDK_VERSION : "1.10.0",
             COMPDFKIT_SDK_BUILD_TAG : "build_beta_1.9.1_c50aa2886_202308291116"
     ]
 }