From e03174aca902278e5bc446df477e4e4e1d84cf1d Mon Sep 17 00:00:00 2001
From: TommyLemon <tommylemon@qq.com>
Date: Mon, 5 Feb 2024 22:35:40 +0800
Subject: [PATCH] =?UTF-8?q?WebView=20=E9=BB=98=E8=AE=A4=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E7=BD=91=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/zuo/biao/library/ui/WebViewActivity.java | 7 +++++++
 ZBLibrary/src/main/res/layout/web_view_activity.xml        | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/WebViewActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/WebViewActivity.java
index 9f6e460..4e37f7f 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/WebViewActivity.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/WebViewActivity.java
@@ -17,6 +17,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.View;
@@ -62,6 +63,7 @@ public static Intent createIntent(Context context, String title, String url) {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); // AndroidManifest 中设置导致 gradle 编译 merge 报错
 		setContentView(R.layout.web_view_activity, this);//传this是为了全局滑动返回
 
 		url = StringUtil.getCorrectUrl(getIntent().getStringExtra(INTENT_URL));
@@ -115,6 +117,11 @@ public void initData() {
 
 		WebSettings webSettings = wvWebView.getSettings();
 		webSettings.setJavaScriptEnabled(true);
+		webSettings.setUseWideViewPort(true);
+		webSettings.setLoadWithOverviewMode(true);
+		webSettings.setBuiltInZoomControls(true);
+		webSettings.setSupportZoom(true);
+		webSettings.setDisplayZoomControls(false);
 
 		wvWebView.requestFocus();
 
diff --git a/ZBLibrary/src/main/res/layout/web_view_activity.xml b/ZBLibrary/src/main/res/layout/web_view_activity.xml
index 162329b..d904af5 100755
--- a/ZBLibrary/src/main/res/layout/web_view_activity.xml
+++ b/ZBLibrary/src/main/res/layout/web_view_activity.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/llWebView"
-    style="@style/activity_page" >
+    style="@style/activity_page"
+    android:splitMotionEvents="true"
+    >
 
     <RelativeLayout style="@style/topbar_bg" >