From 338d8b0762a070d0479fe258be490b15de7efc31 Mon Sep 17 00:00:00 2001
From: wangbing <wangbingit@outlook.com>
Date: Thu, 21 Mar 2019 15:30:20 +0800
Subject: [PATCH] webview

---
 .../main/java/fragment/WebViewFragment.java   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/modules/Android/app/src/main/java/fragment/WebViewFragment.java b/src/main/resources/modules/Android/app/src/main/java/fragment/WebViewFragment.java
index 4c45d630..b37d76d5 100644
--- a/src/main/resources/modules/Android/app/src/main/java/fragment/WebViewFragment.java
+++ b/src/main/resources/modules/Android/app/src/main/java/fragment/WebViewFragment.java
@@ -77,6 +77,19 @@ public class WebViewFragment extends BaseSPAFragment {
 
         //如果不设置WebViewClient，请求会跳转系统浏览器
         webView.setWebViewClient(new WebViewClient() {
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                showLoading();
+                super.onPageStarted(view, url, favicon);
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                closeLoading();
+                super.onPageFinished(view, url);
+            }
+
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 view.loadUrl(url);
                 Log.i("----------", url);
@@ -84,7 +97,7 @@ public class WebViewFragment extends BaseSPAFragment {
             }
         });
         webView.setWebChromeClient(new WebChromeClient());
-        webView.addJavascriptInterface(new AppInterface(), "app");
+        webView.addJavascriptInterface(new AndroidInterface(), "android");
         webView.loadUrl(url);
     }
 
@@ -141,11 +154,16 @@ public class WebViewFragment extends BaseSPAFragment {
         return true;
     }
 
-    private class AppInterface {
+    public class AndroidInterface {
+
+        @JavascriptInterface
+        public void toast(String msg) {
+            WBUIApplication.getInstance().showToast(msg);
+        }
 
         @JavascriptInterface
-        private void showToast(String msg) {
-            showToast(msg);
+        public void finish() {
+            popBackStack();
         }
     }
 }