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
67f3db0f
Commit
67f3db0f
authored
Aug 04, 2022
by
万齐军
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/qj/fix_confide' into 'd/v4.4.06'
修复倾诉弹窗问题 See merge request app_android_lib/YDL-Component!287
parents
93af8718
94127821
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletions
+8
-1
ConfideBottomSheetDialogFragment.kt
m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt
+8
-1
No files found.
m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt
View file @
67f3db0f
...
...
@@ -54,7 +54,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
java.io.UnsupportedEncodingException
import
java.net.URLDecoder
import
java.util.*
import
kotlin.math.roundToInt
class
ConfideBottomSheetDialogFragment
:
BottomSheetDialogFragment
()
{
...
...
@@ -97,6 +96,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
var
shouldShow
:
Boolean
?
=
false
var
uid
:
String
?
=
null
var
listen_free
:
Boolean
=
false
private
var
hasOnResume
=
false
fun
showBottomSheetDialog
(
activity
:
FragmentActivity
,
jumpUrl
:
String
,
...
...
@@ -367,6 +367,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
}
fun
onEventMainThread
(
event
:
ConfideDialogEvent
)
{
if
(!
hasOnResume
)
return
// 第一位表示拨打按钮,第二位代表再换一位按钮
val
show
=
event
.
show
// if (show == 0) {
...
...
@@ -568,8 +569,14 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
return
false
}
override
fun
onStop
()
{
super
.
onStop
()
hasOnResume
=
false
}
override
fun
onResume
()
{
super
.
onResume
()
hasOnResume
=
true
if
(
doctorId
.
isNotBlank
()
&&
layoutCall
.
visibility
==
View
.
VISIBLE
)
{
onLoadDialStatus
(
doctorId
)
}
...
...
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