From be6cfd44646febbbf2d0505245819b284f22c3f9 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 6 Nov 2023 14:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/shayu/onetoone/activity/WebViewActivity.java |  3 +++
 .../common/utils/JavascriptInterfaceUtils.java       | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/WebViewActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/WebViewActivity.java
index 2e541f2f1..e60acaa06 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/WebViewActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/WebViewActivity.java
@@ -20,6 +20,7 @@ import android.webkit.WebViewClient;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.shayu.onetoone.R;
 import com.shayu.onetoone.manager.RouteManager;
+import com.shayu.onetoone.utils.ConversationUtils;
 import com.shayu.onetoone.utils.UserManager;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.IMLoginModel;
@@ -139,6 +140,8 @@ public class WebViewActivity extends AbsOTOActivity {
                     .setTitle("快來認識更多有趣的朋友吧！")
                     .setUrl(event.getData())
                     .showDialog();
+        }else if (event.getMethod().equals("androidCallChat")){
+            ConversationUtils.startConversation(mContext,event.getData());
         }
     }
 }
diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
index aa9ff2572..7597fec8b 100644
--- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
+++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
@@ -40,7 +40,7 @@ public class JavascriptInterfaceUtils {
     //判断是页面关闭还是网页回退
     private boolean pageClose = false;
     private boolean dialogClose = false;
-    private boolean permitSetHigh =true;
+    private boolean permitSetHigh = true;
     //同名activity跳转问题
     private boolean LiveZhuangBana = true;
     private static JavascriptInterfaceUtils sInstance;
@@ -63,8 +63,8 @@ public class JavascriptInterfaceUtils {
     /**
      * 允许js修改webview高度
      */
-    public JavascriptInterfaceUtils setPermitSetHigh(boolean isPermit){
-        this.permitSetHigh=isPermit;
+    public JavascriptInterfaceUtils setPermitSetHigh(boolean isPermit) {
+        this.permitSetHigh = isPermit;
         return this;
     }
 
@@ -512,7 +512,7 @@ public class JavascriptInterfaceUtils {
         if ("0".equals(height)) {
             return;
         }
-        if(!permitSetHigh){
+        if (!permitSetHigh) {
             return;
         }
         Handler handler = new Handler(Looper.getMainLooper());
@@ -612,6 +612,8 @@ public class JavascriptInterfaceUtils {
 
     @JavascriptInterface
     public void androidCallChat(String targetId) {
-        ToastUtil.show("网页触发聊一聊：" + targetId);
+        Bus.get().post(new JavascriptInterfaceEvent()
+                .setData(targetId)
+                .setMethod("androidCallChat"));
     }
 }