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
004471d5
Commit
004471d5
authored
Nov 10, 2020
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:亲子教育跳转专属导医队列接口对接
parent
73ebce75
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
config.gradle
config.gradle
+1
-1
ExpertSearchFragment.kt
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
+1
-2
ExpertSearchPresenter.kt
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchPresenter.kt
+3
-6
ConsultAssistantDialogUtils.kt
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
+7
-1
No files found.
config.gradle
View file @
004471d5
...
...
@@ -6,7 +6,7 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide"
:
"0.0.48.86"
,
"m-consultant"
:
"0.0.59.3
7
"
,
"m-consultant"
:
"0.0.59.3
8
"
,
"m-fm"
:
"0.0.30.00"
,
"m-user"
:
"0.0.60.37"
,
"m-home"
:
"0.0.22.33"
,
...
...
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
View file @
004471d5
...
...
@@ -46,6 +46,7 @@ import com.yidianling.consultant.listener.OnFilterConfirmListener
import
com.yidianling.consultant.listener.OnSortItemSelectedListener
import
com.yidianling.consultant.model.bean.*
import
com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
import
com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils.Companion.REALATION_EDUCATION
import
com.yidianling.consultant.router.ConsultantIn
import
com.yidianling.consultant.ui.view.AreaPopupWindow
import
com.yidianling.consultant.ui.view.CategoryPopupWindow
...
...
@@ -1396,8 +1397,6 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
}
curPage
=
1
onScrollListener
.
resetState
()
getPresenter
().
fetchListData
(
allFilter
,
curPage
)
rvExperts
.
scrollToPosition
(
0
)
}
...
...
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchPresenter.kt
View file @
004471d5
...
...
@@ -16,6 +16,7 @@ import com.yidianling.consultant.http.ExpertSearchDataManager
import
com.yidianling.consultant.model.SearchApi
import
com.yidianling.consultant.model.bean.AllFilter
import
com.yidianling.consultant.model.bean.ExpertSearchBean
import
com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.functions.Consumer
import
io.reactivex.schedulers.Schedulers
...
...
@@ -104,12 +105,8 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
@SuppressLint
(
"CheckResult"
)
fun
fetchListData
(
allFilter
:
AllFilter
,
page
:
Int
)
{
//如果是亲子教育则点击咨询顾问时,跳转专属亲自教育列表
if
(
allFilter
.
categories
.
size
==
1
&&
allFilter
.
categories
[
0
].
cateId
==
23
){
LogUtil
.
e
(
"aaaaaaaaaa"
+
allFilter
.
categories
[
0
].
cateId
)
//
}
//是否亲子教育字段
ConsultAssistantDialogUtils
.
REALATION_EDUCATION
=
allFilter
.
categories
.
size
==
1
&&
allFilter
.
categories
[
0
].
cateId
==
23
var
showType
=
0
val
sb
=
StringBuffer
()
...
...
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
View file @
004471d5
...
...
@@ -27,6 +27,7 @@ class ConsultAssistantDialogUtils private constructor() {
companion
object
{
val
INSTANCE
by
lazy
{
ConsultAssistantDialogUtils
()
}
var
isSHowDesc
=
true
var
REALATION_EDUCATION
=
false
//是否跳转亲子教育字段,接口加ffrom2="learning"
}
var
consultAssistantDialogFromHomePage
:
ConsultAssistantDialog
?
=
null
// 首页展示的dialog
...
...
@@ -290,7 +291,12 @@ class ConsultAssistantDialogUtils private constructor() {
fun
getConsultAssistantUid
(
origin
:
String
,
activity
:
Activity
,
location
:
Int
)
{
if
(
origin
==
"doctor_list"
){
// 请求接口获取咨询助理的uid
getConsultAssistantUid
(
location
,
activity
,
"learning"
)
if
(
REALATION_EDUCATION
){
getConsultAssistantUid
(
location
,
activity
,
"learning"
)
}
else
{
getConsultAssistantUid
(
location
,
activity
,
null
)
}
}
else
{
// 请求接口获取咨询助理的uid
getConsultAssistantUid
(
location
,
activity
,
null
)
...
...
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