From e1fbfa6b679e05d87308e4bb024e887432300585 Mon Sep 17 00:00:00 2001
From: pc <>
Date: Wed, 31 Jul 2024 15:43:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=85=E5=80=BC=E5=92=8C=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                          | 6 +++++-
 app/src/main/assets/YMKeFu.html                           | 3 +++
 .../main/java/com/yingmao/clash/act/NewMainActivity.kt    | 3 +++
 app/src/main/java/com/yingmao/clash/util/testdd.java      | 8 ++++++++
 .../main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt | 7 +------
 .../java/com/yingmao/clash/webview/BZYWebViewNormal.kt    | 1 +
 app/src/main/res/layout/bzy_kefu_webview_layout.xml       | 2 +-
 7 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/yingmao/clash/util/testdd.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 292e822..1bf2e3a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -114,11 +114,13 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".webview.BZYWebViewKeFu"
+
             android:screenOrientation="portrait" />
         <activity
             android:name=".webview.BZYWebViewNormal"
             android:hardwareAccelerated="true"
-            android:process=":background"
+
+
             android:screenOrientation="portrait" />
         <activity
             android:name=".act.SettingActivity"
@@ -149,5 +151,7 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+        <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing"
+            android:value="false" />
     </application>
 </manifest>
diff --git a/app/src/main/assets/YMKeFu.html b/app/src/main/assets/YMKeFu.html
index a361ed7..2abd146 100644
--- a/app/src/main/assets/YMKeFu.html
+++ b/app/src/main/assets/YMKeFu.html
@@ -33,14 +33,17 @@
 </head>
 <body>
 <p id="connectionStatus">正在连接客服，右下角出现按钮后即可聊天...</p>
+<p id="connectionStatus2">如果未出现按钮,请等待一分钟或者重新进入.</p>
 <div class="loading" id="loadingIcon"></div>
 
 <script>
     function updateStatus() {
       var statusElement = document.getElementById("connectionStatus");
+
       var loadingIcon = document.getElementById("loadingIcon");
 
       statusElement.textContent = "已经连接，点击按钮开始聊天吧";
+
       loadingIcon.style.display = "none";
       clearInterval(loadingAnimation);
     }
diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
index fb3bc40..d01bb59 100644
--- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
@@ -672,10 +672,12 @@ class NewMainActivity : BaseActivity() {
         }
         findViewById<TextView>(R.id.tv_kefu).setOnClickListener {//客服
             startActivity(Intent(this, BZYWebViewKeFu::class.java))
+
             drawer.close()
         }
         findViewById<TextView>(R.id.tv_fds).setOnClickListener {//防丢失
             startActivity(Intent(this, LossPreventionActivity::class.java))
+
             drawer.close()
         }
         drawer = findViewById(R.id.drawer)
@@ -703,6 +705,7 @@ class NewMainActivity : BaseActivity() {
         intent.putExtra("url", rcURL)
 //        startActivity(intent)
         startActivityForResult(intent, REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY)
+
     }
 
     private fun showPayResultDialog() {
diff --git a/app/src/main/java/com/yingmao/clash/util/testdd.java b/app/src/main/java/com/yingmao/clash/util/testdd.java
new file mode 100644
index 0000000..fa55a59
--- /dev/null
+++ b/app/src/main/java/com/yingmao/clash/util/testdd.java
@@ -0,0 +1,8 @@
+package com.yingmao.clash.util;
+
+public class test {
+    public static void main(String[] args) {
+
+
+    }
+}
diff --git a/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt b/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt
index e825a59..abfae63 100644
--- a/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt
+++ b/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt
@@ -1,5 +1,6 @@
 package com.yingmao.clash.webview
 
+import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -12,12 +13,6 @@ import com.yingmao.clash.BuildConfig
 import com.yingmao.clash.R
 import com.yingmao.clash.common.log.Log
 import com.yingmao.clash.util.StatusBarUtils
-import com.yingmao.clash.view.RxToast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
 class BZYWebViewKeFu : AppCompatActivity() {
     private lateinit var webView: WebView
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/yingmao/clash/webview/BZYWebViewNormal.kt b/app/src/main/java/com/yingmao/clash/webview/BZYWebViewNormal.kt
index 09335e2..500baf9 100644
--- a/app/src/main/java/com/yingmao/clash/webview/BZYWebViewNormal.kt
+++ b/app/src/main/java/com/yingmao/clash/webview/BZYWebViewNormal.kt
@@ -1,5 +1,6 @@
 package com.yingmao.clash.webview
 
+import android.app.Activity
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
diff --git a/app/src/main/res/layout/bzy_kefu_webview_layout.xml b/app/src/main/res/layout/bzy_kefu_webview_layout.xml
index 96c226a..6a514e7 100644
--- a/app/src/main/res/layout/bzy_kefu_webview_layout.xml
+++ b/app/src/main/res/layout/bzy_kefu_webview_layout.xml
@@ -28,7 +28,7 @@
 
     </RelativeLayout>
 
-    <android.webkit.WebView
+    <WebView
         android:layout_below="@+id/rl_title_bar"
         android:id="@+id/webView"
         android:layout_width="match_parent"
