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
5c0a18c1
Commit
5c0a18c1
authored
Jan 06, 2020
by
徐健
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复空指针
parent
7d5a3b03
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
17 deletions
+46
-17
config.gradle
config.gradle
+2
-2
ExpertConsultServiceDetailView.kt
m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceDetailView.kt
+24
-8
ExpertConsultServiceItemView.kt
m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceItemView.kt
+20
-7
No files found.
config.gradle
View file @
5c0a18c1
ext
{
kotlin_version
=
"1.3.21"
dev_mode
=
tru
e
dev_mode
=
fals
e
ydl_app
=
[
appName
:
"心理咨询壹点灵"
,
...
...
@@ -47,7 +47,7 @@ ext {
"m-fm"
:
"0.0.24"
,
"m-user"
:
"0.0.42"
,
"m-home"
:
"0.0.8.2"
,
"m-im"
:
"0.0.4.6
1
"
,
"m-im"
:
"0.0.4.6
3
"
,
"m-dynamic"
:
"0.0.2"
,
"m-muse"
:
"0.0.21"
,
...
...
m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceDetailView.kt
View file @
5c0a18c1
...
...
@@ -52,6 +52,30 @@ class ExpertConsultServiceDetailView : RelativeLayout {
* 设置数据
*/
fun
updateData
(
bean
:
ServiceItemBean
.
ProductsBean
)
{
val
mCompare
:
Comparator
<
ServiceItemBean
.
ProductsBean
.
ProductSpecDtosBean
>
=
Comparator
{
o1
,
o2
->
val
res
=
o1
.
price
.
compareTo
(
o2
.
price
)
when
{
res
==
0
->
0
res
>
0
->
-
1
else
->
1
}
}
if
(
bean
.
productSpecDtos
!=
null
&&
bean
.
productSpecDtos
.
size
>
0
)
{
val
mBean
:
ServiceItemBean
.
ProductsBean
.
ProductSpecDtosBean
=
bean
.
productSpecDtos
.
sortedWith
(
mCompare
)[
0
]
//价格,取productSpecDtos数组最后一个价格,不保留小数
consult_service_service_price
.
text
=
String
.
format
(
"%.0f"
,
mBean
.
price
)
if
(
bean
.
productDto
.
isPackage
==
2
)
{
consult_service_price_right
.
text
=
"/${mBean.spec2}分钟"
//例: 套餐展示"/60分钟"
}
else
{
consult_service_price_right
.
text
=
"/次"
//例: 不是套餐展示"/次"
}
}
consult_service_title
.
text
=
bean
.
productDto
.
name
?:
""
consult_service_desc
.
text
=
bean
.
productDto
.
desc
?:
""
...
...
@@ -60,14 +84,12 @@ class ExpertConsultServiceDetailView : RelativeLayout {
consult_service_is_package
.
text
=
"套餐"
consult_service_times
.
text
=
"${bean.productDto.packageNum}次"
consult_service_price_right
.
text
=
"/${bean.productSpecDtos.last().spec2}分钟"
//例: 套餐展示"/60分钟"
//起售次数展示
consult_service_low_buy_time
.
visibility
=
View
.
VISIBLE
consult_service_low_buy_time
.
text
=
"(${bean.productDto.packageNum}次起售)"
}
else
{
consult_service_is_package
.
text
=
"单次"
consult_service_times
.
text
=
"1次"
consult_service_price_right
.
text
=
"/次"
//例: 不是套餐展示"/次"
consult_service_low_buy_time
.
visibility
=
View
.
GONE
}
...
...
@@ -106,12 +128,6 @@ class ExpertConsultServiceDetailView : RelativeLayout {
}
consult_service_service_type
.
text
=
serviceTypeStr
.
toString
()
//价格,取productSpecDtos数组最后一个价格,不保留小数
consult_service_service_price
.
text
=
String
.
format
(
"%.0f"
,
(
bean
.
productSpecDtos
.
last
().
price
)
)
consult_service_btn
.
setOnClickListener
{
NewH5Activity
.
start
(
mContext
,
H5Params
(
HttpConfig
.
MH5_URL
+
"consult/#/pages/DownOrder/DownOrder?product_id="
+
bean
.
productDto
.
id
,
null
))
}
...
...
m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceItemView.kt
View file @
5c0a18c1
...
...
@@ -65,13 +65,26 @@ class ExpertConsultServiceItemView : LinearLayout {
//隐藏起售次数限制
service_item_low_buy_time
.
visibility
=
View
.
GONE
}
//价格,取productSpecDtos数组最后一个价格,不保留小数
service_item_price
.
text
=
String
.
format
(
"%.0f"
,
(
bean
.
productSpecDtos
.
last
().
price
)
)
//时间,取productSpecDtos数组最后一个的时间
service_item_time
.
text
=
"/${bean.productSpecDtos.last().spec2}分钟"
val
mCompare
:
Comparator
<
ServiceItemBean
.
ProductsBean
.
ProductSpecDtosBean
>
=
Comparator
{
o1
,
o2
->
val
res
=
o1
.
price
.
compareTo
(
o2
.
price
)
when
{
res
==
0
->
0
res
>
0
->
-
1
else
->
1
}
}
if
(
bean
.
productSpecDtos
!=
null
&&
bean
.
productSpecDtos
.
size
>
0
)
{
val
mBean
:
ServiceItemBean
.
ProductsBean
.
ProductSpecDtosBean
=
bean
.
productSpecDtos
.
sortedWith
(
mCompare
)[
0
]
//价格,取productSpecDtos数组最小价格,不保留小数
service_item_price
.
text
=
String
.
format
(
"%.0f"
,
mBean
.
price
)
//时间,取productSpecDtos数组最后一个的时间
service_item_time
.
text
=
"/${mBean.spec2}分钟"
}
//好评率,*20后 保留1位小数
service_item_feddbackrate
.
text
=
String
.
format
(
"%.1f"
,
...
...
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