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

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

@@ -542,9 +542,10 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
             if (!answerStr.contains("其他")||otherInput.isEmpty()) {
                 answerStr = answerStr.substring(1).replace("#", "、")
             }
+
         }
 
-        mackType2(answerStr)
+        mackType2(answerStr.trim())
 
         //刷新已回答问题，将多选设置成不可再选
         mData.forEachIndexed { index, _ ->

m-im/src/main/res/drawable/im_question_message_round_1da1f2_8dp_bg.xml

@@ -8,8 +8,8 @@
         android:topRightRadius="0dp" />
     <padding
         android:bottom="9dp"
-        android:left="22dp"
-        android:right="22dp"
-        android:top="9dp" />
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
 
 </shape>

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

@@ -176,6 +176,7 @@
                 app:layout_constraintVertical_weight="1"
                 android:background="@color/white"
                 android:gravity="center|bottom"
+                android:paddingBottom="12dp"
                 app:layout_constraintBottom_toBottomOf="@id/et_input_problem"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/et_input_problem">