Skip to content

Commit

Permalink
mod: 移除pdfium
Browse files Browse the repository at this point in the history
  • Loading branch information
Tlanglord committed Jul 25, 2023
1 parent a98e9ea commit 97a0a2d
Show file tree
Hide file tree
Showing 23 changed files with 104 additions and 618 deletions.
2 changes: 1 addition & 1 deletion android-pdf-viewer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {

dependencies {
implementation 'com.android.support:support-compat:28.0.0'
api 'com.github.barteksc:pdfium-android:1.9.0'
// api 'com.github.barteksc:pdfium-android:1.9.0'
}

apply from: 'bintray.gradle'
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.github.barteksc.pdfviewer;

/**
* Created by dongqiangqiang on 2023/7/25
*/
public class Bookmark {
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,18 @@
*/
package com.github.barteksc.pdfviewer;

import static com.github.barteksc.pdfviewer.util.Constants.Pinch.MAXIMUM_ZOOM;
import static com.github.barteksc.pdfviewer.util.Constants.Pinch.MINIMUM_ZOOM;

import android.graphics.PointF;
import android.graphics.RectF;
import android.util.SizeF;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import android.view.View;

import com.github.barteksc.pdfviewer.model.LinkTapEvent;
import com.github.barteksc.pdfviewer.scroll.ScrollHandle;
import com.github.barteksc.pdfviewer.util.SnapEdge;
import com.shockwave.pdfium.PdfDocument;
import com.shockwave.pdfium.util.SizeF;

import static com.github.barteksc.pdfviewer.util.Constants.Pinch.MAXIMUM_ZOOM;
import static com.github.barteksc.pdfviewer.util.Constants.Pinch.MINIMUM_ZOOM;

/**
* This Manager takes care of moving the PDFView,
Expand Down Expand Up @@ -102,15 +99,15 @@ private boolean checkLinkTapped(float x, float y) {
pageY = (int) pdfFile.getSecondaryPageOffset(page, pdfView.getZoom());
pageX = (int) pdfFile.getPageOffset(page, pdfView.getZoom());
}
for (PdfDocument.Link link : pdfFile.getPageLinks(page)) {
RectF mapped = pdfFile.mapRectToDevice(page, pageX, pageY, (int) pageSize.getWidth(),
(int) pageSize.getHeight(), link.getBounds());
mapped.sort();
if (mapped.contains(mappedX, mappedY)) {
pdfView.callbacks.callLinkHandler(new LinkTapEvent(x, y, mappedX, mappedY, mapped, link));
return true;
}
}
// for (Link link : pdfFile.getPageLinks(page)) {
// RectF mapped = pdfFile.mapRectToDevice(page, pageX, pageY, (int) pageSize.getWidth(),
// (int) pageSize.getHeight(), link.getBounds());
// mapped.sort();
// if (mapped.contains(mappedX, mappedY)) {
// pdfView.callbacks.callLinkHandler(new LinkTapEvent(x, y, mappedX, mappedY, mapped, link));
// return true;
// }
// }
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.pdf.PdfDocument;
import android.util.Size;
import android.util.SizeF;

import com.github.barteksc.pdfviewer.exception.PageRenderingException;
import com.shockwave.pdfium.PdfDocument;
import com.shockwave.pdfium.util.Size;
import com.shockwave.pdfium.util.SizeF;


import java.util.List;

Expand Down Expand Up @@ -48,11 +49,11 @@ public interface IBasePdfFile {

public void renderPageBitmap(Bitmap bitmap, int pageIndex, Rect bounds, boolean annotationRendering);

public PdfDocument.Meta getMetaData();
public Meta getMetaData();

public List<PdfDocument.Bookmark> getBookmarks();
public List<Bookmark> getBookmarks();

public List<PdfDocument.Link> getPageLinks(int pageIndex);
public List<Link> getPageLinks(int pageIndex);

public RectF mapRectToDevice(int pageIndex, int startX, int startY, int sizeX, int sizeY, RectF rect);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.github.barteksc.pdfviewer;

import android.graphics.RectF;

/**
* Created by dongqiangqiang on 2023/7/25
*/
public class Link {

public RectF getBounds(){
return new RectF();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.github.barteksc.pdfviewer;

/**
* Created by dongqiangqiang on 2023/7/25
*/
public class Meta {
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import android.graphics.pdf.PdfRenderer;
import android.os.AsyncTask;
import android.util.Size;

import com.github.barteksc.pdfviewer.source.DocumentSource;
import com.shockwave.pdfium.util.Size;

import java.lang.ref.WeakReference;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.pdf.PdfDocument;
import android.graphics.pdf.PdfRenderer;
import android.util.Size;
import android.util.SizeF;
import android.util.SparseBooleanArray;

import com.github.barteksc.pdfviewer.exception.PageRenderingException;
import com.github.barteksc.pdfviewer.util.FitPolicy;
import com.github.barteksc.pdfviewer.util.PageSizeCalculator;
import com.shockwave.pdfium.PdfDocument;
import com.shockwave.pdfium.util.Size;
import com.shockwave.pdfium.util.SizeF;


import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -309,17 +310,17 @@ public void renderPageBitmap(Bitmap bitmap, int pageIndex, Rect bounds, boolean
}

@Override
public PdfDocument.Meta getMetaData() {
return new PdfDocument.Meta();
public Meta getMetaData() {
return new Meta();
}

@Override
public List<PdfDocument.Bookmark> getBookmarks() {
public List<Bookmark> getBookmarks() {
return new ArrayList<>();
}

@Override
public List<PdfDocument.Link> getPageLinks(int pageIndex) {
public List<Link> getPageLinks(int pageIndex) {
return new ArrayList<>();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.graphics.pdf.PdfDocument;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.HandlerThread;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Size;
import android.util.SizeF;
import android.widget.RelativeLayout;

import com.github.barteksc.pdfviewer.exception.PageRenderingException;
Expand Down Expand Up @@ -62,10 +65,6 @@
import com.github.barteksc.pdfviewer.util.MathUtils;
import com.github.barteksc.pdfviewer.util.SnapEdge;
import com.github.barteksc.pdfviewer.util.Util;
import com.shockwave.pdfium.PdfDocument;
import com.shockwave.pdfium.PdfiumCore;
import com.shockwave.pdfium.util.Size;
import com.shockwave.pdfium.util.SizeF;

import java.io.File;
import java.io.InputStream;
Expand Down Expand Up @@ -220,7 +219,6 @@ enum ScrollDir {
/**
* Pdfium core for loading and rendering PDFs
*/
private PdfiumCore pdfiumCore;

private ScrollHandle scrollHandle;

Expand Down Expand Up @@ -318,7 +316,6 @@ public PDFView(Context context, AttributeSet set) {
debugPaint = new Paint();
debugPaint.setStyle(Style.STROKE);

pdfiumCore = new PdfiumCore(context);
setWillNotDraw(false);
}

Expand All @@ -334,11 +331,8 @@ private void load(DocumentSource docSource, String password, int[] userPages) {

recycled = false;
// Start decoding document
if (useNativeRender) {
decodingAsyncTask = new NativeDecodingAsyncTask(docSource, password, userPages, this);
} else {
decodingAsyncTask = new DecodingAsyncTask(docSource, password, userPages, this, pdfiumCore);
}
decodingAsyncTask = new NativeDecodingAsyncTask(docSource, password, userPages, this);

decodingAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}

Expand Down Expand Up @@ -1334,7 +1328,7 @@ public boolean doRenderDuringScale() {
/**
* Returns null if document is not loaded
*/
public PdfDocument.Meta getDocumentMeta() {
public Meta getDocumentMeta() {
if (pdfFile == null) {
return null;
}
Expand All @@ -1344,7 +1338,7 @@ public PdfDocument.Meta getDocumentMeta() {
/**
* Will be empty until document is loaded
*/
public List<PdfDocument.Bookmark> getTableOfContents() {
public List<Bookmark> getTableOfContents() {
if (pdfFile == null) {
return Collections.emptyList();
}
Expand All @@ -1354,7 +1348,7 @@ public List<PdfDocument.Bookmark> getTableOfContents() {
/**
* Will be empty until document is loaded
*/
public List<PdfDocument.Link> getLinks(int page) {
public List<Link> getLinks(int page) {
if (pdfFile == null) {
return Collections.emptyList();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
package com.github.barteksc.pdfviewer;

import android.graphics.RectF;
import android.util.SizeF;

import com.github.barteksc.pdfviewer.util.Constants;
import com.github.barteksc.pdfviewer.util.MathUtils;
import com.github.barteksc.pdfviewer.util.Util;
import com.shockwave.pdfium.util.SizeF;

import java.util.LinkedList;
import java.util.List;
Expand Down
Loading

0 comments on commit 97a0a2d

Please sign in to comment.