diff --git a/common/base/src/main/ets/views/text/IntroduceText.ets b/common/base/src/main/ets/views/text/IntroduceText.ets index d825024ef3d993b6a8c5ee25559010e5ae036209..3c86becc4cdd43a0078f07ab234ea1c315a7251e 100755 --- a/common/base/src/main/ets/views/text/IntroduceText.ets +++ b/common/base/src/main/ets/views/text/IntroduceText.ets @@ -16,7 +16,7 @@ import { BaseConstants } from '../../constants/BaseConstants'; @Component export struct IntroduceText { - @Prop data: string; + @Prop data: ResourceStr; @Prop fontSize: Resource = $r('app.float.micro_font_size'); @Prop fontColor: Resource = $r('app.color.font_color_black_two'); @Prop fontWeight: number = BaseConstants.FONT_WEIGHT_FOUR; diff --git a/common/base/src/main/ets/views/text/NormalText.ets b/common/base/src/main/ets/views/text/NormalText.ets index 872f70b0fe3d63a44640d978668d711add2b5343..97dbebc3c04e319b404eab38ada055a7106553a6 100755 --- a/common/base/src/main/ets/views/text/NormalText.ets +++ b/common/base/src/main/ets/views/text/NormalText.ets @@ -17,7 +17,7 @@ import { BaseConstants } from '../../constants/BaseConstants'; @Component export struct NormalText { - @Prop data: string; + @Prop data: ResourceStr; @Prop fontSize: Resource = BaseConstants.FONT_SIZE_TWELVE; @Prop fontColor: Resource = $r('app.color.font_color_black_two'); @Prop fontWeight: number = BaseConstants.FONT_WEIGHT_FOUR; diff --git a/features/home/src/main/ets/constants/HomeConstants.ets b/features/home/src/main/ets/constants/HomeConstants.ets index 27c9e3d2dd4e74041b4230f226f7570a3ab7a280..653454141a480bd56fdb8af0fbbc86757cf4abe2 100755 --- a/features/home/src/main/ets/constants/HomeConstants.ets +++ b/features/home/src/main/ets/constants/HomeConstants.ets @@ -37,31 +37,31 @@ export class HomeConstants { * Image message */ static readonly USER_PHONE = '15988880000'; - static readonly LAST_POST = '最新动态'; + static readonly LAST_POST = $r('app.string.news'); static readonly IMAGES_SCOPE = 2; static readonly IMAGE_ASPECT_RATIO = 1; /** * Contacts list detail */ - static readonly CONTACTS_NAME = '通讯录'; - static readonly CONTACTS_LIST = ['群组', '名片夹']; + static readonly CONTACTS_NAME = $r('app.string.Contacts'); + static readonly CONTACTS_LIST = [$r('app.string.group'), $r('app.string.card')]; static readonly CONTACTS_DEFAULT_SELECTED_INDEX = 0; - static readonly CONTACTS_DEFAULT_SELECTED_NAME = '阿兰'; + static readonly CONTACTS_DEFAULT_SELECTED_NAME = $r('app.string.Alan'); /** * Conversation detail */ - static readonly CONVERSATION_LIST_APPLET = ['芬芬邀请你喝奶茶啦', '请你喝奶茶,快点单吧!!速度速度,就差你了', '哈哈,今天有什么喜事说来听听']; - static readonly CONVERSATION_LIST_DOCUMENT = ['市场部2023年新产品宣传规划', '这是明天会议的资料,请发给Jack,让他确认', '好的,收到']; + static readonly CONVERSATION_LIST_APPLET = [$r('app.string.milk'), $r('app.string.Speed'), $r('app.string.happy')]; + static readonly CONVERSATION_LIST_DOCUMENT = [$r('app.string.plan'), $r('app.string.jack'), $r('app.string.ok')]; static readonly IS_APPLET_CONVERSATION = true; static readonly IS_DOCUMENT_CONVERSATION = true; static readonly IS_RECEIVED = true; static readonly CONVERSATION_DEFAULT_SIZE = 3; - static readonly CONVERSATION_TITLE = '消息'; + static readonly CONVERSATION_TITLE = $r('app.string.Message'); /** * Conversation top search */ static readonly SEARCH_TEXT_FLEX_BASIS = 150; - static readonly SEARCH_TEXT_INPUT = '搜索...'; + static readonly SEARCH_TEXT_INPUT = $r('app.string.search'); static readonly ENABLE_KEY_BOARD_ON_FOCUS = false; static readonly FLEX_BASIS_AUTO = 'auto'; /** @@ -82,7 +82,7 @@ export class HomeConstants { * Document detail */ static readonly DOCUMENT_SIZE = '24KB'; - static readonly DOCUMENT_INTRODUCE = '文档'; + static readonly DOCUMENT_INTRODUCE = $r('app.string.document'); static readonly DOCUMENT_DIVIDER_WIDTH = 1; /** * Default avatar diff --git a/features/home/src/main/ets/pages/ContactsList.ets b/features/home/src/main/ets/pages/ContactsList.ets index c9ac2a5e9722f977fee310b46f9d78933ea262d4..2526db7a6d6696253e0373daed9ca2e63fed263c 100755 --- a/features/home/src/main/ets/pages/ContactsList.ets +++ b/features/home/src/main/ets/pages/ContactsList.ets @@ -22,7 +22,7 @@ import { HomeTopSearch } from '../views/common/HomeTopSearch'; @Component export struct ContactsList { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - @Link currentContactUserName: string; + @Link currentContactUserName: Resource; @Link currentContactUserIcon: Resource; @Link currentConversationUserName: string; @Consume('pageInfo') pageInfo: NavPathStack; diff --git a/features/home/src/main/ets/pages/ConversationList.ets b/features/home/src/main/ets/pages/ConversationList.ets index 8f83c2b76b954c93770c5f5bc2506405b8bb0469..6d5270ab625c39a6d08b8d3cf27d4a3e75feebfd 100755 --- a/features/home/src/main/ets/pages/ConversationList.ets +++ b/features/home/src/main/ets/pages/ConversationList.ets @@ -23,7 +23,7 @@ import { deviceInfo } from '@kit.BasicServicesKit'; @Component export struct ConversationList { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - @Link currentConversationUserName: string; + @Link currentConversationUserName: Resource; @Link currentContactUserName: string; @State private currentIndex: number = 0 @Consume('pageInfo') pageInfo: NavPathStack; diff --git a/features/home/src/main/ets/viewmodel/ConstactsViewModel.ets b/features/home/src/main/ets/viewmodel/ConstactsViewModel.ets index 10297bd4142a4aa51a08ea8f8431f37de360ec0f..1dcb016304079ecd7e5a709ced5b658b00b8e6cf 100755 --- a/features/home/src/main/ets/viewmodel/ConstactsViewModel.ets +++ b/features/home/src/main/ets/viewmodel/ConstactsViewModel.ets @@ -14,31 +14,31 @@ */ interface ContactsDataInterface { - name: string; + name: Resource; en_name: string; icon: Resource; } const ContactsListData: ContactsDataInterface[] = [ - { name: '阿兰', en_name: '#Alan', icon: $r('app.media.avatar1') }, - { name: '阿琴', en_name: 'AQin', icon: $r('app.media.avatar1') }, - { name: '菜篮', en_name: 'CaiLan', icon: $r('app.media.avatar2') }, - { name: '邓双双', en_name: 'Deng', icon: $r('app.media.avatar3') }, - { name: 'excel教程', en_name: 'excel', icon: $r('app.media.avatar2') }, - { name: '翻译', en_name: 'FanYi', icon: $r('app.media.avatar2') }, - { name: '芬芬', en_name: 'FenFen', icon: $r('app.media.avatar2') }, - { name: '哥白尼', en_name: 'ge', icon: $r('app.media.avatar4') }, - { name: 'Idea', en_name: 'Idea', icon: $r('app.media.avatar4') }, - { name: 'Jack', en_name: 'jack', icon: $r('app.media.avatar1') }, - { name: 'Kat', en_name: 'kat', icon: $r('app.media.avatar1') }, - { name: 'Lily', en_name: 'lily', icon: $r('app.media.avatar11') }, - { name: '李小二', en_name: 'LiX', icon: $r('app.media.avatar8') }, - { name: '马老师', en_name: 'Ma', icon: $r('app.media.avatar11') }, - { name: '聂聂', en_name: 'nie', icon: $r('app.media.avatar5') }, - { name: 'Tom', en_name: 'tom', icon: $r('app.media.avatar10') }, - { name: '张小萌', en_name: 'Zhang', icon: $r('app.media.avatar6') }, - { name: '王小菊', en_name: 'Wang', icon: $r('app.media.avatar7') }, - { name: '足球协会', en_name: 'Zo', icon: $r('app.media.avatar9') }, + { name: $r('app.string.Alan'), en_name: '#Alan', icon: $r('app.media.avatar1') }, + { name: $r('app.string.AQin'), en_name: 'AQin', icon: $r('app.media.avatar1') }, + { name: $r('app.string.CaiLan'), en_name: 'CaiLan', icon: $r('app.media.avatar2') }, + { name: $r('app.string.Deng'), en_name: 'Deng', icon: $r('app.media.avatar3') }, + { name: $r('app.string.excel'), en_name: 'excel', icon: $r('app.media.avatar2') }, + { name: $r('app.string.FanYi'), en_name: 'FanYi', icon: $r('app.media.avatar2') }, + { name: $r('app.string.FenFen'), en_name: 'FenFen', icon: $r('app.media.avatar2') }, + { name: $r('app.string.ge'), en_name: 'ge', icon: $r('app.media.avatar4') }, + { name: $r('app.string.ge'), en_name: 'Idea', icon: $r('app.media.avatar4') }, + { name: $r('app.string.FenFen'), en_name: 'jack', icon: $r('app.media.avatar1') }, + { name: $r('app.string.CaiLan'), en_name: 'kat', icon: $r('app.media.avatar1') }, + { name: $r('app.string.LiX'), en_name: 'lily', icon: $r('app.media.avatar11') }, + { name: $r('app.string.LiX'), en_name: 'LiX', icon: $r('app.media.avatar8') }, + { name: $r('app.string.Ma'), en_name: 'Ma', icon: $r('app.media.avatar11') }, + { name: $r('app.string.Ma'), en_name: 'nie', icon: $r('app.media.avatar5') }, + { name: $r('app.string.FanYi'), en_name: 'tom', icon: $r('app.media.avatar10') }, + { name: $r('app.string.Deng'), en_name: 'Zhang', icon: $r('app.media.avatar6') }, + { name: $r('app.string.CaiLan'), en_name: 'Wang', icon: $r('app.media.avatar7') }, + { name: $r('app.string.CaiLan'), en_name: 'Zo', icon: $r('app.media.avatar9') }, ]; const Alphabets: string[] = ['#', '☆', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', diff --git a/features/home/src/main/ets/viewmodel/ConversationViewModel.ets b/features/home/src/main/ets/viewmodel/ConversationViewModel.ets index e893c2297f376310f61e29b196f10dc3fbd8eb85..d955cf9ddc1dffcb69dc3559ab333fbad18eba36 100755 --- a/features/home/src/main/ets/viewmodel/ConversationViewModel.ets +++ b/features/home/src/main/ets/viewmodel/ConversationViewModel.ets @@ -19,25 +19,25 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; import { Logger } from '@ohos/base'; interface ConversationDataInterface { - name: string - msg: string - time: string + name: Resource + msg: Resource + time: ResourceStr icon: Resource }; const ConversationListData: ConversationDataInterface[] = [ - { name: '张小萌', msg: '好的,我明天过去', time: '13:55', icon: $r('app.media.avatar1') }, - { name: '刘信玄', msg: '你撤回了一条信息', time: '13:55', icon: $r('app.media.avatar2') }, - { name: '邓霜霜', msg: '请你喝奶茶,快点单吧,速度马上要被抢没了', time: '12:00', icon: $r('app.media.avatar11') }, - { name: '芬芬', msg: 'Ok', time: '08:00', icon: $r('app.media.avatar4') }, - { name: 'Jack', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar5') }, - { name: '自由的彤彤', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar6') }, - { name: 'Tom', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar7') }, - { name: '足球协会', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar8') }, - { name: 'Lily', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar9') }, - { name: 'Jack2', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar10') }, - { name: '张晓彤', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar11') }, - { name: '运动俱乐部', msg: '好的,我明天过去', time: '昨天', icon: $r('app.media.avatar1') }, + { name: $r('app.string.Alan'), msg: $r('app.string.okay'), time: '13:55', icon: $r('app.media.avatar1') }, + { name: $r('app.string.CaiLan'), msg: $r('app.string.okay'), time: '13:55', icon: $r('app.media.avatar2') }, + { name: $r('app.string.FenFen'), msg: $r('app.string.okay'), time: '12:00', icon: $r('app.media.avatar11') }, + { name: $r('app.string.FenFen'), msg: $r('app.string.okay'), time: '08:00', icon: $r('app.media.avatar4') }, + { name: $r('app.string.FanYi'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar5') }, + { name: $r('app.string.Deng'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar6') }, + { name: $r('app.string.CaiLan'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar7') }, + { name: $r('app.string.Alan'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar8') }, + { name: $r('app.string.Alan'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar9') }, + { name: $r('app.string.FanYi'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar10') }, + { name: $r('app.string.Deng'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar11') }, + { name: $r('app.string.ge'), msg: $r('app.string.okay'), time: $r('app.string.yesterday'), icon: $r('app.media.avatar1') }, ]; class ConversationViewModel { diff --git a/features/home/src/main/ets/views/Contacts/ContactsItem.ets b/features/home/src/main/ets/views/Contacts/ContactsItem.ets index cf52cf27e27f3c01001180fcbbbc075ca330ef60..de3b104560524f32bbdf7de555e68b501ad9858e 100755 --- a/features/home/src/main/ets/views/Contacts/ContactsItem.ets +++ b/features/home/src/main/ets/views/Contacts/ContactsItem.ets @@ -18,7 +18,7 @@ import { BaseConstants, BreakpointConstants } from '@ohos/base'; @Component export struct ContactsItem { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - private name?: string; + private name?: Resource; private icon?: Resource; build() { diff --git a/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets b/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets index b6ed3705e6cefa01b276aa29ce4d4403bec44f11..2bb697af1c89fe6b8bad4d1d6f07a21c5a9b9985 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets @@ -21,7 +21,7 @@ export default struct ConversationDetailItem { @Link currentFeatureIndex: number; @Link receivedName: string; private isReceived: boolean = !HomeConstants.IS_RECEIVED; - private content: string = ''; + private content: ResourceStr = ''; private isAppletMsg?: boolean; private isDocumentMsg?: boolean; diff --git a/features/home/src/main/ets/views/Conversation/ConversationItem.ets b/features/home/src/main/ets/views/Conversation/ConversationItem.ets index 08c818396ac23e5f24a4bb9490ccad12089b8b54..8ecb5438ff9bf93024d943fc9a4b22b6497c73b7 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationItem.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationItem.ets @@ -19,9 +19,9 @@ import { HomeConstants } from '../../constants/HomeConstants'; @Component export struct ConversationItem { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - private name?: string; - private msg?: string; - private time?: string; + private name?: Resource; + private msg?: Resource; + private time?: ResourceStr; private icon?: Resource; build() { diff --git a/features/home/src/main/ets/views/MessageBubble.ets b/features/home/src/main/ets/views/MessageBubble.ets index 1e4607dcb4e1bcb4151553d98a6a27c4b0e44d36..5e4c77d67b289473843f20825958a5f00f549b91 100755 --- a/features/home/src/main/ets/views/MessageBubble.ets +++ b/features/home/src/main/ets/views/MessageBubble.ets @@ -20,10 +20,10 @@ import { ConversationDataInterface, ConversationListData } from '../viewmodel/Co @Component export struct MessageBubble { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - @Link receivedName: string; + @Link receivedName: Resource; @Link currentFeatureIndex: number; private isReceived: boolean = !HomeConstants.IS_RECEIVED; - private content: string = ""; + private content: ResourceStr = ""; private isAppletMsg?: boolean; private isDocumentMsg?: boolean; avatar1: Resource = $r('app.media.avatar1'); diff --git a/features/home/src/main/ets/views/common/HomeTopSearch.ets b/features/home/src/main/ets/views/common/HomeTopSearch.ets index 90c8889355b4c87ca4bd651168532bd3d82b3952..9f7f8293f50a1818b35b35dd757cf56e05d7e651 100755 --- a/features/home/src/main/ets/views/common/HomeTopSearch.ets +++ b/features/home/src/main/ets/views/common/HomeTopSearch.ets @@ -20,7 +20,7 @@ import { deviceInfo } from '@kit.BasicServicesKit'; @Component export struct HomeTopSearch { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - @Prop title: string; + @Prop title: Resource; build() { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { diff --git a/features/home/src/main/resources/base/element/float.json b/features/home/src/main/resources/base/element/float.json index 4406cdf7081898b18296986e5a0aaf7bcfee02ec..b405d43b2db3fac38819b111fb70404eeb016e57 100755 --- a/features/home/src/main/resources/base/element/float.json +++ b/features/home/src/main/resources/base/element/float.json @@ -338,7 +338,7 @@ }, { "name": "conversation_list_time_width", - "value": "40vp" + "value": "45vp" }, { "name": "home_tab_top_lg", diff --git a/features/home/src/main/resources/base/element/string.json b/features/home/src/main/resources/base/element/string.json index 213dde4b7ab3c66ba2af34622453e47d1bd60844..19211d30a54cf880d40d7c8f566c5ee65c743140 100755 --- a/features/home/src/main/resources/base/element/string.json +++ b/features/home/src/main/resources/base/element/string.json @@ -19,6 +19,98 @@ { "name": "Me", "value": "我的" + }, + { + "name": "news", + "value": "最新动态" + }, + { + "name": "group", + "value": "群组" + }, + { + "name": "card", + "value": "名片夹" + }, + { + "name": "Alan", + "value": "阿兰" + }, + { + "name": "AQin", + "value": "AQin" + }, + { + "name": "CaiLan", + "value": "菜篮" + }, + { + "name": "Deng", + "value": "邓双双" + }, + { + "name": "excel", + "value": "excel教程" + }, + { + "name": "FanYi", + "value": "翻译" + }, + { + "name": "FenFen", + "value": "芬芬" + }, + { + "name": "ge", + "value": "哥白尼" + }, + { + "name": "LiX", + "value": "李小二" + }, + { + "name": "Ma", + "value": "马老师" + }, + { + "name": "milk", + "value": "芬芬邀请你喝奶茶啦" + }, + { + "name": "Speed", + "value": "请你喝奶茶,快点单吧!!速度速度,就差你了" + }, + { + "name": "happy", + "value": "哈哈,今天有什么喜事说来听听" + }, + { + "name": "plan", + "value": "市场部2023年新产品宣传规划" + }, + { + "name": "jack", + "value": "这是明天会议的资料,请发给Jack,让他确认" + }, + { + "name": "ok", + "value": "好的,收到" + }, + { + "name": "okay", + "value": "好的,我明天过去" + }, + { + "name": "yesterday", + "value": "昨天" + }, + { + "name": "document", + "value": "文档" + }, + { + "name": "search", + "value": "搜索..." } ] } \ No newline at end of file diff --git a/features/home/src/main/resources/en_US/element/string.json b/features/home/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..1cdf25e4ee85e2a11c4619c25d2fc0ed82f769bb --- /dev/null +++ b/features/home/src/main/resources/en_US/element/string.json @@ -0,0 +1,116 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "Message", + "value": "Message" + }, + { + "name": "Contacts", + "value": "Contacts" + }, + { + "name": "SocialCircle", + "value": "SocialCircle" + }, + { + "name": "Me", + "value": "Me" + }, + { + "name": "news", + "value": "Latest news" + }, + { + "name": "group", + "value": "group" + }, + { + "name": "card", + "value": "name card holder" + }, + { + "name": "Alan", + "value": "Alan" + }, + { + "name": "AQin", + "value": "AQin" + }, + { + "name": "CaiLan", + "value": "CaiLan" + }, + { + "name": "Deng", + "value": "Deng" + }, + { + "name": "excel", + "value": "excel" + }, + { + "name": "FanYi", + "value": "FanYi" + }, + { + "name": "FenFen", + "value": "FenFen" + }, + { + "name": "ge", + "value": "ge" + }, + { + "name": "LiX", + "value": "LiX" + }, + { + "name": "Ma", + "value": "Ma" + }, + { + "name": "milk", + "value": "Fen-fen invited you for milk tea" + }, + { + "name": "Speed", + "value": "Please drink milk tea, quickly order it!! Speed, speed, all that's missing is you" + }, + { + "name": "happy", + "value": "Ha-ha, what's the happy news today" + }, + { + "name": "plan", + "value": "Marketing Department 2023 new product promotion plan" + }, + { + "name": "jack", + "value": "This is the material for tomorrow's meeting. Please send it to Jack for his confirmation" + }, + { + "name": "ok", + "value": "Ok, copy that" + }, + { + "name": "okay", + "value": "Okay, I'll be there tomorrow" + }, + { + "name": "yesterday", + "value": "yesterday" + }, + { + "name": "document", + "value": "document" + }, + { + "name": "search", + "value": "Search..." + } + ] +} \ No newline at end of file diff --git a/features/home/src/main/resources/zh_CN/element/string.json b/features/home/src/main/resources/zh_CN/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..cdcacc4cc093443781952bbe2044b0da2a62c6ba --- /dev/null +++ b/features/home/src/main/resources/zh_CN/element/string.json @@ -0,0 +1,116 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "Message", + "value": "消息" + }, + { + "name": "Contacts", + "value": "通讯录" + }, + { + "name": "SocialCircle", + "value": "朋友圈" + }, + { + "name": "Me", + "value": "我的" + }, + { + "name": "news", + "value": "最新动态" + }, + { + "name": "group", + "value": "群组" + }, + { + "name": "card", + "value": "名片夹" + }, + { + "name": "Alan", + "value": "阿兰" + }, + { + "name": "AQin", + "value": "AQin" + }, + { + "name": "CaiLan", + "value": "菜篮" + }, + { + "name": "Deng", + "value": "邓双双" + }, + { + "name": "excel", + "value": "excel教程" + }, + { + "name": "FanYi", + "value": "翻译" + }, + { + "name": "FenFen", + "value": "芬芬" + }, + { + "name": "ge", + "value": "哥白尼" + }, + { + "name": "LiX", + "value": "李小二" + }, + { + "name": "Ma", + "value": "马老师" + }, + { + "name": "milk", + "value": "芬芬邀请你喝奶茶啦" + }, + { + "name": "Speed", + "value": "请你喝奶茶,快点单吧!!速度速度,就差你了" + }, + { + "name": "happy", + "value": "哈哈,今天有什么喜事说来听听" + }, + { + "name": "plan", + "value": "市场部2023年新产品宣传规划" + }, + { + "name": "jack", + "value": "这是明天会议的资料,请发给Jack,让他确认" + }, + { + "name": "ok", + "value": "好的,收到" + }, + { + "name": "okay", + "value": "好的,我明天过去" + }, + { + "name": "yesterday", + "value": "昨天" + }, + { + "name": "document", + "value": "文档" + }, + { + "name": "search", + "value": "搜索..." + } + ] +} \ No newline at end of file diff --git a/features/socialCircle/src/main/ets/constants/PictureConstants.ets b/features/socialCircle/src/main/ets/constants/PictureConstants.ets index 84a04f8f37b20872a834ce1b90a5bc375c5f1c9a..39a4f7154222591c99cdb54fe2224bc100dafdec 100755 --- a/features/socialCircle/src/main/ets/constants/PictureConstants.ets +++ b/features/socialCircle/src/main/ets/constants/PictureConstants.ets @@ -17,8 +17,8 @@ import { PictureArrayInterface } from '../viewmodel/CommonViewModel'; export class PictureConstants { static readonly ICON_BORDER_RADIUS = 6; - static readonly USER_NAME = '晓乐'; - static readonly USER_MESSAGE = '挺有意思的,大家都来看看吧!挺有意思的,大家都来看看吧!'; + static readonly USER_NAME = $r('app.string.xiaole'); + static readonly USER_MESSAGE = $r('app.string.see'); static readonly COLUMNS_TEMPLATE = '1fr 1fr 1fr'; static readonly TEMPLATE_BUSINESS = '1fr'; static readonly MAX_COLUMN_NUM = 3; diff --git a/features/socialCircle/src/main/resources/base/element/string.json b/features/socialCircle/src/main/resources/base/element/string.json index 95ba6cbabb98622d7723dcd5f616d3326345eb95..188261635d63856b1bbbee1c593f077d20689ac0 100755 --- a/features/socialCircle/src/main/resources/base/element/string.json +++ b/features/socialCircle/src/main/resources/base/element/string.json @@ -3,6 +3,14 @@ { "name": "shared_desc", "value": "description" + }, + { + "name": "xiaole", + "value": "晓乐" + }, + { + "name": "see", + "value": "挺有意思的,大家都来看看吧!挺有意思的,大家都来看看吧!" } ] } \ No newline at end of file diff --git a/features/socialCircle/src/main/resources/en_US/element/string.json b/features/socialCircle/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..f87a266bdcd01b532f05954949e6e09f217c8b6e --- /dev/null +++ b/features/socialCircle/src/main/resources/en_US/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "xiaole", + "value": "xiaole" + }, + { + "name": "see", + "value": "It's fun. Let's see! It's fun. Let's see!" + } + ] +} \ No newline at end of file diff --git a/features/socialCircle/src/main/resources/zh_CN/element/string.json b/features/socialCircle/src/main/resources/zh_CN/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..404d06f8f95b4033d7dfafa78c7c4fff1e22e1cc --- /dev/null +++ b/features/socialCircle/src/main/resources/zh_CN/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "xiaole", + "value": "晓乐" + }, + { + "name": "see", + "value": "挺有意思的,大家都来看看吧!挺有意思的,大家都来看看吧!" + } + ] +} \ No newline at end of file