From fa75ea3139b9ea47b59865280c5ff49e0248e6bd Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Tue, 6 Jul 2021 09:48:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- build.gradle | 2 +- library/build.gradle | 2 +- library/src/main/config.json | 5 ----- sample/build.gradle | 2 +- sample/src/main/config.json | 8 ++------ 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 63eca1d..93a08a0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ - 项目移植状态：获取设备IMSI未实现 - 调用差异：无 - 基线版本：Release v1.1 -- 开发版本：sdk5，DevEco Studio 2.1 Release +- 开发版本：sdk6，DevEco Studio 2.2 Beta1 #### 效果演示 @@ -33,7 +33,7 @@ allprojects { ...... } ``` -在sdk5，DevEco Studio 2.1 Release下项目可直接运行,如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件，并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 +在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行,如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件，并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 #### 使用说明 diff --git a/build.gradle b/build.gradle index 83d884f..89e97db 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/library/build.gradle b/library/build.gradle index 9279321..0f12dfb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/library/src/main/config.json b/library/src/main/config.json index b2adf3e..0268a73 100644 --- a/library/src/main/config.json +++ b/library/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { diff --git a/sample/build.gradle b/sample/build.gradle index 718f096..6f79f10 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/sample/src/main/config.json b/sample/src/main/config.json index 238ada5..1413075 100644 --- a/sample/src/main/config.json +++ b/sample/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { @@ -28,7 +23,8 @@ "distro": { "deliveryWithInstall": true, "moduleName": "sample", - "moduleType": "entry" + "moduleType": "entry", + "installationFree":false }, "abilities": [ { -- Gitee From e82d3c17e5da2e1acff2e2a21ea3b6e602fa028e Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Tue, 6 Jul 2021 17:53:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?findBugs=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 +-- .../pedant/SafeWebViewBridge/JsCallJava.java | 16 +++++----- .../SafeWebViewBridge/sample/HostJsScope.java | 30 +++++++++++++++++-- .../sample/WebAbilitySlice.java | 2 +- .../sample/util/TaskExecutor.java | 8 ++--- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 89e97db..bf479ca 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.6' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/library/src/main/java/cn/pedant/SafeWebViewBridge/JsCallJava.java b/library/src/main/java/cn/pedant/SafeWebViewBridge/JsCallJava.java index 952ab3d..e659db8 100644 --- a/library/src/main/java/cn/pedant/SafeWebViewBridge/JsCallJava.java +++ b/library/src/main/java/cn/pedant/SafeWebViewBridge/JsCallJava.java @@ -78,7 +78,7 @@ public class JsCallJava { } private String genJavaMethodSign(Method method) { - String sign = method.getName(); + StringBuilder sign = new StringBuilder(method.getName()); Class[] argsTypes = method.getParameterTypes(); int len = argsTypes.length; if (len < 1 || argsTypes[0] != WebView.class) { @@ -88,23 +88,23 @@ public class JsCallJava { for (int kk = 1; kk < len; kk++) { Class cls = argsTypes[kk]; if (cls == String.class) { - sign += "_S"; + sign.append("_S"); } else if (cls == int.class || cls == long.class || cls == float.class || cls == double.class) { - sign += "_N"; + sign.append("_N"); } else if (cls == boolean.class) { - sign += "_B"; + sign.append("_B"); } else if (cls == JsonObject.class) { - sign += "_O"; + sign.append("_O"); } else if (cls == JsCallback.class) { - sign += "_F"; + sign.append("_F"); } else { - sign += "_P"; + sign.append("_P"); } } - return sign; + return sign.toString(); } /** diff --git a/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/HostJsScope.java b/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/HostJsScope.java index 63b6085..166ec5a 100644 --- a/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/HostJsScope.java +++ b/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/HostJsScope.java @@ -226,6 +226,30 @@ public class HostJsScope { int intField; String strField; boolean isBoolField; + + public int getIntField() { + return intField; + } + + public void setIntField(int intField) { + this.intField = intField; + } + + public String getStrField() { + return strField; + } + + public void setStrField(String strField) { + this.strField = strField; + } + + public boolean isBoolField() { + return isBoolField; + } + + public void setBoolField(boolean boolField) { + isBoolField = boolField; + } } /** @@ -236,9 +260,9 @@ public class HostJsScope { */ public static List retJavaObject(WebView view) { RetJavaObj obj = new RetJavaObj(); - obj.intField = 1; - obj.strField = "mine str"; - obj.isBoolField = true; + obj.setIntField(1); + obj.setStrField("mine str"); + obj.setBoolField(true); List rets = new ArrayList(); rets.add(obj); return rets; diff --git a/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/WebAbilitySlice.java b/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/WebAbilitySlice.java index 83967db..716a728 100644 --- a/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/WebAbilitySlice.java +++ b/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/WebAbilitySlice.java @@ -45,7 +45,7 @@ public class WebAbilitySlice extends AbilitySlice { super.onForeground(intent); } - public class CustomChromeClient extends InjectedChromeClient { + static class CustomChromeClient extends InjectedChromeClient { /** * 构造 * diff --git a/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/util/TaskExecutor.java b/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/util/TaskExecutor.java index e623c50..604edcb 100644 --- a/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/util/TaskExecutor.java +++ b/sample/src/main/java/cn/pedant/SafeWebViewBridge/sample/util/TaskExecutor.java @@ -22,18 +22,18 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; public class TaskExecutor { - private static ScheduledThreadPoolExecutor gScheduledThreadPoolExecutor = null; - private static EventHandler gMainHandler = null; + private static volatile ScheduledThreadPoolExecutor gScheduledThreadPoolExecutor = null; + private static volatile EventHandler gMainHandler = null; /** * 不包含网络传输处理过程的线程池执行对象 */ - private static ExecutorService gThreadPoolExecutor = null; + private static volatile ExecutorService gThreadPoolExecutor = null; /** * 包含网络传输处理过程的线程池执行对象 */ - private static ExecutorService gNetProcessThreadPoolExecutor = null; + private static volatile ExecutorService gNetProcessThreadPoolExecutor = null; /** * 执行不包含网络传输处理过程的线程 -- Gitee From 14189fc2244b21d4e4224482a185311353ff83ca Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Tue, 6 Jul 2021 19:42:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?findBugs=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ README.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2539350..e23e5a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.2-SNAPSHOT +* 修改FindBugs + ## 0.0.1-SNAPSHOT ohos第一个版本 * 实现了原库的大部分api diff --git a/README.md b/README.md index 93a08a0..01323e9 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ allprojects { 2.在entry模块的build.gradle文件中 ```gradle dependencies { - implementation('com.gitee.chinasoft_ohos:safe-java-js-webview-bridge:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:safe-java-js-webview-bridge:0.0.2-SNAPSHOT') ...... } ``` -- Gitee From ba62ec190bd9146670eeb59f9bd6ac045ceed0ac Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Wed, 7 Jul 2021 09:41:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?findBugs=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01323e9..e9a559f 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 -- Gitee