From: luozheng <1732036298@qq.com> Date: Wed, 8 May 2024 10:24:35 +0000 (+0800) Subject: 修改连接状态视图适配多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~10^2~8 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=bdecaa7082d2818d79db314b6acd4e6df910620e;p=mirrors%2FFD230.git 修改连接状态视图适配多国语言 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt index 1ca2afaa7..ec7fcb2a7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt @@ -319,4 +319,77 @@ STR_NO_UPDATE$No update STR_LANGUAGE_SELECTION$Language Select STR_RESET_CONFIRM$Are you sure to restart? STR_SHUTDOWN_CONFIRM$Are you sure to shut down? -STR_RESET_CONFIRM_NOTE$The operation will clear and reset the watch data. Are you sure you want to continue? \ No newline at end of file +STR_RESET_CONFIRM_NOTE$The operation will clear and reset the watch data. Are you sure you want to continue? +STR_RECORDER$Recorder +STR_CLICK_TO_RECORD$Click to record +STR_RECORDING$Recording +STR_AUDIO_XX$Audio_XX +STR_VOICE_RECORDING_REMINDER$Voice recording reminder +STR_VOICE_RECORDING_REMINDER_NOTE$The number of recordings must not exceed 30. Please delete some existing recordings. +STR_DELETE_RECORDING$Delete recording +STR_DELETE_PERMANENTLY$Permanently Delete +STR_DO_NOT_DISTURB_MODE$Turn on Do Not Disturb mode, the watch will not vibrate or ring, do you want to turn it on? +STR_CONNECTION_STATUS$Connection Status +STR_PHONE$Phone +STR_HEADSET$Headset +STR_CONNECTED$Connected +STR_DISCONNECTED$Disconnected +STR_PHONE_RINGING_VIBRATING$The mobile phone is ringing/vibrating +STR_WORKDAY$WorkDay +STR_REPEAT_NO$no-repeat +STR_EVERYDAY$Everyday +STR_ADD_A_NEW_ALARM$Add a new alarm +STR_TIME$Time +STR_NEXT_STEP$Next Step +STR_MONDAY$Mon +STR_TUESDAY$Tue +STR_WEDNESDAY$ Wed +STR_THURSDAY$Thu +STR_FRIDAY$Fri +STR_SATURDAY$Sat +STR_SUNDAY$Sun +STR_MONDAY$Mon +STR_TUESDAY$Tue +STR_WEDNESDAY$ Wed +STR_THURSDAY$Thu +STR_FRIDAY$Fri +STR_SATURDAY$Sat +STR_SUNDAY$Sun +STR_CALIBRATE_COMPASS$Calibration compass +STR_CALIBRATE_COMPASS_NOTE$Please stay away from interference sources and follow the instructions Rotate the watch to calibrate +STR_EAST$E +STR_SOUTH$S +STR_WEST$W +STR_NORTH$N +STR_SOUTHEAST$SE +STR_SOUTHWEST$SW +STR_NORTHEAST$NE +STR_NORTHWEST$NW +STR_KEEP_STILL_FOCUS_ON_BREATHING$Keep Still Focus on Breathing +STR_EXHALE_NOW$Exhale now +STR_INHALE_NOW$Inhale now +STR_TRAINING_COMPLETE$Training Complete +STR_BREATHING_TRAINING$Breathing Training +STR_THIS_BREATH$This breath +STR_TODAYS_BREATHING_TRAINING$Today's Breathing Training +STR_RECENT_CALLS$Recent Calls +STR_NO_CALLS$No Calls +STR_MISSED_CALLS$Missed Calls +STR_DIALED_CALLS$Dialed Calls +STR_RECEIVED_CALLS$Received Calls +STR_NOTE_RECENT_CALLS_LIMITATION$Note: Only the last 20 calls are saved +STR_NO_CONTACTS_ADDED$No contacts added, please set up in APP +STR_DIAL_MODE$Dial Mode +STR_DIAL_VIA_WATCH_SIM$Dial via Watch SIM +STR_DIAL_VIA_PHONE$Dial via Phone +STR_KUMI_TECHNOLOGY$KUMI Technology +STR_CALLING$Calling +STR_NOT_PAIRED$Not Paired +STR_PAIRED$Paired +STR_UNPAIR$Unpair +STR_CONNECTION_ERROR$Connection Error +STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE$Insert watch SIM or connect phone to make calls +STR_ENABLE_BLUETOOTH_CALL$Enable Bluetooth Call +STR_ENABLE_BLUETOOTH_CALL_NOTE$The solution:\n1. IPhone\nPlease go to the phone \"Settings\" → \"Bluetooth\" list to find\n“KUMI_XXXX”\nClick and try again\n\n2. Android phones\nPlease go to the phone \"Settings\" → \"Bluetooth\" list to find\n“KUMI_XXXX”\nClick the icon on the right to enter Bluetooth Settings\nEnable the call and media functions and try again +STR_SIM_CARD_ERROR$SIM Card Error +STR_CHECK_SIM_CARD_INSERTION$Check if the watch’s SIM card is properly inserted \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt index c2d8c67b8..ebe9a29f7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt @@ -365,6 +365,7 @@ STR_VOICE_RECORDING_REMINDER_NOTE$录音数量不得超过30首，请删除已 STR_DELETE_RECORDING $删除录音 STR_DELETE_PERMANENTLY$是否永久删除 STR_DO_NOT_DISTURB_MODE$开启勿扰模式，手表将不会发出震动与铃声，是否开启 +STR_CONNECTION_STATUS$连接状态 STR_PHONE$手机 STR_HEADSET$耳机 STR_CONNECTED$已连接 @@ -376,13 +377,20 @@ STR_EVERYDAY$每日 STR_ADD_A_NEW_ALARM$添加新闹钟 STR_TIME$时间 STR_NEXT_STEP$下一步 -STR_MONDAY$一 -STR_TUESDAY$二 -STR_WEDNESDAY$三 -STR_THURSDAY$四 -STR_FRIDAY$五 -STR_SATURDAY$六 -STR_SUNDAY$日 +STR_MON$一 +STR_TUES$二 +STR_WEDNES$三 +STR_THURS$四 +STR_FRI$五 +STR_SATUR$六 +STR_SUN$日 +STR_MONDAY$星期一 +STR_TUESDAY$星期二 +STR_WEDNESDAY$星期三 +STR_THURSDAY$星期四 +STR_FRIDAY$星期五 +STR_SATURDAY$星期六 +STR_SUNDAY$星期日 STR_CALIBRATE_COMPASS$校准指南针 STR_CALIBRATE_COMPASS_NOTE$请远离干扰源，按图示旋转手表进行校准 STR_EAST$东 diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml index 16fa0a6db..61eda9752 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml @@ -321,4 +321,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml index a86a06cce..5a712f8e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml @@ -366,6 +366,7 @@ + @@ -377,13 +378,20 @@ - - - - - - - + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index acf33f74a..62a803821 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang index 87b941a66..d6d35cfc6 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h index 9983e1bf4..b9810c085 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_GENERAL = 0, STR_EXERCISE_FREETRAINING = 1, STR_EXERCISE_RESISTANCETRAINING = 2, @@ -333,123 +333,132 @@ enum UIResourceTextId : uint16_t { STR_RESET_CONFIRM = 320, STR_SHUTDOWN_CONFIRM = 321, STR_RESET_CONFIRM_NOTE = 322, - STR_RANGE_MILE = 323, - STR_CLOSE = 324, - STR_MORE_APP = 325, - STR_SAVENOTE = 326, - STR_SAVEBACK = 327, - STR_SAVEASK = 328, - STR_BLOOD = 329, - STR_CHECK = 330, - STR_CHECKNEW = 331, - STR_CHECKTIME = 332, - STR_CHECKLONG = 333, - STR_CHECKNO = 334, - STR_CHECKNOTE = 335, - STR_CHECKON = 336, - STR_CHECKSTOP = 337, - STR_CHECKERROR = 338, - STR_WAERKEEP = 339, - STR_WEARRE = 340, - STR_WEARREADY = 341, - STR_RECHECK = 342, - STR_CHECKEWARN = 343, - STR_BLOODSHORT = 344, - STR_HEARTNOTE = 345, - STR_KONW = 346, - STR_EXPLAIN = 347, - STR_HEARTREST = 348, - STR_HEARTDATA = 349, - STR_HEARTTITLE = 350, - STR_HEARTMAX = 351, - STR_HEARTMIN = 352, - STR_TRAINGNO = 353, - STR_TRAINGGO = 354, - STR_MESSAGE = 355, - STR_MESSAGENO = 356, - STR_DIS = 357, - STR_DUR = 358, - STR_STANDUP = 359, - STR_SLEEPHOUR = 360, - STR_SLEEPMGOAL = 361, - STR_REATTIME = 362, - STR_SLEEPTIME = 363, - STR_WALKTIME = 364, - STR_DISTURB = 365, - STR_DISTURBNOTE = 366, - STR_MORNNING = 367, - STR_NOW = 368, - STR_NAP = 369, - STR_TACK = 370, - STR_CLICK = 371, - STR_TACKNUM = 372, - RECORDER = 373, - STR_CLICK_TO_RECORD = 374, - STR_AUDIO_XX = 375, - STR_VOICE_RECORDING_REMINDER = 376, - STR_VOICE_RECORDING_REMINDER_NOTE = 377, - STR_DELETE_RECORDING = 378, - STR_DELETE_PERMANENTLY = 379, - STR_DO_NOT_DISTURB_MODE = 380, - STR_HEADSET = 381, - STR_CONNECTED = 382, - STR_DISCONNECTED = 383, - STR_PHONE_RINGING_VIBRATING = 384, - STR_WORKDAY = 385, - STR_REPEAT_NO = 386, - STR_EVERYDAY = 387, - STR_ADD_A_NEW_ALARM = 388, - STR_TIME = 389, - STR_NEXT_STEP = 390, - STR_MONDAY = 391, - STR_TUESDAY = 392, - STR_WEDNESDAY = 393, - STR_THURSDAY = 394, - STR_FRIDAY = 395, - STR_SATURDAY = 396, - STR_SUNDAY = 397, - STR_CALIBRATE_COMPASS = 398, - STR_CALIBRATE_COMPASS_NOTE = 399, - STR_EAST = 400, - STR_SOUTH = 401, - STR_WEST = 402, - STR_NORTH = 403, - STR_SOUTHEAST = 404, - STR_SOUTHWEST = 405, - STR_NORTHEAST = 406, - STR_NORTHWEST = 407, - STR_KEEP_STILL_FOCUS_ON_BREATHING = 408, - STR_EXHALE_NOW = 409, - STR_INHALE_NOW = 410, - STR_TRAINING_COMPLETE = 411, - STR_BREATHING_TRAINING = 412, - STR_THIS_BREATH = 413, - STR_TODAYS_BREATHING_TRAINING = 414, - STR_RECENT_CALLS = 415, - STR_NO_CALLS = 416, - STR_MISSED_CALLS = 417, - STR_DIALED_CALLS = 418, - STR_RECEIVED_CALLS = 419, - STR_NOTE_RECENT_CALLS_LIMITATION = 420, - STR_NO_CONTACTS_ADDED = 421, - STR_DIAL_MODE = 422, - STR_DIAL_VIA_WATCH_SIM = 423, - STR_DIAL_VIA_PHONE = 424, - STR_KUMI_TECHNOLOGY = 425, - STR_CALLING = 426, - STR_NOT_PAIRED = 427, - STR_PAIRED = 428, - STR_UNPAIR = 429, - STR_CONNECTION_ERROR = 430, - STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 431, - STR_ENABLE_BLUETOOTH_CALL = 432, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 433, - STR_SIM_CARD_ERROR = 434, - STR_CHECK_SIM_CARD_INSERTION = 435, - STR_MAX_ID = 436, + STR_RECORDER = 323, + STR_CLICK_TO_RECORD = 324, + STR_AUDIO_XX = 325, + STR_VOICE_RECORDING_REMINDER = 326, + STR_VOICE_RECORDING_REMINDER_NOTE = 327, + STR_DELETE_RECORDING = 328, + STR_DELETE_PERMANENTLY = 329, + STR_DO_NOT_DISTURB_MODE = 330, + STR_CONNECTION_STATUS = 331, + STR_HEADSET = 332, + STR_CONNECTED = 333, + STR_DISCONNECTED = 334, + STR_PHONE_RINGING_VIBRATING = 335, + STR_WORKDAY = 336, + STR_REPEAT_NO = 337, + STR_EVERYDAY = 338, + STR_ADD_A_NEW_ALARM = 339, + STR_TIME = 340, + STR_NEXT_STEP = 341, + STR_MONDAY = 342, + STR_TUESDAY = 343, + STR_WEDNESDAY = 344, + STR_THURSDAY = 345, + STR_FRIDAY = 346, + STR_SATURDAY = 347, + STR_SUNDAY = 348, + STR_CALIBRATE_COMPASS = 349, + STR_CALIBRATE_COMPASS_NOTE = 350, + STR_EAST = 351, + STR_SOUTH = 352, + STR_WEST = 353, + STR_NORTH = 354, + STR_SOUTHEAST = 355, + STR_SOUTHWEST = 356, + STR_NORTHEAST = 357, + STR_NORTHWEST = 358, + STR_KEEP_STILL_FOCUS_ON_BREATHING = 359, + STR_EXHALE_NOW = 360, + STR_INHALE_NOW = 361, + STR_TRAINING_COMPLETE = 362, + STR_BREATHING_TRAINING = 363, + STR_THIS_BREATH = 364, + STR_TODAYS_BREATHING_TRAINING = 365, + STR_RECENT_CALLS = 366, + STR_NO_CALLS = 367, + STR_MISSED_CALLS = 368, + STR_DIALED_CALLS = 369, + STR_RECEIVED_CALLS = 370, + STR_NOTE_RECENT_CALLS_LIMITATION = 371, + STR_NO_CONTACTS_ADDED = 372, + STR_DIAL_MODE = 373, + STR_DIAL_VIA_WATCH_SIM = 374, + STR_DIAL_VIA_PHONE = 375, + STR_KUMI_TECHNOLOGY = 376, + STR_CALLING = 377, + STR_NOT_PAIRED = 378, + STR_PAIRED = 379, + STR_UNPAIR = 380, + STR_CONNECTION_ERROR = 381, + STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 382, + STR_ENABLE_BLUETOOTH_CALL = 383, + STR_ENABLE_BLUETOOTH_CALL_NOTE = 384, + STR_SIM_CARD_ERROR = 385, + STR_CHECK_SIM_CARD_INSERTION = 386, + STR_RANGE_MILE = 387, + STR_CLOSE = 388, + STR_MORE_APP = 389, + STR_SAVENOTE = 390, + STR_SAVEBACK = 391, + STR_SAVEASK = 392, + STR_BLOOD = 393, + STR_CHECK = 394, + STR_CHECKNEW = 395, + STR_CHECKTIME = 396, + STR_CHECKLONG = 397, + STR_CHECKNO = 398, + STR_CHECKNOTE = 399, + STR_CHECKON = 400, + STR_CHECKSTOP = 401, + STR_CHECKERROR = 402, + STR_WAERKEEP = 403, + STR_WEARRE = 404, + STR_WEARREADY = 405, + STR_RECHECK = 406, + STR_CHECKEWARN = 407, + STR_BLOODSHORT = 408, + STR_HEARTNOTE = 409, + STR_KONW = 410, + STR_EXPLAIN = 411, + STR_HEARTREST = 412, + STR_HEARTDATA = 413, + STR_HEARTTITLE = 414, + STR_HEARTMAX = 415, + STR_HEARTMIN = 416, + STR_TRAINGNO = 417, + STR_TRAINGGO = 418, + STR_MESSAGE = 419, + STR_MESSAGENO = 420, + STR_DIS = 421, + STR_DUR = 422, + STR_STANDUP = 423, + STR_SLEEPHOUR = 424, + STR_SLEEPMGOAL = 425, + STR_REATTIME = 426, + STR_SLEEPTIME = 427, + STR_WALKTIME = 428, + STR_DISTURB = 429, + STR_DISTURBNOTE = 430, + STR_MORNNING = 431, + STR_NOW = 432, + STR_NAP = 433, + STR_TACK = 434, + STR_CLICK = 435, + STR_TACKNUM = 436, + RECORDER = 437, + STR_MON = 439, + STR_TUES = 440, + STR_WEDNES = 441, + STR_THURS = 442, + STR_FRI = 443, + STR_SATUR = 444, + STR_SUN = 445, + STR_MAX_ID = 446, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, LANGUAGE_ID_EN, LANGUAGE_ID_ZH, diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang index c5e4f83e0..53b1769d6 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/ConnectedStatusView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/ConnectedStatusView.h index 933924a54..c29280862 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/ConnectedStatusView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/ConnectedStatusView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-26 17:58:00 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-05-08 17:54:05 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/ConnectedStatusView.h + */ #ifndef CONNECTED_STATUS_VIEW_H #define CONNECTED_STATUS_VIEW_H @@ -34,7 +41,8 @@ namespace OHOS int height; int fontSize; int lineHeight; - const char *text; + //const char *text; + uint16_t textId; }; typedef struct diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp index 4ea6fbdde..23558a33f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp @@ -79,7 +79,8 @@ namespace OHOS titleLabel->SetPosition(config.x, config.y, config.width, config.height); titleLabel->SetStyle(STYLE_TEXT_FONT, config.fontSize); titleLabel->SetStyle(STYLE_LINE_HEIGHT, config.lineHeight); - titleLabel->SetText(config.text); + //titleLabel->SetText(config.text); + titleLabel->SetTextId(config.textId); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // titleLabel->SetRollSpeed(40);系统默认为35 @@ -100,7 +101,8 @@ namespace OHOS titleLabel->SetPosition(config.x, config.y, config.width, config.height); titleLabel->SetStyle(STYLE_TEXT_FONT, config.fontSize); titleLabel->SetStyle(STYLE_LINE_HEIGHT, config.lineHeight); - titleLabel->SetText(config.text); + //titleLabel->SetText(config.text); + titleLabel->SetTextId(config.textId); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, config.fontSize); @@ -149,7 +151,8 @@ namespace OHOS group->SetDraggable(true); group->SetIntercept(true); /* -------------------------------------------------------------------------- */ - LabelConfig titleConfig = {93, 53, 280, 35, 30, 35, "连接状态"}; + //LabelConfig titleConfig = {93, 53, 280, 35, 30, 35, "连接状态"}; + LabelConfig titleConfig = {93, 53, 280, 35, 30, 35, STR_CONNECTION_STATUS}; Title = InitLabel(titleConfig); /* -------------------------------------------------------------------------- */ int background_position_x = 33; @@ -206,21 +209,38 @@ namespace OHOS }; BluetoothConnectedStatusImage = InitStatusImage(params); /* -------------------------------------------------------------------------- */ - const char *connectedText[MAX_CONNECTEDSTATUS_ID] = { - "已连接", - "已连接", - "已连接", + // const char *connectedText[MAX_CONNECTEDSTATUS_ID] = { + // "已连接", + // "已连接", + // "已连接", + // }; // 初始化连接状态文字数组 + // const char *disconnectedText[MAX_CONNECTEDSTATUS_ID] = { + // "未连接", + // "未连接", + // "未连接", + // }; // 初始化未连接状态文字数组 + // const char *deviceName[MAX_CONNECTEDSTATUS_ID] = { + // "手机", + // "耳机", + // "蓝牙", + // }; // 初始化设备名称数组 + /* -------------------------------------------------------------------------- */ + uint16_t connectedText[MAX_CONNECTEDSTATUS_ID] = { + STR_CONNECTED, + STR_CONNECTED, + STR_CONNECTED, }; // 初始化连接状态文字数组 - const char *disconnectedText[MAX_CONNECTEDSTATUS_ID] = { - "未连接", - "未连接", - "未连接", + uint16_t disconnectedText[MAX_CONNECTEDSTATUS_ID] = { + STR_DISCONNECTED, + STR_DISCONNECTED, + STR_DISCONNECTED, }; // 初始化未连接状态文字数组 - const char *deviceName[MAX_CONNECTEDSTATUS_ID] = { - "手机", - "耳机", - "蓝牙", + uint16_t deviceName[MAX_CONNECTEDSTATUS_ID] = { + STR_PHONE, + STR_HEADSET, + STR_BLUETOOTH, }; // 初始化设备名称数组 + /* -------------------------------------------------------------------------- */ OHOS::ColorType connectedColor[MAX_CONNECTEDSTATUS_ID] = { Color::GetColorFromRGBA(0xff, 0x8f, 0x00, 0xff), Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff), @@ -250,22 +270,22 @@ namespace OHOS if (i == PHONECONNECTEDSTATUS_ID && pullUpDownView->GetPhoneConnectedStatus()) { - ConnectedStatusLabel[i]->SetText(connectedText[i]); + ConnectedStatusLabel[i]->SetTextId(connectedText[i]); ConnectedStatusLabel[i]->SetTextColor(connectedColor[i]); } else if (i == EARPHONECONNECTESTATUS_ID && pullUpDownView->GetEarPhoneConnectedStatus()) { - ConnectedStatusLabel[i]->SetText(connectedText[i]); + ConnectedStatusLabel[i]->SetTextId(connectedText[i]); ConnectedStatusLabel[i]->SetTextColor(connectedColor[i]); } else if (i == BLUETOOTHCONNECTEDSTATUS && pullUpDownView->GetBluetoothConnectedStatus()) { - ConnectedStatusLabel[i]->SetText(connectedText[i]); + ConnectedStatusLabel[i]->SetTextId(connectedText[i]); ConnectedStatusLabel[i]->SetTextColor(connectedColor[i]); } else { - ConnectedStatusLabel[i]->SetText(disconnectedText[i]); + ConnectedStatusLabel[i]->SetTextId(disconnectedText[i]); ConnectedStatusLabel[i]->SetTextColor(disconnectedColor); } } @@ -283,7 +303,8 @@ namespace OHOS UIView::OnClickListener *listener = static_cast(MainPresenterSample::GetInstance()); CloseButton->SetOnClickListener(listener); /* -------------------------------------------------------------------------- */ - titleConfig = {143, 363, 180, 35, 26, 35, "关闭"}; + //titleConfig = {143, 363, 180, 35, 26, 35, "关闭"}; + titleConfig = {143, 363, 180, 35, 26, 35, STR_CLOSE}; CloseLabel = InitLabel(titleConfig); /* ----------------------------------- Add ---------------------------------- */ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index acf33f74a..62a803821 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang index 87b941a66..d6d35cfc6 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 9983e1bf4..b9810c085 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_GENERAL = 0, STR_EXERCISE_FREETRAINING = 1, STR_EXERCISE_RESISTANCETRAINING = 2, @@ -333,123 +333,132 @@ enum UIResourceTextId : uint16_t { STR_RESET_CONFIRM = 320, STR_SHUTDOWN_CONFIRM = 321, STR_RESET_CONFIRM_NOTE = 322, - STR_RANGE_MILE = 323, - STR_CLOSE = 324, - STR_MORE_APP = 325, - STR_SAVENOTE = 326, - STR_SAVEBACK = 327, - STR_SAVEASK = 328, - STR_BLOOD = 329, - STR_CHECK = 330, - STR_CHECKNEW = 331, - STR_CHECKTIME = 332, - STR_CHECKLONG = 333, - STR_CHECKNO = 334, - STR_CHECKNOTE = 335, - STR_CHECKON = 336, - STR_CHECKSTOP = 337, - STR_CHECKERROR = 338, - STR_WAERKEEP = 339, - STR_WEARRE = 340, - STR_WEARREADY = 341, - STR_RECHECK = 342, - STR_CHECKEWARN = 343, - STR_BLOODSHORT = 344, - STR_HEARTNOTE = 345, - STR_KONW = 346, - STR_EXPLAIN = 347, - STR_HEARTREST = 348, - STR_HEARTDATA = 349, - STR_HEARTTITLE = 350, - STR_HEARTMAX = 351, - STR_HEARTMIN = 352, - STR_TRAINGNO = 353, - STR_TRAINGGO = 354, - STR_MESSAGE = 355, - STR_MESSAGENO = 356, - STR_DIS = 357, - STR_DUR = 358, - STR_STANDUP = 359, - STR_SLEEPHOUR = 360, - STR_SLEEPMGOAL = 361, - STR_REATTIME = 362, - STR_SLEEPTIME = 363, - STR_WALKTIME = 364, - STR_DISTURB = 365, - STR_DISTURBNOTE = 366, - STR_MORNNING = 367, - STR_NOW = 368, - STR_NAP = 369, - STR_TACK = 370, - STR_CLICK = 371, - STR_TACKNUM = 372, - RECORDER = 373, - STR_CLICK_TO_RECORD = 374, - STR_AUDIO_XX = 375, - STR_VOICE_RECORDING_REMINDER = 376, - STR_VOICE_RECORDING_REMINDER_NOTE = 377, - STR_DELETE_RECORDING = 378, - STR_DELETE_PERMANENTLY = 379, - STR_DO_NOT_DISTURB_MODE = 380, - STR_HEADSET = 381, - STR_CONNECTED = 382, - STR_DISCONNECTED = 383, - STR_PHONE_RINGING_VIBRATING = 384, - STR_WORKDAY = 385, - STR_REPEAT_NO = 386, - STR_EVERYDAY = 387, - STR_ADD_A_NEW_ALARM = 388, - STR_TIME = 389, - STR_NEXT_STEP = 390, - STR_MONDAY = 391, - STR_TUESDAY = 392, - STR_WEDNESDAY = 393, - STR_THURSDAY = 394, - STR_FRIDAY = 395, - STR_SATURDAY = 396, - STR_SUNDAY = 397, - STR_CALIBRATE_COMPASS = 398, - STR_CALIBRATE_COMPASS_NOTE = 399, - STR_EAST = 400, - STR_SOUTH = 401, - STR_WEST = 402, - STR_NORTH = 403, - STR_SOUTHEAST = 404, - STR_SOUTHWEST = 405, - STR_NORTHEAST = 406, - STR_NORTHWEST = 407, - STR_KEEP_STILL_FOCUS_ON_BREATHING = 408, - STR_EXHALE_NOW = 409, - STR_INHALE_NOW = 410, - STR_TRAINING_COMPLETE = 411, - STR_BREATHING_TRAINING = 412, - STR_THIS_BREATH = 413, - STR_TODAYS_BREATHING_TRAINING = 414, - STR_RECENT_CALLS = 415, - STR_NO_CALLS = 416, - STR_MISSED_CALLS = 417, - STR_DIALED_CALLS = 418, - STR_RECEIVED_CALLS = 419, - STR_NOTE_RECENT_CALLS_LIMITATION = 420, - STR_NO_CONTACTS_ADDED = 421, - STR_DIAL_MODE = 422, - STR_DIAL_VIA_WATCH_SIM = 423, - STR_DIAL_VIA_PHONE = 424, - STR_KUMI_TECHNOLOGY = 425, - STR_CALLING = 426, - STR_NOT_PAIRED = 427, - STR_PAIRED = 428, - STR_UNPAIR = 429, - STR_CONNECTION_ERROR = 430, - STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 431, - STR_ENABLE_BLUETOOTH_CALL = 432, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 433, - STR_SIM_CARD_ERROR = 434, - STR_CHECK_SIM_CARD_INSERTION = 435, - STR_MAX_ID = 436, + STR_RECORDER = 323, + STR_CLICK_TO_RECORD = 324, + STR_AUDIO_XX = 325, + STR_VOICE_RECORDING_REMINDER = 326, + STR_VOICE_RECORDING_REMINDER_NOTE = 327, + STR_DELETE_RECORDING = 328, + STR_DELETE_PERMANENTLY = 329, + STR_DO_NOT_DISTURB_MODE = 330, + STR_CONNECTION_STATUS = 331, + STR_HEADSET = 332, + STR_CONNECTED = 333, + STR_DISCONNECTED = 334, + STR_PHONE_RINGING_VIBRATING = 335, + STR_WORKDAY = 336, + STR_REPEAT_NO = 337, + STR_EVERYDAY = 338, + STR_ADD_A_NEW_ALARM = 339, + STR_TIME = 340, + STR_NEXT_STEP = 341, + STR_MONDAY = 342, + STR_TUESDAY = 343, + STR_WEDNESDAY = 344, + STR_THURSDAY = 345, + STR_FRIDAY = 346, + STR_SATURDAY = 347, + STR_SUNDAY = 348, + STR_CALIBRATE_COMPASS = 349, + STR_CALIBRATE_COMPASS_NOTE = 350, + STR_EAST = 351, + STR_SOUTH = 352, + STR_WEST = 353, + STR_NORTH = 354, + STR_SOUTHEAST = 355, + STR_SOUTHWEST = 356, + STR_NORTHEAST = 357, + STR_NORTHWEST = 358, + STR_KEEP_STILL_FOCUS_ON_BREATHING = 359, + STR_EXHALE_NOW = 360, + STR_INHALE_NOW = 361, + STR_TRAINING_COMPLETE = 362, + STR_BREATHING_TRAINING = 363, + STR_THIS_BREATH = 364, + STR_TODAYS_BREATHING_TRAINING = 365, + STR_RECENT_CALLS = 366, + STR_NO_CALLS = 367, + STR_MISSED_CALLS = 368, + STR_DIALED_CALLS = 369, + STR_RECEIVED_CALLS = 370, + STR_NOTE_RECENT_CALLS_LIMITATION = 371, + STR_NO_CONTACTS_ADDED = 372, + STR_DIAL_MODE = 373, + STR_DIAL_VIA_WATCH_SIM = 374, + STR_DIAL_VIA_PHONE = 375, + STR_KUMI_TECHNOLOGY = 376, + STR_CALLING = 377, + STR_NOT_PAIRED = 378, + STR_PAIRED = 379, + STR_UNPAIR = 380, + STR_CONNECTION_ERROR = 381, + STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 382, + STR_ENABLE_BLUETOOTH_CALL = 383, + STR_ENABLE_BLUETOOTH_CALL_NOTE = 384, + STR_SIM_CARD_ERROR = 385, + STR_CHECK_SIM_CARD_INSERTION = 386, + STR_RANGE_MILE = 387, + STR_CLOSE = 388, + STR_MORE_APP = 389, + STR_SAVENOTE = 390, + STR_SAVEBACK = 391, + STR_SAVEASK = 392, + STR_BLOOD = 393, + STR_CHECK = 394, + STR_CHECKNEW = 395, + STR_CHECKTIME = 396, + STR_CHECKLONG = 397, + STR_CHECKNO = 398, + STR_CHECKNOTE = 399, + STR_CHECKON = 400, + STR_CHECKSTOP = 401, + STR_CHECKERROR = 402, + STR_WAERKEEP = 403, + STR_WEARRE = 404, + STR_WEARREADY = 405, + STR_RECHECK = 406, + STR_CHECKEWARN = 407, + STR_BLOODSHORT = 408, + STR_HEARTNOTE = 409, + STR_KONW = 410, + STR_EXPLAIN = 411, + STR_HEARTREST = 412, + STR_HEARTDATA = 413, + STR_HEARTTITLE = 414, + STR_HEARTMAX = 415, + STR_HEARTMIN = 416, + STR_TRAINGNO = 417, + STR_TRAINGGO = 418, + STR_MESSAGE = 419, + STR_MESSAGENO = 420, + STR_DIS = 421, + STR_DUR = 422, + STR_STANDUP = 423, + STR_SLEEPHOUR = 424, + STR_SLEEPMGOAL = 425, + STR_REATTIME = 426, + STR_SLEEPTIME = 427, + STR_WALKTIME = 428, + STR_DISTURB = 429, + STR_DISTURBNOTE = 430, + STR_MORNNING = 431, + STR_NOW = 432, + STR_NAP = 433, + STR_TACK = 434, + STR_CLICK = 435, + STR_TACKNUM = 436, + RECORDER = 437, + STR_MON = 439, + STR_TUES = 440, + STR_WEDNES = 441, + STR_THURS = 442, + STR_FRI = 443, + STR_SATUR = 444, + STR_SUN = 445, + STR_MAX_ID = 446, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, LANGUAGE_ID_EN, LANGUAGE_ID_ZH, diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index c5e4f83e0..53b1769d6 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