Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
S
scanqrwhitecopy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanglei
scanqrwhitecopy
Commits
0b394320
Commit
0b394320
authored
Jan 21, 2025
by
周文华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修复】修复webvie嵌套refresh导致的滑动冲突.
parent
dc7afb7e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
WebBrowserActivity.kt
...ava/com/base/scanqrclear/ui/webview/WebBrowserActivity.kt
+3
-2
WebRefreshView.kt
...ain/java/com/base/scanqrclear/ui/widget/WebRefreshView.kt
+20
-0
activity_web_browser.xml
app/src/main/res/layout/activity_web_browser.xml
+1
-1
No files found.
app/src/main/java/com/base/scanqrclear/ui/webview/WebBrowserActivity.kt
View file @
0b394320
...
...
@@ -27,7 +27,8 @@ import kotlinx.coroutines.launch
import
kotlin.random.Random
class
WebBrowserActivity
:
BaseActivity
<
ActivityWebBrowserBinding
>(
ActivityWebBrowserBinding
::
inflate
)
{
class
WebBrowserActivity
:
BaseActivity
<
ActivityWebBrowserBinding
>(
ActivityWebBrowserBinding
::
inflate
)
{
override
fun
initView
()
{
super
.
initView
()
...
...
@@ -172,7 +173,7 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>(ActivityWebBr
val
instance
=
CookieManager
.
getInstance
()
instance
.
setAcceptThirdPartyCookies
(
binding
.
webView
,
true
)
binding
.
webView
.
addJavascriptInterface
(
this
,
"android"
)
binding
.
webView
.
swipeRefreshLayout
=
binding
.
refreshLayout
}
}
\ No newline at end of file
app/src/main/java/com/base/scanqrclear/ui/widget/WebRefreshView.kt
0 → 100644
View file @
0b394320
package
com.base.scanqrclear.ui.widget
import
android.content.Context
import
android.util.AttributeSet
import
android.webkit.WebView
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
/**
*Create by SleepDog on 2025-01-21
*/
class
WebRefreshView
@JvmOverloads
constructor
(
context
:
Context
,
attrs
:
AttributeSet
?
=
null
)
:
WebView
(
context
,
attrs
)
{
var
swipeRefreshLayout
:
SwipeRefreshLayout
?
=
null
override
fun
onScrollChanged
(
l
:
Int
,
t
:
Int
,
oldl
:
Int
,
oldt
:
Int
)
{
super
.
onScrollChanged
(
l
,
t
,
oldl
,
oldt
)
swipeRefreshLayout
?.
isEnabled
=
scrollY
==
0
}
}
\ No newline at end of file
app/src/main/res/layout/activity_web_browser.xml
View file @
0b394320
...
...
@@ -26,7 +26,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<
Web
View
<
com.base.scanqrclear.ui.widget.WebRefresh
View
android:id=
"@+id/webView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment