1.优化代码

.idea/misc.xml

@@ -566,6 +566,7 @@
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/layout_health_counseling.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/layout_play_with_blue_porpoise.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/layout_professional_evaluation.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pads/imageselector/src/main/res/layout/activity_clip_image.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/imageselector/src/main/res/layout/activity_preview.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_btn_game_task.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_item_live_broadcast.xml" value="0.1715" />

baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
@@ -293,6 +294,7 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
     private fun initLiveEventBusUtil() {
         //展示任务弹窗
         LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
+            Log.e("wwww", GsonUtil.GsonString(bean))
             val taskFragment = TaskFragment()
             taskFragment.setTaskDesn(bean.getMessageData(), "")
             taskFragment.onDialogClickListener = {

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -67,7 +67,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
     private var pageList = mutableListOf<Record>()
     private val gameAdapter by lazy { GameAdapter() }
     private var aCountDownTimer: CountDownTimer? = null
-    private var aMessageList = mutableListOf<MessageBean>()
+    private var aMessageList = mutableMapOf<Long, MessageBean>()
 
     override fun initViews() {
         voicePlayer = VoicePlayer.getInstance(mContext)
@@ -672,9 +672,10 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                         if (customElem != null && customElem.data != null) {
                             val data = String(customElem.data)
                             val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
-                            Log.e("wpp", "666-----------------------" + messageBean)
+                            Log.e("wpp1", "666-----------------------" + messageBean)
                             if (messageBean != null) {
                                 messageBean.timestamp = msg.timestamp
+                                Log.e("wpp9", "666-----------------------" + messageBean)
                                 when (messageBean.businessID) {
                                     "A" -> {
                                         if (TextUtils.equals("购买成功，等待医生接诊。", messageBean.data) ||
@@ -698,7 +699,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                                             addAMessageData(messageBean)
                                         }
                                     }
-                                    "B", "C", "D" -> {
+                                    "B", "C", "D", "E", "F", "G" -> {
                                         addAMessageData(messageBean)
                                     }
                                     "end" -> {
@@ -743,8 +744,12 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun addAMessageData(msg: MessageBean) {
         runOnUiThread {
-            Log.e("wpp", GsonUtil.GsonString(msg))
-            aMessageList.add(msg)
+            Log.e("wpp2", GsonUtil.GsonString(msg))
+            if (aMessageList.isNotEmpty() && aMessageList.containsKey(msg.timestamp).not()) {
+                aMessageList[msg.timestamp] = msg
+            } else {
+                aMessageList[msg.timestamp] = msg
+            }
             if (aCountDownTimer != null) {
                 aCountDownTimer?.cancel()
                 aCountDownTimer?.start()
@@ -754,7 +759,8 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                     }
 
                     override fun onFinish() {
-                        sortMessageDataByTimestamp(aMessageList)
+                        Log.e("wpp8", GsonUtil.GsonString(aMessageList))
+                        sortMessageDataByTimestamp(ArrayList(aMessageList.values))
                     }
                 }
                 aCountDownTimer?.start()
@@ -766,29 +772,36 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      * 消息分类
      */
     private fun sortMessageDataByTimestamp(conversationList: List<MessageBean>) {
-        val aMessages = mutableListOf<MessageBean>()
-        val bMessages = mutableListOf<MessageBean>()
-        val cMessages = mutableListOf<MessageBean>()
-        val dMessages = mutableListOf<MessageBean>()
-        conversationList.forEach {
-            when (it.businessID) {
-                "A" -> aMessages.add(it)
-                "B" -> bMessages.add(it)
-                "C" -> cMessages.add(it)
-                "D" -> dMessages.add(it)
+        if (conversationList.isNullOrEmpty().not()) {
+            Log.e("wpp7", GsonUtil.GsonString(conversationList))
+            val aMessages = mutableListOf<MessageBean>()
+            val bMessages = mutableListOf<MessageBean>()
+            val cMessages = mutableListOf<MessageBean>()
+            val dMessages = mutableListOf<MessageBean>()
+            conversationList.forEach {
+                when (it.businessID) {
+                    "A" -> aMessages.add(it)
+                    "B" -> bMessages.add(it)
+                    "C" -> cMessages.add(it)
+                    "D" -> dMessages.add(it)
+                }
+            }
+            if (aMessages.isNotEmpty()) {
+                Log.i("wpp3", "------------>" + GsonUtil.GsonString(aMessages))
+                showMessageDialog(aMessages)
+            }
+            if (bMessages.isNotEmpty()) {
+                Log.i("wpp4", "------------>" + GsonUtil.GsonString(bMessages))
+                showMessageDialog(bMessages)
+            }
+            if (cMessages.isNotEmpty()) {
+                Log.i("wpp5", "------------>" + GsonUtil.GsonString(cMessages))
+                showMessageDialog(cMessages)
+            }
+            if (dMessages.isNotEmpty()) {
+                Log.i("wpp6", "------------>" + GsonUtil.GsonString(dMessages))
+                showMessageDialog(dMessages)
             }
-        }
-        if (aMessages.isNullOrEmpty().not()) {
-            showMessageDialog(aMessages)
-        }
-        if (bMessages.isNullOrEmpty().not()) {
-            showMessageDialog(bMessages)
-        }
-        if (cMessages.isNullOrEmpty().not()) {
-            showMessageDialog(cMessages)
-        }
-        if (dMessages.isNullOrEmpty().not()) {
-            showMessageDialog(dMessages)
         }
         aMessageList.clear()
     }
@@ -817,14 +830,10 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                 .clearC2CHistoryMessage(userId, object : V2TIMCallback {
                     override fun onSuccess() {
                         // 清空单聊消息成功
-                        Log.e("wpp", "1-------------------清空单聊消息成功")
                     }
 
                     override fun onError(code: Int, desc: String) {
                         // 清空单聊消息失败
-                        Log.e("wpp", "2-------------------清空单聊消息失败")
-                        Log.e("wpp", "2-------------------清空单聊消息失败" + code)
-                        Log.e("wpp", "2-------------------清空单聊消息失败" + desc)
                     }
                 })
         }