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
12fece28
Commit
12fece28
authored
Mar 25, 2020
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充测评搜索/测评首页 arouter 名称、升级版本号
parent
6e43276f
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
19 additions
and
16 deletions
+19
-16
config.gradle
config.gradle
+3
-3
YdlHomeAdapter.kt
m-home/src/ydl/java/com/yidianling/home/adapter/YdlHomeAdapter.kt
+1
-1
HomeViewConfig.kt
m-home/src/ydl/java/com/yidianling/home/constract/HomeViewConfig.kt
+1
-1
HomePresenterImpl.kt
m-home/src/ydl/java/com/yidianling/home/presenter/HomePresenterImpl.kt
+4
-4
YdlHomeFragment.kt
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
+5
-3
NewTestHomeActivity.kt
m-tests/src/main/java/com/yidianling/tests/home/NewTestHomeActivity.kt
+1
-1
NewTestHomeFragment.kt
m-tests/src/main/java/com/yidianling/tests/home/NewTestHomeFragment.kt
+1
-1
TestSearchActivity.kt
m-tests/src/main/java/com/yidianling/tests/search/TestSearchActivity.kt
+2
-1
IYDLRouterConstant.kt
ydl-platform/src/main/java/com/ydl/ydlcommon/router/IYDLRouterConstant.kt
+1
-1
No files found.
config.gradle
View file @
12fece28
ext
{
kotlin_version
=
"1.3.21"
dev_mode
=
fals
e
dev_mode
=
tru
e
ydl_app
=
[
appName
:
"心理咨询壹点灵"
,
...
...
@@ -46,12 +46,12 @@ ext {
"m-consultant"
:
"0.0.58.4"
,
"m-fm"
:
"0.0.29.8"
,
"m-user"
:
"0.0.60.2"
,
"m-home"
:
"0.0.20.
4
"
,
"m-home"
:
"0.0.20.
6
"
,
"m-im"
:
"0.0.17.1"
,
"m-dynamic"
:
"0.0.7.6"
,
"m-muse"
:
"0.0.28.11"
,
"m-tests"
:
"0.0.24.
2
"
,
"m-tests"
:
"0.0.24.
3
"
,
"m-course"
:
"0.0.42.2"
,
//-------------- 业务模块 API 层 --------------
...
...
m-home/src/ydl/java/com/yidianling/home/adapter/YdlHomeAdapter.kt
View file @
12fece28
...
...
@@ -145,7 +145,7 @@ class YdlHomeAdapter(private val mContext: Context,
return
HomeAssuageGriefViewHolder
(
HomeAssuageGriefView
(
mContext
,
homeEvent
),
viewType
)
}
//测试模块
HomeViewConfig
.
getOrder
().
testIndex
->
{
HomeViewConfig
.
getOrder
().
test
s
Index
->
{
return
HomeTestViewHolder
(
HomeTestView
(
mContext
,
homeEvent
),
viewType
)
}
//心灵*电台模块
...
...
m-home/src/ydl/java/com/yidianling/home/constract/HomeViewConfig.kt
View file @
12fece28
...
...
@@ -45,7 +45,7 @@ class HomeViewConfig {
/**
* 测试模块
*/
var
testIndex
:
Int
?
=
5
var
test
s
Index
:
Int
?
=
5
/**
* 解忧*问答模块
*/
...
...
m-home/src/ydl/java/com/yidianling/home/presenter/HomePresenterImpl.kt
View file @
12fece28
...
...
@@ -95,7 +95,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
homeList
.
add
(
getHomeItemFromTempData
(
homeTestBean
,
HomeViewConfig
.
getOrder
().
testIndex
!!
HomeViewConfig
.
getOrder
().
test
s
Index
!!
)
)
}
...
...
@@ -148,7 +148,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
if
(
HomeViewConfig
.
getOrder
().
confideIndex
!=
null
){
mergeArrays
.
add
(
confideObservable
)
}
if
(
HomeViewConfig
.
getOrder
().
testIndex
!=
null
){
if
(
HomeViewConfig
.
getOrder
().
test
s
Index
!=
null
){
mergeArrays
.
add
(
testObservable
)
}
if
(
HomeViewConfig
.
getOrder
().
dynamicIndex
!=
null
){
...
...
@@ -248,7 +248,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
HomeViewConfig
.
getOrder
().
courseIndex
->
{
homeBean
.
courseBean
=
dataBean
.
courseBean
}
HomeViewConfig
.
getOrder
().
testIndex
->
{
HomeViewConfig
.
getOrder
().
test
s
Index
->
{
homeBean
.
testListBean
=
dataBean
.
testListBean
}
HomeViewConfig
.
getOrder
().
dynamicIndex
->
{
...
...
@@ -293,7 +293,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
item
.
courseBean
=
if
(
dataBean
.
isRealEmpty
||
dataBean
!
is
HomeCourseBean
)
homeTempData
.
courseBean
else
dataBean
}
HomeViewConfig
.
getOrder
().
testIndex
->
{
HomeViewConfig
.
getOrder
().
test
s
Index
->
{
item
.
testListBean
=
if
(
dataBean
.
isRealEmpty
||
dataBean
!
is
HomeTestBean
)
homeTempData
.
testListBean
else
dataBean
.
testItemList
}
...
...
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
View file @
12fece28
...
...
@@ -51,7 +51,7 @@ import kotlinx.android.synthetic.ydl.home_fragment.*
* @date 2019/02/12
*/
@Route
(
path
=
"/home/home"
)
class
YdlHomeFragment
:
BaseMvpFragment
<
IHomeContract
.
View
,
HomePresenterImpl
>(),
open
class
YdlHomeFragment
:
BaseMvpFragment
<
IHomeContract
.
View
,
HomePresenterImpl
>(),
IHomeContract
.
View
,
SwipeRefreshLayout
.
OnRefreshListener
{
...
...
@@ -100,7 +100,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
// val homeViewOrder = HomeViewConfig.HomeViewOrder()
//
// homeViewOrder.bannerIndex = -1
// homeViewOrder.testIndex = 1
// homeViewOrder.test
s
Index = 1
// homeViewOrder.consultIndex = 2
// homeViewOrder.footerIndex = 3
//
...
...
@@ -136,7 +136,9 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
}
open
fun
initRvListener
()
{
home_module_fragment_recycler
.
addOnScrollListener
(
homeEvent
?.
onPageScroll
(
view_rl_top_bg
))
if
(
HomeViewConfig
.
getOrder
().
bannerIndex
!=-
1
){
home_module_fragment_recycler
.
addOnScrollListener
(
homeEvent
?.
onPageScroll
(
view_rl_top_bg
))
}
scrollListner
=
HomeConfideRecyleSuspendListener
()
home_module_fragment_recycler
.
addOnScrollListener
(
scrollListner
)
setSuspendListener
()
...
...
m-tests/src/main/java/com/yidianling/tests/home/NewTestHomeActivity.kt
View file @
12fece28
...
...
@@ -9,7 +9,7 @@ import org.json.JSONObject
* flutter版测评首页
* Created by xj on 2019/11/19.
*/
@Route
(
path
=
"/
ceshi
/home"
)
@Route
(
path
=
"/
tests
/home"
)
class
NewTestHomeActivity
:
BaseFlutterActivity
()
{
override
fun
initialRoute
():
String
{
return
"test/home"
...
...
m-tests/src/main/java/com/yidianling/tests/home/NewTestHomeFragment.kt
View file @
12fece28
...
...
@@ -10,7 +10,7 @@ import io.flutter.view.FlutterView
* flutter版测评首页
* Created by xj on 2019/11/19.
*/
@Route
(
path
=
"/tests/home"
)
@Route
(
path
=
"/tests/home
_fragment
"
)
class
NewTestHomeFragment
:
BaseFlutterFragment
()
{
override
fun
initChannelPlugin
(
flutterView
:
FlutterView
)
{
var
statusBarHeight
=
StatusBarUtils
.
getStatusBarHeight
(
context
);
...
...
m-tests/src/main/java/com/yidianling/tests/search/TestSearchActivity.kt
View file @
12fece28
...
...
@@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager
import
android.widget.LinearLayout
import
android.widget.TextView
import
cn.lankton.flowlayout.FlowLayout
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.ydl.ydlcommon.adapter.MyBaseAdapter
import
com.ydl.ydlcommon.base.BaseMvpActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
...
...
@@ -32,7 +33,7 @@ import de.greenrobot.event.EventBus
import
kotlinx.android.synthetic.main.tests_activity_test_search.*
import
kotlinx.android.synthetic.main.tests_item_hot_search.view.*
@Route
(
path
=
"/tests/search"
)
class
TestSearchActivity
:
BaseMvpActivity
<
TestSearchView
,
TestSearchPresenter
>(),
TestSearchView
,
View
.
OnClickListener
{
private
var
isFirstLoad
=
true
...
...
ydl-platform/src/main/java/com/ydl/ydlcommon/router/IYDLRouterConstant.kt
View file @
12fece28
...
...
@@ -17,7 +17,7 @@ interface IYDLRouterConstant{
//课程列表页
const
val
ROUTER_COURSE_LIST
=
ROUTER_BASE
+
"course/list"
//测评频道首页
const
val
ROUTER_TEST_HOME
=
ROUTER_BASE
+
"
ceshi
/home"
const
val
ROUTER_TEST_HOME
=
ROUTER_BASE
+
"
tests
/home"
//测评列表页
const
val
ROUTER_TEST_LIST
=
ROUTER_BASE
+
"ceshi/list"
//咨询列表页(专家服务搜索页面)
...
...
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