Merge remote-tracking branch 'origin/4.2.60_lp_test' into 4.2.60_lp_test

# Conflicts:
#	m-im/src/main/java/com/yidianling/uikit/business/session/view/QuestionInformationView.kt
#	m-im/src/main/res_uikit/layout/im_view_question_infomation.xml

m-im/src/main/java/com/yidianling/uikit/business/session/view/question/QuestionMultiItem.java

@@ -2,11 +2,12 @@ package com.yidianling.uikit.business.session.view.question;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.yidianling.uikit.custom.http.response.question.QuestionsBean;
+import com.yidianling.uikit.custom.http.response.question.QuestionsBeanExample;
+
 
 /**
- * Created by hzchenkang on 2017/6/21.
+ * @author liupeng
  */
-
 public class QuestionMultiItem implements MultiItemEntity {
 
     public int viewType;
@@ -15,6 +16,9 @@ public class QuestionMultiItem implements MultiItemEntity {
     public String type2Text;
     /***type 3 单选 type 4  多选  */
     public QuestionsBean questionsBean;
+    public boolean type4CanClick;
+
+    public QuestionsBeanExample type5Bean;
 
 
     @Override

m-im/src/main/java/com/yidianling/uikit/business/session/view/question/QuestionOneCheckListener.kt

@@ -6,15 +6,15 @@ interface QuestionOneCheckListener {
     /**
      * 单选点击获取item信息
      */
-    fun itemClick(bean: OptionsBean?,questionId:String)
+    fun itemClick(bean: OptionsBean?, questionId: String)
 
     /**
      * 多选确定按钮点击
      */
-    fun moreDefineItemClick(list: List<OptionsBean?>?)
+    fun moreDefineItemClick(list: List<OptionsBean?>?, questionId: String)
 
     /**
      * 展示其他
      */
-    fun showOtherEdit(list: List<OptionsBean?>?)
+    fun showOtherEdit(list: List<OptionsBean?>?, questionId: String)
 }
\ No newline at end of file

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

@@ -24,7 +24,7 @@ public class QuestionsBean {
     public int isDeleted;
     public String questionPaperId;
     public String category;
-    public int order;
+    public String order;
     public String name;
     /***类型:
      * radio(单选)

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

 package com.yidianling.uikit.custom.http.response.question;
 
 import java.util.List;
-import java.util.Map;
 
 public class QuestionsInfoBean {
 
@@ -21,19 +20,8 @@ public class QuestionsInfoBean {
      * question_chains : {"601128318581870592":{"id":"601145789934211072","create_time":"2021-06-12 17:39:50","update_time":"2021-06-12 17:41:31","question_paper_id":"601128023407726592","question_id":"601128318581870592","head":true,"options":{"601128318544121856":"601128931717812224"}}}
      * questions : {"601128318581870592":{"id":"601128318581870592","create_time":"2021-06-12 16:30:25","update_time":"2021-06-12 16:30:25","is_deleted":0,"question_paper_id":"601128023407726592","category":"pre_diagnosis","order":1,"name":"服药历","type":"radio","remarks":["请问你有服药史么？"],"options":[{"id":"601128318544121856","name":"1~3 个月","relates":[{"category":"症状","name":"幻觉"}]},{"id":"601128318544121857","name":"4~6 个月","relates":[{"category":"症状","name":"幻觉"}]},{"id":"601128318544121858","name":"7~9 个月","relates":[{"category":"症状","name":"幻觉"}]},{"id":"601128318544121859","name":"10~12 个月","relates":[{"category":"症状","name":"幻觉"}]}]},"601128931717812224":{"id":"601128931717812224","create_time":"2021-06-12 16:32:51","update_time":"2021-06-12 16:32:51","is_deleted":0,"question_paper_id":"601128023407726592","category":"pre_diagnosis","order":2,"name":"晚上睡觉会醒几次","type":"radio","remarks":["晚上睡觉会醒几次？"],"options":[{"id":"601128931680063488","name":"1~3 次","relates":[{"category":"症状","name":"思绪混乱"}]},{"id":"601128931680063489","name":"4~6 次","relates":[{"category":"症状","name":"思绪混乱"}]},{"id":"601128931680063490","name":"7~9 次","relates":[{"category":"症状","name":"思绪混乱"}]},{"id":"601128931680063491","name":"10~12 次","relates":[{"category":"症状","name":"思绪混乱"}]}]},"601129312090853376":{"id":"601129312090853376","create_time":"2021-06-12 16:34:22","update_time":"2021-06-12 16:34:22","is_deleted":0,"question_paper_id":"601128023407726592","category":"pre_diagnosis","order":3,"name":"有逃离的想法么？","type":"radio","remarks":["有逃离的想法么？"],"options":[{"id":"601129312040521728","name":"有","relates":[{"category":"症状","name":"妄想症"}]},{"id":"601129312040521729","name":"无","relates":[{"category":"症状","name":"妄想症"}]},{"id":"601129312040521730","name":"其他"}]}}
      */
+    public QuestionPaperBean questionPaper;
+    public List<QuestionsBeanExample> questions;
 
-    public String id;
-    public String createTime;
-    public String updateTime;
-    public int isDeleted;
-    public String category;
-    public String name;
-    public long cateId;
-    public String cateName;
-    public int questionNum;
-    public int status;
-    public String remark;
-    public Map<String, QuestionChainsBean> questionChains;
-    public Map<String, QuestionsBean> questions;
 
 }

m-im/src/main/res/layout/item_left_more_check_layout.xml

@@ -53,12 +53,13 @@
             android:layout_width="110dp"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
+            android:textColor="@color/white"
             android:layout_marginTop="8dp"
             android:background="@drawable/im_background_18dp_ebebeb"
             android:gravity="center"
             android:paddingTop="@dimen/platform_dp_8"
             android:paddingBottom="@dimen/platform_dp_8"
-            android:text="确定(2)"
+            android:text="确定"
             android:textSize="@dimen/im_text_size_15">
 
         </TextView>

m-im/src/main/res/values/strings.xml

@@ -245,5 +245,6 @@
     <string name="im_chat_private_title">私聊须知</string>
     <string name="im_chat_pivate_content">如系统检测到涉黄、涉爆、涉政等信息，可能会封号处理并追究法律责任！</string>
     <string name="im_video_play">视频播放</string>
+    <string name="question_notes">注：描述中请包涵问题持续时间、问题发生原因、当前的问题。如何描述？</string>
 
 </resources>

m-im/src/main/res_uikit/layout/im_view_question_infomation.xml

@@ -60,7 +60,7 @@
             android:background="@color/color_f8f8f8"
             app:layout_constraintBottom_toTopOf="@id/cl_input"
             app:layout_constraintTop_toTopOf="parent"
-            android:paddingBottom="50dp"
+            android:paddingBottom="12dp"
             app:layout_constraintVertical_weight="1" />
 
         <androidx.constraintlayout.widget.ConstraintLayout