From 7b737b69f6d0a7ff6494fd374c79b5e15160c5a4 Mon Sep 17 00:00:00 2001
From: wangyu <wangyu@batiao8.com>
Date: Mon, 12 Jan 2026 12:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E7=BD=AE=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E9=85=8D=E7=BD=AE=EF=BC=8C=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=89=88=E6=9C=AC=E4=B8=BA2.0.0/200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  6 +--
 .../blzb/ui/activity/LauncherActivity.kt      |  7 +--
 .../cheng/blzb/ui/dialog/LoginTipDialog.kt    |  2 +-
 .../fragment/bid/detail/BidDetailFragment.kt  |  2 +-
 .../login/onekey/OneKeyLoginFragment.kt       |  2 +-
 .../java/com/cheng/blzb/utils/UrlHelper.kt    |  4 +-
 .../example/base/browser/BrowserActivity.kt   | 43 ++++++++++++++-----
 7 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index eb11d8d..d135d1b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "com.cheng.BoLe"
         minSdk 26
         targetSdk 34
-        versionCode 240
-        versionName "2.4.0"
+        versionCode 200
+        versionName "2.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -93,7 +93,7 @@ android {
     applicationVariants.configureEach { variant ->
         if (variant.buildType.name == "release") {
             variant.outputs.forEach {
-                it.outputFileName = "material_v${defaultConfig.versionName}_${variant.productFlavors[0].name}.apk"
+                it.outputFileName = "bole_v${defaultConfig.versionName}_${variant.productFlavors[0].name}.apk"
             }
 
             variant.assembleProvider.get().doLast {
diff --git a/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt b/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt
index 8cc40d5..a708cfb 100644
--- a/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt
+++ b/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt
@@ -94,7 +94,8 @@ class LauncherActivity : BaseActivity() {
         if (UserConfigManager.isFirstUseApp()) {
             UserConfigManager.saveFirstUseApp(false)
             if (UserConfigManager.getGuideEnable()) {
-                startActivity<GuideActivity>()
+//                startActivity<GuideActivity>()
+                LoginActivity.start(this@LauncherActivity)
             } else {
                 if (!LoginManager.isLogin()) {
                     if (TextUtils.isEmpty(LoginManager.getLastLoginType())) {
@@ -115,8 +116,8 @@ class LauncherActivity : BaseActivity() {
                     LoginActivity.start(this@LauncherActivity)
                 }
             } else {
-//                startActivity<MainActivity>()
-                startActivity<GuideActivity>()
+                startActivity<MainActivity>()
+//                startActivity<GuideActivity>()
             }
             finish()
         }
diff --git a/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt b/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt
index 6d45514..9517803 100644
--- a/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt
+++ b/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt
@@ -88,7 +88,7 @@ class LoginTipDialog :DialogFragment(){
             .append("登录之前须先查看并同意")
             .append("《${preLoginResult.privacyName}》")
             .setClickSpan(getColor(R.color.color_125ffe), false) {
-                BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl, false)
+                BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl)
             }
             .append("、")
             .append("《用户协议》")
diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt
index a86e0c2..e88160a 100644
--- a/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt
+++ b/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt
@@ -110,7 +110,7 @@ class BidDetailFragment: BaseFragment<FragmentBidDetailBinding, BidDetailViewMod
         }
 
         binding.ivView.onClick {
-            BrowserActivity.start(requireContext(), "原文", detail!!.origin_url, true)
+            BrowserActivity.start(requireContext(), "原文", detail!!.origin_url)
             ClipboardUtils.copyText(detail!!.origin_url)
             toast("原文链接已复制")
         }
diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/login/onekey/OneKeyLoginFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/login/onekey/OneKeyLoginFragment.kt
index 7135454..2ee3b9b 100644
--- a/app/src/main/java/com/cheng/blzb/ui/fragment/login/onekey/OneKeyLoginFragment.kt
+++ b/app/src/main/java/com/cheng/blzb/ui/fragment/login/onekey/OneKeyLoginFragment.kt
@@ -234,7 +234,7 @@ class OneKeyLoginFragment : BaseFragment<FragmentOnekeyLoginBinding, OnekeyLogin
             .append("我已同意并阅读了")
             .append("《${preLoginResult.privacyName}》")
             .setClickSpan(getColor(R.color.color_125ffe), false) {
-                BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl, false)
+                BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl)
             }
             .append("、")
             .append("《用户协议》")
diff --git a/app/src/main/java/com/cheng/blzb/utils/UrlHelper.kt b/app/src/main/java/com/cheng/blzb/utils/UrlHelper.kt
index 48d9813..28e00f8 100644
--- a/app/src/main/java/com/cheng/blzb/utils/UrlHelper.kt
+++ b/app/src/main/java/com/cheng/blzb/utils/UrlHelper.kt
@@ -7,11 +7,11 @@ import com.example.base.browser.BrowserActivity
 object UrlHelper {
 
     fun startUserAgreement(context: Context, title: String? = null) {
-        BrowserActivity.start(context, title ?: "用户协议", Constants.userAgreement, false)
+        BrowserActivity.start(context, title ?: "用户协议", Constants.userAgreement)
     }
 
     fun startPrivacyPolicy(context: Context) {
-        BrowserActivity.start(context, "隐私政策", Constants.privacyPolicy, false)
+        BrowserActivity.start(context, "隐私政策", Constants.privacyPolicy)
     }
 
     fun startRenewAgreement(context: Context) {
diff --git a/base/src/main/java/com/example/base/browser/BrowserActivity.kt b/base/src/main/java/com/example/base/browser/BrowserActivity.kt
index ccd41ea..42c96f4 100644
--- a/base/src/main/java/com/example/base/browser/BrowserActivity.kt
+++ b/base/src/main/java/com/example/base/browser/BrowserActivity.kt
@@ -2,7 +2,6 @@ package com.example.base.browser
 
 import android.content.Context
 import android.content.Intent
-import android.graphics.Color
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
@@ -16,6 +15,7 @@ import com.example.base.R
 import com.example.base.utils.DensityUtils
 import com.example.base.widget.TitleBar
 import com.gyf.immersionbar.ImmersionBar
+import com.just.agentweb.AbsAgentWebSettings
 import com.just.agentweb.AgentWeb
 import com.just.agentweb.MiddlewareWebChromeBase
 import com.just.agentweb.MiddlewareWebClientBase
@@ -26,8 +26,10 @@ import com.just.agentweb.MiddlewareWebClientBase
  */
 class BrowserActivity : AppCompatActivity() {
 
-    private val titleStr by lazy { intent.getStringExtra(com.example.base.browser.BrowserActivity.Companion.ARG_TITLE) }
-    private val url by lazy { intent.getStringExtra(com.example.base.browser.BrowserActivity.Companion.ARG_URL) }
+    private val titleStr by lazy { intent.getStringExtra(ARG_TITLE) }
+    private val url by lazy { intent.getStringExtra(ARG_URL) }
+
+    private val zoom by lazy { intent.getBooleanExtra(ARG_ZOOM, false) }
 
 
     private lateinit var mAgentWeb: AgentWeb
@@ -68,6 +70,7 @@ class BrowserActivity : AppCompatActivity() {
             .useDefaultIndicator()
             .useMiddlewareWebChrome(mMiddlewareWebChromeBase)
             .useMiddlewareWebClient(mMiddlewareWebClientBase)
+            .setAgentWebWebSettings(CustomSettings())
             .createAgentWeb()
             .ready()
 
@@ -144,8 +147,8 @@ class BrowserActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         if (intent?.extras != null) {
-            title = intent.extras!!.getString(com.example.base.browser.BrowserActivity.Companion.ARG_TITLE)
-            val url = intent.extras!!.getString(com.example.base.browser.BrowserActivity.Companion.ARG_URL)
+            title = intent.extras!!.getString(ARG_TITLE)
+            val url = intent.extras!!.getString(ARG_URL)
             mPreAgentWeb.go(url)
         }
     }
@@ -159,20 +162,38 @@ class BrowserActivity : AppCompatActivity() {
     companion object {
         const val ARG_TITLE = "arg_title"
         const val ARG_URL = "arg_url"
-        const val ARG_SHOW_MENU = "arg_show_menu"
+        const val ARG_ZOOM = "arg_zoom"
 
         /**
          * @param title
          * @param url
+         * @param zoom
          */
-        fun start(context: Context?, title: String?, url: String?, showMenu: Boolean = true) {
-            val intent = Intent(context, com.example.base.browser.BrowserActivity::class.java)
-            intent.putExtra(com.example.base.browser.BrowserActivity.Companion.ARG_TITLE, title)
-            intent.putExtra(com.example.base.browser.BrowserActivity.Companion.ARG_URL, url)
-            intent.putExtra(com.example.base.browser.BrowserActivity.Companion.ARG_SHOW_MENU, showMenu)
+        fun start(context: Context?, title: String?, url: String?, zoom: Boolean = false) {
+            val intent = Intent(context, BrowserActivity::class.java)
+            intent.putExtra(ARG_TITLE, title)
+            intent.putExtra(ARG_URL, url)
+            intent.putExtra(ARG_ZOOM, zoom)
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             context?.startActivity(intent)
         }
     }
 
+    inner class CustomSettings : AbsAgentWebSettings() {
+
+        override fun toSetting(webView: WebView?): AbsAgentWebSettings {
+            super.toSetting(webView)
+            if (zoom) {
+                webSettings.builtInZoomControls = true
+                webSettings.displayZoomControls = false
+                webSettings.useWideViewPort = true
+                webSettings.loadWithOverviewMode = true
+            }
+            return this
+        }
+
+        override fun bindAgentWebSupport(agentWeb: AgentWeb?) {
+            this.mAgentWeb = agentWeb
+        }
+    }
 }