Merge remote-tracking branch 'origin/4.2.30' into 4.2.30

config.gradle

@@ -5,8 +5,8 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.49.07",
-            "m-consultant"    : "0.0.59.70",
+            "m-confide"       : "0.0.49.08",
+            "m-consultant"    : "0.0.59.76",
             "m-fm"            : "0.0.30.03",
             "m-user"          : "0.0.61.30",
             "m-home"          : "0.0.22.60",
@@ -21,7 +21,7 @@ ext {
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",
             "m-confide-api"   : "0.0.2.11",
-            "m-consultant-api": "0.0.5.61",
+            "m-consultant-api": "0.0.5.62",
             "m-course-api"    : "0.0.3.6",
             "m-fm-api"        : "0.0.3",
             "m-muse-api"      : "0.0.1",
@@ -88,8 +88,8 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.49.02",
-            "m-consultant"    : "0.0.59.65",
+            "m-confide"       : "0.0.49.08",
+            "m-consultant"    : "0.0.59.76",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.18",
             "m-home"          : "0.0.22.54",
@@ -103,7 +103,7 @@ ext {
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",
             "m-confide-api"   : "0.0.2.1",
-            "m-consultant-api": "0.0.5.6",
+            "m-consultant-api": "0.0.5.62",
             "m-course-api"    : "0.0.3.6",
             "m-fm-api"        : "0.0.3",
             "m-muse-api"      : "0.0.1",

m-confide/build.gradle

@@ -80,6 +80,7 @@ dependencies {
     implementation 'com.alibaba:fastjson:1.2.38'
 
     api rootProject.ext.dependencies["ydl-user-router"]
+    implementation modularPublication('com.ydl:m-consultant-api')
     if (rootProject.ext.dev_mode){
         //开发时使用
         api project(':ydl-media')

m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt

@@ -2,11 +2,11 @@ package com.ydl.confide.home
 
 import android.content.Context
 import android.os.Build
+import android.view.View
+import android.widget.LinearLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
-import android.view.View
-import android.widget.LinearLayout
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.jcodecraeer.xrecyclerview.ProgressStyle
 import com.jcodecraeer.xrecyclerview.XRecyclerView
@@ -26,12 +26,15 @@ import com.ydl.confide.home.presenter.ConfideHomePresenterImpl
 import com.ydl.confide.home.util.ConfideHomeUtils
 import com.ydl.confide.router.PhoneCallIn
 import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
+import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
 import com.ydl.ydlcommon.utils.StatusBarUtils
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.ydl.ydlcommon.view.DrawableRightTextView
 import com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
 import com.yidianling.common.tools.RxImageTool
+import com.yidianling.consultant.api.IConsultantService
 import kotlinx.android.synthetic.main.confide_home_activity.*
 import kotlinx.android.synthetic.main.confide_title_bar.*
 
@@ -178,6 +181,8 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         initClick()
         initQuickConsultDialog()
         initStatus();
+        ModularServiceManager.provide(IConsultantService::class.java).showConfideListDialog(this)
+        ActionCountUtils.count("daoyi_advertisement_page|daoyi_advertisement_visit","17")
     }
 
 

m-consultant/src/main/java/com/yidianling/consultant/constants/ConsultBIConstants.kt

@@ -17,6 +17,7 @@ class ConsultBIConstants {
         const val POSITION_CONSULT_FILTER_RESET_CLICK = "consult_filter_reset_click" //重置
         const val POSITION_CONSULT_FILTER_CHECKOUT_CLICK = "consult_filter_checkoutallconsultants_click" //查看XXX位咨询师
         const val POSITION_DAOYI_ADVERTISEMENT_CLICK="daoyi_advertisement_page|daoyi_advertisement_click"
+        const val POSITION_DAOYI_ADVERTISEMENT_VISIT="daoyi_advertisement_page|daoyi_advertisement_visit"
     }
 
     //====================APP咨询列表页（app_consult_list_page）====================

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

@@ -122,6 +122,10 @@ class ConsultantServiceImp : IConsultantService {
         ConsultAssistantEntryUtils.getTypeJump(activity,location,doctorId,url)
     }
 
+    override fun showConfideListDialog(activity: Activity) {
+        ConsultAssistantDialogUtils.INSTANCE.showFromConfideListHome(activity)
+    }
+
     override fun resetConsultAssistantDialogStatus() {
         ConsultAssistantDialogUtils.INSTANCE.resetStatus()
     }

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

@@ -38,6 +38,7 @@ class ConsultAssistantDialogUtils private constructor() {
     var consultAssistantFragmentDialog: ConsultAssistantDialog? = null //咨询师列表fragment页面展示的dialog
     var expertSearchPageHasShown: Boolean = false // 专家咨询列表fragment页面是否已经展示
     var consultAssistantActivityDialog: ConsultAssistantDialog? = null //咨询师列表activity页面展示的dialog
+    var confideListDialog: ConsultAssistantDialog? = null //倾诉列表activity页面展示的dialog
     var expertSearchActivityPageHasShown: Boolean = false // 专家咨询列表activity页面是否已经展示
 //    var ASSISTANT_DIALOG_SP_TAG = "assistant_dialog_sp_tag" // 是否展示左侧文本的缓存key
     var minWidth = 0 // 最小宽度
@@ -135,6 +136,36 @@ class ConsultAssistantDialogUtils private constructor() {
 
     //////////////////////////////////////  首页的展示隐藏逻辑 代码块end  ///////////////////////////////////////////////////
 
+    //////////////////////////////////////  倾诉列表页展示隐藏逻辑 代码块start  ///////////////////////////////////////////////////
+    /**
+     * 倾诉列表页展示
+     */
+    fun showFromConfideListHome(activity: Activity) {
+        if (!activity.isFinishing) {
+            confideListDialog = ConsultAssistantDialog(
+                    activity,
+                    object : ConsultAssistantDialog.OnConsultAssistantClickListener {
+                        override fun onClickAction() {
+                            if (!ConsultantIn.getUserImpl().loginByOneKeyLogin(activity,true)){
+                               return
+                            }
+                            ActionCountUtils.count(ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK, "17")
+                            getConsultAssistantUid("",activity,17)
+                        }
+
+                    })
+            confideListDialog?.show()
+        }
+    }
+
+    /**
+     * 倾诉列表页隐藏
+     */
+    fun hideFromConfideListPage() {
+        confideListDialog?.hide()
+    }
+
+    //////////////////////////////////////  倾诉列表页展示隐藏逻辑 代码块end  ///////////////////////////////////////////////////
 
     //////////////////////////////////////  我的展示隐藏逻辑 代码块start  ///////////////////////////////////////////////////
 

m-consultant/src/main/modular_api/com/yidianling/consultant/api/IConsultantService.kt

@@ -43,4 +43,7 @@ interface IConsultantService: IProvider {
 
     //根据返回Type跳转自主或者导医
     fun dueToTypeJumpAutoOrGuide(activity: Activity, location:Int,doctorId:Int,url:String)
+
+    // 咨询列表页显示咨询助理弹框
+    fun showConfideListDialog(activity: Activity)
 }
\ No newline at end of file

m-consultant/src/main/res/drawable/consultant_edit_cursor_drawable.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="1dp" />
+    <span style="font-family: Arial, Helvetica, sans-serif;"/>
+    <solid android:color="@color/platform_main_theme" />
+</shape>
\ No newline at end of file

m-consultant/src/main/res/layout/consultant_activity_hot_search.xml

@@ -60,7 +60,7 @@
                 android:tag="tag_search_input_edit"
                 android:textColor="#242424"
                 android:textColorHint="#b3b3b3"
-                android:textCursorDrawable="@color/platform_main_theme"
+                android:textCursorDrawable="@drawable/consultant_edit_cursor_drawable"
                 android:textSize="13sp" />
 
             <ImageView
@@ -104,9 +104,9 @@
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
             android:scaleType="centerCrop"
+            android:visibility="gone"
             app:pa_borderRadius="8dp"
             app:pa_type="pa_round"
-            android:visibility="gone"
             tools:visibility="visible" />
 
 
@@ -115,9 +115,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/v_topLine"
+            android:layout_marginTop="13dp"
             android:clickable="true"
             android:focusable="true"
-            android:layout_marginTop="13dp"
             android:orientation="vertical"
             android:paddingLeft="15dp"
             android:paddingRight="15dp">