Merge branch 'fix/fq/fq_v4.3.98' into 'd/v4.3.98'

Fix/fq/fq v4.3.98

See merge request app_android_lib/YDL-Component!172

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

@@ -9,14 +9,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.animation.AccelerateInterpolator
-import android.view.animation.Animation
 import android.view.animation.DecelerateInterpolator
-import android.view.animation.TranslateAnimation
+import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.interfaces.DraweeController
 import com.jcodecraeer.xrecyclerview.ProgressStyle
@@ -57,6 +57,7 @@ import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.api.service.IImService
 import com.yidianling.user.api.service.IUserService
 import kotlinx.android.synthetic.main.confide_home_activity.*
+import kotlinx.android.synthetic.main.confide_recommend_view_new.view.*
 import kotlinx.android.synthetic.main.confide_title_bar.*
 
 /**
@@ -264,7 +265,7 @@ class ConfideHomeActivity :
         findViewById<View>(R.id.confide_Free).visibility = if (isLogin) View.GONE else View.VISIBLE
         if (!isLogin) {
             val controller: DraweeController = Fresco.newDraweeControllerBuilder()
-                .setUri(Uri.parse("res://drawable/" + R.drawable.first_order))
+                .setUri(Uri.parse("res://drawable/" + R.drawable.confide_first_order))
                 .setOldController(confide_Free.controller)
                 .setAutoPlayAnimations(true) // 是否自动播放Gif动画
                 .build()
@@ -273,6 +274,11 @@ class ConfideHomeActivity :
         if (isLogin) {
             findViewById<View>(R.id.confideRed).visibility =
                 if (listenFree) View.VISIBLE else View.GONE
+
+            Glide.with(this)
+                .load(R.drawable.confide__free)
+                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                .into(findViewById<ImageView>(R.id.confideRed))
             (quick_consult_btn.layoutParams as? ViewGroup.MarginLayoutParams)?.rightMargin =
                 if (listenFree) dp48 / 2 else 0
         }
@@ -305,7 +311,8 @@ class ConfideHomeActivity :
                 this as FragmentActivity,
                 HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro("0"),
                 "0",
-                true
+                true,
+                listenFree = listenFree
             )
 
 
@@ -640,4 +647,15 @@ class ConfideHomeActivity :
     }
 
 
+
+    fun searchLinkUrlByUid(uid : String):String{
+        cacheList?.forEach {confideHomeDataBean ->
+            confideHomeDataBean.body?.forEach { confideHomeBodyBean ->
+                if (uid == confideHomeBodyBean.uid.toString()){
+                    return confideHomeBodyBean.linkUrl?:""
+                }
+            }
+        }
+        return ""
+    }
 }
\ No newline at end of file

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

@@ -132,13 +132,13 @@ class ConfideHomeEventImpl(context: Context, var confideHomeView: IConfideHomeCo
      * 最佳倾诉榜单--点我倾诉
      * @param linkUrl 跳转地址
      */
