backup

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = true
+    dev_mode = false
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -46,8 +46,8 @@ ext {
             "m-consultant"    : "0.0.52.1",
             "m-fm"            : "0.0.24.1",
             "m-user"          : "0.0.42.1",
-            "m-home"          : "0.0.9",
-            "m-im"            : "0.0.4.7",
+            "m-home"          : "0.0.10",
+            "m-im"            : "0.0.6",
             "m-dynamic"       : "0.0.2.2",
 
             "m-muse"          : "0.0.22",
@@ -64,7 +64,7 @@ ext {
             "m-tests-api"     : "0.0.1",
             "m-user-api"      : "0.0.9",
             "m-home-api"      : "0.0.3",
-            "m-im-api"        : "0.0.5",
+            "m-im-api"        : "0.0.7",
             "m-dynamic-api"   : "0.0.1",
             //-------------- 功能组件 --------------
 
@@ -110,7 +110,7 @@ ext {
             "m-tests-api"     : "0.0.1",
             "m-user-api"      : "0.0.9",
             "m-home-api"      : "0.0.3",
-            "m-im-api"        : "0.0.5",
+            "m-im-api"        : "0.0.7",
             "m-dynamic-api"   : "0.0.1",
             //-------------- 功能组件 --------------
 

m-home/src/ydl/res/layout/home_test_item_view.xml

@@ -64,7 +64,6 @@
                     android:id="@+id/tv_tested_count"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/platform_dp_12"
                     android:textColor="@color/platform_color_444444"
                     android:textSize="@dimen/platform_dp_12"
                     android:textStyle="bold"

m-im/src/main/java/com/yidianling/im/ui/page/fragment/view/ChatItemView.kt

 package com.yidianling.im.ui.page.fragment.view
 
 import android.content.Context
+import android.text.Html
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
@@ -8,6 +9,7 @@ import android.widget.RelativeLayout
 import com.ydl.ydl_image.module.GlideApp
 import com.yidianling.im.R
 import com.yidianling.im.helper.MsgReceiveHelper
+import com.yidianling.im.preference.ImTempData
 import com.yidianling.im.ui.page.fragment.bean.ChatItemBean
 import kotlinx.android.synthetic.main.im_chat_item_view.view.*
 
@@ -17,7 +19,10 @@ import kotlinx.android.synthetic.main.im_chat_item_view.view.*
 class ChatItemView(mContext: Context) : LinearLayout(mContext) {
 
     init {
-        val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        val params = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
         layoutParams = params
         View.inflate(mContext, R.layout.im_chat_item_view, this)
     }
@@ -25,9 +30,9 @@ class ChatItemView(mContext: Context) : LinearLayout(mContext) {
     fun initData(bean: ChatItemBean?) {
         bean?.let {
             GlideApp.with(context)
-                    .load(bean.head)
-                    .circleCrop()
-                    .into(chat_message_img)
+                .load(bean.head)
+                .circleCrop()
+                .into(chat_message_img)
             chat_message_name.text = bean.toName
             if (bean.doctorTitle != "") {
                 chat_message_tab.visibility = View.VISIBLE
@@ -58,7 +63,19 @@ class ChatItemView(mContext: Context) : LinearLayout(mContext) {
             }
 
             chat_message_time.text = bean.timeStr
-            chat_message_content.text = bean.content
+            if (ImTempData.getInstance().getTempMsg(bean.toUid.toString()) != null && ImTempData.getInstance().getTempMsg(
+                    bean.toUid.toString()
+                ) != ""
+            ) run {
+                //if草稿箱有消息则显示
+                val th =
+                    "<font color='#EA0000' charset='utf-8'>[草稿]</font> " + ImTempData.getInstance().getTempMsg(
+                        bean.toUid.toString()
+                    )
+                chat_message_content.setText(Html.fromHtml(th))
+            }else {
+                chat_message_content.text = bean.content
+            }
 
             if (bean.unReadNum > 99) {
                 chat_message_unread_num.visibility = View.VISIBLE