feat(AgentWebFragment): New interface to add file compression

Justson · Justson · commit 25b775a32c95 · 2021-11-27T22:56:26.000+08:00
diff --git a/agentweb-core/src/main/java/com/just/agentweb/AgentWebUtils.java b/agentweb-core/src/main/java/com/just/agentweb/AgentWebUtils.java
@@ -559,7 +559,7 @@ static String getFileAbsolutePath(Activity context, Uri fileUri) {
 		if (context == null || fileUri == null) {
 			return null;
 		}
-		LogUtils.i(TAG, "getAuthority:" + fileUri.getAuthority() + "  getHost:" + fileUri.getHost() + "   getPath:" + fileUri.getPath() + "  getScheme:" + fileUri.getScheme() + "  query:" + fileUri.getQuery());
+//		LogUtils.i(TAG, "getAuthority:" + fileUri.getAuthority() + "  getHost:" + fileUri.getHost() + "   getPath:" + fileUri.getPath() + "  getScheme:" + fileUri.getScheme() + "  query:" + fileUri.getQuery());
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, fileUri)) {
 			if (isExternalStorageDocument(fileUri)) {
 				String docId = DocumentsContract.getDocumentId(fileUri);
diff --git a/agentweb-filechooser/src/main/java/com/just/agentweb/filechooser/FileChooser.java b/agentweb-filechooser/src/main/java/com/just/agentweb/filechooser/FileChooser.java
@@ -538,7 +538,7 @@ private void convertFileAndCallback(final Uri[] uris) {
             mJsChannelCallback.call(null);
             return;
         }
-        FileCompressor.getInstance().fileCompress(uris, new ValueCallback<Uri[]>() {
+        FileCompressor.getInstance().fileCompress("customize",uris, new ValueCallback<Uri[]>() {
             @Override
             public void onReceiveValue(Uri[] value) {
                 String[] compressFilePath = AgentWebUtils.uriToPath(mActivity, value);
diff --git a/agentweb-filechooser/src/main/java/com/just/agentweb/filechooser/FileCompressor.java b/agentweb-filechooser/src/main/java/com/just/agentweb/filechooser/FileCompressor.java
@@ -13,7 +13,7 @@
 public class FileCompressor implements Serializable {
 
     private static FileCompressor sInstance = null;
-    private FileCompressListener mFileCompressor;
+    private FileCompressEngine mFileCompressEngine;
 
     FileCompressor() {
     }
@@ -30,24 +30,24 @@ public static final FileCompressor getInstance() {
     }
 
 
-    public void registerFileCompressListener(FileCompressListener valueCallback) {
-        this.mFileCompressor = valueCallback;
+    public void registerFileCompressEngine(FileCompressEngine valueCallback) {
+        this.mFileCompressEngine = valueCallback;
     }
 
-    public void unregisterFileCompressListener(FileCompressListener valueCallback) {
-        this.mFileCompressor = null;
+    public void unregisterFileCompressEngine(FileCompressEngine valueCallback) {
+        this.mFileCompressEngine = null;
     }
 
-    void fileCompress(Uri[] uri, ValueCallback<Uri[]> callback) {
-        if (mFileCompressor == null) {
+    void fileCompress(String type, Uri[] uri, ValueCallback<Uri[]> callback) {
+        if (mFileCompressEngine == null) {
             callback.onReceiveValue(uri);
         } else {
-            mFileCompressor.compressFile(uri, callback);
+            mFileCompressEngine.compressFile(type, uri, callback);
         }
     }
 
-    public interface FileCompressListener {
-        void compressFile(Uri[] uri, ValueCallback<Uri[]> callback);
+    public interface FileCompressEngine {
+        void compressFile(String type, Uri[] uri, ValueCallback<Uri[]> callback);
     }
 
 
diff --git a/sample/src/main/java/com/just/agentweb/sample/fragment/AgentWebFragment.java b/sample/src/main/java/com/just/agentweb/sample/fragment/AgentWebFragment.java
@@ -43,7 +43,6 @@
 import com.download.library.DownloadListenerAdapter;
 import com.download.library.Extra;
 import com.download.library.ResourceRequest;
-import com.download.library.Runtime;
 import com.ferfalk.simplesearchview.SimpleSearchView;
 import com.google.gson.Gson;
 import com.just.agentweb.AbsAgentWebSettings;
@@ -71,7 +70,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -83,7 +81,7 @@
  * source code  https://github.com/Justson/AgentWeb
  */
 
-public class AgentWebFragment extends Fragment implements FragmentKeyDown, FileCompressor.FileCompressListener {
+public class AgentWebFragment extends Fragment implements FragmentKeyDown, FileCompressor.FileCompressEngine {
 
     private ImageView mBackImageView;
     private View mLineView;
@@ -429,7 +427,7 @@ public boolean onQueryTextCleared() {
             }
         });
 
-        FileCompressor.getInstance().registerFileCompressListener(this);
+        FileCompressor.getInstance().registerFileCompressEngine(this);
     }
 
     public int getColorPrimary() {
@@ -633,7 +631,7 @@ public boolean onFragmentKeyDown(int keyCode, KeyEvent event) {
     @Override
     public void onDestroyView() {
         mAgentWeb.getWebLifeCycle().onDestroy();
-        FileCompressor.getInstance().unregisterFileCompressListener(this);
+        FileCompressor.getInstance().unregisterFileCompressEngine(this);
         super.onDestroyView();
     }
 
@@ -688,9 +686,26 @@ protected MiddlewareWebChromeBase getMiddlewareWebChrome() {
         };
     }
 
-
+    /**
+     * 选择文件后回调该方法， 这里可以做文件压缩
+     *
+     * @param type     customize/system  ， customize 表示通过js方式获取文件， 把文件
+     *                 转成base64的方式返回给js，这种方式兼容性高，但是存在文件过大转成base64时
+     *                 字符串长度过长，导致与js通信失败问题，所以很有必要压缩文件， 尽量控制字符串长度在512kb以内。
+     *                 <p>
+     *                 system 这种方式，是由input/file 标签触发的文件选择，这种方式缺点是在Android 4.4 不回调
+     *                 fileChooser，存在兼容性问题，但是经过升级，基本可以忽略了，api 的兼容性越来越好了， 回调
+     *                 返回是于uri形式，所以不存在文件大小问题，作图片预览也很快。(推荐这种方式)
+     * @param uri      文件的uri
+     * @param callback
+     */
     @Override
-    public void compressFile(Uri[] uri, ValueCallback<Uri[]> callback) {
+    public void compressFile(String type, Uri[] uri, ValueCallback<Uri[]> callback) {
+        if ("system".equals(type)) { // input/file 标签触发的文件选择，这种方式不存在性能问题，可压缩也可以不压缩，具体看自己业务要求
+            callback.onReceiveValue(uri);
+            return;
+        }
+        // customize.equals(type)  这种强烈方式建议压缩
         if (uri == null || uri.length == 0) {
             callback.onReceiveValue(uri);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ static String getFileAbsolutePath(Activity context, Uri fileUri) {`
`559`	`559`	`if (context == null \|\| fileUri == null) {`
`560`	`560`	`return null;`
`561`	`561`	`}`
`562`		`- LogUtils.i(TAG, "getAuthority:" + fileUri.getAuthority() + " getHost:" + fileUri.getHost() + " getPath:" + fileUri.getPath() + " getScheme:" + fileUri.getScheme() + " query:" + fileUri.getQuery());`
	`562`	`+// LogUtils.i(TAG, "getAuthority:" + fileUri.getAuthority() + " getHost:" + fileUri.getHost() + " getPath:" + fileUri.getPath() + " getScheme:" + fileUri.getScheme() + " query:" + fileUri.getQuery());`
`563`	`563`	`if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, fileUri)) {`
`564`	`564`	`if (isExternalStorageDocument(fileUri)) {`
`565`	`565`	`String docId = DocumentsContract.getDocumentId(fileUri);`
Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ private void convertFileAndCallback(final Uri[] uris) {`
`538`	`538`	`mJsChannelCallback.call(null);`
`539`	`539`	`return;`
`540`	`540`	`}`
`541`		`- FileCompressor.getInstance().fileCompress(uris, new ValueCallback<Uri[]>() {`
	`541`	`+ FileCompressor.getInstance().fileCompress("customize",uris, new ValueCallback<Uri[]>() {`
`542`	`542`	`@Override`
`543`	`543`	`public void onReceiveValue(Uri[] value) {`
`544`	`544`	`String[] compressFilePath = AgentWebUtils.uriToPath(mActivity, value);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`public class FileCompressor implements Serializable {`
`14`	`14`
`15`	`15`	`private static FileCompressor sInstance = null;`
`16`		`- private FileCompressListener mFileCompressor;`
	`16`	`+ private FileCompressEngine mFileCompressEngine;`
`17`	`17`
`18`	`18`	`FileCompressor() {`
`19`	`19`	`}`
`@@ -30,24 +30,24 @@ public static final FileCompressor getInstance() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`33`		`- public void registerFileCompressListener(FileCompressListener valueCallback) {`
`34`		`- this.mFileCompressor = valueCallback;`
	`33`	`+ public void registerFileCompressEngine(FileCompressEngine valueCallback) {`
	`34`	`+ this.mFileCompressEngine = valueCallback;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public void unregisterFileCompressListener(FileCompressListener valueCallback) {`
`38`		`- this.mFileCompressor = null;`
	`37`	`+ public void unregisterFileCompressEngine(FileCompressEngine valueCallback) {`
	`38`	`+ this.mFileCompressEngine = null;`
`39`	`39`	`}`
`40`	`40`
`41`		`- void fileCompress(Uri[] uri, ValueCallback<Uri[]> callback) {`
`42`		`- if (mFileCompressor == null) {`
	`41`	`+ void fileCompress(String type, Uri[] uri, ValueCallback<Uri[]> callback) {`
	`42`	`+ if (mFileCompressEngine == null) {`
`43`	`43`	`callback.onReceiveValue(uri);`
`44`	`44`	`} else {`
`45`		`- mFileCompressor.compressFile(uri, callback);`
	`45`	`+ mFileCompressEngine.compressFile(type, uri, callback);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- public interface FileCompressListener {`
`50`		`- void compressFile(Uri[] uri, ValueCallback<Uri[]> callback);`
	`49`	`+ public interface FileCompressEngine {`
	`50`	`+ void compressFile(String type, Uri[] uri, ValueCallback<Uri[]> callback);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`