From de6fef02acd32c3af3e578a09a321ba29c5f4ef3 Mon Sep 17 00:00:00 2001 From: 17351781990 <827990754@qq.com> Date: Tue, 6 Jul 2021 10:23:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=91=EF=BC=9A=E4=BF=AE=E6=94=B9copyRight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ohos/entry/src/main/java/com/zyao89/view/CustomApp.java | 1 - .../main/java/com/zyao89/view/zweb/views/BrowserAgentEx.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ohos/entry/src/main/java/com/zyao89/view/CustomApp.java b/ohos/entry/src/main/java/com/zyao89/view/CustomApp.java index 642a4c4..905d1e9 100644 --- a/ohos/entry/src/main/java/com/zyao89/view/CustomApp.java +++ b/ohos/entry/src/main/java/com/zyao89/view/CustomApp.java @@ -2,7 +2,6 @@ package com.zyao89.view; import com.zyao89.view.zweb.ZWebInstance; import ohos.aafwk.ability.AbilityPackage; -import ohos.agp.window.dialog.ToastDialog; /** * @author Zyao89 diff --git a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/BrowserAgentEx.java b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/BrowserAgentEx.java index 49d179c..0179f99 100644 --- a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/BrowserAgentEx.java +++ b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/BrowserAgentEx.java @@ -4,14 +4,13 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ package com.zyao89.view.zweb.views; -- Gitee From bcd1f653ce0b6a768f2658d12d3dd862c04fab50 Mon Sep 17 00:00:00 2001 From: 17351781990 <827990754@qq.com> Date: Tue, 6 Jul 2021 14:50:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=91=EF=BC=9A=E4=BF=AE=E6=94=B9findbugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zyao89/view/zweb/ZWebConfig.java | 2 +- .../src/main/java/com/zyao89/view/zweb/ZWebInstance.java | 2 +- .../src/main/java/com/zyao89/view/zweb/utils/ZLog.java | 4 ++-- .../src/main/java/com/zyao89/view/zweb/views/WebViewEx.java | 2 -- .../src/main/java/com/zyao89/view/zweb/views/ZWebView.java | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebConfig.java b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebConfig.java index 518babb..316d95c 100644 --- a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebConfig.java +++ b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebConfig.java @@ -96,7 +96,7 @@ public class ZWebConfig { /** * 对内接口名称 */ - private final String mInterName = "ZWeb"; + private static final String mInterName = "ZWeb"; /** * 对外暴露接口名称 */ diff --git a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebInstance.java b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebInstance.java index 6622fd9..d06bcec 100644 --- a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebInstance.java +++ b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/ZWebInstance.java @@ -20,7 +20,7 @@ import ohos.app.Context; */ public class ZWebInstance implements IZActivityStateListener, IZWebView.OnPageListener { static AbilityPackage sApplication; - public static Context sContext; + static Context sContext; private final ZWebConfig mZWebConfig; private final ZWebHandler mZWebHandler; private final ServiceFactory mServiceFactory; diff --git a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/utils/ZLog.java b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/utils/ZLog.java index dde6ea7..ebaf197 100644 --- a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/utils/ZLog.java +++ b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/utils/ZLog.java @@ -28,13 +28,13 @@ public class ZLog implements IZLog { // public static IZLog with(@NonNull Object tag) public static IZLog with(Object tag) { - if (mSingle == null) { +// if (mSingle == null) { synchronized (ZLog.class) { if (mSingle == null) { mSingle = new ZLog(); } } - } +// } synchronized (ZLog.class) { mTAG = tag.getClass().getSimpleName(); } diff --git a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/WebViewEx.java b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/WebViewEx.java index 29e98a2..d9ce26a 100644 --- a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/WebViewEx.java +++ b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/WebViewEx.java @@ -2,7 +2,6 @@ package com.zyao89.view.zweb.views; import com.alibaba.fastjson.JSONObject; import com.zyao89.view.zweb.exceptions.ZWebException; -import com.zyao89.view.zweb.javascript.IZRenderListener; import com.zyao89.view.zweb.javascript.ZJavaScriptEx; import com.zyao89.view.zweb.utils.JsCallJava; import com.zyao89.view.zweb.utils.JsUtils; @@ -22,7 +21,6 @@ import java.util.HashMap; public class WebViewEx extends WebView { private final HashMap mJsInterfaceMap = new HashMap(); private FixedOnReceivedTitle mFixedOnReceivedTitle; - private IZRenderListener mIZRenderListener; public WebViewEx(Context context) { super(context); diff --git a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/ZWebView.java b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/ZWebView.java index 18f2db1..d7bfc79 100644 --- a/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/ZWebView.java +++ b/ohos/z_webview/src/main/java/com/zyao89/view/zweb/views/ZWebView.java @@ -19,7 +19,6 @@ import ohos.utils.net.Uri; public class ZWebView implements IZWebView { private final Context mContext; - private ZWebConfig mZWebConfig; private WebViewEx mWebView; private OnErrorListener mOnErrorListener; @@ -30,7 +29,7 @@ public class ZWebView implements IZWebView { } public void setConfig(ZWebConfig config) { - mZWebConfig = config; + } @Override -- Gitee