feat:consult组件

config.gradle

@@ -6,7 +6,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.48.91",
-            "m-consultant"    : "0.0.59.51",
+            "m-consultant"    : "0.0.59.61",
             "m-fm"            : "0.0.30.00",
             "m-user"          : "0.0.60.84",
             "m-home"          : "0.0.22.51",

m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt

@@ -3,7 +3,9 @@ package com.yidianling.consultant.modular.singlton
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.support.v7.app.AppCompatActivity
+import com.alibaba.android.arouter.launcher.ARouter
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
+import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.common.tools.LogUtil
@@ -323,8 +325,14 @@ class ConsultAssistantDialogUtils private constructor() {
                         }
                         EventBus.getDefault().post(HomeModuleTabEvent(2))
                     }else{
-                        if (null!=activity&&!activity.isFinishing){
+                        if (activity.componentName.toString().contains("CourseListContainerActivity") ){
+                            ActivityManager.getInstance()
+                                .getSecondTaskActivity()?.finish()
                             activity.finish()
+                        }else{
+                            if (null!=activity&&!activity.isFinishing){
+                                activity.finish()
+                            }
                         }
                         EventBus.getDefault().post(HomeModuleTabEvent(2))
                     }

m-consultant/src/main/java/com/yidianling/consultant/modular/utils/ConsultAssistantEntryUtils.kt

@@ -7,6 +7,8 @@ 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.ActivityManager
+import com.ydl.ydlcommon.utils.ActivityManager.Companion.getInstance
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.ToastUtil
@@ -50,10 +52,17 @@ class ConsultAssistantEntryUtils {
                             if (activity is ExpertSearchActivity&&!activity.isFinishing){
                                 activity.finish()
                             }
+
                             EventBus.getDefault().post(HomeModuleTabEvent(2))
                         }else{
-                            if (null!=activity&&!activity.isFinishing){
+                            if (activity.componentName.toString().contains("CourseListContainerActivity") ){
+                                getInstance()
+                                    .getSecondTaskActivity()?.finish()
                                 activity.finish()
+                            }else{
+                                if (null!=activity&&!activity.isFinishing){
+                                    activity.finish()
+                                }
                             }
                             EventBus.getDefault().post(HomeModuleTabEvent(2))
                         }