-    override fun consultantClick(doctorId: String?, confideId: String?, uid: String?) {
+    override fun consultantClick(doctorId: String?, confideId: String?, uid: String?,listenFree : Boolean?, expertUrl:String?) {
         confideId?.let {
             ConfideBottomSheetDialogFragment()
                 .showBottomSheetDialog(
                     mContext as FragmentActivity,
                     HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(it),
-                    doctorId!!, uid = uid
+                    doctorId!!, uid = uid, listenFree = listenFree ?: false,expertUrl = expertUrl?:""
                 )
         }
     }

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

@@ -73,7 +73,7 @@ interface IConfideHomeEvent {
      * 咨询师推荐--点我倾诉
      * @param linkUrl 跳转地址
      */
-    fun consultantClick(doctorId: String?, confideId: String?, uid: String?)
+    fun consultantClick(doctorId: String?, confideId: String?, uid: String?, listenFree: Boolean?= false, expertUrl : String?="")
 
     fun videoShowClick(index: Int, data: List<ConfideHomeBodyBean>?)
 

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

@@ -38,7 +38,7 @@ interface ConfideHomeApi {
     // 1=在线 3-通话中 2-离线
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
     @GET("auth/listen/dialchangestatus")
-    fun getDialStatus(@Query("doctorId") doctorId: String): Observable<BaseAPIResponse<DialStatus>>
+    fun getDialStatus(@Query("doctorId") doctorId: String, @Query("listenVersion")listenVersion : String = "2.1"): Observable<BaseAPIResponse<DialStatus>>
 
     @GET
     fun recommendDoctor(

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

@@ -16,9 +16,15 @@ fun TextView.confideLineText(line: Int) {
         3 -> {
             text = "通话中"
         }
-        4->{
+        4 -> {
             text = "继续倾诉"
         }
+        5 -> {
+            text = "已离线，可预约"
+        }
+        6 -> {
+            text = "已离线，可留言"
+        }
     }
 }
 

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

@@ -243,7 +243,7 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
     private fun click(bodyBean: ConfideHomeBodyBean) {
         when (bodyBean.confideLine) {//1在线 2离线 3通话中
             1, 3, 4 -> {
-                confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId, bodyBean.uid?.toString())
+                confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId, bodyBean.uid?.toString(), bodyBean.listenFree)
             }
             2 -> {
                 //跳转私聊 并发送自定义消息

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

@@ -94,7 +94,8 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
                 "1"
             )
 
-            confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId, bodyBean.uid?.toString())
+            confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId, bodyBean.uid?.toString(), bodyBean.listenFree,bodyBean.linkUrl)
+
         }
         img_head.setOnClickListener {
             ActionCountUtils.record("listen_counselor_list_page", "head_portrait_click", "2")
@@ -344,7 +345,7 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
                 if (bodyBean.confideLine == 3) {
                 }
 
-                confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId, bodyBean.uid?.toString())
+                confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId, bodyBean.uid?.toString(), bodyBean.listenFree)
             }
             2 -> {
                 //跳转私聊 并发送自定义消息

m-confide/src/main/java/com/ydl/confide/intro/ItemIntroHolder.kt

@@ -2,6 +2,7 @@ package com.ydl.confide.intro
 
 import android.app.Activity
 import android.net.Uri
+import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.widget.SeekBar
@@ -11,6 +12,7 @@ import androidx.databinding.ObservableInt
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
+import com.alibaba.android.arouter.launcher.ARouter
 import com.dou361.ijkplayer.widget.IjkVideoView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.interfaces.DraweeController
@@ -35,6 +37,8 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.confide_home_activity.*
 import tv.danmaku.ijk.media.player.IjkMediaPlayer
+import java.io.UnsupportedEncodingException
+import java.net.URLDecoder
 import java.net.URLEncoder
 import java.util.concurrent.TimeUnit
 
@@ -77,6 +81,36 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
             )
             val status = item.lineStatus.get()
             when (status) {
+                5 -> {
+                    if (!TextUtils.isEmpty(item.linkedUrl.get())){
+                        val linkUri = Uri.parse(item.linkedUrl.get())
+                        if (linkUri != null) {
+                            val host = linkUri.host
+                            if (!TextUtils.isEmpty(host) && host == "h5") {
+                                //如果是h5，跳转至NewH5Activity
+                                try {
+                                    var params = URLDecoder.decode(linkUri.getQueryParameter("params"),"UTF-8")
+                                    ARouter.getInstance().build("/new_h5/h5").withSerializable("routerParam", params).navigation()
+                                }catch (e : NullPointerException){
+                                    com.yidianling.common.tools.LogUtil.e("params参数为空")
+                                }catch (e : UnsupportedEncodingException){
+                                    com.yidianling.common.tools.LogUtil.e("解码错误")
+                                }catch (e : UnsupportedOperationException){
+                                    com.yidianling.common.tools.LogUtil.e("这不是一个uri格式的地址")
+                                }
+                            }
+                        }
+                    }
+                }
+
+                6 -> {
+                    if (!item.uid.isNullOrBlank()) {
+                        (itemView.context as? Activity)?.let { it1 ->
+                            ARouter.getInstance().navigation(IImService::class.java)
+                                ?.startChatBySessionId(it1, item.uid!!)
+                        }
+                    }
+                }
                 2, 3 -> {//离线，通话中
                     (itemView.context as? Activity)?.let { aty ->
                         findRouteService(IImService::class.java).startChat(aty, item.uid!!, 0, 0)
@@ -226,12 +260,19 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
         }
 
         val controller: DraweeController = Fresco.newDraweeControllerBuilder()
-            .setUri(Uri.parse("res://drawable/" + R.drawable.first_order))
+            .setUri(Uri.parse("res://drawable/" + R.drawable.confide_first_order))
             .setOldController(binding.confideFirstFree.controller)
             .setAutoPlayAnimations(true) // 是否自动播放Gif动画
             .build()
         binding.confideFirstFree.controller = controller
 
+        val freeController: DraweeController = Fresco.newDraweeControllerBuilder()
+            .setUri(Uri.parse("res://drawable/" + R.drawable.confide_free))
+            .setOldController(binding.free.controller)
+            .setAutoPlayAnimations(true) // 是否自动播放Gif动画
+            .build()
+        binding.free.controller = freeController
+
         binding.seekbar.progress = 0
         binding.seekbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
@@ -330,7 +371,8 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
                     itemView.context as FragmentActivity,
                     url,
                     item.doctorId!!,
-                    uid = item.uid
+                    uid = item.uid,
+                    listenFree = item.listenFree.get()
                 )
         }
     }
