diff --git a/features/home/src/main/ets/pages/ConversationDetail.ets b/features/home/src/main/ets/pages/ConversationDetail.ets index eda9ee347bc73424f35fe71ee7bddfa1ba08f50d..2b221030f14694cc16433dbd9f577cf6b13b956e 100755 --- a/features/home/src/main/ets/pages/ConversationDetail.ets +++ b/features/home/src/main/ets/pages/ConversationDetail.ets @@ -26,54 +26,31 @@ export struct ConversationDetail { @StorageProp('currentBreakpoint') currentBreakpoint: string = 'sm'; @Prop currentConversationUserName: string; @Prop currentFeatureIndex: number; - @Consume('pageInfo') pageInfo: NavPathStack; build() { NavDestination() { Flex({ direction: FlexDirection.Column }) { ConversationDetailTopSearch({ currentConversationUserName: $currentConversationUserName, }) .height(Adaptive.ContactItemHeight(this.currentBreakpoint)) - if (this.currentConversationUserName.length === 3) { - ConversationDetailItem({ - receivedName: $currentConversationUserName, - isReceived: true, - content: $r('app.string.FF_take_tea'), - isAppletMsg: true, - currentFeatureIndex: $currentFeatureIndex - }) - ConversationDetailItem({ - receivedName: $currentConversationUserName, - isReceived: true, - content: $r('app.string.Speed'), - currentFeatureIndex: $currentFeatureIndex - }) - ConversationDetailItem({ - receivedName: $currentConversationUserName, - isReceived: false, - content: $r('app.string.happy_thing'), - currentFeatureIndex: $currentFeatureIndex - }) - } else { - ConversationDetailItem({ - receivedName: $currentConversationUserName, - isReceived: true, - content: $r('app.string.2023_preach'), - isDocumentMsg: true, - currentFeatureIndex: $currentFeatureIndex - }) - ConversationDetailItem({ - receivedName: $currentConversationUserName, - isReceived: true, - content: $r('app.string.confirm_meeting'), - currentFeatureIndex: $currentFeatureIndex - }) - ConversationDetailItem({ - receivedName: $currentConversationUserName, - isReceived: false, - content: $r('app.string.okay'), - currentFeatureIndex: $currentFeatureIndex - }) - } + ConversationDetailItem({ + receivedName: $currentConversationUserName, + isReceived: true, + content: $r('app.string.FF_take_tea'), + isAppletMsg: true, + currentFeatureIndex: $currentFeatureIndex + }) + ConversationDetailItem({ + receivedName: $currentConversationUserName, + isReceived: true, + content: $r('app.string.Speed'), + currentFeatureIndex: $currentFeatureIndex + }) + ConversationDetailItem({ + receivedName: $currentConversationUserName, + isReceived: false, + content: $r('app.string.happy_thing'), + currentFeatureIndex: $currentFeatureIndex + }) Blank() ConversationDetailBottom() } @@ -87,4 +64,5 @@ export struct ConversationDetail { .hideTitleBar(true) } } + // [End conversation_detail] \ No newline at end of file diff --git a/features/home/src/main/ets/views/MessageBubble.ets b/features/home/src/main/ets/views/MessageBubble.ets index 65f6aa72635e08e988581ceee101104e12976917..dacc95ba4f95780cceaf7e2d6fa5d4c49d4c4ffd 100755 --- a/features/home/src/main/ets/views/MessageBubble.ets +++ b/features/home/src/main/ets/views/MessageBubble.ets @@ -33,7 +33,7 @@ export struct MessageBubble { Column() { Flex({ justifyContent: this.isReceived ? FlexAlign.Start : FlexAlign.End, direction: FlexDirection.Row }) { if (this.isReceived) { - Image(ConversationListData.find((item) => item.name === this.receivedName)?.icon || this.avatar1) + Image(ConversationListData.find((item) => item.name.id === this.receivedName.id)?.icon || this.avatar1) .width($r('app.float.avatar_image_size')) .height($r('app.float.avatar_image_size')) .flexShrink(BaseConstants.FLEX_SHRINK_ZERO)