PDFSamples(Android) - 1.优化日志输出代码

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/CFileUtils.java

@@ -48,7 +48,7 @@ public class CFileUtils {
         File dir = new File(savePath);
         if (!dir.exists()) {
             if (!dir.mkdirs()) {
-                Log.d("FileUtils", "mkdir error: " + savePath);
+                CLog.d("FileUtils", "mkdir error: " + savePath);
                 return;
             }
         }
@@ -71,9 +71,9 @@ public class CFileUtils {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            Log.d("FileUtils", "[copyFileFromAssets] copy asset file: " + assetName + " to : " + filename);
+            CLog.d("FileUtils", "[copyFileFromAssets] copy asset file: " + assetName + " to : " + filename);
         } else {
-            Log.d("FileUtils", "[copyFileFromAssets] file is exist: " + filename);
+            CLog.d("FileUtils", "[copyFileFromAssets] file is exist: " + filename);
         }
     }
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/CLog.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.
+ *
+ * THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+ * AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
+ * UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+ * This notice may not be removed from this file.
+ */
+
+package com.compdfkit.tools.common.utils;
+
+
+import android.util.Log;
+
+import com.compdfkit.tools.BuildConfig;
+
+public class CLog {
+
+    public static void e(String tag, String message){
+        if (BuildConfig.DEBUG){
+            Log.e(tag, message);
+        }
+    }
+
+    public static void d(String tag, String message){
+        if (BuildConfig.DEBUG){
+            Log.d(tag, message);
+        }
+    }
+}

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/CAnnotStyle.java

@@ -12,7 +12,6 @@ package com.compdfkit.tools.common.views.pdfproperties.pdfstyle;
 
 import android.graphics.Color;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.FloatRange;
@@ -26,6 +25,7 @@ import com.compdfkit.core.annotation.CPDFStampAnnotation;
 import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.core.annotation.form.CPDFWidget;
 import com.compdfkit.tools.R;
