From 54a93d54673715e36e7baed61d8dc207105431c6 Mon Sep 17 00:00:00 2001
From: ChinaLike <572919350@qq.com>
Date: Sat, 16 Sep 2023 20:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=AE=BE=E7=BD=AE=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=BC=82=E6=AD=A5=E5=9B=9E=E8=B0=83=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/test.html                 |  1 +
 .../com/like/jsbridge/ConstantJsBridge.kt     | 24 +++++++++++++++++++
 .../java/com/like/jsbridge/JsBridgeDialog.kt  |  3 ++-
 .../java/com/like/jsbridge/JsBridgeToast.kt   |  3 ++-
 .../java/com/like/jsbridge/MainActivity.java  |  1 +
 .../com/like/jsbridge/MainActivityKotlin.kt   |  1 +
 library/build.gradle                          |  4 ++--
 .../src/main/java/com/core/web/IWebView.kt    |  1 -
 .../java/com/core/web/base/BaseWebView.kt     |  9 +++++--
 .../com/core/web/base/IJavascriptInterface.kt |  8 +++++++
 10 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/like/jsbridge/ConstantJsBridge.kt
 create mode 100644 library/src/main/java/com/core/web/base/IJavascriptInterface.kt

diff --git a/app/src/main/assets/test.html b/app/src/main/assets/test.html
index bd356f9..d575594 100644
--- a/app/src/main/assets/test.html
+++ b/app/src/main/assets/test.html
@@ -38,6 +38,7 @@
 </body>
 <script>
 
