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

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.03",
             "m-user"          : "0.0.61.37",
             "m-home"          : "0.0.22.67",
-            "m-im"            : "0.0.19.43",
+            "m-im"            : "0.0.19.44",
             "m-dynamic"       : "0.0.7.25",
             "m-article"       : "0.0.0.10",
 
@@ -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.43",
+            "m-im"            : "0.0.19.44",
             "m-dynamic"       : "0.0.7.25",
             "m-article"       : "0.0.0.8",
 

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

@@ -253,7 +253,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
                 }
                 tv_finish.visibility = View.VISIBLE
                 mackType2(lastAnswer, "")
-                setFirstAndLatQuestion("我们根据您的情况安排了一位高级咨询顾问，帮助您匹配最合适的咨询服务，点击按钮现在去沟通～")
+                setFirstAndLatQuestion(mQuestionBean!!.questions[2].question)
 
                 //滑动到底部
                 recycle.scrollToPosition(mData.size - 1)
@@ -452,7 +452,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
                     //设置数据，清空list数据
                     mData.clear()
                     //取到问候语
-                    setFirstAndLatQuestion("你好，为了更好的帮助您我们需要了解些基本信息，我们将会严格保护你的隐私安全，请放心。")
+                    setFirstAndLatQuestion(mQuestionBean!!.questions[0].question)
                     //取出第二条消息
                     if (resp.data.questionPaper != null) {
                         haveLingxiQuestion = true
@@ -588,7 +588,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
     /**最后一条道题*/
     private fun makeType5() {
         val questionMultiItem5 = QuestionMultiItem()
-        questionMultiItem5.type5Bean = mQuestionBean!!.questions[0]
+        questionMultiItem5.type5Bean = mQuestionBean!!.questions[1]
         questionMultiItem5.viewType = 5
         mData.add(questionMultiItem5)