feat: 新增聊天界面左上角未读消息数量显示

.idea/GitCommitMessageStorage.xml

@@ -2,19 +2,7 @@
 <project version="4">
   <component name="GitCommitMessageStorage">
     <option name="messageStorage">
-      <MessageStorage>
+      <MessageStorage />
-        <option name="commitTemplate">
-          <CommitTemplate>
-            <option name="body" value="" />
-            <option name="changes" value="" />
-            <option name="closes" value="" />
-            <option name="scope" value="" />
-            <option name="skipCi" value="" />
-            <option name="subject" value="" />
-            <option name="type" value="feat" />
-          </CommitTemplate>
-        </option>
-      </MessageStorage>
     </option>
   </component>
 </project>

app/src/main/java/com/kaixed/kchat/manager/ConversationManager.kt

@@ -30,6 +30,7 @@ object ConversationManager {
     private val conversationMap: MutableMap<String, Conversation> = mutableMapOf()
 
     private var unreadCount = 0
+    val unReadMsgCount get() = unreadCount
 
     init {
         loadConversations()
@@ -49,7 +50,8 @@ object ConversationManager {
     }
 
     fun handleMessages(messages: Messages) {
-        if (messages.senderId != getUsername() || messages.talkerId != getCurrentContactId()) {
+        val talkerId = getCurrentContactId()
+        if (messages.senderId != getUsername() && messages.talkerId != talkerId) {
             unreadCount++
         }
         val updatedConversation = updateConversation(messages)

app/src/main/java/com/kaixed/kchat/manager/MessagesManager.kt

@@ -1,5 +1,6 @@
 package com.kaixed.kchat.manager
 
+import com.kaixed.kchat.data.DataBase
 import com.kaixed.kchat.data.LocalDatabase
 import com.kaixed.kchat.data.LocalDatabase.getAllHistoryMessages
 import com.kaixed.kchat.data.LocalDatabase.getMessagesWithContact
@@ -25,6 +26,14 @@ object MessagesManager {
     private var loading = false
     private var tempIndex: Long = 0
 
+    fun deleteMessage(msgLocalId: Long) {
+        DataBase.messagesBox.remove(msgLocalId)
+        val msg = _messages.value.toMutableList().apply {
+            removeIf { it.msgLocalId == msgLocalId }
+        }
+        _messages.value = msg
+    }
+
     fun queryHistory(msgLocalId: Long): Int {
         _messages.value = emptyList()
         val msg = getAllHistoryMessages(contactId, msgLocalId)
@@ -49,6 +58,7 @@ object MessagesManager {
     }
 
     fun receiveMessage(messages: Messages) {
+        if (messages.talkerId != contactId) return
         if (_messages.value.first() == messages) return
         _messages.value = _messages.value.toMutableList().apply {
             add(0, messages)

app/src/main/java/com/kaixed/kchat/network/ApiCall.kt

@@ -6,8 +6,7 @@ package com.kaixed.kchat.network
  */
 object ApiCall {
     suspend fun <T> apiCall(
-        apiCall: suspend () -> ApiResponse<T>,
+        apiCall: suspend () -> ApiResponse<T>, errorMessage: String = "操作失败"
-        errorMessage: String = "操作失败"
     ): Result<T?> {
         return try {
             val response = apiCall()

app/src/main/java/com/kaixed/kchat/ui/activity/ChatActivity.kt

@@ -28,10 +28,12 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.kaixed.kchat.R
+import com.kaixed.kchat.data.event.UnreadEvent
 import com.kaixed.kchat.data.local.box.ObjectBox.getBoxStore
 import com.kaixed.kchat.data.local.entity.Messages
 import com.kaixed.kchat.data.model.FunctionItem
 import com.kaixed.kchat.databinding.ActivityChatBinding
+import com.kaixed.kchat.manager.ConversationManager
 import com.kaixed.kchat.manager.MessagesManager
 import com.kaixed.kchat.processor.MessageProcessor
 import com.kaixed.kchat.service.WebSocketService
@@ -59,6 +61,9 @@ import com.tencent.mmkv.MMKV
 import io.objectbox.Box
 import io.objectbox.kotlin.boxFor
 import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import org.json.JSONObject
 import java.io.File
 
@@ -108,6 +113,7 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        EventBus.getDefault().register(this)
         firstLoadData()
         initView()
         setListener()
@@ -367,6 +373,7 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
     }
 
     private fun initView() {
+        binding.ctb.setUnReadCount(ConversationManager.unReadMsgCount)
         setupFunctionPanel()
         setRecycleView()
         contactNickname?.let {
@@ -461,8 +468,15 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
         )
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMessageEvent(unreadEvent: UnreadEvent) {
+        val unreadCount = unreadEvent.unreadCount
+        binding.ctb.setUnReadCount(unreadCount)
+    }
+
     override fun onDestroy() {
         super.onDestroy()
+        EventBus.getDefault().unregister(this)
         MessagesManager.resetMessages()
         mmkv.putString(CURRENT_CONTACT_ID, "")
         if (bound) {

app/src/main/java/com/kaixed/kchat/ui/activity/setting/UpdatePasswordActivity.kt

@@ -54,9 +54,7 @@ class UpdatePasswordActivity : BaseActivity<ActivityUpdatePasswordBinding>() {
             } else {
                 loadingDialog.showLoading(supportFragmentManager)
                 val updatePassword = UpdatePasswordRequest(
-                    ConstantsUtil.getUsername(),
+                    ConstantsUtil.getUsername(), oldPassword, newPassword
-                    oldPassword,
-                    newPassword
                 )
                 userViewModel.updatePassword(updatePassword)
             }
@@ -93,9 +91,8 @@ class UpdatePasswordActivity : BaseActivity<ActivityUpdatePasswordBinding>() {
         }
 
         override fun afterTextChanged(s: Editable?) {
-            val enable = binding.cetNewPassword.text?.length != 0 &&
+            val enable =
-                    binding.cetOldPassword.text?.length != 0 &&
+                binding.cetNewPassword.text?.length != 0 && binding.cetOldPassword.text?.length != 0 && binding.cetConfirmPassword.text?.length != 0
-                    binding.cetConfirmPassword.text?.length != 0
             binding.titleBar.setBtnEnable(enable)
         }
     }

app/src/main/java/com/kaixed/kchat/ui/adapter/ChatAdapter.kt

@@ -1,7 +1,6 @@
 package com.kaixed.kchat.ui.adapter
 
 import android.content.Context
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -19,10 +18,10 @@ import com.kaixed.kchat.data.local.entity.Messages
 import com.kaixed.kchat.databinding.ChatRecycleItemCustomNormalBinding
 import com.kaixed.kchat.databinding.ChatRecycleItemImageNormalBinding
 import com.kaixed.kchat.databinding.ChatRecycleItemTipBinding
+import com.kaixed.kchat.manager.MessagesManager
 import com.kaixed.kchat.utils.ConstantsUtil
 import com.kaixed.kchat.utils.ConstantsUtil.getUsername
 import com.kaixed.kchat.utils.PopWindowUtil.showPopupWindow
-import com.kaixed.kchat.utils.TextUtil
 import com.kaixed.kchat.utils.TextUtil.extractDimensionsAndPrefix
 import com.kaixed.kchat.utils.ViewUtil.changeTimerVisibility
 import com.kaixed.kchat.utils.ViewUtil.setViewVisibility
@@ -57,22 +56,25 @@ class ChatAdapter(
         return when (viewType) {
             CUSTOM -> {
                 CustomViewHolder(
-                    ChatRecycleItemCustomNormalBinding
+                    ChatRecycleItemCustomNormalBinding.inflate(
-                        .inflate(LayoutInflater.from(parent.context), parent, false)
+                        LayoutInflater.from(parent.context), parent, false
+                    )
                 )
             }
 
             IMAGE -> {
                 ImageViewHolder(
-                    ChatRecycleItemImageNormalBinding
+                    ChatRecycleItemImageNormalBinding.inflate(
-                        .inflate(LayoutInflater.from(parent.context), parent, false)
+                        LayoutInflater.from(parent.context), parent, false
+                    )
                 )
             }
 
             else -> {
                 TipViewHolder(
-                    ChatRecycleItemTipBinding
+                    ChatRecycleItemTipBinding.inflate(
-                        .inflate(LayoutInflater.from(parent.context), parent, false)
+                        LayoutInflater.from(parent.context), parent, false
+                    )
                 )
             }
         }
@@ -108,30 +110,18 @@ class ChatAdapter(
         }
 
         contentView?.setOnLongClickListener {
-            Log.d("haha", "长按了:${message.content} position: $position")
             val popupWindow = showPopupWindow(context, it, message.senderId == getUsername())
             val deleteButton = popupWindow.contentView.findViewById<TextView>(R.id.tv_delete)
             deleteButton.setOnClickListener {
-                deleteMessage(position, message)
+                deleteMessage(message)
-                Log.d("haha", "长按并删除了了:${message.content} position: $position")
                 popupWindow.dismiss()
             }
             true
         }
     }
 
-    private fun deleteMessage(position: Int, message: Messages) {
+    private fun deleteMessage(message: Messages) {
-        // 从数据库删除
+        MessagesManager.deleteMessage(message.msgLocalId)
-//        val messagesBox: Box<Messages> = getBox(Messages::class.java)
-//        messagesBox.remove(message.msgLocalId)
-//
-//        // 更新数据源并通知 RecyclerView
-//        messages.removeAt(position)
-//        notifyItemRemoved(position)
-//
-//        if (position != messages.size) { // 如果移除的是最后一个，忽略
-//            notifyItemRangeChanged(position, messages.size - position);
-//        }
     }
 
     interface HasTimer {
@@ -162,8 +152,7 @@ class ChatAdapter(
                 contentId = binding.tvMsgContent.id,
                 contentMineId = binding.tvMsgContentMine.id
             )
-            val avatarUrl =
+            val avatarUrl = if (sender) ConstantsUtil.getAvatarUrl() else message.avatarUrl
-                if (sender) ConstantsUtil.getAvatarUrl() else message.avatarUrl
             Glide.with(binding.root.context).load(avatarUrl)
                 .into(if (sender) binding.ifvAvatarMine else binding.ifvAvatar)
 
@@ -182,8 +171,7 @@ class ChatAdapter(
         RecyclerView.ViewHolder(binding.root), HasTimer {
         fun bindData(message: Messages) {
             val sender = message.senderId == getUsername()
-            val avatarUrl =
+            val avatarUrl = if (sender) ConstantsUtil.getAvatarUrl() else message.avatarUrl
-                if (sender) ConstantsUtil.getAvatarUrl() else message.avatarUrl
             Glide.with(binding.root.context).load(avatarUrl)
                 .into(if (sender) binding.ifvAvatarMine else binding.ifvAvatar)
 
@@ -209,8 +197,8 @@ class ChatAdapter(
                         this.width = width
                     }
                 }
-                Glide.with(binding.root.context).load(url)
+                Glide.with(binding.root.context).load(url).placeholder(R.drawable.image_loading)
-                    .placeholder(R.drawable.image_loading).into(imageView)
+                    .into(imageView)
             } ?: run {
                 Glide.with(binding.root.context).load(message.content)
                     .placeholder(R.drawable.image_loading).into(imageView)

app/src/main/java/com/kaixed/kchat/ui/widget/CustomTitleBar.kt

@@ -67,8 +67,9 @@ class CustomTitleBar @JvmOverloads constructor(
         }
     }
 
-    fun setOnBackClickListener(listener: OnClickListener?) {
+    fun setUnReadCount(count: Int) {
-        binding.ivBack.setOnClickListener(listener)
+        binding.rlUnreadCount.visibility = if (count > 0) View.VISIBLE else View.INVISIBLE
+        binding.tvUnreadCount.text = count.toString()
     }
 
     fun setOnSettingClickListener(listener: OnClickListener?) {

app/src/main/java/com/kaixed/kchat/viewmodel/UserViewModel.kt

@@ -36,6 +36,7 @@ class UserViewModel : ViewModel() {
         viewModelScope.launch {
             val result = userProfileRepo.updatePassword(updatePasswordRequest)
             _updatePasswordResult.postValue(result)
+            _updatePasswordResult.value = result
         }
     }
 

app/src/main/res/drawable/icon_gray_dot.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#D5D5D5" />
+    <corners android:radius="50dp" />
+    <size
+        android:width="10dp"
+        android:height="10dp" />
+</shape>

app/src/main/res/layout/view_title_bar.xml

@@ -14,6 +14,29 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <RelativeLayout
+        android:id="@+id/rl_unread_count"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginStart="3dp"
+        android:background="@drawable/icon_gray_dot"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@id/iv_back"
+        app:layout_constraintStart_toEndOf="@id/iv_back"
+        app:layout_constraintTop_toTopOf="@id/iv_back">
+
+        <TextView
+            android:id="@+id/tv_unread_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="9"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+    </RelativeLayout>
+
     <TextView
         android:id="@+id/tv_title_name"
         android:layout_width="wrap_content"