feat : 前置信息收集导医分配增加参数

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.04",
             "m-user"          : "0.0.61.94",
             "m-home"          : "0.0.22.84",
-            "m-im"            : "0.0.21.01",
+            "m-im"            : "0.0.21.03",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.10",
 
@@ -93,7 +93,7 @@ ext {
             "m-fm"            : "0.0.30.07",
             "m-user"          : "0.0.61.94",
             "m-home"          : "0.0.22.83",
-            "m-im"            : "0.0.21.01",
+            "m-im"            : "0.0.21.03",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.8",
 

m-im/src/main/java/com/yidianling/im/http/ImRetrofitApi.kt

@@ -156,6 +156,8 @@ interface ImRetrofitApi {
     fun getConsultAssistantUidRequest(
         @Query("location") location: Int,
         @Query("ffrom_2") ffrom: String?,
-        @Query("naviType") naviType: String = "1"
+        @Query("naviType") naviType: String = "1",
+        @Query("examId") examId: String = "",
+        @Query("questionPaperId") questionPaperId: String = ""
     ): Observable<BaseAPIResponse<Long>>
 }
\ No newline at end of file

m-im/src/main/java/com/yidianling/im/ui/activity/CmsExamQuestionPaperActivity.kt

@@ -86,8 +86,9 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
 
         private var location: Int = 0
         private var ffrom2: String? = null
+
         /**单选类型*/
-        private const val RADIO_KEY="radio"
+        private const val RADIO_KEY = "radio"
 
         @JvmStatic
         fun start(context: Context, toUid: String, expertInfo: IMExpertBuild, isFromQingShu: Int) {
@@ -241,7 +242,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
         //当前问题
         tv_cur_problem.setOnClickListener {
             problemContent = et_input_problem.text.toString()
-            if (!TextUtils.isEmpty(problemContent)){
+            if (!TextUtils.isEmpty(problemContent)) {
                 problemContent = "$problemContent\n\n"
             }
             et_input_problem.setText("$problemContent${tv_cur_problem.text}：")
@@ -251,7 +252,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
         //持续时间
         tv_duration.setOnClickListener {
             problemContent = et_input_problem.text.toString()
-            if (!TextUtils.isEmpty(problemContent)){
+            if (!TextUtils.isEmpty(problemContent)) {
                 problemContent = "$problemContent\n\n"
             }
             et_input_problem.setText("$problemContent${tv_duration.text}：")
@@ -261,7 +262,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
         //问题影响
         tv_problem_impact.setOnClickListener {
             problemContent = et_input_problem.text.toString()
-            if (!TextUtils.isEmpty(problemContent)){
+            if (!TextUtils.isEmpty(problemContent)) {
                 problemContent = "$problemContent\n\n"
             }
             et_input_problem.setText("$problemContent${tv_problem_impact.text}：")
@@ -322,6 +323,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
             }
         }
     }
+
     /**
      * 最后一题
      * */
@@ -348,6 +350,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
             mData[index].type5CanClick = false
         }
     }
+
     /**
      * 隐藏输入框
      * */
@@ -405,10 +408,10 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
             //还有下一题
             questionMultiItem2.questionsBean = questionsBean
             if (RADIO_KEY == questionsBean.type) {
-                if(!questionsBean.image.isNullOrEmpty()||!questionsBean.url.isNullOrEmpty()){
+                if (!questionsBean.image.isNullOrEmpty() || !questionsBean.url.isNullOrEmpty()) {
                     tv_skip.visibility = View.GONE
                     questionMultiItem2.viewType = 7
-                }else{
+                } else {
                     questionMultiItem2.viewType = 3
                 }
             } else {
@@ -589,10 +592,10 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
         val questionsBean = mQuestionBean!!.questionPaper.questions[questionChain.questionId]
         questionMultiItem2.questionsBean = questionsBean
         if (RADIO_KEY == questionsBean?.type) {
-            if(!questionsBean.image.isNullOrEmpty()||!questionsBean.url.isNullOrEmpty()){
+            if (!questionsBean.image.isNullOrEmpty() || !questionsBean.url.isNullOrEmpty()) {
                 tv_skip.visibility = View.GONE
                 questionMultiItem2.viewType = 7
-            }else{
+            } else {
                 questionMultiItem2.viewType = 3
             }
         } else {
@@ -772,8 +775,11 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
             }, 1000L)
         } else {
             //代表是导医进来的  导医进来的需要获取导医后再发送消息
+            var questionPaperId = ""
+            mQuestionBean?.questionPaper?.id?.let { questionPaperId = it }
+
             ImRetrofitApi.getImJavaApi()
-                .getConsultAssistantUidRequest(location, ffrom2)
+                .getConsultAssistantUidRequest(location, ffrom2, answerQuestionId, questionPaperId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ uidBean ->

m-im/src/main/java/com/yidianling/uikit/custom/http/response/question/QuestionPaperBean.java

@@ -3,6 +3,7 @@ package com.yidianling.uikit.custom.http.response.question;
 import java.util.Map;
 
 public class QuestionPaperBean {
+    //试卷id
     public String id;
     public String createTime;
     public String updateTime;