Merge branch '私聊发起收款' into 咨询列表去除重复

# Conflicts:
#	config.gradle

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceItemView.kt

 package com.yidianling.uikit.custom.widget.expertConsultService.view
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
 import android.view.View
 import android.widget.LinearLayout
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.config.HttpConfig
-import com.yidianling.avchatkit.common.log.LogUtil
+import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.ydl.ydlcommon.view.dialog.CommonDialog
 import com.yidianling.im.R
+import com.yidianling.im.config.constants.ImConstants
+import com.yidianling.im.router.ImIn
 import com.yidianling.uikit.custom.http.response.ServiceItemBean
 import com.yidianling.uikit.custom.widget.expertConsultService.callback.ConsultServiceViewCallback
+import com.yidianling.user.api.service.IUserService
 import kotlinx.android.synthetic.main.im_expert_consult_service_item_view.view.*
 
+/**
+ * 咨询服务， 预约item
+ * */
 class ExpertConsultServiceItemView : LinearLayout {
 
 
-    constructor(context: Context, listener: ConsultServiceViewCallback?,isBusy:Boolean) : super(context) {
+    constructor(context: Context, listener: ConsultServiceViewCallback?, isBusy: Boolean) : super(
+        context
+    ) {
         mListener = listener
         mContext = context
         mIsBusy = isBusy
@@ -26,7 +36,7 @@ class ExpertConsultServiceItemView : LinearLayout {
 
     private var mContext: Context? = null
     private var mListener: ConsultServiceViewCallback? = null
-    private var mIsBusy:Boolean = false
+    private var mIsBusy: Boolean = false
 
 
     private fun initView() {
@@ -50,13 +60,13 @@ class ExpertConsultServiceItemView : LinearLayout {
      */
     @SuppressLint("SetTextI18n")
     fun setData(bean: ServiceItemBean.ProductsBean) {
-        if (mIsBusy){ // 是否繁忙 true繁忙
+        if (mIsBusy) { // 是否繁忙 true繁忙
             ll_not_busy.visibility = View.GONE
             ll_busy.visibility = View.VISIBLE
             tv_add.setOnClickListener {
                 mListener?.addTime()
             }
-        }else{
+        } else {
             ll_not_busy.visibility = View.VISIBLE
             ll_busy.visibility = View.GONE
         }
@@ -126,7 +136,7 @@ class ExpertConsultServiceItemView : LinearLayout {
         }
 
         im_expert_service_list_btn.setOnClickListener {
-
+            if (ImIn.getUserService().isBindPhone()) {
                 NewH5Activity.start(
                     mContext,
                     H5Params(
@@ -134,7 +144,27 @@ class ExpertConsultServiceItemView : LinearLayout {
                         null
                     )
                 )
+            }else{
+                //新增需求，如果没有绑定手机号，跳转到绑定手机号页面
+                bindPhoneDialog()
+            }
         }
 
     }
+
+    fun bindPhoneDialog() {
+        CommonDialog(mContext)
+            .setCancelAble(false)
+            .setMessage(ImConstants.TEL_BINDPHONE)
+            .setLeftOnclick("忍痛放弃", null)
+            .setRightClick("果断绑定") { view ->
+                try {
+                    ModularServiceManager.provide(IUserService::class.java)
+                        .wxBindToInputhonePage(mContext as Activity)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+            .show()
+    }
 }
\ No newline at end of file