+import com.compdfkit.tools.common.utils.CLog;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -117,7 +117,7 @@ public class CAnnotStyle implements Serializable {
     public void setColor(@ColorInt int color) {
         boolean update = color != this.color;
         this.color = color;
-        Log.e("CAnnotStyle", "setColor(" + color + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setColor(" + color + ", update:" + update + ")");
         updateColorListener(this.color, update);
     }
 
@@ -128,7 +128,7 @@ public class CAnnotStyle implements Serializable {
     public void setOpacity(@IntRange(from = 0, to = 255) int opacity) {
         boolean update = opacity != this.opacity;
         this.opacity = opacity;
-        Log.e("CAnnotStyle", "setOpacity(" + opacity + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setOpacity(" + opacity + ", update:" + update + ")");
         updateOpacity(this.opacity, update);
     }
 
@@ -142,7 +142,7 @@ public class CAnnotStyle implements Serializable {
         if (borderStyle != null) {
             borderStyle.setBorderWidth(this.borderWidth);
         }
-        Log.e("CAnnotStyle", "setBorderWidth(" + borderWidth + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setBorderWidth(" + borderWidth + ", update:" + update + ")");
         updateBorderWidth(this.borderWidth, update);
     }
 
@@ -161,7 +161,7 @@ public class CAnnotStyle implements Serializable {
     public void setBorderColor(@ColorInt int lineColor) {
         boolean update = lineColor != this.lineColor;
         this.lineColor = lineColor;
-        Log.e("CAnnotStyle", "setLineColor(" + lineColor + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setLineColor(" + lineColor + ", update:" + update + ")");
         updateLineColor(lineColor, update);
     }
 
@@ -172,7 +172,7 @@ public class CAnnotStyle implements Serializable {
     public void setLineColorOpacity(@IntRange(from = 0, to = 255) int lineColorOpacity) {
         boolean update = lineColorOpacity != this.lineColorOpacity;
         this.lineColorOpacity = lineColorOpacity;
-        Log.e("CAnnotStyle", "setLineColorOpacity(" + lineColorOpacity + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setLineColorOpacity(" + lineColorOpacity + ", update:" + update + ")");
         updateLineColorOpacity(lineColorOpacity, update);
     }
 
@@ -183,7 +183,7 @@ public class CAnnotStyle implements Serializable {
     public void setFillColor(@ColorInt int fillColor) {
         boolean update = fillColor != this.fillColor;
         this.fillColor = fillColor;
-        Log.e("CAnnotStyle", "setFillColor(" + fillColor + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFillColor(" + fillColor + ", update:" + update + ")");
         updateFillColor(fillColor, update);
     }
 
@@ -195,14 +195,14 @@ public class CAnnotStyle implements Serializable {
     public void setFillColorOpacity(@IntRange(from = 0, to = 255) int fillColorOpacity) {
         boolean update = fillColorOpacity != this.fillColorOpacity;
         this.fillColorOpacity = fillColorOpacity;
-        Log.e("CAnnotStyle", "setFillColorOpacity(" + fillColor + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFillColorOpacity(" + fillColor + ", update:" + update + ")");
         updateFillColorOpacity(fillColorOpacity, update);
     }
 
     public void setBorderStyle(CPDFBorderStyle borderStyle) {
         boolean update = borderStyle != this.borderStyle && Arrays.equals(borderStyle.getDashArr(), this.borderStyle.getDashArr());
         this.borderStyle = borderStyle;
-        Log.e("CAnnotStyle", "setBorderStyle(" + borderStyle + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setBorderStyle(" + borderStyle + ", update:" + update + ")");
         updateBorderStyle(borderStyle, update);
     }
 
@@ -217,7 +217,7 @@ public class CAnnotStyle implements Serializable {
     public void setStartLineType(CPDFLineAnnotation.LineType startLineType) {
         boolean update = startLineType != this.startLineType;
         this.startLineType = startLineType;
-        Log.e("CAnnotStyle", "setStartLineType(" + startLineType + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setStartLineType(" + startLineType + ", update:" + update + ")");
         updateStartLineType(this.startLineType, update);
     }
 
@@ -228,7 +228,7 @@ public class CAnnotStyle implements Serializable {
     public void setTailLineType(CPDFLineAnnotation.LineType tailLineType) {
         boolean update = tailLineType != this.tailLineType;
         this.tailLineType = tailLineType;
-        Log.e("CAnnotStyle", "setTailLineType(" + tailLineType + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setTailLineType(" + tailLineType + ", update:" + update + ")");
         updateTailLineType(this.tailLineType, update);
     }
 
@@ -239,7 +239,7 @@ public class CAnnotStyle implements Serializable {
     public void setFontBold(boolean fontBold) {
         boolean update = fontBold != this.fontBold;
         this.fontBold = fontBold;
-        Log.e("CAnnotStyle", "setFontBold(" + fontBold + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFontBold(" + fontBold + ", update:" + update + ")");
         updateFontBold(this.fontBold, update);
     }
 
@@ -250,7 +250,7 @@ public class CAnnotStyle implements Serializable {
     public void setFontItalic(boolean fontItalic) {
         boolean update = fontItalic != this.fontItalic;
         this.fontItalic = fontItalic;
-        Log.e("CAnnotStyle", "setFontItalic(" + fontItalic + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFontItalic(" + fontItalic + ", update:" + update + ")");
         updateFontItalic(this.fontItalic, update);
     }
 
@@ -261,7 +261,7 @@ public class CAnnotStyle implements Serializable {
     public void setFontColor(@ColorInt int textColor) {
         boolean update = textColor != this.textColor;
         this.textColor = textColor;
-        Log.e("CAnnotStyle", "setTextColor(" + textColor + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setTextColor(" + textColor + ", update:" + update + ")");
         updateTextColor(textColor, update);
     }
 
@@ -272,7 +272,7 @@ public class CAnnotStyle implements Serializable {
     public void setTextColorOpacity(@IntRange(from = 0, to = 255) int textColorOpacity) {
         boolean update = textColorOpacity != this.textColorOpacity;
         this.textColorOpacity = textColorOpacity;
-        Log.e("CAnnotStyle", "setTextColorOpacity(" + textColorOpacity + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setTextColorOpacity(" + textColorOpacity + ", update:" + update + ")");
         updateTextColorOpacity(textColorOpacity, update);
     }
 
@@ -283,7 +283,7 @@ public class CAnnotStyle implements Serializable {
     public void setFontSize(@IntRange(from = 0) int fontSize) {
         boolean update = fontSize != this.fontSize;
         this.fontSize = fontSize;
-        Log.e("CAnnotStyle", "setFontSize(" + fontSize + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFontSize(" + fontSize + ", update:" + update + ")");
         updateFontSize(fontSize, update);
     }
 
@@ -299,7 +299,7 @@ public class CAnnotStyle implements Serializable {
         boolean update = fontType != this.fontType;
         this.fontType = fontType;
         externFontName = "";
-        Log.e("CAnnotStyle", "setFontType(" + fontType + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFontType(" + fontType + ", update:" + update + ")");
         updateFontType(fontType, update);
     }
 
@@ -317,7 +317,7 @@ public class CAnnotStyle implements Serializable {
     public void setAlignment(Alignment alignment) {
         boolean update = alignment != this.alignment;
         this.alignment = alignment;
-        Log.e("CAnnotStyle", "setAlignment(" + alignment + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setAlignment(" + alignment + ", update:" + update + ")");
         updateTextAlignment(alignment, update);
     }
 
@@ -331,13 +331,13 @@ public class CAnnotStyle implements Serializable {
 
     public void setImagePath(String imagePath) {
         this.imagePath = imagePath;
-        Log.e("CAnnotStyle", "setImagePath(" + imagePath + ", update:" + true + ")");
+        CLog.e("CAnnotStyle", "setImagePath(" + imagePath + ", update:" + true + ")");
         updateImagePath(imagePath);
     }
 
     public void setStandardStamp(CPDFStampAnnotation.StandardStamp standardStamp) {
         this.standardStamp = standardStamp;
-        Log.e("CAnnotStyle", "setStandardStamp(" + standardStamp + ", update:" + true + ")");
+        CLog.e("CAnnotStyle", "setStandardStamp(" + standardStamp + ", update:" + true + ")");
         updateStandardStamp(standardStamp);
     }
 
@@ -347,7 +347,7 @@ public class CAnnotStyle implements Serializable {
 
     public void setTextStamp(CPDFStampAnnotation.TextStamp textStamp) {
         this.textStamp = textStamp;
-        Log.e("CAnnotStyle", "setTextStamp(" + textStamp + ", update:" + true + ")");
+        CLog.e("CAnnotStyle", "setTextStamp(" + textStamp + ", update:" + true + ")");
         updateTextStamp(textStamp);
     }
 
@@ -357,7 +357,7 @@ public class CAnnotStyle implements Serializable {
 
     public void setRotationAngle(float rotationAngle) {
         this.rotationAngle = rotationAngle;
-        Log.e("CAnnotStyle", "setRotationAngle(" + rotationAngle + ", update:" + true + ")");
+        CLog.e("CAnnotStyle", "setRotationAngle(" + rotationAngle + ", update:" + true + ")");
         setUpdatePropertyType(EditUpdatePropertyType.Rotation);
         updateRotationAngle(rotationAngle);
     }
@@ -368,7 +368,7 @@ public class CAnnotStyle implements Serializable {
 
     public void setMirror(Mirror mirror) {
         this.mirror = mirror;
-        Log.e("CAnnotStyle", "setMirror(" + mirror + ", update:" + true + ")");
+        CLog.e("CAnnotStyle", "setMirror(" + mirror + ", update:" + true + ")");
         setUpdatePropertyType(EditUpdatePropertyType.Mirror);
         updateMirror(mirror);
     }
@@ -380,7 +380,7 @@ public class CAnnotStyle implements Serializable {
     public void setFormDefaultValue(String formDefaultValue) {
         boolean update = !formDefaultValue.equals(this.formDefaultValue);
         this.formDefaultValue = formDefaultValue;
-        Log.e("CAnnotStyle", "setFormDefaultValue(" + formDefaultValue + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFormDefaultValue(" + formDefaultValue + ", update:" + update + ")");
         updateDefaultValue(formDefaultValue, update);
     }
 
@@ -391,7 +391,7 @@ public class CAnnotStyle implements Serializable {
     public void setFormFieldName(String formFieldName) {
         boolean update = !formFieldName.equals(this.formFieldName);
         this.formFieldName = formFieldName;
-        Log.e("CAnnotStyle", "setFormFieldName(" + formFieldName + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFormFieldName(" + formFieldName + ", update:" + update + ")");
         updateFieldName(formFieldName, update);
     }
 
@@ -402,7 +402,7 @@ public class CAnnotStyle implements Serializable {
     public void setHideForm(boolean hideForm) {
         boolean update = hideForm != this.hideForm;
         this.hideForm = hideForm;
-        Log.e("CAnnotStyle", "setHideForm(" + hideForm + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setHideForm(" + hideForm + ", update:" + update + ")");
         updateHideForm(this.hideForm, update);
     }
 
@@ -413,7 +413,7 @@ public class CAnnotStyle implements Serializable {
     public void setFormMultiLine(boolean formMultiLine) {
         boolean update = formMultiLine != this.formMultiLine;
         this.formMultiLine = formMultiLine;
-        Log.e("CAnnotStyle", "setFormMultiLine(" + formMultiLine + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setFormMultiLine(" + formMultiLine + ", update:" + update + ")");
         updateMultiLine(this.formMultiLine, update);
     }
 
@@ -423,7 +423,7 @@ public class CAnnotStyle implements Serializable {
 
     public void setCheckStyle(CPDFWidget.CheckStyle checkStyle) {
         this.checkStyle = checkStyle;
-        Log.e("CAnnotStyle", "setCheckStyle(" + checkStyle + ", update:" + true + ")");
+        CLog.e("CAnnotStyle", "setCheckStyle(" + checkStyle + ", update:" + true + ")");
         updateCheckStyle(checkStyle, true);
     }
 
@@ -434,7 +434,7 @@ public class CAnnotStyle implements Serializable {
     public void setChecked(boolean checked) {
         boolean update = checked != this.isChecked;
         isChecked = checked;
-        Log.e("CAnnotStyle", "setChecked(" + isChecked + ", update:" + update + ")");
+        CLog.e("CAnnotStyle", "setChecked(" + isChecked + ", update:" + update + ")");
         updateIsChecked(isChecked, update);
     }
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/stamp/CPDFStampTextView.java

@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
 
 import com.compdfkit.core.annotation.CPDFStampAnnotation;
 import com.compdfkit.tools.R;
+import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.ui.utils.CPDFScreenUtils;
 
 import java.util.Calendar;
@@ -53,7 +54,7 @@ public class CPDFStampTextView extends View {
 
         public static TimeType valueOf(int index) {
             if (index < 0 || index >= values().length) {
-                Log.e("TimeType", "TimeType: IndexOutOfBoundsException");
+                CLog.e("TimeType", "TimeType: IndexOutOfBoundsException");
                 index = 0;
             }
             return values()[index];

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/docseditor/pdfpageedit/CPDFPageEditDialogFragment.java

@@ -18,7 +18,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -36,6 +35,7 @@ import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.CFileUtils;
+import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.dialog.CAlertDialog;
 import com.compdfkit.tools.common.utils.dialog.CDialogFragmentUtil;
 import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
@@ -149,7 +149,7 @@ public class CPDFPageEditDialogFragment extends BottomSheetDialogFragment {
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
                 switch (newState) {
                     case BottomSheetBehavior.STATE_HIDDEN:
-                        Log.e("Bottom Sheet Behavior", "STATE_HIDDEN");
+                        CLog.e("Bottom Sheet Behavior", "STATE_HIDDEN");
                         if (onBackLisener != null) {
                             onBackLisener.onBack();
                         }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfformbar/CFormToolbar.java

@@ -30,6 +30,7 @@ import com.compdfkit.core.undo.exception.CPDFRedoFailedException;
 import com.compdfkit.core.undo.exception.CPDFUndoFailedException;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.interfaces.COnFormChangeListener;
+import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 import com.compdfkit.tools.forms.pdfformbar.adapter.CPDFFormToolListAdapter;
 import com.compdfkit.tools.forms.pdfformbar.bean.CFormToolBean;
@@ -92,7 +93,7 @@ public class CFormToolbar extends FrameLayout {
         this.pdfView = pdfView;
         toolListAdapter.setList(CFormToolDatas.getFormList(pdfView));
         pdfView.getCPdfReaderView().setSelectEditAreaChangeListener(type -> {
-            Log.e("SelectEdit", "type:"+ type);
+            CLog.e("SelectEdit", "type:"+ type);
         });
         redoUndoManager();
     }

Samples/src/main/java/com/compdfkit/samples/util/FileUtils.java

@@ -18,6 +18,8 @@ import android.util.Log;
 
 import androidx.core.content.FileProvider;
 
+import com.compdfkit.tools.common.utils.CLog;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -70,7 +72,7 @@ public class FileUtils {
         File dir = new File(savePath);
         if (!dir.exists()) {
             if (!dir.mkdirs()) {
-                Log.d("FileUtils", "mkdir error: " + savePath);
+                CLog.d("FileUtils", "mkdir error: " + savePath);
                 return null;
             }
         }
@@ -96,10 +98,10 @@ public class FileUtils {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            Log.d("FileUtils", "[copyFileFromAssets] copy asset file: " + assetName + " to : " + filename);
+            CLog.d("FileUtils", "[copyFileFromAssets] copy asset file: " + assetName + " to : " + filename);
             return file.getAbsolutePath();
         } else {
-            Log.d("FileUtils", "[copyFileFromAssets] file is exist: " + filename);
+            CLog.d("FileUtils", "[copyFileFromAssets] file is exist: " + filename);
             return file.getAbsolutePath();
         }
     }