feat: 新增部分功能

- 新增删除历史消息功能
- 更改聊天界面adapter为ListAdapter并使用DiffUtil增加效率
- 引入第三方库EventBus

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-25T08:35:02.927264800Z">
+        <DropdownSelection timestamp="2024-12-08T08:09:52.665646200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=10.39.42.8:5555;connection=563cba5e" />
+              <DeviceId pluginId="Default" identifier="serial=10.71.207.251:5555;connection=d2528536" />
             </handle>
           </Target>
         </DropdownSelection>

app/build.gradle.kts

@@ -86,6 +86,8 @@ dependencies {
     // 图片裁剪
     implementation(libs.ucrop)
 
+    implementation(libs.eventbus)
+
     // 自定义spannable
     implementation(libs.spannable)
 

app/src/main/AndroidManifest.xml

@@ -39,6 +39,12 @@
         android:theme="@style/Theme.KChatAndroid"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.activity.SearchChatHistory"
+            android:exported="false" />
+        <activity
+            android:name=".ui.activity.setting.UpdateKidActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.activity.setting.AboutActivity"
             android:exported="false" />

app/src/main/java/com/kaixed/kchat/data/LocalDatabase.kt

@@ -3,6 +3,8 @@ package com.kaixed.kchat.data
 import com.kaixed.kchat.data.local.box.ObjectBox.getBox
 import com.kaixed.kchat.data.local.entity.Contact
 import com.kaixed.kchat.data.local.entity.Contact_
+import com.kaixed.kchat.data.local.entity.Conversation
+import com.kaixed.kchat.data.local.entity.Conversation_
 import com.kaixed.kchat.data.local.entity.Messages
 import com.kaixed.kchat.data.local.entity.Messages_
 import io.objectbox.Box
@@ -13,8 +15,18 @@ import io.objectbox.query.QueryBuilder
  * @Date: 2024/11/24 13:34
  */
 object LocalDatabase {
+
     private val contactBox by lazy { getBox(Contact::class.java) }
 
+    private val messagesBox: Box<Messages> by lazy { getBox(Messages::class.java) }
+
+    private val conversationBox: Box<Conversation> by lazy { getBox(Conversation::class.java) }
+
+    fun cleanChatHistory(contactId: String) {
+        messagesBox.query(Messages_.takerId.equal(contactId)).build().remove()
+        conversationBox.query(Conversation_.talkerId.equal(contactId)).build().remove()
+    }
+
     fun isMyFriend(contactId: String): Boolean {
         return getContactByUsername(contactId) != null
     }
@@ -23,8 +35,6 @@ object LocalDatabase {
         return contactBox.query(Contact_.username.equal(contactId)).build().findFirst()
     }
 
-    private val messagesBox: Box<Messages> by lazy { getBox(Messages::class.java) }
-
     fun getMessagesWithContact(contactId: String, offset: Long, limit: Long): List<Messages> {
         val query = messagesBox
             .query(Messages_.takerId.equal(contactId))

app/src/main/java/com/kaixed/kchat/data/repository/MessagesRepository.kt

@@ -0,0 +1,9 @@
+package com.kaixed.kchat.data.repository
+
+/**
+ * @Author: kaixed
+ * @Date: 2024/12/11 9:43
+ */
+class MessagesRepository {
+
+}

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

@@ -0,0 +1,95 @@
+package com.kaixed.kchat.manager
+
+import com.kaixed.kchat.data.LocalDatabase
+import com.kaixed.kchat.data.LocalDatabase.getMessagesWithContact
+import com.kaixed.kchat.data.LocalDatabase.getMoreMessages
+import com.kaixed.kchat.data.local.entity.Messages
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * @Author: kaixed
+ * @Date: 2024/12/11 13:40
+ */
+object MessagesManager {
+
+    private const val LIMIT = 10L
+
+    private val _messages = MutableStateFlow<List<Messages>>(emptyList())
+
+    val messages: StateFlow<List<Messages>> get() = _messages
+
+    private var contactId: String = ""
+    private var isHasHistory = false
+    private var loading = false
+    private var tempIndex: Long = 0
+
+    fun setContactId(contactId: String) {
+        this.contactId = contactId
+    }
+
+    fun resetMessages() {
+        _messages.value = emptyList()
+    }
+
+    fun cleanMessages(timestamp: Long) {
+        val messages = _messages.value.toMutableList()
+        _messages.value = messages.apply {
+            removeIf { it.timestamp < timestamp }
+        }
+        LocalDatabase.cleanChatHistory(contactId)
+    }
+
+    fun receiveMessage(messages: Messages) {
+        _messages.value = _messages.value.toMutableList().apply {
+            add(0, messages)
+        }
+    }
+
+    fun sendMessages(messages: Messages) {
+        _messages.value = _messages.value.toMutableList().apply {
+            add(0, messages)
+        }
+    }
+
+    fun firstLoadMessages() {
+        val messages = getMessagesWithContact(contactId, 0, LIMIT + 1)
+        if (messages.isNotEmpty()) {
+            val size = messages.size
+            isHasHistory = size > LIMIT
+            if (isHasHistory) {
+                val messages1 = messages.subList(0, LIMIT.toInt())
+                _messages.value = messages1
+                tempIndex = messages[size - 1].msgLocalId
+            } else {
+                _messages.value = messages
+            }
+        }
+    }
+
+    fun loadMoreMessages() {
+        if (loading) return
+
+        if (!isHasHistory) return
+
+        loading = true
+
+        val newMessages: List<Messages> =
+            getMoreMessages(contactId, tempIndex, LIMIT + 1)
+
+        val size = newMessages.size
+        tempIndex = newMessages[size - 1].msgLocalId
+        isHasHistory = size > LIMIT
+
+        if (newMessages.isNotEmpty()) {
+            val messages1 = if (isHasHistory) {
+                newMessages.subList(0, LIMIT.toInt()).toMutableList()
+            } else {
+                newMessages.subList(0, newMessages.size).toMutableList()
+            }
+            _messages.value += messages1
+        }
+
+        loading = false
+    }
+}

app/src/main/java/com/kaixed/kchat/service/WebSocketService.kt

@@ -8,6 +8,7 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
+import com.kaixed.kchat.data.LocalDatabase.getContactByUsername
 import com.kaixed.kchat.data.local.box.ObjectBox.getBoxStore
 import com.kaixed.kchat.data.local.entity.Contact
 import com.kaixed.kchat.data.local.entity.Contact_
@@ -31,6 +32,9 @@ import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 
 class WebSocketService : Service() {
@@ -56,9 +60,15 @@ class WebSocketService : Service() {
 
     private val serviceScope = CoroutineScope(IO + serviceJob)
 
-    private val _messagesMutableLiveData = MutableLiveData<Messages>()
+    private val _messagesMutableLiveData = MutableLiveData<Messages?>()
 
-    val messageLivedata: LiveData<Messages> get() = _messagesMutableLiveData
+    val messageLivedata: LiveData<Messages?> get() = _messagesMutableLiveData
+
+    private val _conversations = MutableLiveData<List<Conversation>?>()
+
+    val conversations: LiveData<List<Conversation>?> get() = _conversations
+
+    private var conversationList = mutableListOf<Conversation>()
 
     inner class LocalBinder : Binder() {
         fun getService(): WebSocketService {
@@ -75,6 +85,9 @@ class WebSocketService : Service() {
         messagesBox = getBoxStore().boxFor(Messages::class.java)
         username = getUsername()
         firstLoad()
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this)
+        }
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -82,6 +95,12 @@ class WebSocketService : Service() {
         return START_STICKY
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMessageEvent(contactId: String) {
+        conversationList.removeIf { it.talkerId == contactId }
+        _conversations.postValue(conversationList)
+    }
+
     fun sendMessage(jsonObject: String, msgLocalId: Long) {
         webSocket?.let {
             it.send(jsonObject)
@@ -160,9 +179,10 @@ class WebSocketService : Service() {
     private fun createChatList(
         messages: Messages
     ): Conversation {
+        val contact = getContactByUsername(messages.takerId)!!
         return Conversation(
             talkerId = messages.takerId,
-            nickname = messages.takerId,
+            nickname = contact.remark ?: contact.nickname,
             avatarUrl = messages.avatarUrl,
             lastContent = if (messages.type == "4") "[图片]" else messages.content,
             timestamp = messages.timestamp,
@@ -178,6 +198,7 @@ class WebSocketService : Service() {
         timestamp: Long,
         unreadCount: Int = 1
     ): Conversation {
+
         return Conversation(
             0L,
             talkerId = talkerId,
@@ -211,7 +232,6 @@ class WebSocketService : Service() {
                     }
                 } else {
                     messages.takerId = messages.senderId
-
                     _messagesMutableLiveData.postValue(messages)
                     messagesBox.put(messages)
                     updateConversationList(messages)
@@ -231,12 +251,6 @@ class WebSocketService : Service() {
         }
     }
 
-    private val _conversations = MutableLiveData<List<Conversation>?>()
-
-    val conversations: LiveData<List<Conversation>?> get() = _conversations
-
-    private var conversationList = mutableListOf<Conversation>()
-
     private fun updateConversationList(messages: Messages) {
         updateDbConversation(messages)
         val index = conversationList.indexOfFirst { it.talkerId == messages.takerId }
@@ -251,10 +265,11 @@ class WebSocketService : Service() {
                     if (this.talkerId == getCurrentContactId() || messages.senderId == getUsername()) 0 else unreadCount + 1
             }
         } else {
+            val contact = getContactByUsername(messages.takerId)
             conversationList.add(
                 createChatList(
                     talkerId = messages.takerId,
-                    nickname = messages.takerId,
+                    nickname = contact?.remark ?: messages.takerId,
                     content = if (messages.type == "4") "[图片]" else messages.content,
                     timestamp = messages.timestamp,
                     avatarUrl = messages.avatarUrl,
@@ -275,6 +290,9 @@ class WebSocketService : Service() {
 
     override fun onDestroy() {
         super.onDestroy()
+        if (EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().unregister(this)
+        }
         serviceJob.cancel()
         heartbeatJob?.cancel()
         webSocket?.close(WEBSOCKET_CLOSE_CODE, "App exited")

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

@@ -23,16 +23,16 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.lifecycleScope
 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.LocalDatabase.getMessagesWithContact
-import com.kaixed.kchat.data.LocalDatabase.getMoreMessages
 import com.kaixed.kchat.data.local.box.ObjectBox.getBox
 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.MessagesManager
 import com.kaixed.kchat.service.WebSocketService
 import com.kaixed.kchat.service.WebSocketService.LocalBinder
 import com.kaixed.kchat.ui.adapter.ChatAdapter
@@ -56,9 +56,9 @@ import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.tencent.mmkv.MMKV
 import io.objectbox.Box
+import kotlinx.coroutines.launch
 import org.json.JSONObject
 import java.io.File
-import java.util.LinkedList
 
 class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
     IOnItemClickListener {
@@ -67,8 +67,6 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
 
     private var webSocketService: WebSocketService? = null
 
-    private val messagesList = LinkedList<Messages>()
-
     private val messagesBox: Box<Messages> by lazy { getBox(Messages::class.java) }
 
     private var contactId: String = ""
@@ -77,8 +75,6 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
 
     private val username: String by lazy { getUsername() }
 
-    private var tempIndex: Long = 0
-
     private val context: Context = this
 
     private var strings: MutableList<String>? = mutableListOf()
@@ -89,20 +85,13 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
 
     private var keyboardShown = false
 
-    private var loading = false
-
-    private var hasHistory = false
-
     private var bound = false
 
     private val mmkv by lazy { MMKV.mmkvWithID(MMKV_USER_SESSION) }
 
-    private var lastMessage: Messages? = null
-
     private val fileViewModel: FileViewModel by viewModels()
 
     companion object {
-        private const val LIMIT: Long = 20L
         private const val UNBLOCK_DELAY_TIME = 200L
     }
 
@@ -113,13 +102,21 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-
         firstLoadData()
         initView()
         setListener()
         bindWebSocketService()
         setPanelChange()
         getKeyBoardVisibility()
+        observeViewModel()
+    }
+
+    private fun observeViewModel() {
+        lifecycleScope.launch {
+            MessagesManager.messages.collect {
+                chatAdapter?.submitList(it)
+            }
+        }
     }
 
     private val connection: ServiceConnection = object : ServiceConnection {
@@ -270,7 +267,7 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
         binding.recycleChatList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
-                if (recyclerView.canScrollVertically(-1) && hasHistory && !loading) {
+                if (recyclerView.canScrollVertically(-1)) {
                     loadMoreMessages()
                 }
 //                val layoutManager = checkNotNull(recyclerView.layoutManager as LinearLayoutManager?)
@@ -391,80 +388,34 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
         val layoutManager = LinearLayoutManager(this)
         layoutManager.reverseLayout = true
         binding.recycleChatList.layoutManager = layoutManager
-        chatAdapter = ChatAdapter(this, messagesList)
+        chatAdapter = ChatAdapter(this)
         binding.recycleChatList.adapter = chatAdapter
     }
 
-    /**
-     * 初次进入进行加载历史数据
-     */
     private fun firstLoadData() {
-        val messages = getMessagesWithContact(contactId, 0, LIMIT + 1)
+        MessagesManager.setContactId(contactId)
-        if (messages.isNotEmpty()) {
+        MessagesManager.firstLoadMessages()
-            val size = messages.size
-            hasHistory = size > LIMIT
-            if (hasHistory) {
-                val messages1 = messages.subList(0, LIMIT.toInt())
-                messagesList.addAll(messages1)
-                tempIndex = messages[size - 1].msgLocalId
-            } else {
-                messagesList.addAll(messages)
-            }
-        }
     }
 
     private fun loadMoreMessages() {
-        if (loading) return
+        MessagesManager.loadMoreMessages()
-
-        loading = true
-
-        val newMessages: List<Messages> = getMoreMessages(contactId, tempIndex, LIMIT + 1)
-
-        val size = newMessages.size
-        tempIndex = newMessages[size - 1].msgLocalId
-        hasHistory = size > LIMIT
-
-        if (newMessages.isNotEmpty()) {
-            val messages1 = if (hasHistory) {
-                newMessages.subList(0, LIMIT.toInt()).toMutableList()
-            } else {
-                newMessages.subList(0, newMessages.size).toMutableList()
-            }
-
-            val messagesSize = messagesList.size
-
-            messagesList.addAll(messagesSize, messages1)
-            binding.recycleChatList.post {
-                chatAdapter!!.notifyItemRangeInserted(messagesSize, newMessages.size)
-            }
-        }
-
-        loading = false
     }
 
     private fun observeLiveData() {
         if (webSocketService == null) {
             return
         }
-        webSocketService!!.messageLivedata.observe(
+        webSocketService!!.messageLivedata.observe(this) {
-            this
+            it?.let {
-        ) { messages: Messages ->
+                handleMsg(it)
-            handleMsg(messages)
+            }
         }
     }
 
     private fun handleMsg(messages: Messages) {
-        if (lastMessage == messages || messagesList[0] == messages) {
+        MessagesManager.receiveMessage(messages)
-            return
+//        messagesViewModel.receiveMessage(messages)
-        }
+        binding.recycleChatList.smoothScrollToPosition(0)
-        lastMessage = messages
-        if ("ack" != messages.type && username != messages.senderId) {
-            if (messages.takerId == contactId) {
-                messagesList.addFirst(messages)
-                chatAdapter!!.notifyItemInserted(0)
-                binding.recycleChatList.smoothScrollToPosition(0)
-            }
-        }
     }
 
     private fun sendMessage(talkerId: String, message: String, type: String) {
@@ -476,8 +427,6 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
             type = type,
         )
 
-        addData(messages)
-
         val id: Long = messagesBox.put(messages)
 
         val jsonObject = JSONObject()
@@ -490,13 +439,10 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
         webSocketService!!.sendMessage(jsonObject.toString(), id)
         webSocketService!!.storeOwnerMsg(messages)
 
-        binding.etInput.setText("")
+        MessagesManager.sendMessages(messages)
-    }
-
-    private fun addData(messages: Messages) {
-        messagesList.addFirst(messages)
-        chatAdapter!!.notifyItemInserted(0)
         binding.recycleChatList.smoothScrollToPosition(0)
+
+        binding.etInput.setText("")
     }
 
 
@@ -513,6 +459,7 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
 
     override fun onDestroy() {
         super.onDestroy()
+        MessagesManager.resetMessages()
         mmkv.putString(CURRENT_CONTACT_ID, "")
         if (bound) {
             unbindService(connection)

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

@@ -3,10 +3,13 @@ package com.kaixed.kchat.ui.activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
+import androidx.lifecycle.ViewModelProvider
 import com.bumptech.glide.Glide
 import com.kaixed.kchat.data.LocalDatabase.getContactByUsername
 import com.kaixed.kchat.databinding.ActivityChatDetailBinding
+import com.kaixed.kchat.manager.MessagesManager
 import com.kaixed.kchat.ui.base.BaseActivity
+import org.greenrobot.eventbus.EventBus
 
 class ChatDetailActivity : BaseActivity<ActivityChatDetailBinding>() {
 
@@ -37,10 +40,21 @@ class ChatDetailActivity : BaseActivity<ActivityChatDetailBinding>() {
     }
 
     private fun setListener() {
+        binding.ciCleanChatHistory.setOnClickListener {
+            val timestamp = System.currentTimeMillis()
+            MessagesManager.cleanMessages(timestamp)
+            EventBus.getDefault().post(contactId)
+        }
+
         binding.ifvAvatar.setOnClickListener {
             val intent =
                 Intent(this, ContactsDetailActivity::class.java)
-            intent.putExtra("contactId", "kaixed")
+            intent.putExtra("contactId", contactId)
+            startActivity(intent)
+        }
+
+        binding.ciSearchChatHistory.setOnClickListener {
+            val intent = Intent(this, SearchChatHistory::class.java)
             startActivity(intent)
         }
     }

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

@@ -12,6 +12,7 @@ import com.kaixed.kchat.utils.Constants.USER_LOGIN_STATUS
 import com.tencent.mmkv.MMKV
 
 
+@SuppressLint("CustomSplashScreen")
 class LaunchActivity : BaseActivity<ActivityLaunchBinding>() {
 
     override fun inflateBinding(): ActivityLaunchBinding {

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

@@ -0,0 +1,27 @@
+package com.kaixed.kchat.ui.activity
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.kaixed.kchat.R
+import com.kaixed.kchat.databinding.ActivitySearchChatHistoryBinding
+import com.kaixed.kchat.ui.base.BaseActivity
+
+class SearchChatHistory : BaseActivity<ActivitySearchChatHistoryBinding>() {
+
+    override fun inflateBinding(): ActivitySearchChatHistoryBinding {
+        return ActivitySearchChatHistoryBinding.inflate(layoutInflater)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_search_chat_history)
+    }
+
+    override fun initData() {
+
+    }
+}

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

@@ -39,11 +39,38 @@ class SearchFriendsActivity : BaseActivity<ActivitySearchFriendsBinding>() {
 
         initView()
 
+        setObserver()
+
         setOnClick()
     }
 
-    override fun initData() {
+    private fun setObserver() {
+        contactViewModel.searchContactResult.observe(this) { result ->
+            result.onSuccess {
+                it?.let {
+                    if (LocalDatabase.isMyFriend(it.username)) {
+                        val intent =
+                            Intent(this, ContactsDetailActivity::class.java).apply {
+                                putExtra("contactId", it.username)
+                            }
+                        startActivity(intent)
+                    } else {
+                        userItem = it
+                        updateView(true)
+                        setContent(it)
+                    }
+                }
+            }
 
+            result.onFailure {
+                updateView(false)
+            }
+
+            loadingDialog.dismissLoading()
+        }
+    }
+
+    override fun initData() {
     }
 
     private fun setOnClick() {
@@ -104,29 +131,6 @@ class SearchFriendsActivity : BaseActivity<ActivitySearchFriendsBinding>() {
     }
 
     private fun searchUser(username: String) {
-        contactViewModel.searchContactResult.observe(this) { result ->
-            result.onSuccess {
-                it?.let {
-                    if (LocalDatabase.isMyFriend(it.username)) {
-                        val intent =
-                            Intent(this, ContactsDetailActivity::class.java).apply {
-                                putExtra("contactId", it.username)
-                            }
-                        startActivity(intent)
-                    } else {
-                        userItem = it
-                        updateView(true)
-                        setContent(it)
-                    }
-                }
-            }
-
-            result.onFailure {
-                updateView(false)
-            }
-
-            loadingDialog.dismissLoading()
-        }
         contactViewModel.searchContact(username)
     }
 

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

@@ -0,0 +1,26 @@
+package com.kaixed.kchat.ui.activity.setting
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.kaixed.kchat.R
+import com.kaixed.kchat.databinding.ActivityUpdateKidBinding
+import com.kaixed.kchat.ui.base.BaseActivity
+
+class UpdateKidActivity : BaseActivity<ActivityUpdateKidBinding>() {
+
+    override fun inflateBinding(): ActivityUpdateKidBinding {
+        return ActivityUpdateKidBinding.inflate(layoutInflater)
+    }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_update_kid)
+    }
+
+    override fun initData() {
+
+    }
+}

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

@@ -7,6 +7,8 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.drake.spannable.replaceSpan
@@ -23,12 +25,20 @@ import com.kaixed.kchat.utils.TextUtil.extractDimensionsAndPrefix
 import com.kaixed.kchat.utils.ViewUtil.changeTimerVisibility
 import com.kaixed.kchat.utils.ViewUtil.setViewVisibility
 import io.objectbox.Box
-import java.util.LinkedList
 
 
 class ChatAdapter(
-    private val context: Context, private val messages: LinkedList<Messages>
+    private val context: Context
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+) : ListAdapter<Messages, RecyclerView.ViewHolder>(object : DiffUtil.ItemCallback<Messages>() {
+    override fun areItemsTheSame(oldItem: Messages, newItem: Messages): Boolean {
+        return oldItem.msgLocalId == newItem.msgLocalId
+    }
+
+    override fun areContentsTheSame(oldItem: Messages, newItem: Messages): Boolean {
+        return oldItem == newItem
+    }
+
+}) {
 
     companion object {
         const val CUSTOM = 0
@@ -83,7 +93,7 @@ class ChatAdapter(
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val singleMessage = messages[position]
+        val singleMessage = getItem(position)
         when (holder) {
             is CustomViewHolder -> {
                 holder.bindData(singleMessage)
@@ -98,7 +108,7 @@ class ChatAdapter(
             }
         }
         (holder as? HasTimer)?.let {
-            changeTimerVisibility(position, messages, it.getTimerView(), singleMessage)
+            changeTimerVisibility(position, currentList, it.getTimerView(), singleMessage)
         }
         handleLongClick(holder, position, singleMessage)
     }
@@ -126,16 +136,16 @@ class ChatAdapter(
 
     private fun deleteMessage(position: Int, message: Messages) {
         // 从数据库删除
-        val messagesBox: Box<Messages> = getBox(Messages::class.java)
+//        val messagesBox: Box<Messages> = getBox(Messages::class.java)
-        messagesBox.remove(message.msgLocalId)
+//        messagesBox.remove(message.msgLocalId)
-
+//
-        // 更新数据源并通知 RecyclerView
+//        // 更新数据源并通知 RecyclerView
-        messages.removeAt(position)
+//        messages.removeAt(position)
-        notifyItemRemoved(position)
+//        notifyItemRemoved(position)
-
+//
-        if (position != messages.size) { // 如果移除的是最后一个，忽略
+//        if (position != messages.size) { // 如果移除的是最后一个，忽略
-            notifyItemRangeChanged(position, messages.size - position);
+//            notifyItemRangeChanged(position, messages.size - position);
-        }
+//        }
     }
 
     interface HasTimer {
@@ -215,7 +225,7 @@ class ChatAdapter(
     }
 
     override fun getItemViewType(position: Int): Int {
-        return messages[position].type.toInt()
+        return getItem(position).type.toInt()
 
     }
 
@@ -223,6 +233,4 @@ class ChatAdapter(
         val messagesBox: Box<Messages> = getBox(Messages::class.java)
         messagesBox.put(message)
     }
-
-    override fun getItemCount(): Int = messages.size
 }

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

@@ -84,7 +84,7 @@ class ConversationAdapter(
             binding.tvContent.text = chatList.lastContent.replaceSpan("[委屈]") {
                 CenterImageSpan(context, R.drawable.emoji).setDrawableSize(55)
             }
-            binding.tvNickname.text = chatList.talkerId
+            binding.tvNickname.text = chatList.nickname
             binding.tvTimestamp.text = TextUtil.getTimestampString(chatList.timestamp)
         }
     }

app/src/main/java/com/kaixed/kchat/ui/fragment/HomeFragment.kt

@@ -43,6 +43,7 @@ import com.kaixed.kchat.ui.i.OnDialogFragmentClickListener
 import com.kaixed.kchat.ui.i.OnItemListener
 import com.kaixed.kchat.ui.widget.HomeDialogFragment
 import io.objectbox.Box
+import org.greenrobot.eventbus.EventBus
 
 class HomeFragment : BaseFragment<FragmentHomeBinding>(), OnItemListener,
     OnDialogFragmentClickListener {

app/src/main/java/com/kaixed/kchat/ui/fragment/MineFragment.kt

@@ -15,6 +15,7 @@ import com.kaixed.kchat.utils.ConstantsUtil
 import com.kaixed.kchat.utils.ConstantsUtil.getAvatarUrl
 import com.kaixed.kchat.utils.ConstantsUtil.getUsername
 import com.kaixed.kchat.utils.TextUtil
+import org.greenrobot.eventbus.EventBus
 
 
 class MineFragment : BaseFragment<FragmentMineBinding>() {

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

@@ -0,0 +1,40 @@
+package com.kaixed.kchat.ui.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.util.AttributeSet
+
+class CustomButton : androidx.appcompat.widget.AppCompatButton {
+
+    private val paint: Paint = Paint()  // 用于绘制背景
+    private val cornerRadius = 20f  // 圆角半径
+
+    // 构造函数
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
+    // 重写 onDraw 方法绘制圆角背景
+    @SuppressLint("DrawAllocation")
+    override fun onDraw(canvas: Canvas) {
+        // 绘制圆角矩形背景
+        paint.color = Color.parseColor("#ffffff")  // 背景颜色
+        paint.isAntiAlias = true  // 开启抗锯齿
+        paint.style = Paint.Style.FILL  // 填充
+
+        // 创建一个圆角矩形的矩形区域
+        val rect = RectF(0f, 0f, width.toFloat(), height.toFloat())
+        canvas.drawRoundRect(rect, cornerRadius, cornerRadius, paint)
+
+        // 在圆角背景上绘制按钮文本
+        super.onDraw(canvas)
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.kaixed.kchat.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+
+/**
+ * @Author: kaixed
+ * @Date: 2024/12/7 15:35
+ */
+class KButton @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+) : androidx.appcompat.widget.AppCompatButton(context, attrs, defStyleAttr) {
+
+}

app/src/main/java/com/kaixed/kchat/utils/SingleLiveEvent.kt

@@ -6,6 +6,16 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import java.util.concurrent.atomic.AtomicBoolean
 
+/**
+ * A lifecycle-aware observable that sends only new updates after subscription, used for events like
+ * navigation and Snackbar messages.
+ * <p>
+ * This avoids a common problem with events: on configuration change (like rotation) an update
+ * can be emitted if the observer is active. This LiveData only calls the observable if there's an
+ * explicit call to setValue() or call().
+ * <p>
+ * Note that only one observer is going to be notified of changes.
+ */
 class SingleLiveEvent<T> : MutableLiveData<T>() {
     private val mPending = AtomicBoolean(false)
 
@@ -24,9 +34,6 @@ class SingleLiveEvent<T> : MutableLiveData<T>() {
         super.setValue(value)
     }
 
-    /**
-     * 用于 T 为 Void 类型的情况，使调用更简洁
-     */
     @MainThread
     fun call() {
         setValue(null)

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

@@ -33,7 +33,7 @@ class ContactViewModel : ViewModel() {
     val addContactResult: LiveData<Result<String?>> = _addContactResult
 
     // 搜索联系人
-    private val _searchContactResult = SingleLiveEvent<Result<SearchUser?>>()
+    private val _searchContactResult = MutableLiveData<Result<SearchUser?>>()
     val searchContactResult: LiveData<Result<SearchUser?>> = _searchContactResult
 
     // 获取联系人列表

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

@@ -13,6 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:titleIcon="@drawable/ic_more"
+        android:background="#F7F7F7"
         app:titleName="contact" />
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -37,9 +37,8 @@
             android:id="@+id/tv_contact_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="3dp"
-            android:text="kaixed"
+            android:textSize="13sp"
-            android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="@id/ifv_avatar"
             app:layout_constraintStart_toStartOf="@id/ifv_avatar"
             app:layout_constraintTop_toBottomOf="@id/ifv_avatar" />
@@ -48,6 +47,7 @@
 
 
     <com.kaixed.kchat.ui.widget.CustomItem
+        android:id="@+id/ci_search_chat_history"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -81,6 +81,7 @@
         app:itemName="设置当前聊天背景" />
 
     <com.kaixed.kchat.ui.widget.CustomItem
+        android:id="@+id/ci_clean_chat_history"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"

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

@@ -55,12 +55,13 @@
         android:id="@+id/et_username"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:maxLength="16"
         android:layout_marginStart="35dp"
         android:background="@null"
         android:hint="请填写用户名"
-        android:visibility="invisible"
         android:textCursorDrawable="@drawable/cursor"
         android:textSize="17sp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@id/view1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/tv_username"
@@ -73,6 +74,7 @@
         android:layout_marginStart="35dp"
         android:background="@null"
         android:hint="请填写手机号"
+        android:maxLength="11"
         android:textCursorDrawable="@drawable/cursor"
         android:textSize="17sp"
         app:layout_constraintBottom_toTopOf="@id/view1"
@@ -108,6 +110,8 @@
         android:background="@null"
         android:hint="请填写密码"
         android:inputType="textPassword"
+        android:maxLength="16"
+        android:maxLines="1"
         android:textCursorDrawable="@drawable/cursor"
         android:textSize="17sp"
         app:layout_constraintBottom_toTopOf="@id/view2"

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ededed"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.activity.SearchChatHistory">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_search"
+        android:layout_width="0dp"
+        android:layout_height="30dp"
+        android:layout_margin="15dp"
+        app:cardCornerRadius="7dp"
+        app:cardElevation="0dp"
+        app:cardMaxElevation="0dp"
+        app:layout_constraintEnd_toStartOf="@id/tv_cancel"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/iv_search"
+                android:layout_width="17dp"
+                android:layout_height="17dp"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="10dp"
+                android:src="@drawable/icon_search" />
+
+            <EditText
+                android:id="@+id/et_search"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="5dp"
+                android:layout_toEndOf="@id/iv_search"
+                android:background="@null"
+                android:hint="搜索"
+                android:inputType="text"
+                android:maxLines="1"
+                android:textColor="@color/black"
+                android:textSize="15sp" />
+
+        </RelativeLayout>
+
+
+    </androidx.cardview.widget.CardView>
+
+    <TextView
+        android:id="@+id/tv_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:text="取消"
+        android:textColor="#576B95"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@id/cv_search"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/cv_search"
+        app:layout_constraintTop_toTopOf="@id/cv_search" />
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginTop="10dp"
+        android:background="@color/gray"
+        app:layout_constraintTop_toBottomOf="@id/cv_search" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -68,7 +68,7 @@
     <View
         android:id="@+id/view"
         android:layout_width="match_parent"
-        android:layout_height="0.2dp"
+        android:layout_height="@dimen/divider_height"
         android:layout_marginTop="15dp"
         android:background="@color/gray"
         app:layout_constraintTop_toBottomOf="@id/cv_search" />

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activity.setting.UpdateKidActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ui.fragment.settings.AccountSecurityFragment">
 
     <com.kaixed.kchat.ui.widget.CustomTitleBar
@@ -12,5 +13,54 @@
         android:layout_height="wrap_content"
         app:titleName="账号与安全" />
 
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:isBottomDividerVisible="true"
+        app:itemDesc="kaixed"
+        app:itemName="微信号" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:itemDesc="177******45"
+        app:itemName="手机号" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin"
+        app:isBottomDividerVisible="true"
+        app:itemName="密码" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:itemName="声音锁" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin"
+        app:isBottomDividerVisible="true"
+        app:itemName="应急联系人" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:isBottomDividerVisible="true"
+        app:itemName="登陆过的设备" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:itemName="更多安全设置" />
+
+    <com.kaixed.kchat.ui.widget.CustomItem
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin"
+        app:itemName="安全中心" />
+
 
 </LinearLayout>

app/src/main/res/values/attr.xml

@@ -49,11 +49,11 @@
     </declare-styleable>
 
     <declare-styleable name="SmoothCheckBox">
-        <attr name="duration" format="integer"/>
+        <attr name="duration" format="integer" />
-        <attr name="stroke_width" format="dimension"/>
+        <attr name="stroke_width" format="dimension" />
-        <attr name="color_tick" format="color"/>
+        <attr name="color_tick" format="color" />
-        <attr name="color_checked" format="color"/>
+        <attr name="color_checked" format="color" />
-        <attr name="color_unchecked" format="color"/>
+        <attr name="color_unchecked" format="color" />
-        <attr name="color_unchecked_stroke" format="color"/>
+        <attr name="color_unchecked_stroke" format="color" />
     </declare-styleable>
 </resources>

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 agp = "8.3.2"
 converterGson = "2.11.0"
 emoji2 = "1.5.0"
+eventbus = "3.3.1"
 glide = "4.16.0"
 gson = "2.11.0"
 junit = "4.13.2"
@@ -33,6 +34,7 @@ navigationFragment = "2.8.4"
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 compress = { module = "io.github.lucksiege:compress", version.ref = "pictureselector" }
+eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbus" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptorVersion" }