1.修改IM聊天页面UI

baselib/src/main/java/com/yingyangfly/baselib/image/ImagePagerActivity.kt

@@ -47,11 +47,6 @@ class ImagePagerActivity : FragmentActivity() {
     private fun initData(arg0: Bundle?) {
         pagerPosition = intent.getIntExtra(EXTRA_IMAGE_INDEX, 0)
         val urls = intent.getStringArrayListExtra(EXTRA_IMAGE_URLS)
-        if(urls.isNullOrEmpty()){
-            Log.e("wpp", "1----------------------")
-        } else {
-            Log.e("wpp", "2----------------------")
-        }
         pageSize = urls!!.size
         val us = ArrayList<String>()
         if (urls.size <= 3) {

healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -144,7 +144,11 @@ class HealthConsultationActivity :
         }, success = {
             consultationBeans.clear()
             if (it.isNullOrEmpty().not()) {
-                consultationBeans.addAll(it!!)
+                it!!.forEach {
+                    if (it.doctor != null) {
+                        consultationBeans.add(it.doctor)
+                    }
+                }
             }
             consultationAdapter.setData(consultationBeans)
             binding {

healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationViewModel.kt

@@ -1,5 +1,6 @@
 package com.yingyang.healthconsultation.activity
 
+import com.yingyang.healthconsultation.entity.ConsultationListBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel
@@ -27,7 +28,7 @@ class HealthConsultationViewModel : BaseViewModel() {
      */
     fun getConsultationList(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<DoctorBean>?) -> Unit)? = null,
+        success: ((success: List<ConsultationListBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         HEALTHCONSULTATION_API.getConsultationList()
     }.runUI(

healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/ConsultationListBean.kt

@@ -0,0 +1,33 @@
+package com.yingyang.healthconsultation.entity
+
+import com.yingyangfly.baselib.db.DoctorBean
+
+/**
+ * 正在进行的问诊
+ */
+data class ConsultationListBean(
+    val appUserAge: String,
+    val appUserId: String,
+    val appUserName: String,
+    val appUserSex: String,
+    val createBy: String,
+    val createTime: String,
+    val doctor: DoctorBean,
+    val finishTime: String,
+    val id: String,
+    val images: String,
+    val isConsultation: String,
+    val mobile: String,
+    val orgCode: String,
+    val orgName: String,
+    val payMethod: String,
+    val price: Double,
+    val reason: String,
+    val remark: String,
+    val sickTime: String,
+    val status: String,
+    val sysUserId: String,
+    val sysUserName: String,
+    val updateBy: String,
+    val updateTime: String
+)

healthconsultation/src/main/java/com/yingyang/healthconsultation/net/HealthConsultationApiService.kt

@@ -1,9 +1,6 @@
 package com.yingyang.healthconsultation.net
 
-import com.yingyang.healthconsultation.entity.ConsultationRecordsBean
-import com.yingyang.healthconsultation.entity.EvaluateRecordsBean
-import com.yingyang.healthconsultation.entity.MedicalConsultationDetailBean
-import com.yingyang.healthconsultation.entity.UserInfoBean
+import com.yingyang.healthconsultation.entity.*
 import com.yingyangfly.baselib.bean.PayImageBean
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.net.BaseResp
@@ -25,7 +22,7 @@ interface HealthConsultationApiService {
      * 正在进行的咨询列表
      */
     @POST("medical_consultation/list")
-    suspend fun getConsultationList(): BaseResp<List<DoctorBean>>
+    suspend fun getConsultationList(): BaseResp<List<ConsultationListBean>>
 
     /**
      * 获取个人中心信息接口

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -173,7 +173,7 @@ class LiveBroadcastActivity :
             }
 
             override fun onSuccess() {
-                Log.e("wpp", "IM登陆成功")
+
             }
         })
     }

tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatConstants.java

@@ -19,6 +19,7 @@ public class TUIChatConstants {
     public static final String BUSINESS_ID_QUICK_TAP = "quick_tap";
     public static final String BUSINESS_ID_CUSTOM_END_CONSULTATION = "end";
     public static final String BUSINESS_ID_CUSTOM_START_CONSULTATION = "start";
+    public static final String BUSINESS_ID_CUSTOM_PATIENT_CONSULTATION = "patient";
 
     public static final int PLUGIN_NORMAL_MESSAGE = 1;
     public static final int PLUGIN_TIPS_MESSAGE = 2;

tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/PatientStartConsultationBean.java

@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+/**
+ * 开始问诊消息
+ *
+ * @author 王鹏鹏
+ */
+public class PatientStartConsultationBean {
+
+    public String businessID = TUIChatConstants.BUSINESS_ID_CUSTOM_PATIENT_CONSULTATION;
+}

tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/C2CChatPresenter.java

@@ -5,6 +5,7 @@ import android.util.Log;
 import android.util.Pair;
 
 import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
 import com.tencent.qcloud.tuikit.timcommon.bean.MessageFeature;
 import com.tencent.qcloud.tuikit.timcommon.bean.MessageReceiptInfo;
 import com.tencent.qcloud.tuikit.timcommon.bean.TUIMessageBean;
@@ -14,7 +15,9 @@ import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
 import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
 import com.tencent.qcloud.tuikit.tuichat.bean.CustomStartConsultationBean;
 import com.tencent.qcloud.tuikit.tuichat.bean.message.MessageTypingBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.PatientStartConsultationBean;
 import com.tencent.qcloud.tuikit.tuichat.interfaces.C2CChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
 import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
 import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
 
@@ -64,7 +67,14 @@ public class C2CChatPresenter extends ChatPresenter {
                         parseTypingMessage((MessageTypingBean) message);
                         return;
                     } else if (message instanceof CustomStartConsultationBean) {
-
+                        V2TIMMessage v2TIMMessage = message.getV2TIMMessage();
+                        if (v2TIMMessage != null) {
+                            String description = v2TIMMessage.getCustomElem().getDescription();
+                            if (!TextUtils.isEmpty(description)) {
+                                sendPatientMessage(description);
+                            }
+                        }
+                        return;
                     }
                     C2CChatPresenter.this.onRecvNewMessage(message);
                 }
@@ -114,6 +124,18 @@ public class C2CChatPresenter extends ChatPresenter {
         initMessageSender();
     }
 
+    /**
+     * 发送患者信息
+     */
+    private void sendPatientMessage(String description) {
+        Gson gson = new Gson();
+        PatientStartConsultationBean patientStartConsultationBean = new PatientStartConsultationBean();
+        patientStartConsultationBean.businessID = TUIChatConstants.BUSINESS_ID_CUSTOM_PATIENT_CONSULTATION;
+        String data = gson.toJson(patientStartConsultationBean);
+        TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, description, description.getBytes());
+        sendMessage(info, false, null);
+    }
+
     /**
      * 拉取消息
      *

tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java

@@ -143,6 +143,7 @@ public final class TUIConstants {
         public static final String CALL_BACK = "callback";
         public static final String PLUGIN_ITEM_VIEW = "pluginItemView";
         public static final String PLUGIN_BEAN_OBJECT = "pluginBeanObject";
+        public static final String PATIENTINFO = "patientInfo";
 
         // Send custom message fields
         public static final String MESSAGE_CONTENT = "messageContent";