From 33c3fbea688bb3a3f6c58317575af8890e74a634 Mon Sep 17 00:00:00 2001 From: xiaoxiao Date: Mon, 11 Aug 2025 13:21:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=92=A4=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E7=A4=BA+=E6=89=AB=E4=B8=80=E6=89=AB=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chatkit/src/main/ets/utils/MessageUtils.ets | 66 ++++++++++--------- .../ets/components/CustomScanResultComp.ets | 2 +- .../main/ets/view/ConversationViewItem.ets | 6 +- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/chatkit/src/main/ets/utils/MessageUtils.ets b/chatkit/src/main/ets/utils/MessageUtils.ets index 7efef14..a91016b 100644 --- a/chatkit/src/main/ets/utils/MessageUtils.ets +++ b/chatkit/src/main/ets/utils/MessageUtils.ets @@ -12,42 +12,46 @@ import { ChatRepo } from '../repo/ChatRepo'; // 保存撤回消息到本地 export function saveLocalRevokeMessage(conversationId: string, msg: V2NIMMessage, edit: boolean) { - // let currentTime = systemDateTime.getTime() + let currentTime = systemDateTime.getTime() // let revokeText = getContext().resourceManager.getStringByNameSync('chat_msg_undo_tips'); - // let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText) - // revokeMsg.serverExtension = msg.serverExtension - // revokeMsg.threadReply = msg.threadReply - // let localExtension = { - // revoke_message_local: true, - // revoke_message_local_time: currentTime, - // revoke_message_client_id: msg.messageClientId, - // revoke_message_local_edit: edit, - // revoke_message_local_content: msg.text ?? '' - // - // } as RevokeMessageExtension - // - // revokeMsg.localExtension = JSON.stringify(localExtension) - // let createTime = msg.createTime + 10 - // console.debug('netease saveLocalRevokeMessage:', revokeMsg.localExtension) - // ChatRepo.saveLocalMessage(revokeMsg, conversationId, ChatKitClient.getLoginUserId(), createTime) + let revokeText = '你撤回一条消息'; + let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText) + revokeMsg.serverExtension = msg.serverExtension + revokeMsg.threadReply = msg.threadReply + revokeMsg.messageType = 10 + let localExtension = { + revoke_message_local: true, + revoke_message_local_time: currentTime, + revoke_message_client_id: msg.messageClientId, + revoke_message_local_edit: edit, + revoke_message_local_content: msg.text ?? '' + + } as RevokeMessageExtension + + revokeMsg.localExtension = JSON.stringify(localExtension) + let createTime = msg.createTime + 10 + console.debug('netease saveLocalRevokeMessage:', revokeMsg.localExtension) + ChatRepo.saveLocalMessage(revokeMsg, conversationId, ChatKitClient.getLoginUserId(), createTime) } // 保存他人撤回消息到本地 export function saveLocalRevokeMessageFormOther(conversationId: string, msgNotify: V2NIMMessageRevokeNotification, edit: boolean) { - // let currentTime = systemDateTime.getTime() + let currentTime = systemDateTime.getTime() // let revokeText = getContext().resourceManager.getStringByNameSync('chat_msg_undo_tips'); - // let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText) - // let localExtension = { - // revoke_message_local: false, - // revoke_message_local_time: currentTime, - // revoke_message_client_id: msgNotify.messageRefer.messageClientId, - // revoke_message_local_edit: edit, - // revoke_message_local_content: '' - // } as RevokeMessageExtension - // - // revokeMsg.localExtension = JSON.stringify(localExtension) - // console.debug('netease saveLocalRevokeMessageFormOther:', revokeMsg.localExtension) - // let createTime = msgNotify.messageRefer.createTime + 10; - // ChatRepo.saveLocalMessage(revokeMsg, conversationId, msgNotify.revokeAccountId, createTime) + let revokeText = '对方撤回一条消息'; + let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText) + revokeMsg.messageType = 10 + let localExtension = { + revoke_message_local: false, + revoke_message_local_time: currentTime, + revoke_message_client_id: msgNotify.messageRefer.messageClientId, + revoke_message_local_edit: edit, + revoke_message_local_content: '' + } as RevokeMessageExtension + + revokeMsg.localExtension = JSON.stringify(localExtension) + console.debug('netease saveLocalRevokeMessageFormOther:', revokeMsg.localExtension) + let createTime = msgNotify.messageRefer.createTime + 10; + ChatRepo.saveLocalMessage(revokeMsg, conversationId, msgNotify.revokeAccountId, createTime) } diff --git a/features/Home/src/main/ets/components/CustomScanResultComp.ets b/features/Home/src/main/ets/components/CustomScanResultComp.ets index 1ac45b0..0cad26b 100644 --- a/features/Home/src/main/ets/components/CustomScanResultComp.ets +++ b/features/Home/src/main/ets/components/CustomScanResultComp.ets @@ -33,7 +33,7 @@ export struct CustomScanResultComp { .margin({left:15,right:15,top:100}) .onClick(()=>isAuthorization(this.params.id,true)) - Text('确认登录') + Text('取消登录') .textAlign(TextAlign.Center) .fontSize(18) .fontColor('rgba(153,153,153,1)') diff --git a/localconversationkit_ui/src/main/ets/view/ConversationViewItem.ets b/localconversationkit_ui/src/main/ets/view/ConversationViewItem.ets index 674864e..3255d00 100644 --- a/localconversationkit_ui/src/main/ets/view/ConversationViewItem.ets +++ b/localconversationkit_ui/src/main/ets/view/ConversationViewItem.ets @@ -9,7 +9,8 @@ import { BasicConstant, customAttachment, patientDbManager, PatientEntity } from import { ChatKitClient } from '@nimkit/chatkit'; import { AvatarColorUntil, AvatarItem, CommonAvatar, UserUtils } from '@nimkit/common'; import { DateUtil } from '@nimkit/common/src/main/ets/utils/DateUtil'; -import { V2NIMLocalConversation, +import { + V2NIMLocalConversation, V2NIMMessageAttachment, V2NIMMessageCallAttachment, V2NIMMessageType } from '@nimsdk/base'; import { LocalConversationOperationDialog } from './LocalConversationOperationDialog'; @@ -228,7 +229,8 @@ export struct ConversationViewItem { case V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION: return $r('app.string.notificationMessageType') case V2NIMMessageType.V2NIM_MESSAGE_TYPE_TIPS: - return $r('app.string.tipMessageType') + return String(item.lastMessage?.text) + // return $r('app.string.tipMessageType') case V2NIMMessageType.V2NIM_MESSAGE_TYPE_CALL: if (item.lastMessage?.attachment) { const messageAttachment = item.lastMessage.attachment as V2NIMMessageCallAttachment