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
ede29184
Commit
ede29184
authored
Nov 21, 2019
by
徐健
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into feature/test_home_pager
parents
790e34e1
9636ee6d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
44 deletions
+45
-44
ConsultAssistantDialogUtils.kt
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
+45
-44
No files found.
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
View file @
ede29184
...
...
@@ -6,7 +6,6 @@ import com.yidianling.common.tools.ToastUtil
import
com.yidianling.consultant.dialog.ConsultAssistantDialog
import
com.yidianling.consultant.model.SearchApi
import
com.yidianling.consultant.router.ConsultantIn
import
com.yidianling.consultant.router.ConsultantRouterImp
import
io.reactivex.Observable
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
...
...
@@ -35,16 +34,13 @@ class ConsultAssistantDialogUtils private constructor() {
when
(
origin
)
{
"home_index"
->
{
if
(
ConsultantIn
.
isLogin
()
&&
ConsultantIn
.
getUserImpl
().
getUserInfo
()
?.
user_type
==
1
)
{
ConsultantIn
.
getUserImpl
().
getUserInfo
()
?.
user_type
==
1
)
{
shouldShowDialog
(
activity
,
origin
)
}
}
"doctor_list"
->
{
if
(
ConsultantIn
.
getUserImpl
().
getUserInfo
()
?.
user_type
==
1
)
{
shouldShowDialog
(
activity
,
origin
)
}
shouldShowDialog
(
activity
,
origin
)
}
}
...
...
@@ -56,17 +52,17 @@ class ConsultAssistantDialogUtils private constructor() {
private
fun
shouldShowDialog
(
activity
:
Activity
,
origin
:
String
,
isDelay
:
Boolean
=
false
)
{
// 请求接口判断导医咨询助理按钮是否展示
SearchApi
.
getSearchApi
().
getConsultAssistantRequest
(
origin
)
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
if
(
it
.
data
)
{
if
(
origin
==
"home_index"
)
{
showFromYdlHome
(
activity
)
}
else
if
(
origin
==
"doctor_list"
)
{
show
(
activity
)
}
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
if
(
it
.
data
)
{
if
(
origin
==
"home_index"
)
{
showFromYdlHome
(
activity
)
}
else
if
(
origin
==
"doctor_list"
)
{
show
(
activity
)
}
}
}
}
////////////////////////////////////// 首页的展示隐藏逻辑 代码块start ///////////////////////////////////////////////////
...
...
@@ -77,13 +73,15 @@ class ConsultAssistantDialogUtils private constructor() {
fun
showFromYdlHome
(
activity
:
Activity
)
{
consultAssistantDialogFromHomePage
?.
dismiss
()
consultAssistantDialogFromHomePage
=
null
consultAssistantDialogFromHomePage
=
ConsultAssistantDialog
(
activity
,
object
:
ConsultAssistantDialog
.
OnConsultAssistantClickListener
{
override
fun
onClickAction
()
{
//获取用户uid
getConsultAssistantUid
(
activity
)
}
consultAssistantDialogFromHomePage
=
ConsultAssistantDialog
(
activity
,
object
:
ConsultAssistantDialog
.
OnConsultAssistantClickListener
{
override
fun
onClickAction
()
{
//获取用户uid
getConsultAssistantUid
(
activity
)
}
})
})
consultAssistantDialogFromHomePage
?.
show
()
}
...
...
@@ -107,10 +105,10 @@ class ConsultAssistantDialogUtils private constructor() {
timer
!!
.
schedule
(
object
:
TimerTask
()
{
override
fun
run
()
{
Observable
.
just
(
1
).
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
expertSearchPageHasShown
=
true
showDialog
(
activity
)
}
.
subscribe
{
expertSearchPageHasShown
=
true
showDialog
(
activity
)
}
}
},
5000
)
}
else
{
...
...
@@ -124,18 +122,20 @@ class ConsultAssistantDialogUtils private constructor() {
fun
showDialog
(
activity
:
Activity
)
{
consultAssistantDialog
?.
dismiss
()
consultAssistantDialog
=
null
consultAssistantDialog
=
ConsultAssistantDialog
(
activity
,
object
:
ConsultAssistantDialog
.
OnConsultAssistantClickListener
{
override
fun
onClickAction
()
{
// 咨询师列表页面且未登录情况下,跳转登录页面
if
(
expertSearchPageHasShown
&&
!
ConsultantIn
.
isLogin
())
{
ConsultantIn
.
toLogin
(
activity
)
}
else
{
//获取用户uid
getConsultAssistantUid
(
activity
)
consultAssistantDialog
=
ConsultAssistantDialog
(
activity
,
object
:
ConsultAssistantDialog
.
OnConsultAssistantClickListener
{
override
fun
onClickAction
()
{
// 咨询师列表页面且未登录情况下,跳转登录页面
if
(
expertSearchPageHasShown
&&
!
ConsultantIn
.
isLogin
())
{
ConsultantIn
.
toLogin
(
activity
)
}
else
{
//获取用户uid
getConsultAssistantUid
(
activity
)
}
}
}
})
})
consultAssistantDialog
?.
show
()
}
...
...
@@ -163,14 +163,14 @@ class ConsultAssistantDialogUtils private constructor() {
private
fun
getConsultAssistantUid
(
activity
:
Activity
)
{
// 请求接口获取咨询助理的uid
SearchApi
.
getSearchApi
().
getConsultAssistantUidRequest
()
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
if
(
it
.
code
==
"200"
&&
it
.
data
!=
0
.
toLong
())
{
ConsultantIn
.
startP2PSession
(
activity
as
AppCompatActivity
,
it
.
data
.
toString
())
}
else
{
ToastUtil
.
toastShort
(
"咨询助理忙碌中,请稍后再试"
)
}
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
if
(
it
.
code
==
"200"
&&
it
.
data
!=
0
.
toLong
())
{
ConsultantIn
.
startP2PSession
(
activity
as
AppCompatActivity
,
it
.
data
.
toString
())
}
else
{
ToastUtil
.
toastShort
(
"咨询助理忙碌中,请稍后再试"
)
}
}
}
}
\ 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