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
61b21619
Commit
61b21619
authored
Dec 23, 2019
by
徐健
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
冥想进入播放,修复部分空指针异常
parent
1187ed69
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
134 additions
and
125 deletions
+134
-125
config.gradle
config.gradle
+9
-9
ExpertSearchAdapter.kt
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
+3
-3
DoctorServiceItem.kt
m-consultant/src/main/java/com/yidianling/consultant/model/bean/DoctorServiceItem.kt
+118
-112
consultant_expert_search_item_view.xml
m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
+0
-0
YDLMessageFragment.java
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
+1
-1
MusePlugin.kt
m-muse/src/main/java/com/yidianling/muse/handler/MusePlugin.kt
+3
-0
No files found.
config.gradle
View file @
61b21619
...
@@ -44,17 +44,17 @@ ext {
...
@@ -44,17 +44,17 @@ ext {
//第三步 若干
//第三步 若干
"m-confide"
:
"0.0.41.2"
,
"m-confide"
:
"0.0.41.2"
,
"m-consultant"
:
"0.0.51.1
1
"
,
"m-consultant"
:
"0.0.51.1
2
"
,
"m-fm"
:
"0.0.23.4"
,
"m-fm"
:
"0.0.23.4"
,
"m-user"
:
"0.0.41.1"
,
"m-user"
:
"0.0.41.1"
,
"m-home"
:
"0.0.6.25"
,
"m-home"
:
"0.0.6.25"
,
"m-muse"
:
"0.0.20.4"
,
"m-tests"
:
"0.0.15.3"
,
"m-course"
:
"0.0.34.4"
,
"m-im"
:
"0.0.3.7"
,
"m-im"
:
"0.0.3.7"
,
"m-dynamic"
:
"0.0.1.5"
,
"m-dynamic"
:
"0.0.1.5"
,
"m-muse"
:
"0.0.20.6"
,
"m-tests"
:
"0.0.15.6"
,
"m-course"
:
"0.0.34.6"
,
//-------------- 业务模块 API 层 --------------
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.5"
,
"m-audioim-api"
:
"0.0.5"
,
...
@@ -83,7 +83,7 @@ ext {
...
@@ -83,7 +83,7 @@ ext {
"router"
:
"0.0.1"
,
"router"
:
"0.0.1"
,
"ydl-net"
:
"0.0.3.1"
,
"ydl-net"
:
"0.0.3.1"
,
"ydl-utils"
:
"0.0.3"
,
"ydl-utils"
:
"0.0.3"
,
"ydl-flutter-base"
:
"0.0.5.1
7
"
,
"ydl-flutter-base"
:
"0.0.5.1
9
"
,
]
]
ydlCompileVersion
=
[
ydlCompileVersion
=
[
...
@@ -91,7 +91,6 @@ ext {
...
@@ -91,7 +91,6 @@ ext {
//第三步 若干
//第三步 若干
"m-confide"
:
"0.0.40"
,
"m-confide"
:
"0.0.40"
,
"m-consultant"
:
"0.0.28"
,
"m-consultant"
:
"0.0.28"
,
"m-course"
:
"0.0.22"
,
"m-fm"
:
"0.0.15"
,
"m-fm"
:
"0.0.15"
,
"m-user"
:
"0.0.25"
,
"m-user"
:
"0.0.25"
,
"m-home"
:
"0.0.3"
,
"m-home"
:
"0.0.3"
,
...
@@ -101,6 +100,7 @@ ext {
...
@@ -101,6 +100,7 @@ ext {
// 以下为接入flutter的模块
// 以下为接入flutter的模块
"m-muse"
:
"0.0.7"
,
"m-muse"
:
"0.0.7"
,
"m-tests"
:
"0.0.4"
,
"m-tests"
:
"0.0.4"
,
"m-course"
:
"0.0.22"
,
//-------------- 业务模块 API 层 --------------
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.5"
,
"m-audioim-api"
:
"0.0.5"
,
"m-confide-api"
:
"0.0.1.1"
,
"m-confide-api"
:
"0.0.1.1"
,
...
@@ -129,7 +129,7 @@ ext {
...
@@ -129,7 +129,7 @@ ext {
"router"
:
"0.0.1"
,
"router"
:
"0.0.1"
,
"ydl-net"
:
"0.0.3.1"
,
"ydl-net"
:
"0.0.3.1"
,
"ydl-utils"
:
"0.0.3"
,
"ydl-utils"
:
"0.0.3"
,
"ydl-flutter-base"
:
"0.0.5.1
7
"
,
"ydl-flutter-base"
:
"0.0.5.1
9
"
,
]
]
dependencies
=
[
dependencies
=
[
...
@@ -267,7 +267,7 @@ ext {
...
@@ -267,7 +267,7 @@ ext {
//flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
//flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
"ydl-flutter-base"
:
"com.ydl:ydl-flutter-base:${ydlCompileVersion["
ydl
-
flutter
-
base
"]}"
,
//组件化项目中的flutter base模块
"ydl-flutter-base"
:
"com.ydl:ydl-flutter-base:${ydlCompileVersion["
ydl
-
flutter
-
base
"]}"
,
//组件化项目中的flutter base模块
"ydl-flutter"
:
"com.ydl:ydl-flutter:0.0.16.
4
@aar"
,
//flutter aar
"ydl-flutter"
:
"com.ydl:ydl-flutter:0.0.16.
6
@aar"
,
//flutter aar
"ydl-flutter-sp"
:
"com.ydl:ydl-flutter-sp:0.0.2@aar"
,
//flutter 缓存 aar
"ydl-flutter-sp"
:
"com.ydl:ydl-flutter-sp:0.0.2@aar"
,
//flutter 缓存 aar
//基础组件 <<--- 先发这个,发完改这里的版本号
//基础组件 <<--- 先发这个,发完改这里的版本号
...
...
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
View file @
61b21619
...
@@ -215,9 +215,9 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
...
@@ -215,9 +215,9 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
holder
.
tvChat
.
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
platform_color_999999
))
holder
.
tvChat
.
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
platform_color_999999
))
holder
.
tvChat
.
background
=
ContextCompat
.
getDrawable
(
context
,
R
.
drawable
.
consultant_expert_search_chat_rest
)
holder
.
tvChat
.
background
=
ContextCompat
.
getDrawable
(
context
,
R
.
drawable
.
consultant_expert_search_chat_rest
)
}
}
//
月售
时长
//
服务
时长
val
durationStringBuffer
=
StringBuffer
()
val
durationStringBuffer
=
StringBuffer
()
holder
.
tvSaleDurationForMonth
.
text
=
durationStringBuffer
.
append
(
itemBean
.
saleDurationForMonth
.
toInt
()).
append
(
""
).
toString
()
holder
.
tvSaleDurationForMonth
.
text
=
durationStringBuffer
.
append
(
itemBean
.
allSaleDuration
.
toInt
()).
append
(
""
).
toString
()
//价格
//价格
val
sb
=
StringBuffer
()
val
sb
=
StringBuffer
()
holder
.
tvPrice
.
text
=
sb
.
append
(
""
).
append
(
itemBean
.
minBookingPrice
).
toString
()
holder
.
tvPrice
.
text
=
sb
.
append
(
""
).
append
(
itemBean
.
minBookingPrice
).
toString
()
...
@@ -308,7 +308,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
...
@@ -308,7 +308,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
val
tvOrderNum
=
itemView
.
tvOrderNum
!!
val
tvOrderNum
=
itemView
.
tvOrderNum
!!
//帮助人数文案
//帮助人数文案
val
tvOrderNumContent
=
itemView
.
tvOrderNumContent
val
tvOrderNumContent
=
itemView
.
tvOrderNumContent
//
月售
时长
//
服务
时长
val
tvSaleDurationForMonth
=
itemView
.
tvSaleDurationForMonth
!!
val
tvSaleDurationForMonth
=
itemView
.
tvSaleDurationForMonth
!!
//月售时长文案
//月售时长文案
val
tvSaleDurationForMonthContent
=
itemView
.
tvSaleDurationForMonthContent
val
tvSaleDurationForMonthContent
=
itemView
.
tvSaleDurationForMonthContent
...
...
m-consultant/src/main/java/com/yidianling/consultant/model/bean/DoctorServiceItem.kt
View file @
61b21619
...
@@ -10,116 +10,121 @@ import com.yidianling.consultant.bean.ExpertSearchTagsIconBean
...
@@ -10,116 +10,121 @@ import com.yidianling.consultant.bean.ExpertSearchTagsIconBean
* @Company 壹点灵
* @Company 壹点灵
* @date 2018/12/11
* @date 2018/12/11
*/
*/
data class
DoctorServiceItem
(
/**
data class
DoctorServiceItem
(
* 专家ID
/**
*/
* 专家ID
val
doctorId
:
String
?,
*/
/**
val
doctorId
:
String
?,
* 专家uid
/**
*/
* 专家uid
val
uid
:
String
?,
*/
/**
val
uid
:
String
?,
* 专家名称
/**
*/
* 专家名称
val
name
:
String
?,
*/
/**
val
name
:
String
?,
* 跳转路由地址(正常为专家主页地址)
/**
*/
* 跳转路由地址(正常为专家主页地址)
val
linkUrl
:
String
?,
*/
/**
val
linkUrl
:
String
?,
* 专家头像地址
/**
*/
* 专家头像地址
val
head
:
String
?,
*/
/**
val
head
:
String
?,
* 专家是否在线 1.在线
/**
*/
* 专家是否在线 1.在线
val
isOnline
:
Int
?,
*/
/**
val
isOnline
:
Int
?,
* 能力等级 1.实习 2.新手 3.精英
/**
*/
* 能力等级 1.实习 2.新手 3.精英
val
abilityLevel
:
Int
?,
*/
/**
val
abilityLevel
:
Int
?,
* 有免费咨询:1.有,2.无
/**
*/
* 有免费咨询:1.有,2.无
val
hasServiceFree
:
Int
?,
*/
/**
val
hasServiceFree
:
Int
?,
* 活动图标
/**
*/
* 活动图标
val
activityImg
:
String
?,
*/
/**
val
activityImg
:
String
?,
* 是否参加活动
/**
*/
* 是否参加活动
val
joinActivity
:
Boolean
?,
*/
/**
val
joinActivity
:
Boolean
?,
* 是否新入驻:true:是,false:否
/**
*/
* 是否新入驻:true:是,false:否
var
isNewEnter
:
Boolean
=
false
,
*/
/**
var
isNewEnter
:
Boolean
=
false
,
* 好评率(倾诉+咨询)
/**
*/
* 好评率(倾诉+咨询)
var
feedbackRate
:
Float
=
0f
,
*/
/**
var
feedbackRate
:
Float
=
0f
,
* 评价数(咨询订单数)
/**
*/
* 评价数(咨询订单数)
var
zixunOrderNum
:
Int
=
0
,
*/
/**
var
zixunOrderNum
:
Int
=
0
,
* 咨询最低价
/**
*/
* 咨询最低价
val
minBookingPrice
:
String
?,
*/
/**
val
minBookingPrice
:
String
?,
* 资质材料
/**
*/
* 资质材料
val
teamCertifications
:
String
?,
*/
/**
val
teamCertifications
:
String
?,
* 标签分类
/**
*/
* 标签分类
val
tags
:
String
?,
*/
/**
val
tags
:
String
?,
* 已帮助人数(咨询人数)
/**
*/
* 已帮助人数(咨询人数)
val
zixunOrderUser
:
String
?,
*/
/**
val
zixunOrderUser
:
String
?,
* 月售时长
/**
*/
* 月售时长
var
saleDurationForMonth
:
Float
=
0f
,
*/
/**
var
saleDurationForMonth
:
Float
=
0f
,
* 服务
/**
*/
* 服务时长
val
products
:
MutableList
<
ExpertSearchProductsBean
>?,
*/
/**
var
allSaleDuration
:
Float
=
0f
,
* 标签图片
/**
*/
* 服务
val
tagsIcon
:
ExpertSearchTagsIconBean
?,
*/
/**
val
products
:
MutableList
<
ExpertSearchProductsBean
>?,
* 今日是否可约
/**
*/
* 标签图片
val
isTodayFree
:
Boolean
?,
*/
/**
val
tagsIcon
:
ExpertSearchTagsIconBean
?,
* 是否咨询中
/**
*/
* 今日是否可约
var
inConsult
:
Boolean
=
false
,
*/
/**
val
isTodayFree
:
Boolean
?,
* 是否聆听中
/**
*/
* 是否咨询中
var
isListening
:
Boolean
=
false
,
*/
/**
var
inConsult
:
Boolean
=
false
,
* 私聊人数
/**
*/
* 是否聆听中
var
chatNum
:
Int
=
0
,
*/
/**
var
isListening
:
Boolean
=
false
,
* 个人铭言
/**
*/
* 私聊人数
val
famousRemark
:
String
?,
*/
/**
var
chatNum
:
Int
=
0
,
* 省
/**
*/
* 个人铭言
val
province
:
String
?,
*/
/**
val
famousRemark
:
String
?,
* 市
/**
*/
* 省
val
city
:
String
?,
*/
/**
val
province
:
String
?,
* 私聊按钮的文案(如果不为空则取这个字段的值,如果为空 则默认为:“私聊”)
/**
*/
* 市
val
chatBtnText
:
String
?
*/
val
city
:
String
?,
/**
* 私聊按钮的文案(如果不为空则取这个字段的值,如果为空 则默认为:“私聊”)
*/
val
chatBtnText
:
String
?
)
)
\ No newline at end of file
m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
View file @
61b21619
This diff is collapsed.
Click to expand it.
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
View file @
61b21619
...
@@ -221,7 +221,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -221,7 +221,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
}
// 初始化顶部专家信息栏
// 初始化顶部专家信息栏
if
(
ActionHandlerStorage
.
getL
(
sessionId
).
getUserType
()
==
2
)
{
if
(
ActionHandlerStorage
.
getL
(
sessionId
)
!=
null
&&
ActionHandlerStorage
.
getL
(
sessionId
)
.
getUserType
()
==
2
)
{
top_expert_info_cl
.
setVisibility
(
View
.
VISIBLE
);
top_expert_info_cl
.
setVisibility
(
View
.
VISIBLE
);
initTopCustomBar
();
initTopCustomBar
();
}
}
...
...
m-muse/src/main/java/com/yidianling/muse/handler/MusePlugin.kt
View file @
61b21619
...
@@ -4,6 +4,8 @@ import android.graphics.drawable.Drawable
...
@@ -4,6 +4,8 @@ import android.graphics.drawable.Drawable
import
com.google.gson.Gson
import
com.google.gson.Gson
import
com.ydl.media.audio.AudioPlayer
import
com.ydl.media.audio.AudioPlayer
import
com.ydl.media.audio.model.Music
import
com.ydl.media.audio.model.Music
import
com.ydl.media.view.PlayTypeEnum
import
com.ydl.media.view.PlayerFloatHelper
import
com.ydl.ydlcommon.utils.YDLCacheUtils
import
com.ydl.ydlcommon.utils.YDLCacheUtils
import
com.ydl.ydlcommon.view.dialog.YDLShareDialog
import
com.ydl.ydlcommon.view.dialog.YDLShareDialog
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
...
@@ -77,6 +79,7 @@ class MusePlugin : MethodChannel.MethodCallHandler {
...
@@ -77,6 +79,7 @@ class MusePlugin : MethodChannel.MethodCallHandler {
music
.
artist
=
""
music
.
artist
=
""
music
.
coverPath
=
""
music
.
coverPath
=
""
music
.
title
=
""
music
.
title
=
""
PlayerFloatHelper
.
playingType
=
PlayTypeEnum
.
PLAY_TYPE_MUSE
AudioPlayer
.
get
().
singleCirclePlay
(
music
)
AudioPlayer
.
get
().
singleCirclePlay
(
music
)
}
}
}
}
...
...
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