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

# Conflicts:
#	config.gradle

config.gradle

@@ -93,7 +93,7 @@ ext {
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.37",
             "m-home"          : "0.0.22.67",
-            "m-im"            : "0.0.19.33",
+            "m-im"            : "0.0.19.36",
             "m-dynamic"       : "0.0.7.24",
             "m-article"       : "0.0.0.8",
 

m-im/src/main/java/com/yidianling/im/session/extension/CustomAttachLingxiAnswerQuestion.java

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 
 public class CustomAttachLingxiAnswerQuestion extends CustomAttachment{
     private final String ANSWERS = "answers";
-    private final String QUESTIONID = "questionPaperId";
+    private final String QUESTIONID = "questionId";
 
 
     public ArrayList<QuestionItemBean> answers;

m-im/src/main/java/com/yidianling/uikit/business/session/module/list/MessageListPanelEx.java

@@ -285,7 +285,12 @@ public class MessageListPanelEx {
         }
         if (needRefresh) {
             sortMessages(items);
-            adapter.notifyDataSetChanged();
+            new Handler().post(new Runnable() {
+                @Override
+                public void run() {
+                    adapter.notifyDataSetChanged();
+                }
+            });
         }
 
         adapter.updateShowTimeItem(addedListItems, false, true);

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

@@ -13,6 +13,6 @@
         android:includeFontPadding="false"
         android:lineSpacingExtra="3dip"
         android:minHeight="40dp"
-        android:textColor="@color/white"
+        android:textColor="@color/im_color_242424"
         android:textSize="17dp"/>
 </LinearLayout>