kaixed/kchat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 重构WebsocketService

Browse Source 
- 引入ConversationManager类进行管理主页消息列表，以解耦service
- 修复对方发送的同一条消息会出现在聊天界面两次问题
This commit is contained in:
糕小菜 2024-12-13 12:30:29 +08:00
parent e48010cae8
commit d33e6b60c6
17 changed files with 192 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@ -4,6 +4,7 @@ plugins {
id("com.google.devtools.ksp")
// id("therouter")
id("org.jetbrains.kotlin.plugin.serialization")
id("kotlin-kapt")
}
android {
@ -94,8 +95,6 @@ dependencies {
// Navigation Component 依赖
implementation("androidx.navigation:navigation-fragment-ktx:2.8.4")
implementation("androidx.navigation:navigation-ui-ktx:2.8.4")
// implementation(libs.therouter)
// ksp(libs.therouter.ksp)
}

24
app/objectbox-models/default.json
View File

@ -5,7 +5,7 @@
"entities": [
{
"id": "1:488582047102418567",
"lastPropertyId": "15:6294917834245722650",
"lastPropertyId": "16:1385814819739404832",
"name": "Messages",
"properties": [
{
@ -44,11 +44,6 @@
"name": "senderId",
"type": 9
},
{
"id": "11:8166842332862045141",
"name": "takerId",
"type": 9
},
{
"id": "12:4851920989895940582",
"name": "show",
@ -68,6 +63,11 @@
"id": "15:6294917834245722650",
"name": "avatarUrl",
"type": 9
},
{
"id": "16:1385814819739404832",
"name": "talkerId",
"type": 9
}
],
"relations": []
@ -200,7 +200,7 @@
},
{
"id": "6:411582187056789368",
"lastPropertyId": "11:1529665629379902832",
"lastPropertyId": "12:385998119105891942",
"name": "Conversation",
"properties": [
{
@ -256,7 +256,7 @@
}
],
"lastEntityId": "6:411582187056789368",
"lastIndexId": "5:5778861805343771794",
"lastIndexId": "6:2000658164272752230",
"lastRelationId": "0:0",
"lastSequenceId": "0:0",
"modelVersion": 5,
@ -265,7 +265,9 @@
4156940900268054047,
6854189850259048168
],
"retiredIndexUids": [],
"retiredIndexUids": [
2000658164272752230
],
"retiredPropertyUids": [
840045868537717781,
4549217622013661678,
@ -288,7 +290,9 @@
2123413060720974577,
8705063061921345729,
6199737871252062125,
2020630799900991467
2020630799900991467,
385998119105891942,
8166842332862045141
],
"retiredRelationUids": [],
"version": 1

19
app/objectbox-models/default.json.bak
View File

@ -93,7 +93,9 @@
{
"id": "3:8037315472776382017",
"name": "nickname",
"type": 9
"indexId": "4:679586433530042459",
"type": 9,
"flags": 2048
},
{
"id": "4:4442492673513561150",
@ -108,7 +110,9 @@
{
"id": "6:4419123739192764234",
"name": "remark",
"type": 9
"indexId": "5:5778861805343771794",
"type": 9,
"flags": 2048
},
{
"id": "7:2091607227595340484",
@ -196,7 +200,7 @@
},
{
"id": "6:411582187056789368",
"lastPropertyId": "11:1529665629379902832",
"lastPropertyId": "12:385998119105891942",
"name": "Conversation",
"properties": [
{
@ -252,7 +256,7 @@
}
],
"lastEntityId": "6:411582187056789368",
"lastIndexId": "3:4492440644813580438",
"lastIndexId": "6:2000658164272752230",
"lastRelationId": "0:0",
"lastSequenceId": "0:0",
"modelVersion": 5,
@ -261,7 +265,9 @@
4156940900268054047,
6854189850259048168
],
"retiredIndexUids": [],
"retiredIndexUids": [
2000658164272752230
],
"retiredPropertyUids": [
840045868537717781,
4549217622013661678,
@ -284,7 +290,8 @@
2123413060720974577,
8705063061921345729,
6199737871252062125,
2020630799900991467
2020630799900991467,
385998119105891942
],
"retiredRelationUids": [],
"version": 1

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

@ -1,6 +1,7 @@
package com.kaixed.kchat.data
import com.kaixed.kchat.data.local.box.ObjectBox.getBox
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_
import com.kaixed.kchat.data.local.entity.Conversation
@ -8,6 +9,7 @@ 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
import io.objectbox.kotlin.boxFor
import io.objectbox.query.QueryBuilder
/**
@ -16,14 +18,14 @@ import io.objectbox.query.QueryBuilder
*/
object LocalDatabase {
private val contactBox by lazy { getBox(Contact::class.java) }
private val contactBox: Box<Contact> by lazy { getBoxStore().boxFor() }
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()
messagesBox.query(Messages_.talkerId.equal(contactId)).build().remove()
conversationBox.query(Conversation_.talkerId.equal(contactId)).build().remove()
}
@ -37,7 +39,7 @@ object LocalDatabase {
fun getMessagesWithContact(contactId: String, offset: Long, limit: Long): List<Messages> {
val query = messagesBox
.query(Messages_.takerId.equal(contactId))
.query(Messages_.talkerId.equal(contactId))
.order(Messages_.timestamp, QueryBuilder.DESCENDING)
.build()
return query.find(offset, limit)
@ -45,7 +47,7 @@ object LocalDatabase {
fun getMoreMessages(contactId: String, msgLocalId: Long, limit: Long): List<Messages> {
val query = messagesBox
.query(Messages_.takerId.equal(contactId))
.query(Messages_.talkerId.equal(contactId))
.lessOrEqual(Messages_.msgLocalId, msgLocalId)
.order(Messages_.timestamp, QueryBuilder.DESCENDING)
.build()
@ -55,7 +57,7 @@ object LocalDatabase {
fun getAllHistoryMessages(contactId: String, msgLocalId: Long): List<Messages> {
val query = messagesBox
.query(Messages_.takerId.equal(contactId))
.query(Messages_.talkerId.equal(contactId))
.greaterOrEqual(Messages_.msgLocalId, msgLocalId)
.order(Messages_.timestamp, QueryBuilder.DESCENDING)
.build()

1
app/src/main/java/com/kaixed/kchat/data/local/box/ObjectBoxManager.kt
View File

@ -4,6 +4,7 @@ import android.content.Context
import com.kaixed.kchat.data.local.entity.MyObjectBox
import io.objectbox.Box
import io.objectbox.BoxStore
import io.objectbox.kotlin.boxFor
/**
* @Author: kaixed

5
app/src/main/java/com/kaixed/kchat/data/local/entity/Conversation.kt
View File

@ -3,6 +3,7 @@ package com.kaixed.kchat.data.local.entity
import io.objectbox.annotation.Entity
import io.objectbox.annotation.Id
import io.objectbox.annotation.Index
import io.objectbox.relation.ToOne
/**
* @Author: kaixed
@ -21,5 +22,5 @@ data class Conversation(
var timestamp: Long,
var unreadCount: Int = 0,
var isShow: Boolean = true,
var isPinned: Boolean = false
)
var isPinned: Boolean = false,
)

2
app/src/main/java/com/kaixed/kchat/data/local/entity/Messages.kt
View File

@ -20,7 +20,7 @@ data class Messages(
var status: String = "normal",
var senderId: String,
var avatarUrl: String = "",
var takerId: String,
var talkerId: String,
var type: String,
var show: Boolean = true,
var isShowTimer: Boolean = false,

108
app/src/main/java/com/kaixed/kchat/manager/ConversationManager.kt Normal file
View File

@ -0,0 +1,108 @@
package com.kaixed.kchat.manager
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.kaixed.kchat.data.LocalDatabase.getContactByUsername
import com.kaixed.kchat.data.local.box.ObjectBox.getBoxStore
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 com.kaixed.kchat.utils.ConstantsUtil.getCurrentContactId
import com.kaixed.kchat.utils.ConstantsUtil.getUsername
import io.objectbox.Box
import io.objectbox.kotlin.boxFor
/**
* @Author: kaixed
* @Date: 2024/12/13 10:42
*/
object ConversationManager {
private val _conversationLiveData = MutableLiveData<List<Conversation>?>()
val conversations: LiveData<List<Conversation>?> get() = _conversationLiveData
private val conversationBox: Box<Conversation> by lazy { getBoxStore().boxFor() }
private val messagesBox: Box<Messages> by lazy { getBoxStore().boxFor() }
private val conversationMap: MutableMap<String, Conversation> = mutableMapOf()
init {
loadConversations()
}
private fun loadConversations() {
val conversations = conversationBox.query(Conversation_.isShow.equal(true))
.orderDesc(Conversation_.timestamp)
.build()
.find()
// 使用 Map 来优化查找效率
conversationMap.putAll(conversations.associateBy { it.talkerId })
_conversationLiveData.postValue(conversations.sortedByDescending { it.timestamp })
}
fun handleMessages(messages: Messages) {
val updatedConversation = updateConversation(messages)
conversationBox.put(updatedConversation)
_conversationLiveData.postValue(conversationMap.values.sortedByDescending { it.timestamp })
}
private fun updateConversation(messages: Messages): Conversation {
val existingConversation = conversationMap[messages.talkerId]
return existingConversation?.apply {
lastContent = if (messages.type == "4") "[图片]" else messages.content
timestamp = messages.timestamp
unreadCount =
if (talkerId == getCurrentContactId() || messages.senderId == getUsername()) 0 else unreadCount + 1
}
?: createConversation(messages)
}
fun hideConversation(contactId: String) {
conversationMap[contactId]?.apply {
isShow = false
}
_conversationLiveData.postValue(conversationMap.values.filter { it.isShow }
.sortedByDescending { it.timestamp })
}
fun deleteConversation(conversation: Conversation) {
conversationMap.remove(conversation.talkerId)
conversationBox.query(Conversation_.talkerId.equal(conversation.talkerId)).build().remove()
messagesBox.query(Messages_.talkerId.equal(conversation.talkerId)).build().remove()
_conversationLiveData.postValue(conversationMap.values.sortedByDescending { it.timestamp })
}
fun updateConversationList(con: Conversation) {
val conversation = conversationMap[con.talkerId]
conversation?.let {
conversation.apply {
if (!con.isShow) {
this.isShow = false
conversationMap.remove(talkerId)
}
this.isPinned = con.isPinned
this.unreadCount = con.unreadCount
}
conversationBox.put(conversation)
_conversationLiveData.postValue(conversationMap.values.filter { it.isShow }
.sortedByDescending { it.timestamp })
}
}
private fun createConversation(messages: Messages): Conversation {
val contact = getContactByUsername(messages.talkerId)
return Conversation(
talkerId = messages.talkerId,
nickname = contact?.remark ?: messages.talkerId,
lastContent = if (messages.type == "4") "[图片]" else messages.content,
timestamp = messages.timestamp,
avatarUrl = messages.avatarUrl,
unreadCount = if (messages.senderId == getUsername()) 0 else 1
).also {
conversationMap[messages.talkerId] = it
}
}
}

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

@ -49,6 +49,7 @@ object MessagesManager {
}
fun receiveMessage(messages: Messages) {
if (_messages.value.first() == messages) return
_messages.value = _messages.value.toMutableList().apply {
add(0, messages)
}

2
app/src/main/java/com/kaixed/kchat/processor/MessageProcessor.kt
View File

@ -17,7 +17,7 @@ object MessageProcessor {
fun processorMsg(messages: Messages): Messages {
val curTimestamp = System.currentTimeMillis()
val localMsg = messagesBox.query(Messages_.takerId.equal(messages.takerId))
val localMsg = messagesBox.query(Messages_.talkerId.equal(messages.talkerId))
.lessOrEqual(Messages_.timestamp, curTimestamp)
.orderDesc(Messages_.timestamp).build().findFirst()

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

@ -5,27 +5,22 @@ import android.content.Intent
import android.os.Binder
import android.os.IBinder
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_
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 com.kaixed.kchat.manager.ConversationManager
import com.kaixed.kchat.network.NetworkInterface.WEBSOCKET
import com.kaixed.kchat.network.NetworkInterface.WEBSOCKET_SERVER_URL
import com.kaixed.kchat.network.OkhttpHelper
import com.kaixed.kchat.processor.MessageProcessor
import com.kaixed.kchat.utils.Constants.MMKV_COMMON_DATA
import com.kaixed.kchat.utils.ConstantsUtil.getCurrentContactId
import com.kaixed.kchat.utils.ConstantsUtil.getUsername
import com.kaixed.kchat.utils.SingleLiveEvent
import com.tencent.mmkv.MMKV
import io.objectbox.Box
import io.objectbox.kotlin.boxFor
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Job
@ -46,9 +41,9 @@ class WebSocketService : Service() {
private const val WEBSOCKET_CLOSE_CODE = 1000
}
private lateinit var messagesBox: Box<Messages>
private val messagesBox: Box<Messages> by lazy { getBoxStore().boxFor() }
private val conversationBox: Box<Conversation> by lazy { getBoxStore().boxFor(Conversation::class.java) }
private val contactBox: Box<Contact> by lazy { getBoxStore().boxFor() }
private lateinit var username: String
@ -66,12 +61,6 @@ class WebSocketService : Service() {
val messageLivedata: SingleLiveEvent<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 {
return this@WebSocketService
@ -84,9 +73,7 @@ class WebSocketService : Service() {
override fun onCreate() {
super.onCreate()
messagesBox = getBoxStore().boxFor(Messages::class.java)
username = getUsername()
firstLoad()
if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this)
}
@ -99,8 +86,7 @@ class WebSocketService : Service() {
@Subscribe(threadMode = ThreadMode.MAIN)
fun onMessageEvent(contactId: String) {
conversationList.removeIf { it.talkerId == contactId }
_conversations.postValue(conversationList)
ConversationManager.hideConversation(contactId)
}
fun sendMessage(jsonObject: String, msgLocalId: Long) {
@ -113,39 +99,11 @@ class WebSocketService : Service() {
fun storeOwnerMsg(messages: Messages) {
if (messages.avatarUrl == "") {
val contactBox: Box<Contact> = getBoxStore().boxFor(Contact::class.java)
val contact =
contactBox.query(Contact_.username.equal(messages.takerId)).build().findFirst()
contactBox.query(Contact_.username.equal(messages.talkerId)).build().findFirst()
messages.avatarUrl = contact?.avatarUrl ?: ""
}
updateConversationList(messages)
}
fun deleteConversationList(con: Conversation) {
val conversation = conversationList.find { it.talkerId == con.talkerId }!!
conversationList.remove(conversation)
conversationBox.remove(conversation.id)
messagesBox.query(Messages_.takerId.equal(con.talkerId)).build().remove()
_conversations.postValue(conversationList.sortedByDescending { it.timestamp })
}
fun updateConversationList(con: Conversation) {
val conversation = conversationList.find { it.talkerId == con.talkerId }!!
if (!con.isShow) {
conversation.apply {
isShow = false
conversationList.remove(conversation)
}
}
conversation.apply {
isPinned = con.isPinned
unreadCount = con.unreadCount
}
conversationBox.put(conversation)
_conversations.postValue(conversationList.sortedByDescending { it.timestamp })
ConversationManager.handleMessages(messages)
}
private fun establishConnection() {
@ -158,60 +116,6 @@ class WebSocketService : Service() {
}
}
private fun updateDbConversation(messages: Messages) {
val conversation =
conversationBox.query(Conversation_.talkerId.equal(messages.takerId)).build()
.findFirst()
val currentContactId = getCurrentContactId()
if (conversation != null) {
conversation.apply {
unreadCount =
if (talkerId == currentContactId || messages.senderId == getUsername()) 0 else unreadCount + 1
lastContent = if (messages.type == "4") "[图片]" else messages.content
timestamp = messages.timestamp
}
conversationBox.put(conversation)
} else {
val con = createChatList(messages)
conversationBox.put(con)
}
}
private fun createChatList(
messages: Messages
): Conversation {
val contact = getContactByUsername(messages.takerId)!!
return Conversation(
talkerId = messages.takerId,
nickname = contact.remark ?: contact.nickname,
avatarUrl = messages.avatarUrl,
lastContent = if (messages.type == "4") "[图片]" else messages.content,
timestamp = messages.timestamp,
unreadCount = if (messages.senderId == getUsername()) 0 else 1
)
}
private fun createChatList(
talkerId: String,
nickname: String,
content: String,
avatarUrl: String,
timestamp: Long,
unreadCount: Int = 1
): Conversation {
return Conversation(
0L,
talkerId = talkerId,
nickname = nickname,
avatarUrl = avatarUrl,
lastContent = content,
timestamp = timestamp,
unreadCount = unreadCount
)
}
private inner class EchoWebSocketListener : WebSocketListener() {
override fun onOpen(webSocket: WebSocket, response: Response) {
Log.d(TAG, "WebSocket Opened")
@ -233,11 +137,11 @@ class WebSocketService : Service() {
messagesBox.put(messages)
}
} else {
messages.takerId = messages.senderId
messages.talkerId = messages.senderId
_messagesMutableLiveData.postValue(messages)
MessageProcessor.processorMsg(messages)
messagesBox.put(messages)
updateConversationList(messages)
ConversationManager.handleMessages(messages)
}
}
}
@ -254,43 +158,6 @@ class WebSocketService : Service() {
}
}
private fun updateConversationList(messages: Messages) {
updateDbConversation(messages)
val index = conversationList.indexOfFirst { it.talkerId == messages.takerId }
if (index != -1) {
if (messages.timestamp < conversationList[index].timestamp) {
return
}
conversationList[index].apply {
lastContent = if (messages.type == "4") "[图片]" else messages.content
timestamp = messages.timestamp
unreadCount =
if (this.talkerId == getCurrentContactId() || messages.senderId == getUsername()) 0 else unreadCount + 1
}
} else {
val contact = getContactByUsername(messages.takerId)
conversationList.add(
createChatList(
talkerId = messages.takerId,
nickname = contact?.remark ?: messages.takerId,
content = if (messages.type == "4") "[图片]" else messages.content,
timestamp = messages.timestamp,
avatarUrl = messages.avatarUrl,
unreadCount = if (messages.senderId == getUsername()) 0 else 1
)
)
}
_conversations.postValue(conversationList.sortedByDescending { it.timestamp })
}
private fun firstLoad() {
conversationList = conversationBox.query(Conversation_.isShow.equal(true))
.orderDesc(Conversation_.timestamp)
.build()
.find()
_conversations.postValue(conversationList)
}
override fun onDestroy() {
super.onDestroy()
if (EventBus.getDefault().isRegistered(this)) {

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

@ -28,7 +28,7 @@ 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.local.box.ObjectBox.getBox
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
@ -46,7 +46,6 @@ import com.kaixed.kchat.ui.widget.LoadingDialogFragment
import com.kaixed.kchat.utils.Constants.CURRENT_CONTACT_ID
import com.kaixed.kchat.utils.Constants.KEYBOARD_HEIGHT_RATIO
import com.kaixed.kchat.utils.Constants.MMKV_USER_SESSION
import com.kaixed.kchat.utils.ConstantsUtil.getAvatarUrl
import com.kaixed.kchat.utils.ConstantsUtil.getKeyboardHeight
import com.kaixed.kchat.utils.ConstantsUtil.getUsername
import com.kaixed.kchat.utils.ImageEngines
@ -58,6 +57,7 @@ import com.luck.picture.lib.entity.LocalMedia
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.tencent.mmkv.MMKV
import io.objectbox.Box
import io.objectbox.kotlin.boxFor
import kotlinx.coroutines.launch
import org.json.JSONObject
import java.io.File
@ -69,7 +69,7 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
private var webSocketService: WebSocketService? = null
private val messagesBox: Box<Messages> by lazy { getBox(Messages::class.java) }
private val messagesBox: Box<Messages> by lazy { getBoxStore().boxFor() }
private var contactId: String = ""
@ -442,7 +442,7 @@ class ChatActivity : BaseActivity<ActivityChatBinding>(), OnItemClickListener,
content = message,
timestamp = System.currentTimeMillis(),
senderId = username,
takerId = talkerId,
talkerId = talkerId,
type = type,
)
val msg = MessageProcessor.processorMsg(messages)

1
app/src/main/java/com/kaixed/kchat/ui/activity/MainActivity.kt
View File

@ -89,7 +89,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
}
contactViewModel.loadFriendList(getUsername())
delay(2000)
loadingDialogFragment.dismissLoading()
}
}

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

@ -29,6 +29,7 @@ import com.kaixed.kchat.data.local.entity.Conversation
import com.kaixed.kchat.data.local.entity.Conversation_
import com.kaixed.kchat.data.model.HomeItem
import com.kaixed.kchat.databinding.FragmentHomeBinding
import com.kaixed.kchat.manager.ConversationManager
import com.kaixed.kchat.service.WebSocketService
import com.kaixed.kchat.service.WebSocketService.LocalBinder
import com.kaixed.kchat.ui.activity.AddFriendsActivity
@ -43,7 +44,6 @@ 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 {
@ -162,16 +162,23 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), OnItemListener,
}
private fun observeLiveData() {
if (webSocketService == null) {
return
}
webSocketService!!.conversations.observe(viewLifecycleOwner) {
ConversationManager.conversations.observe(viewLifecycleOwner) {
it?.let {
chatLists = it.toMutableList()
conversationAdapter.submitList(chatLists)
notifyData()
}
}
// if (webSocketService == null) {
// return
// }
// webSocketService!!.conversations.observe(viewLifecycleOwner) {
// it?.let {
// chatLists = it.toMutableList()
// conversationAdapter.submitList(chatLists)
// notifyData()
// }
// }
}
private fun initView() {
@ -227,9 +234,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), OnItemListener,
}
private fun setupRecycleView() {
// conversationBox.all?.let {
// chatLists = conversationBox.query(Conversation_.show.equal(true)).build().find()
// }
binding.recycleChatList.layoutManager =
LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
binding.recycleChatList.adapter = conversationAdapter
@ -290,17 +294,12 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), OnItemListener,
override fun onItemClick(talkerId: String) {
this.talkerId = talkerId
// chatLists.find { it.talkerId == talkerId }?.let {
// it.unreadCount = 0
// conversationBox.put(it)
// }
for (i in chatLists.indices) {
if (chatLists[i].talkerId == talkerId) {
chatLists[i].unreadCount = 0
}
}
notifyData()
//
val conversation =
conversationBox.query(Conversation_.talkerId.equal(talkerId)).build().findFirst()
@ -337,24 +336,25 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), OnItemListener,
if (con == null) {
return
}
webSocketService?.updateConversationList(con!!.apply {
ConversationManager.updateConversationList(con!!.apply {
this.unreadCount = if (unreadCount != 0) 0 else 1
})
}
override fun onClickHideConversation() {
webSocketService?.updateConversationList(getConversation().apply {
ConversationManager.updateConversationList(con!!.apply {
this.isShow = false
})
}
override fun onClickSticky() {
webSocketService?.updateConversationList(getConversation().apply {
ConversationManager.updateConversationList(getConversation().apply {
this.isPinned = !isPinned
})
}
override fun onClickDeleteConversation() {
webSocketService?.deleteConversationList(getConversation())
val con = getConversation()
ConversationManager.deleteConversation(con)
}
}

9
app/src/main/res/drawable/ic_not_disturb.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="70dp"
android:height="70dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M806.1,989.8L171.9,70.8A29.4,29.4 0,0 1,177.3 31.9l4.6,-3.7a24.5,24.5 0,0 1,35.9 5.7l634,919a29.4,29.4 0,0 1,-5.2 38.9l-4.6,3.7a24.5,24.5 0,0 1,-36 -5.7zM419.2,924.6S419.3,1024 511.2,1024h1.4c91.9,0 91.9,-99.4 91.9,-99.4L419.3,924.6zM512,821.9L299.9,821.9l-74.6,1.1c-73.5,0 -67,4 -23.5,-67.4 46.3,-76 79.6,-228.7 79.6,-348 0,-29 1.4,-60.4 6.5,-91.4l-51,-74c-17.5,51.8 -22.8,107.3 -22.8,155.5 0,139.2 -31.5,287.5 -101,381.2 -65.6,88.5 0,109.2 39.8,109.2h529.6l-45.7,-66.3L511.9,821.9zM910.8,778.7c-69.5,-93.6 -101.1,-241.9 -101.1,-381.1 0,-132.6 -39.8,-321.4 -266.4,-331.4v-33C543.3,13.3 531,0 512.5,0h-1.4c-18.4,0 -30.6,13.3 -30.6,33.2v33.1c-65.8,3 -115.9,21 -153.8,48.3L365.3,170.7c33.8,-25.1 80.7,-40.1 145.7,-38.1h1.4c205.1,-6.6 229.6,155.8 229.6,275.1 0,119.4 33.3,271.9 79.6,348 39.7,65.4 48.6,67.5 -6.5,67.4l44.9,65.2h10.6c40,0 105.7,-20.9 40,-109.5z"
android:fillColor="#2c2c2c"/>
</vector>

2
build.gradle.kts
View File

@ -14,6 +14,6 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("io.objectbox:objectbox-gradle-plugin:4.0.0")
classpath(libs.objectbox.gradle.plugin)
}
}

2
gradle/libs.versions.toml
View File

@ -17,6 +17,7 @@ material = "1.12.0"
activity = "1.9.3"
constraintlayout = "2.2.0"
mmkv = "1.3.9"
objectboxGradlePlugin = "4.0.3"
okhttp = "4.12.0"
pictureselector = "v3.11.2"
pinyin4j = "2.5.1"
@ -37,6 +38,7 @@ compress = { module = "io.github.lucksiege:compress", version.ref = "picturesele
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" }
objectbox-gradle-plugin = { module = "io.objectbox:objectbox-gradle-plugin", version.ref = "objectboxGradlePlugin" }
okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptorVersion" }
pictureselector = { module = "io.github.lucksiege:pictureselector", version.ref = "pictureselector" }
pinyin4j = { module = "com.belerweb:pinyin4j", version.ref = "pinyin4j" }