@@ -352,6 +394,8 @@ class VideoViewModel {
     var uid: String? = null
     var doctorId: String? = null
     var confideId: String? = null
+    var listenFree = ObservableBoolean(false)
+    var linkedUrl = ObservableField<String>("")
 }
 
 private fun genMinProgramPath(url: String): String {
@@ -363,6 +407,7 @@ private fun genMinProgramPath(url: String): String {
 internal fun VideoViewModel.mapOf(bean: ConfideHomeBodyBean): VideoViewModel {
     name.set(bean.confidedName)
     avatar.set(bean.confidedIcon)
+    linkedUrl.set(bean.linkUrl)
     val num = bean.confideNum?.replace("人", "") ?: "0"
     count.set("倾诉人次 $num")
     intro.set(bean.confideContent)
@@ -385,6 +430,11 @@ internal fun VideoViewModel.mapOf(bean: ConfideHomeBodyBean): VideoViewModel {
     uid = bean.uid?.toString()
     doctorId = bean.doctorId
     confideId = bean.confidedId
+    if (bean.listenFree == null) {
+        listenFree.set(false)
+    } else {
+        listenFree.set(bean.listenFree!!)
+    }
     return this
 }
 

m-confide/src/main/res/drawable/confide_offline_book_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="26dp" />
+    <gradient
+        android:endColor="#FE745B"
+        android:startColor="#FF8772" />
+    <stroke
+        android:width="1dp"
+        android:color="#69FFFFFF" />
+</shape>
\ No newline at end of file

m-confide/src/main/res/layout/confide_bottom_two.xml

@@ -83,12 +83,24 @@
         app:layout_constraintCircleRadius="70dp" />-->
 
     <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/free"
+        android:layout_width="@dimen/platform_dp_48"
+        android:layout_height="@dimen/platform_dp_24"
+        app:layout_constraintCircle="@+id/layoutCall"
+        app:layout_constraintCircleAngle="70"
+        app:layout_constraintCircleRadius="70dp"
+        android:visibility="gone"
+        tools:ignore="MissingConstraints" />
+
+    <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/first_order"
-        android:layout_width="@dimen/platform_dp_64"
-        android:layout_height="@dimen/platform_dp_34"
+        android:layout_width="@dimen/platform_dp_48"
+        android:layout_height="@dimen/platform_dp_24"
         app:layout_constraintCircle="@+id/layoutCall"
         app:layout_constraintCircleAngle="70"
-        app:layout_constraintCircleRadius="70dp"/>
+        app:layout_constraintCircleRadius="70dp"
+        android:visibility="gone"
+        tools:ignore="MissingConstraints" />
 
 
     <LinearLayout

m-confide/src/main/res/layout/item_expert_intro.xml

@@ -100,7 +100,7 @@
             android:layout_width="160dp"
             android:layout_height="47dp"
             android:layout_marginBottom="28dp"
-            android:background="@{item.lineStatus==3?@drawable/confide_line_bg_3:(item.lineStatus==2?@drawable/confide_line_bg_2:@drawable/confide_line_bg_1)}"
+            android:background="@{(item.lineStatus == 5 || item.lineStatus == 6) ? @drawable/confide_offline_book_bg : item.lineStatus==3?@drawable/confide_line_bg_3:(item.lineStatus==2?@drawable/confide_line_bg_2:@drawable/confide_line_bg_1)}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -166,13 +166,24 @@
             app:layout_constraintCircleRadius="70dp" />-->
 
         <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/free"
+            android:layout_width="@dimen/platform_dp_48"
+            android:layout_height="@dimen/platform_dp_24"
+            android:visibility="@{item.listenFree?View.VISIBLE:View.GONE}"
+            app:layout_constraintCircle="@+id/layoutCall"
+            app:layout_constraintCircleAngle="70"
+            app:layout_constraintCircleRadius="70dp"
+            tools:ignore="MissingConstraints" />
+
+        <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/confide_first_free"
-            android:layout_width="@dimen/platform_dp_64"
-            android:layout_height="@dimen/platform_dp_34"
+            android:layout_width="@dimen/platform_dp_48"
+            android:layout_height="@dimen/platform_dp_24"
             android:visibility="@{item.showFreeTag?View.VISIBLE:View.GONE}"
             app:layout_constraintCircle="@+id/layoutCall"
             app:layout_constraintCircleAngle="70"
-            app:layout_constraintCircleRadius="70dp" />
+            app:layout_constraintCircleRadius="70dp"
+            tools:ignore="MissingConstraints" />
 
         <TextView
             android:id="@+id/tvTag"