Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
2ad2db39
Commit
2ad2db39
authored
Jun 13, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 1. 倾诉2.0半屏uid刷新问题修复
parent
d78288df
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
config.gradle
config.gradle
+2
-2
ConfideBottomSheetDialogFragment.kt
m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt
+17
-6
No files found.
config.gradle
View file @
2ad2db39
...
...
@@ -5,7 +5,7 @@ ext {
ydlPublishVersion
=
[
// -------------- 业务模块 --------------
//第三步 若干
"m-confide"
:
"0.0.50.2
4
"
,
"m-confide"
:
"0.0.50.2
5
"
,
"m-consultant"
:
"0.0.60.67"
,
"m-fm"
:
"0.0.30.09"
,
"m-user"
:
"0.0.62.48"
,
...
...
@@ -94,7 +94,7 @@ ext {
ydlCompileVersion
=
[
// -------------- 业务模块 --------------
//第三步 若干
"m-confide"
:
"0.0.50.2
4
"
,
"m-confide"
:
"0.0.50.2
5
"
,
"m-consultant"
:
"0.0.60.67"
,
"m-fm"
:
"0.0.30.09"
,
"m-user"
:
"0.0.62.48"
,
...
...
m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt
View file @
2ad2db39
...
...
@@ -31,6 +31,7 @@ import com.ydl.confide.home.event.ConfideDialogEvent
import
com.ydl.confide.home.http.ConfideHomeApi
import
com.ydl.confide.router.PhoneCallIn
import
com.ydl.utils.WebUrlParamsUtils
import
com.ydl.webview.IJavascriptHandler
import
com.ydl.webview.ProgressWebView
import
com.ydl.webview.TellData
import
com.ydl.webview.WebModularServiceUtils
...
...
@@ -42,6 +43,7 @@ import com.ydl.ydlnet.YDLHttpUtils
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.im.api.service.IImService
import
com.yidianling.user.api.event.UserLoginEvent
import
com.yidianling.user.api.service.IUserService
import
de.greenrobot.event.EventBus
import
io.reactivex.android.schedulers.AndroidSchedulers
...
...
@@ -75,7 +77,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
lateinit
var
layoutBottom
:
View
lateinit
var
itemView
:
View
var
bottomSheet
:
FrameLayout
?=
null
var
mJtoJHandle
:
IJavascriptHandler
?=
null
private
var
behavior
:
BottomSheetBehavior
<*>?
=
null
...
...
@@ -345,14 +347,13 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
setting
.
setAllowFileAccess
(
true
)
setting
.
setBlockNetworkImage
(
false
)
wv_content
!!
.
scrollBarStyle
=
View
.
SCROLLBARS_INSIDE_OVERLAY
//滚动条风格,为0指滚动条不占用空间,直接覆盖在网页上
val
j
toJHandle
=
WebModularServiceUtils
.
getWebService
()
wv_content
?
.
scrollBarStyle
=
View
.
SCROLLBARS_INSIDE_OVERLAY
//滚动条风格,为0指滚动条不占用空间,直接覆盖在网页上
mJ
toJHandle
=
WebModularServiceUtils
.
getWebService
()
.
getJavascripHandler
(
requireActivity
(),
tellData
=
TellData
())
wv_content
!!
.
addJavascriptInterface
(
j
toJHandle
,
"javascriptHandler"
)
wv_content
?.
addJavascriptInterface
(
mJ
toJHandle
,
"javascriptHandler"
)
// var jumpurl = "http://192.168.210.152/jy/listenMask?listenerId=257&isFromApp=1"
val
url
=
WebUrlParamsUtils
.
getSuffix
(
jumpUrl
,
jtoJHandle
.
getUriAppendSuffix
())
wv_content
.
loadUrl
(
url
)
loadUrl
()
// wv_content.loadUrl(jumpUrl)
wv_content
.
setOnTouchListener
{
p0
,
p1
->
//canScrollVertically(-1)的值表示是否能向下滚动,false表示已经滚动到顶部
...
...
@@ -418,6 +419,11 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
}
}
private
fun
loadUrl
()
{
val
url
=
WebUrlParamsUtils
.
getSuffix
(
jumpUrl
,
mJtoJHandle
?.
getUriAppendSuffix
())
wv_content
?.
loadUrl
(
url
)
}
private
fun
shouldOverridePayUrl
(
view
:
WebView
,
url
:
String
):
Boolean
{
if
(
url
.
startsWith
(
"weixin://"
))
{
return
try
{
...
...
@@ -574,4 +580,8 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
wv_content
.
destroy
()
EventBus
.
getDefault
().
unregister
(
this
)
}
fun
onEvent
(
event
:
UserLoginEvent
)
{
loadUrl
()
}
}
\ No newline at end of file
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