Skip to content

Commit f67e1ec

Browse files
committed
修复web添加浮窗无法返回前进刷新web页面问题
1 parent dbe8ffb commit f67e1ec

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

assists-web/src/main/java/com/ven/assists/web/ASJavascriptInterface.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,25 @@ class ASJavascriptInterface(val webView: WebView) {
192192
val minWidth = request.arguments?.get("minWidth")?.asInt ?: (ScreenUtils.getScreenHeight() * 0.5).toInt()
193193
val minHeight = request.arguments?.get("minHeight")?.asInt ?: (ScreenUtils.getScreenHeight() * 0.5).toInt()
194194
val initialCenter = request.arguments?.get("initialCenter")?.asBoolean ?: true
195-
195+
val webWindowBinding = WebFloatingWindowBinding.inflate(LayoutInflater.from(AssistsService.instance)).apply {
196+
webView.loadUrl(url)
197+
}
196198
AssistsWindowManager.add(
197199
windowWrapper = AssistsWindowWrapper(
198200
wmLayoutParams = AssistsWindowManager.createLayoutParams().apply {
199201
width = initialWidth
200202
height = initialHeight
201203
},
202-
view = WebFloatingWindowBinding.inflate(LayoutInflater.from(AssistsService.instance)).apply {
203-
webView.loadUrl(url)
204-
}.root
204+
view = webWindowBinding.root
205205
).apply {
206206
viewBinding.ivWebBack.isVisible = true
207+
viewBinding.ivWebBack.setOnClickListener { webWindowBinding.webView.goBack() }
207208
viewBinding.ivWebForward.isVisible = true
209+
viewBinding.ivWebForward.setOnClickListener { webWindowBinding.webView.goBack() }
210+
208211
viewBinding.ivWebRefresh.isVisible = true
212+
viewBinding.ivWebRefresh.setOnClickListener { webWindowBinding.webView.reload() }
213+
209214
this.minWidth = minWidth
210215
this.minHeight = minHeight
211216
this.initialCenter = initialCenter

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ buildscript {
99
targetSdk = 33
1010

1111
// 应用版本
12-
versionCode = 18
13-
versionName = "3.2.193"
14-
mavenVersion = "3.2.193"
12+
versionCode = 19
13+
versionName = "3.2.194"
14+
mavenVersion = "3.2.194"
1515

1616
// 依赖库版本
1717
coreKtxVersion = "1.13.1"

0 commit comments

Comments
 (0)