+        alert(window.JsBridgeConstant.statusHeight())
 
 		function nativeNoArgAndNoCallback(){
 			JsBridge.nativeNoArgAndNoCallback();
diff --git a/app/src/main/java/com/like/jsbridge/ConstantJsBridge.kt b/app/src/main/java/com/like/jsbridge/ConstantJsBridge.kt
new file mode 100644
index 0000000..1bbf146
--- /dev/null
+++ b/app/src/main/java/com/like/jsbridge/ConstantJsBridge.kt
@@ -0,0 +1,24 @@
+package com.like.jsbridge
+
+import android.content.Context
+import android.webkit.JavascriptInterface
+
+/**
+ *
+ * @author like
+ * @date 2023/9/16 20:36
+ */
+class ConstantJsBridge(private val context: Context){
+
+    @JavascriptInterface
+    fun statusHeight():Int{
+        var result = 0
+        val resourceId = context.resources
+            .getIdentifier("status_bar_height", "dimen", "android")
+        if (resourceId > 0) {
+            result = context.resources.getDimensionPixelSize(resourceId)
+        }
+        return result
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/like/jsbridge/JsBridgeDialog.kt b/app/src/main/java/com/like/jsbridge/JsBridgeDialog.kt
index 7e25df7..9b7e875 100644
--- a/app/src/main/java/com/like/jsbridge/JsBridgeDialog.kt
+++ b/app/src/main/java/com/like/jsbridge/JsBridgeDialog.kt
@@ -5,13 +5,14 @@ import android.webkit.JavascriptInterface
 import androidx.appcompat.app.AlertDialog
 import com.alibaba.fastjson.JSON
 import com.core.web.Callback
+import com.core.web.base.IJavascriptInterface
 
 /**
  *
  * @author like
  * @date 6/1/21 5:28 PM
  */
-class JsBridgeDialog(private val context: Context) {
+class JsBridgeDialog(private val context: Context): IJavascriptInterface {
 
     @JavascriptInterface
     fun nativeDialog(params: String, callback: Callback) {
diff --git a/app/src/main/java/com/like/jsbridge/JsBridgeToast.kt b/app/src/main/java/com/like/jsbridge/JsBridgeToast.kt
index 2deb110..13f8445 100644
--- a/app/src/main/java/com/like/jsbridge/JsBridgeToast.kt
+++ b/app/src/main/java/com/like/jsbridge/JsBridgeToast.kt
@@ -7,13 +7,14 @@ import android.webkit.JavascriptInterface
 import android.widget.Toast
 import com.core.web.Callback
 import com.core.web.CallbackBean
+import com.core.web.base.IJavascriptInterface
 
 /**
  * 测试类
  * @author like
  * @date 5/26/21 4:43 PM
  */
-class JsBridgeToast(private val context: Context)  {
+class JsBridgeToast(private val context: Context):IJavascriptInterface  {
 
     @JavascriptInterface
     fun nativeNoArgAndNoCallback(){
diff --git a/app/src/main/java/com/like/jsbridge/MainActivity.java b/app/src/main/java/com/like/jsbridge/MainActivity.java
index 74a2825..379fe36 100644
--- a/app/src/main/java/com/like/jsbridge/MainActivity.java
+++ b/app/src/main/java/com/like/jsbridge/MainActivity.java
@@ -21,6 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         webView.addJavascriptInterface(new JsBridgeToast(this));
         webView.addJavascriptInterface(new JsBridgeDialog(this));
+        webView.addJavascriptInterface(new ConstantJsBridge(this),webView.jsCallName() + "Constant");
 
         webView.loadUrl("file:///android_asset/test.html");
 
diff --git a/app/src/main/java/com/like/jsbridge/MainActivityKotlin.kt b/app/src/main/java/com/like/jsbridge/MainActivityKotlin.kt
index fcb44ce..fe2bf9b 100644
--- a/app/src/main/java/com/like/jsbridge/MainActivityKotlin.kt
+++ b/app/src/main/java/com/like/jsbridge/MainActivityKotlin.kt
@@ -15,6 +15,7 @@ class MainActivityKotlin : AppCompatActivity() {
         webView = findViewById(R.id.webView)
         webView?.addJavascriptInterface(JsBridgeToast(this))
         webView?.addJavascriptInterface(JsBridgeDialog(this))
+        webView?.addJavascriptInterface(ConstantJsBridge(this),webView?.jsCallName() + "Constant")
         webView?.loadUrl("file:///android_asset/test.html")
 
         //调用Js无参数无回调
diff --git a/library/build.gradle b/library/build.gradle
index 4c6aebc..085c377 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 5
-        versionName "0.0.5"
+        versionCode 6
+        versionName "0.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/library/src/main/java/com/core/web/IWebView.kt b/library/src/main/java/com/core/web/IWebView.kt
index 422be6c..6ae1993 100644
--- a/library/src/main/java/com/core/web/IWebView.kt
+++ b/library/src/main/java/com/core/web/IWebView.kt
@@ -52,7 +52,6 @@ interface IWebView {
         return "JsBridge"
     }
 
-
     /**
      * 获取js的Window，可不用重写，如果遇到window对象不对可以使用这个重新赋值window
      */
diff --git a/library/src/main/java/com/core/web/base/BaseWebView.kt b/library/src/main/java/com/core/web/base/BaseWebView.kt
index 6783954..ff8aa45 100644
--- a/library/src/main/java/com/core/web/base/BaseWebView.kt
+++ b/library/src/main/java/com/core/web/base/BaseWebView.kt
@@ -35,6 +35,11 @@ abstract class BaseWebView : WebView, IWebView {
 
     private var uniqueId = 0
 
+    /**
+     * 常量注入次数
+     */
+    private var constantInjectCount: Int = 0
+
     constructor(context: Context) : super(context) {
         initWebView()
     }
@@ -142,7 +147,7 @@ abstract class BaseWebView : WebView, IWebView {
 
     @SuppressLint("JavascriptInterface")
     override fun addJavascriptInterface(`object`: Any, name: String) {
-        if (name != "MiWebViewDetector" && name != innerJavascriptInterfaceName) {
+        if (`object` is IJavascriptInterface) {
             javascriptInterfaceList.add(JavascriptInterfaceBean(`object`, name))
         } else {
             super.addJavascriptInterface(`object`, name)
@@ -152,7 +157,7 @@ abstract class BaseWebView : WebView, IWebView {
     /**
      * 添加需要注入的类
      */
-    fun addJavascriptInterface(`object`: Any) {
+    fun addJavascriptInterface(`object`: IJavascriptInterface) {
         addJavascriptInterface(`object`, "")
     }
 
diff --git a/library/src/main/java/com/core/web/base/IJavascriptInterface.kt b/library/src/main/java/com/core/web/base/IJavascriptInterface.kt
new file mode 100644
index 0000000..c553488
--- /dev/null
+++ b/library/src/main/java/com/core/web/base/IJavascriptInterface.kt
@@ -0,0 +1,8 @@
+package com.core.web.base
+
+/**
+ * 使用异步回调的类需要实现此类，如果不实现此类，将会走正常[android.webkit.WebView.addJavascriptInterface]流程
+ * @author like
+ * @date 2023/9/16 20:44
+ */
+interface IJavascriptInterface
\ No newline at end of file