wangyu
/
blzb-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改内置浏览器配置， 修改版本为2.0.0/200

This commit is contained in:
wangyu 2026-01-12 12:09:22 +08:00
parent 3919ad489d
commit 7b737b69f6
7 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -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 {

7
app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt
View File

@ -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()
}

2
app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt
View File

@ -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("《用户协议》")

2
app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt
View File

@ -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("原文链接已复制")
}

2
app/src/main/java/com/cheng/blzb/ui/fragment/login/onekey/OneKeyLoginFragment.kt
View File

@ -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("《用户协议》")

4
app/src/main/java/com/cheng/blzb/utils/UrlHelper.kt
View File

@ -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) {

43
base/src/main/java/com/example/base/browser/BrowserActivity.kt
View File

@ -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
}
}
}