From f90c65e1ad782490aecb3b91c792550d07169ec1 Mon Sep 17 00:00:00 2001 From: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> Date: Sat, 26 Jul 2025 07:24:31 +0000 Subject: [PATCH 1/4] update features/home/src/main/ets/pages/ConversationDetail.ets. Signed-off-by: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> --- .../src/main/ets/pages/ConversationDetail.ets | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/features/home/src/main/ets/pages/ConversationDetail.ets b/features/home/src/main/ets/pages/ConversationDetail.ets index 34f8a30..4c064d6 100755 --- a/features/home/src/main/ets/pages/ConversationDetail.ets +++ b/features/home/src/main/ets/pages/ConversationDetail.ets @@ -32,44 +32,44 @@ export struct ConversationDetail { Flex({ direction: FlexDirection.Column }) { ConversationDetailTopSearch({ currentConversationUserName: $currentConversationUserName, }) .height(Adaptive.ContactItemHeight(this.currentBreakpoint)) - if (this.currentConversationUserName.length === HomeConstants.CONVERSATION_DEFAULT_SIZE) { + if (this.currentConversationUserName.length === 3) { ConversationDetailItem({ receivedName: $currentConversationUserName, - isReceived: HomeConstants.IS_RECEIVED, - content: HomeConstants.CONVERSATION_LIST_APPLET[0], - isAppletMsg: HomeConstants.IS_APPLET_CONVERSATION, + isReceived: true, + content: $r('app.string.FF_take_tea'), + isAppletMsg: true, currentFeatureIndex: $currentFeatureIndex }) ConversationDetailItem({ receivedName: $currentConversationUserName, - isReceived: HomeConstants.IS_RECEIVED, - content: HomeConstants.CONVERSATION_LIST_APPLET[1], + isReceived: true, + content: $r('app.string.Speed'), currentFeatureIndex: $currentFeatureIndex }) ConversationDetailItem({ receivedName: $currentConversationUserName, - isReceived: !HomeConstants.IS_RECEIVED, - content: HomeConstants.CONVERSATION_LIST_APPLET[2], + isReceived: false, + content: $r('app.string.happy_thing'), currentFeatureIndex: $currentFeatureIndex }) } else { ConversationDetailItem({ receivedName: $currentConversationUserName, - isReceived: HomeConstants.IS_RECEIVED, - content: HomeConstants.CONVERSATION_LIST_DOCUMENT[0], - isDocumentMsg: HomeConstants.IS_DOCUMENT_CONVERSATION, + isReceived: true, + content: $r('app.string.2023_preach'), + isDocumentMsg: true, currentFeatureIndex: $currentFeatureIndex }) ConversationDetailItem({ receivedName: $currentConversationUserName, - isReceived: HomeConstants.IS_RECEIVED, - content: HomeConstants.CONVERSATION_LIST_DOCUMENT[1], + isReceived: true, + content: $r('app.string.confirm_meeting'), currentFeatureIndex: $currentFeatureIndex }) ConversationDetailItem({ receivedName: $currentConversationUserName, - isReceived: !HomeConstants.IS_RECEIVED, - content: HomeConstants.CONVERSATION_LIST_DOCUMENT[2], + isReceived: false, + content: $r('app.string.okay'), currentFeatureIndex: $currentFeatureIndex }) } -- Gitee From e5be0e66a439d1ef48b251d6009dfa5142063e66 Mon Sep 17 00:00:00 2001 From: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> Date: Sat, 26 Jul 2025 07:25:11 +0000 Subject: [PATCH 2/4] update features/home/src/main/resources/base/element/string.json. Signed-off-by: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> --- .../home/src/main/resources/base/element/string.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/features/home/src/main/resources/base/element/string.json b/features/home/src/main/resources/base/element/string.json index 5c3119b..ff3f96e 100755 --- a/features/home/src/main/resources/base/element/string.json +++ b/features/home/src/main/resources/base/element/string.json @@ -171,6 +171,18 @@ { "name": "sport_club", "value": "运动俱乐部" + }, + { + "name": "happy_thing", + "value": "哈哈，今天有什么喜事说来听听" + }, + { + "name": "2023_preach", + "value": "市场部2023年新产品宣传规划" + }, + { + "name": "confirm_meeting", + "value": "这是明天会议的资料，请发给Jack，让他确认" } ] } \ No newline at end of file -- Gitee From d25b9feb909cc6d1cacdc62d4acd2092b9b6abc0 Mon Sep 17 00:00:00 2001 From: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> Date: Sat, 26 Jul 2025 07:25:27 +0000 Subject: [PATCH 3/4] update features/home/src/main/resources/zh_CN/element/string.json. Signed-off-by: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> --- .../src/main/resources/zh_CN/element/string.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/features/home/src/main/resources/zh_CN/element/string.json b/features/home/src/main/resources/zh_CN/element/string.json index cc786c9..0351e1c 100644 --- a/features/home/src/main/resources/zh_CN/element/string.json +++ b/features/home/src/main/resources/zh_CN/element/string.json @@ -171,6 +171,18 @@ { "name": "sport_club", "value": "运动俱乐部" + }, + { + "name": "happy_thing", + "value": "哈哈，今天有什么喜事说来听听" + }, + { + "name": "2023_preach", + "value": "市场部2023年新产品宣传规划" + }, + { + "name": "confirm_meeting", + "value": "这是明天会议的资料，请发给Jack，让他确认" } ] } \ No newline at end of file -- Gitee From 0d18e2836d9e7ebd125dd8fd47a925d6f4903b43 Mon Sep 17 00:00:00 2001 From: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> Date: Sat, 26 Jul 2025 07:25:47 +0000 Subject: [PATCH 4/4] update features/home/src/main/resources/en_US/element/string.json. Signed-off-by: ZhangQ <12903047+zq-kexin@user.noreply.gitee.com> --- .../src/main/resources/en_US/element/string.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/features/home/src/main/resources/en_US/element/string.json b/features/home/src/main/resources/en_US/element/string.json index 84e1515..7a3d3b9 100644 --- a/features/home/src/main/resources/en_US/element/string.json +++ b/features/home/src/main/resources/en_US/element/string.json @@ -171,6 +171,22 @@ { "name": "sport_club", "value": "Sport club" + }, + { + "name": "FF_take_tea", + "value": "Fenfen invites you for milk tea" + }, + { + "name": "happy_thing", + "value": "Ha ha, what's the happy event?" + }, + { + "name": "2023_preach", + "value": "Marketing Department 2023 New Product Promotion Plan" + }, + { + "name": "confirm_meeting", + "value": "Here are the materials for tomorrow's meeting. Please send them to Jack for his confirmation." } ] } \ No newline at end of file -- Gitee