Skip to content

Y
YDL-Component-Medical
Commit fd0aaafa by konghaorui
Options

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

parents 7392ed0f 84f65e74
Showing with 58 additions and 50 deletions
config.gradle
ext {
kotlin_version = "1.3.21"
dev_mode = true
dev_mode = false
ydl_app = [
appName : "心理咨询壹点灵",
......@@ -43,8 +43,8 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.18",
"m-consultant" : "0.0.27",
"m-course" : "0.0.21",
"m-consultant" : "0.0.33",
"m-course" : "0.0.17",
"m-fm" : "0.0.15",
"m-muse" : "0.0.11",
"m-tests" : "0.0.10",
......@@ -80,7 +80,7 @@ ext {
//第三步 若干
"m-confide" : "0.0.15",
"m-consultant" : "0.0.26",
"m-course" : "0.0.17",
"m-course" : "0.0.22",
"m-fm" : "0.0.15",
"m-muse" : "0.0.7",
"m-tests" : "0.0.4",
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
......@@ -267,7 +267,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
if (isVisibleToUser && isResumed) {
onResume()
}
}
private fun showConsultAssistantDialog() {
......
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
......@@ -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 (!ConsultantIn.isLogin()) {
ConsultantIn.toLogin(activity)
} else {
//获取用户uid
getConsultAssistantUid(activity)
}
}
}
})
})
consultAssistantDialog?.show()
}
......@@ -151,10 +151,12 @@ class ConsultAssistantDialogUtils private constructor() {
* 咨询师列表页面使用的重置本单例关于专家咨询列表页面得状态
*/
fun resetStatus() {
consultAssistantDialogFromHomePage?.dismiss()
consultAssistantDialog?.dismiss()
timer?.cancel()
timer = null
expertSearchPageHasShown = false
consultAssistantDialogFromHomePage = null
consultAssistantDialog = null
}
......@@ -163,14 +165,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
m-consultant/src/main/java/com/yidianling/consultant/router/ConsultantIn.kt
......@@ -37,7 +37,7 @@ object ConsultantIn {
}
fun toLogin(activity: Activity) {
ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity)
activity.startActivity(ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity))
}
}
\ No newline at end of file
ydl-utils/src/main/java/com/yidianling/common/tools/LogUtil.java
......@@ -24,6 +24,10 @@ public class LogUtil {
private LogUtil() {
}
public static void setPrint(boolean isPrint){
debug = isPrint;
}
private static String printLog(String log) {
//记录本地日志系统
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment