Commit 9eaae1df by 徐健

backup

parent 05fc7a07
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = true dev_mode = false
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
...@@ -46,8 +46,8 @@ ext { ...@@ -46,8 +46,8 @@ ext {
"m-consultant" : "0.0.52.1", "m-consultant" : "0.0.52.1",
"m-fm" : "0.0.24.1", "m-fm" : "0.0.24.1",
"m-user" : "0.0.42.1", "m-user" : "0.0.42.1",
"m-home" : "0.0.9", "m-home" : "0.0.10",
"m-im" : "0.0.4.7", "m-im" : "0.0.6",
"m-dynamic" : "0.0.2.2", "m-dynamic" : "0.0.2.2",
"m-muse" : "0.0.22", "m-muse" : "0.0.22",
...@@ -64,7 +64,7 @@ ext { ...@@ -64,7 +64,7 @@ ext {
"m-tests-api" : "0.0.1", "m-tests-api" : "0.0.1",
"m-user-api" : "0.0.9", "m-user-api" : "0.0.9",
"m-home-api" : "0.0.3", "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-dynamic-api" : "0.0.1",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
...@@ -110,7 +110,7 @@ ext { ...@@ -110,7 +110,7 @@ ext {
"m-tests-api" : "0.0.1", "m-tests-api" : "0.0.1",
"m-user-api" : "0.0.9", "m-user-api" : "0.0.9",
"m-home-api" : "0.0.3", "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-dynamic-api" : "0.0.1",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
......
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
android:id="@+id/tv_tested_count" android:id="@+id/tv_tested_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/platform_dp_12"
android:textColor="@color/platform_color_444444" android:textColor="@color/platform_color_444444"
android:textSize="@dimen/platform_dp_12" android:textSize="@dimen/platform_dp_12"
android:textStyle="bold" android:textStyle="bold"
......
package com.yidianling.im.ui.page.fragment.view package com.yidianling.im.ui.page.fragment.view
import android.content.Context import android.content.Context
import android.text.Html
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout import android.widget.LinearLayout
...@@ -8,6 +9,7 @@ import android.widget.RelativeLayout ...@@ -8,6 +9,7 @@ import android.widget.RelativeLayout
import com.ydl.ydl_image.module.GlideApp import com.ydl.ydl_image.module.GlideApp
import com.yidianling.im.R import com.yidianling.im.R
import com.yidianling.im.helper.MsgReceiveHelper import com.yidianling.im.helper.MsgReceiveHelper
import com.yidianling.im.preference.ImTempData
import com.yidianling.im.ui.page.fragment.bean.ChatItemBean import com.yidianling.im.ui.page.fragment.bean.ChatItemBean
import kotlinx.android.synthetic.main.im_chat_item_view.view.* import kotlinx.android.synthetic.main.im_chat_item_view.view.*
...@@ -17,7 +19,10 @@ 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) { class ChatItemView(mContext: Context) : LinearLayout(mContext) {
init { 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 layoutParams = params
View.inflate(mContext, R.layout.im_chat_item_view, this) View.inflate(mContext, R.layout.im_chat_item_view, this)
} }
...@@ -58,7 +63,19 @@ class ChatItemView(mContext: Context) : LinearLayout(mContext) { ...@@ -58,7 +63,19 @@ class ChatItemView(mContext: Context) : LinearLayout(mContext) {
} }
chat_message_time.text = bean.timeStr chat_message_time.text = bean.timeStr
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 chat_message_content.text = bean.content
}
if (bean.unReadNum > 99) { if (bean.unReadNum > 99) {
chat_message_unread_num.visibility = View.VISIBLE chat_message_unread_num.visibility = View.VISIBLE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment