gdxz/harmony
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息撤回显示+扫一扫按钮文字

Browse Source
This commit is contained in:
xiaoxiao 2025-08-11 13:21:54 +08:00
parent 5ea18f1468
commit 33c3fbea68
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
chatkit/src/main/ets/utils/MessageUtils.ets
View File

@ -12,42 +12,46 @@ import { ChatRepo } from '../repo/ChatRepo';
// 保存撤回消息到本地 // 保存撤回消息到本地
export function saveLocalRevokeMessage(conversationId: string, msg: V2NIMMessage, edit: boolean) { 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 revokeText = getContext().resourceManager.getStringByNameSync('chat_msg_undo_tips');
// let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText) let revokeText = '你撤回一条消息';
// revokeMsg.serverExtension = msg.serverExtension let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText)
// revokeMsg.threadReply = msg.threadReply revokeMsg.serverExtension = msg.serverExtension
// let localExtension = { revokeMsg.threadReply = msg.threadReply
// revoke_message_local: true, revokeMsg.messageType = 10
// revoke_message_local_time: currentTime, let localExtension = {
// revoke_message_client_id: msg.messageClientId, revoke_message_local: true,
// revoke_message_local_edit: edit, revoke_message_local_time: currentTime,
// revoke_message_local_content: msg.text ?? '' revoke_message_client_id: msg.messageClientId,
// revoke_message_local_edit: edit,
// } as RevokeMessageExtension revoke_message_local_content: msg.text ?? ''
//
// revokeMsg.localExtension = JSON.stringify(localExtension) } as RevokeMessageExtension
// let createTime = msg.createTime + 10
// console.debug('netease saveLocalRevokeMessage:', revokeMsg.localExtension) revokeMsg.localExtension = JSON.stringify(localExtension)
// ChatRepo.saveLocalMessage(revokeMsg, conversationId, ChatKitClient.getLoginUserId(), createTime) 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, export function saveLocalRevokeMessageFormOther(conversationId: string, msgNotify: V2NIMMessageRevokeNotification,
edit: boolean) { edit: boolean) {
// let currentTime = systemDateTime.getTime() let currentTime = systemDateTime.getTime()
// let revokeText = getContext().resourceManager.getStringByNameSync('chat_msg_undo_tips'); // let revokeText = getContext().resourceManager.getStringByNameSync('chat_msg_undo_tips');
// let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText) let revokeText = '对方撤回一条消息';
// let localExtension = { let revokeMsg = ChatKitClient.nim.messageCreator.createTextMessage(revokeText)
// revoke_message_local: false, revokeMsg.messageType = 10
// revoke_message_local_time: currentTime, let localExtension = {
// revoke_message_client_id: msgNotify.messageRefer.messageClientId, revoke_message_local: false,
// revoke_message_local_edit: edit, revoke_message_local_time: currentTime,
// revoke_message_local_content: '' revoke_message_client_id: msgNotify.messageRefer.messageClientId,
// } as RevokeMessageExtension revoke_message_local_edit: edit,
// revoke_message_local_content: ''
// revokeMsg.localExtension = JSON.stringify(localExtension) } as RevokeMessageExtension
// console.debug('netease saveLocalRevokeMessageFormOther:', revokeMsg.localExtension)
// let createTime = msgNotify.messageRefer.createTime + 10; revokeMsg.localExtension = JSON.stringify(localExtension)
// ChatRepo.saveLocalMessage(revokeMsg, conversationId, msgNotify.revokeAccountId, createTime) console.debug('netease saveLocalRevokeMessageFormOther:', revokeMsg.localExtension)
let createTime = msgNotify.messageRefer.createTime + 10;
ChatRepo.saveLocalMessage(revokeMsg, conversationId, msgNotify.revokeAccountId, createTime)
} }

2
features/Home/src/main/ets/components/CustomScanResultComp.ets
View File

@ -33,7 +33,7 @@ export struct CustomScanResultComp {
.margin({left:15,right:15,top:100}) .margin({left:15,right:15,top:100})
.onClick(()=>isAuthorization(this.params.id,true)) .onClick(()=>isAuthorization(this.params.id,true))
Text('确认登录') Text('取消登录')
.textAlign(TextAlign.Center) .textAlign(TextAlign.Center)
.fontSize(18) .fontSize(18)
.fontColor('rgba(153,153,153,1)') .fontColor('rgba(153,153,153,1)')

6
localconversationkit_ui/src/main/ets/view/ConversationViewItem.ets
View File

@ -9,7 +9,8 @@ import { BasicConstant, customAttachment, patientDbManager, PatientEntity } from
import { ChatKitClient } from '@nimkit/chatkit'; import { ChatKitClient } from '@nimkit/chatkit';
import { AvatarColorUntil, AvatarItem, CommonAvatar, UserUtils } from '@nimkit/common'; import { AvatarColorUntil, AvatarItem, CommonAvatar, UserUtils } from '@nimkit/common';
import { DateUtil } from '@nimkit/common/src/main/ets/utils/DateUtil'; import { DateUtil } from '@nimkit/common/src/main/ets/utils/DateUtil';
import { V2NIMLocalConversation, import {
V2NIMLocalConversation,
V2NIMMessageAttachment, V2NIMMessageAttachment,
V2NIMMessageCallAttachment, V2NIMMessageType } from '@nimsdk/base'; V2NIMMessageCallAttachment, V2NIMMessageType } from '@nimsdk/base';
import { LocalConversationOperationDialog } from './LocalConversationOperationDialog'; import { LocalConversationOperationDialog } from './LocalConversationOperationDialog';
@ -228,7 +229,8 @@ export struct ConversationViewItem {
case V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION: case V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION:
return $r('app.string.notificationMessageType') return $r('app.string.notificationMessageType')
case V2NIMMessageType.V2NIM_MESSAGE_TYPE_TIPS: 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: case V2NIMMessageType.V2NIM_MESSAGE_TYPE_CALL:
if (item.lastMessage?.attachment) { if (item.lastMessage?.attachment) {
const messageAttachment = item.lastMessage.attachment as V2NIMMessageCallAttachment const messageAttachment = item.lastMessage.attachment as V2NIMMessageCallAttachment