Skip to content

Y
YDL-Component-Medical
Commit b9863cc1 by 霍志良
Options

feat:新年导医开关配置

parent 6ca663e8
Showing with 41 additions and 29 deletions
config.gradle
......@@ -6,7 +6,7 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.48.91",
"m-consultant" : "0.0.59.40",
"m-consultant" : "0.0.59.50",
"m-fm" : "0.0.30.00",
"m-user" : "0.0.60.83",
"m-home" : "0.0.22.51",
......@@ -89,7 +89,7 @@ ext {
//第三步 若干
"m-confide" : "0.0.48.91",
"m-consultant" : "0.0.51.16",
"m-consultant" : "0.0.59.44",
"m-fm" : "0.0.23.5",
"m-user" : "0.0.60.83",
"m-home" : "0.0.22.51",
......
m-consultant/build.gradle
......@@ -74,12 +74,14 @@ dependencies {
//开发时使用
implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-im-api')
implementation modularPublication('com.ydl:m-home-api')
api project(":ydl-webview")
api project(":ydl-platform")
} else {
//发布时使用
compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
compileOnly rootProject.ext.dependencies["ydl-m-im-api"]
compileOnly rootProject.ext.dependencies["ydl-m-home-api"]
api rootProject.ext.dependencies["ydl-webview"]
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
......
m-consultant/src/main/java/com/yidianling/consultant/bean/HomeModuleTabEvent.java deleted 100644 → 0
package com.yidianling.consultant.bean;
public class HomeModuleTabEvent {
private int tabIndex;
public HomeModuleTabEvent(int index) {
tabIndex = index;
}
public int getTabIndex() {
return tabIndex;
}
public void setTabIndex(int tabIndex) {
this.tabIndex = tabIndex;
}
}
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
......@@ -3,19 +3,18 @@ package com.yidianling.consultant.modular.singlton
import android.annotation.SuppressLint
import android.app.Activity
import android.support.v7.app.AppCompatActivity
import android.text.TextUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
import com.yidianling.consultant.ConsultAssistantCenterActivity
import com.yidianling.consultant.bean.HomeModuleTabEvent
import com.yidianling.consultant.ExpertSearchActivity
import com.yidianling.consultant.constants.ConsultBIConstants
import com.yidianling.consultant.dialog.ConsultAssistantDialog
import com.yidianling.consultant.model.SearchApi
import com.yidianling.consultant.router.ConsultantIn
import com.yidianling.home.api.event.HomeModuleTabEvent
import de.greenrobot.event.EventBus
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
......@@ -316,9 +315,21 @@ class ConsultAssistantDialogUtils private constructor() {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
if (it.data==100L){
if (it.data==100L&&(location<=11)){
//跳转咨询tab栏目
EventBus.getDefault().post(HomeModuleTabEvent(2))
LogUtil.e("it.data"+it.data+"location:"+location)
if (location==1||location==4||location==6||location==3){
if (activity is ExpertSearchActivity &&!activity.isFinishing){
activity.finish()
}
EventBus.getDefault().post(HomeModuleTabEvent(2))
}else{
if (null!=activity&&!activity.isFinishing){
activity.finish()
}
LogUtil.e("activity:"+activity.packageName)
EventBus.getDefault().post(HomeModuleTabEvent(2))
}
}else{
if (it.code == "200" && it.data != 0.toLong() && null != activity) {
ConsultantIn.startP2PSession(activity as AppCompatActivity, it.data.toString())
......
m-consultant/src/main/java/com/yidianling/consultant/modular/utils/ConsultAssistantEntryUtils.kt
......@@ -7,15 +7,16 @@ import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
import com.yidianling.consultant.ConsultAssistantCenterActivity
import com.yidianling.consultant.bean.HomeModuleTabEvent
import com.yidianling.consultant.ExpertSearchActivity
import com.yidianling.consultant.HotSearchActivity
import com.yidianling.consultant.constants.ConsultBIConstants
import com.yidianling.consultant.model.SearchApi
import com.yidianling.consultant.router.ConsultantIn
import com.yidianling.home.api.event.HomeModuleTabEvent
import de.greenrobot.event.EventBus
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
......@@ -38,9 +39,25 @@ class ConsultAssistantEntryUtils {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
if (it.data==100L){
/*
* location=1首页，3问答列表页，4我的入口，5亲子在线咨询入口，6咨询列表页导医入口，
* 7使用心理课进入，8使用心理课列表页进入，9测评解读页进入，10搜索页进入，11注册引导页
* 0小壹点击前往
* */
if (it.data==100L&&(location<=11)){
//跳转咨询tab栏目
EventBus.getDefault().post(HomeModuleTabEvent(2))
if (location==1||location==4||location==6||location==3){
if (activity is ExpertSearchActivity&&!activity.isFinishing){
activity.finish()
}
EventBus.getDefault().post(HomeModuleTabEvent(2))
}else{
if (null!=activity&&!activity.isFinishing){
activity.finish()
}
LogUtil.e("activity:"+activity.packageName)
EventBus.getDefault().post(HomeModuleTabEvent(2))
}
}else{
if (it.code == "200" && it.data != 0.toLong() && null != activity) {
ConsultantIn.startP2PSession(
......
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