From: luozheng <1732036298@qq.com> Date: Fri, 10 May 2024 09:06:24 +0000 (+0800) Subject: 修改传统蓝牙，查找手机，勿扰模式适配多国语言，需要重新下载字体资源 X-Git-Tag: release_V1.2.70_20241020_135402~1121^2~4^2~5 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=82aaaf7d02495d41bccc2f7326ae9e6b59a21244;p=mirrors%2FFD230.git 修改传统蓝牙，查找手机，勿扰模式适配多国语言，需要重新下载字体资源 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h index 9264fc9a7..ca22b8df7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-25 11:51:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-05-06 14:20:02 + * @LastEditTime: 2024-05-10 14:33:18 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h */ #ifndef CLASSIC_BLUETOOTH_VIEW_H @@ -66,7 +66,7 @@ namespace OHOS UILabelExt *BlueToothEarPhoneLabel = nullptr; // 蓝牙耳机 UILabelExt *TradionalBlueToothLabel = nullptr; // 传统蓝牙 UILabelExt *BluetoothServiceOptionsLabel = nullptr; // 蓝牙服务选项 - UILabelExt *AttentionLabel = nullptr; + UILabel *AttentionLabel = nullptr; UIToggleButton *TradionalBlueToothToggleButton = nullptr; bool initViewStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp index a6403bc5a..84fbc45db 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp @@ -2,6 +2,7 @@ #include "classicbluetooth/include/ClassicBlueToothPresenter.h" #include "config/include/ConfigModel.h" #include "UiConfig.h" +#include "uicomponents/UIComponents.h" namespace OHOS { static ClassicBlueToothView *g_pClassicBlueToothView{nullptr}; @@ -95,9 +96,9 @@ namespace OHOS label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小 label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); // 字体大小 label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 - //label->SetText(labelconfig.text); // 内容 - label->SetTextId(labelconfig.textId); - label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 + // label->SetText(labelconfig.text); // 内容 + label->SetTextId(labelconfig.textId); + label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } @@ -143,7 +144,7 @@ namespace OHOS } /* -------------------------------------------------------------------------- */ labelconfig.top = 273; - //labelconfig.text = "传统蓝牙"; + // labelconfig.text = "传统蓝牙"; labelconfig.textId = STR_TRADITIONAL_BLUETOOTH; TradionalBlueToothLabel = SetClassicBlueToothViewLabel(labelconfig); if (nullptr == TradionalBlueToothLabel) @@ -153,7 +154,7 @@ namespace OHOS } /* -------------------------------------------------------------------------- */ labelconfig.top = 393; - //labelconfig.text = "蓝牙服务选项"; + // labelconfig.text = "蓝牙服务选项"; labelconfig.textId = STR_BLUETOOTH_SERVICE_OPTIONS; BluetoothServiceOptionsLabel = SetClassicBlueToothViewLabel(labelconfig); if (nullptr == BluetoothServiceOptionsLabel) @@ -162,23 +163,21 @@ namespace OHOS return false; } /* -------------------------------------------------------------------------- */ - labelconfig = { - .left = 53, - .top = 499, - .width = 360, - .height = 180, - .fontSize = 20, - .lineHeigh = 30, - //.text = "注：开启后10分钟没连接成功会自动关闭，因为传统蓝牙长时间打开会增加电耗，建议在有需要的时候使用\n\n（该功能主要用于电话拨打/通知、音乐控制/传输等）", - .textId = STR_AUTO_OFF_BLUETOOTH_NOTE, - .lineBreakMode = UILabel::LINE_BREAK_WRAP, - }; - AttentionLabel = SetClassicBlueToothViewLabel(labelconfig); - if (nullptr == AttentionLabel) + AttentionLabel = new UILabel(); + if (AttentionLabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothView::AttentionLabel is nullptr!"); return false; } + AttentionLabel->SetPosition(53, 499, 360, 180); // 位置大小 + AttentionLabel->SetStyle(STYLE_TEXT_FONT, 20); // 字体大小 + AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 30); // 字体行高 + //.text = "注：开启后10分钟没连接成功会自动关闭，因为传统蓝牙长时间打开会增加电耗，建议在有需要的时候使用\n\n（该功能主要用于电话拨打/通知、音乐控制/传输等）", + SetLabelId(AttentionLabel, STR_AUTO_OFF_BLUETOOTH_NOTE); + AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); + AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); // 断行模式。 + AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); + /* -------------------------------------------------------------------------- */ return true; } @@ -205,7 +204,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " ClassicBlueToothView::TradionalBlueToothButton new fail!"); return false; } - TradionalBlueToothButton->SetPosition(43, 240,380,100); + TradionalBlueToothButton->SetPosition(43, 240, 380, 100); TradionalBlueToothButton->SetViewId(TRADIONALBLUETOOTHBUTTON); TradionalBlueToothButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); TradionalBlueToothButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 16); @@ -249,7 +248,7 @@ namespace OHOS return true; } - UIToggleButton * ClassicBlueToothView::GetTradionalBlueToothToggleButton(void) + UIToggleButton *ClassicBlueToothView::GetTradionalBlueToothToggleButton(void) { return TradionalBlueToothToggleButton; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/include/DnotDisturbView.h b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/include/DnotDisturbView.h index c634f9698..e6c78afb3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/include/DnotDisturbView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/include/DnotDisturbView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-10 11:58:15 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-10 16:30:58 + * @LastEditTime: 2024-05-10 15:42:00 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/include/DnotDisturbView.h */ #ifndef DNOTDISTURB_VIEW_H @@ -43,7 +43,7 @@ namespace OHOS UILabelExt *showTimeLabel{nullptr}; // 显示系统时间的标签 UIImageView *background{nullptr}; UIImageView *DnotDisturbImage{nullptr}; - UILabelExt *AttentionLabel{nullptr}; + UILabel *AttentionLabel{nullptr}; UILabelButtonExt *ButtonOn; UILabelButtonExt *ButtonOff; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp index 6b2733a30..b6a9baeb7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-10 11:58:21 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-10 17:16:44 + * @LastEditTime: 2024-05-10 15:43:25 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp */ #include "dnotdisturb/include/DnotDisturbView.h" @@ -11,6 +11,8 @@ #include "screensetting/include/ScreenModels.h" #include "UiConfig.h" #include "ui_resource_image.h" +#include "uicomponents/UIComponents.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -126,7 +128,7 @@ namespace OHOS DnotDisturbImage->SetResizeMode(UIImageView::CENTER); ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, DnotDisturbImage, DROPDOWN_DNOTDISTURB); /* -------------------------------------------------------------------------- */ - AttentionLabel = new UILabelExt(); + AttentionLabel = new UILabel(); if (AttentionLabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DnotDisturbView::AttentionLabel new fail!!"); @@ -135,7 +137,8 @@ namespace OHOS AttentionLabel->SetPosition(33, 228, 400, 70); AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30); AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - AttentionLabel->SetText("开启勿扰模式，手表将不会发出震动与铃声，是否开启"); + //AttentionLabel->SetText("开启勿扰模式，手表将不会发出震动与铃声，是否开启"); + SetLabelId(AttentionLabel, STR_DO_NOT_DISTURB_MODE); AttentionLabel->SetLineBreakMode(UILabelExt::LINE_BREAK_WRAP); AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneModel.h b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneModel.h index 7e303fbc0..af97544e7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneModel.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 15:21:17 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-03-27 19:41:24 + * @LastEditTime: 2024-05-10 16:23:41 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneModel.h */ #ifndef FINDPHONE_MODEL_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhonePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhonePresenter.h index 0e4f43612..6fce8bb5e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhonePresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhonePresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 10:47:24 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-03-27 14:30:28 + * @LastEditTime: 2024-05-10 16:22:33 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhonePresenter.h */ @@ -14,6 +14,8 @@ namespace OHOS { + static constexpr const uint8_t FINDPHONE_START = 1; //开始查找手机 + static constexpr const uint8_t FINDPHONE_STOP = 0; //停止查找手机 static constexpr char *FINDPHONE_LABELBUTTON = "FindPhoneLabelButton"; class FindPhoneView; class FindPhonePresenter : public Presenter, diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp index dee76b5b5..b2cbdeea3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp @@ -2,12 +2,14 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 15:21:30 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-03-27 19:41:35 + * @LastEditTime: 2024-05-10 17:00:42 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp */ #include "findphone/include/FindPhoneModel.h" #include "bletest.h" +#include +#include "wearable_log.h" namespace OHOS { @@ -23,9 +25,15 @@ namespace OHOS isBlueToothConnected = state; } - /*获取蓝牙是否已连接*/ + /*获取与手机蓝牙是否已连接*/ bool FindPhoneModel::GetBlueToothConnectedState() { - return ble_is_ready() && ble_is_connect_ready(); + //return ble_is_ready() && ble_is_connect_ready(); + uint8_t ret = uapi_dev_runtime_get_ble_connect_stat(); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "ble phone connect stat = %d", ret); + if (ret == 1) + return true; + else + return false; } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp index 6b4982c6d..312ffae97 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp @@ -2,17 +2,18 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 10:47:40 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-03-27 14:44:52 + * @LastEditTime: 2024-05-10 16:29:37 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" #include "NativeAbility.h" #include "findphone/include/FindPhonePresenter.h" #include "common/key_code.h" #include #include "bleEvent.h" +#include "findphone/include/FindPhoneModel.h" namespace OHOS { @@ -59,10 +60,12 @@ namespace OHOS UNUSED(event); if (strcmp(view.GetViewId(), FINDPHONE_LABELBUTTON) == 0) { - //发送指令停止震动 - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); - senfindphoneSend(0); + // 发送指令停止震动 + if (FindPhoneModel::GetInstance().GetBlueToothConnectedState()) + { + senfindphoneSend(FINDPHONE_STOP); + } + NativeAbility::GetInstance().Back(); } return true; } @@ -76,9 +79,12 @@ namespace OHOS // 如果是power键,且是亮屏状态，按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) { - //发送指令停止震动 - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + // 发送指令停止震动 + if (FindPhoneModel::GetInstance().GetBlueToothConnectedState()) + { + senfindphoneSend(FINDPHONE_STOP); + } + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp index 642b2b2ed..03779a7b5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 10:47:46 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-07 16:57:52 + * @LastEditTime: 2024-05-10 16:36:28 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp */ #include "findphone/include/FindPhoneView.h" @@ -12,6 +12,7 @@ #include "UiConfig.h" #include "bletest.h" #include "bleEvent.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -133,7 +134,8 @@ namespace OHOS FindPhoneTitleLabel->SetPosition(133, 51, 200, 40); FindPhoneTitleLabel->SetStyle(STYLE_TEXT_FONT, 30); FindPhoneTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - FindPhoneTitleLabel->SetText("查找手机"); + //FindPhoneTitleLabel->SetText("查找手机"); + FindPhoneTitleLabel->SetTextId(STR_FIND_PHONE); FindPhoneTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); FindPhoneTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); FindPhoneTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); @@ -156,7 +158,8 @@ namespace OHOS FindPhoneLabel->SetPosition(33, 270, 400, 40); FindPhoneLabel->SetStyle(STYLE_TEXT_FONT, 30); FindPhoneLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - FindPhoneLabel->SetText("蓝牙未连接"); + //FindPhoneLabel->SetText("蓝牙未连接"); + FindPhoneLabel->SetTextId(STR_BLUETOOTH_DISCONNECTED); FindPhoneLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); FindPhoneLabel->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); FindPhoneLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -172,7 +175,8 @@ namespace OHOS FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON); const char *ImgSrc = "/user/res/466x100button.bin"; FindPhoneLabelButton->SetImageSrc(ImgSrc, ImgSrc); - FindPhoneLabelButton->SetText("关闭"); + //FindPhoneLabelButton->SetText("关闭"); + FindPhoneLabelButton->SetTextId(STR_CLOSE); FindPhoneLabelButton->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); FindPhoneLabelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); FindPhoneLabelButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); @@ -212,7 +216,8 @@ namespace OHOS FindPhoneTitleLabel->SetPosition(133, 51, 200, 40); FindPhoneTitleLabel->SetStyle(STYLE_TEXT_FONT, 30); FindPhoneTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - FindPhoneTitleLabel->SetText("查找手机"); + //FindPhoneTitleLabel->SetText("查找手机"); + FindPhoneTitleLabel->SetTextId(STR_FIND_PHONE); FindPhoneTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); FindPhoneTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); FindPhoneTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); @@ -252,7 +257,8 @@ namespace OHOS FindPhoneLabel->SetPosition(33, 270, 400, 40); FindPhoneLabel->SetStyle(STYLE_TEXT_FONT, 30); FindPhoneLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - FindPhoneLabel->SetText("手机正在响铃/震动"); + //FindPhoneLabel->SetText("手机正在响铃/震动"); + FindPhoneLabel->SetTextId(STR_PHONE_RINGING_VIBRATING); FindPhoneLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); FindPhoneLabel->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); FindPhoneLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -268,7 +274,8 @@ namespace OHOS FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON); const char *ImgSrc = "/user/res/466x100button.bin"; FindPhoneLabelButton->SetImageSrc(ImgSrc, ImgSrc); - FindPhoneLabelButton->SetText("停止"); + //FindPhoneLabelButton->SetText("停止"); + FindPhoneLabelButton->SetTextId(STR_STOP); FindPhoneLabelButton->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); FindPhoneLabelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); FindPhoneLabelButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); @@ -290,7 +297,7 @@ namespace OHOS if (FindPhoneModel::GetInstance().GetBlueToothConnectedState() == true) // 判断蓝牙是否是连接状态 { FindPhoneViewInit_BlueToothConnected(); - senfindphoneSend(1); + senfindphoneSend(FINDPHONE_START); } else { 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 e56f97edf..8256ed8ee 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 @@ -250,7 +250,7 @@ STR_DISPLAY_MODE$Display Mode STR_CARD_MANAGEMENT$Card Management STR_MUSIC$Music STR_SLEEP$Sleep -STR_RECORDING$Recording +STR_RECORD$Record STR_BREATH_TRAINING$Breath Training STR_REMOTE_SHOOTING$Remote Shooting STR_VOICE_ASSISTANT$Voice Assistant @@ -289,7 +289,7 @@ STR_SYSTEM_UPDATE$System Update STR_ONLINE_MUSIC$Online music STR_BLUETOOTH_HEADPHONES$Bluetooth Headphones STR_TRADITIONAL_BLUETOOTH$Traditional Bluetooth -STR_AUTO_OFF_BLUETOOTH_NOTE$Note: It will be automatically turned off if the connection is not successful for 10 minutes after opening, because the traditional Bluetooth will increase the power consumption for a long time, it is recommended to use when necessary\n\n(this function is mainly used for phone calls/notifications、music control/transmission, etc.) +STR_AUTO_OFF_BLUETOOTH_NOTE$Note: It will be automatically turned off if the connection is not successful for 10 minutes after opening, because the traditional Bluetooth will increase the power consumption for a long time, it is recommended to use when necessary(this function is mainly used for phone calls/notifications、music control/transmission, etc.) STR_BLUETOOTH_SERVICE_OPTIONS$Bluetooth Service Options STR_HFP$HFP STR_A2DP$A2DP @@ -335,6 +335,8 @@ STR_HEADSET$Headset STR_CONNECTED$Connected STR_DISCONNECTED$Disconnected STR_PHONE_RINGING_VIBRATING$The mobile phone is ringing/vibrating +STR_BLUETOOTH_DISCONNECTED$Bluetooth not connected +STR_STOP$Stop STR_WORKDAY$WorkDay STR_REPEAT_NO$no-repeat STR_EVERYDAY$Everyday 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 c8c81c5d5..01932187c 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 @@ -286,7 +286,7 @@ STR_DISPLAY_MODE$显示方式 STR_CARD_MANAGEMENT$卡片管理 STR_MUSIC$音乐 STR_SLEEP$睡眠 -STR_RECORDING$录音 +STR_RECORD$录音 STR_BREATH_TRAINING$呼吸训练 STR_REMOTE_SHOOTING$遥控拍照 STR_VOICE_ASSISTANT$语音助手 @@ -325,7 +325,7 @@ STR_SYSTEM_UPDATE$系统更新 STR_ONLINE_MUSIC$在线音乐 STR_BLUETOOTH_HEADPHONES$蓝牙耳机 STR_TRADITIONAL_BLUETOOTH$传统蓝牙 -STR_AUTO_OFF_BLUETOOTH_NOTE$注：开启后10分钟没连接成功会自动关闭，因为传统蓝牙长时间打开会增加电耗，建议在有需要的时候使用\n\n（该功能主要用于电话拨打/通知、音乐控制/传输等） +STR_AUTO_OFF_BLUETOOTH_NOTE$注：开启后10分钟没连接成功会自动关闭，因为传统蓝牙长时间打开会增加电耗，建议在有需要的时候使用（该功能主要用于电话拨打/通知、音乐控制/传输等） STR_BLUETOOTH_SERVICE_OPTIONS$蓝牙服务选项 STR_HFP$通话蓝牙 STR_A2DP$媒体蓝牙 @@ -371,6 +371,8 @@ STR_HEADSET$耳机 STR_CONNECTED$已连接 STR_DISCONNECTED$未连接 STR_PHONE_RINGING_VIBRATING$手机正在响铃/震动 +STR_BLUETOOTH_DISCONNECTED$蓝牙未连接 +STR_STOP$停止 STR_WORKDAY$工作日 STR_REPEAT_NO$不重复 STR_EVERYDAY$每日 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 99f7a0c49..abb51b624 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 @@ -251,7 +251,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -336,6 +336,8 @@ + + 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 b772e48c0..8d461f294 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 @@ -287,7 +287,7 @@ - + @@ -326,7 +326,7 @@ - + @@ -372,6 +372,8 @@ + + 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 65675412e..b93a9ce1f 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 f5336af95..436b3d501 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 47818ab70..28707bb44 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 @@ -263,7 +263,7 @@ enum UIResourceTextId : uint16_t { STR_CARD_MANAGEMENT = 250, STR_MUSIC = 251, STR_SLEEP = 252, - STR_RECORDING = 253, + STR_RECORD = 253, STR_BREATH_TRAINING = 254, STR_REMOTE_SHOOTING = 255, STR_VOICE_ASSISTANT = 256, @@ -335,149 +335,152 @@ enum UIResourceTextId : uint16_t { STR_RESET_CONFIRM_NOTE = 322, 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_WEATHER_REPORT = 387, - STR_ULTRAVIOLET = 388, - STR_WIND_SPEED = 389, - STR_HUMIDITY = 390, - STR_NEXT_7_DAYS = 391, - STR_GET_WEATHER_ERROR = 392, - STR_MUSIC_SOURCE = 393, - STR_MOBILE_MUSIC = 394, - STR_WATCH_MUSIC = 395, - STR_MUSIC_LIST = 396, - STR_BLUETOOTH_CONNECTION_FAILED = 397, - STR_SCANNING_BINDING = 398, - STR_DEVICE_BINDING = 399, - STR_DEVICE_BINDING_NOTE = 400, - STR_EQUIPMENT_UNTYING = 401, - STR_EQUIPMENT_UNTYING_NOTE = 402, - STR_DRINK_WATER_REMINDER = 403, - STR_DRINK_WATER_REMINDER_NOTE = 404, - STR_SEDENTARY_REMINDER = 405, - STR_SEDENTARY_REMINDER_NOTE = 406, - STR_SYSTEM_UPGRADING = 407, - STR_NEWDEVICE_BIND_REMIND_NOTE = 408, - STR_TABULAR_DISPLAY = 409, - STR_RANGE_MILE = 410, - STR_CLOSE = 411, - STR_MORE_APP = 412, - STR_SAVENOTE = 413, - STR_SAVEBACK = 414, - STR_SAVEASK = 415, - STR_BLOOD = 416, - STR_CHECK = 417, - STR_CHECKNEW = 418, - STR_CHECKTIME = 419, - STR_CHECKLONG = 420, - STR_CHECKNO = 421, - STR_CHECKNOTE = 422, - STR_CHECKON = 423, - STR_CHECKSTOP = 424, - STR_CHECKERROR = 425, - STR_WAERKEEP = 426, - STR_WEARRE = 427, - STR_WEARREADY = 428, - STR_RECHECK = 429, - STR_CHECKEWARN = 430, - STR_BLOODSHORT = 431, - STR_HEARTNOTE = 432, - STR_KONW = 433, - STR_EXPLAIN = 434, - STR_HEARTREST = 435, - STR_HEARTDATA = 436, - STR_HEARTTITLE = 437, - STR_HEARTMAX = 438, - STR_HEARTMIN = 439, - STR_TRAINGNO = 440, - STR_TRAINGGO = 441, - STR_MESSAGE = 442, - STR_MESSAGENO = 443, - STR_DIS = 444, - STR_DUR = 445, - STR_STANDUP = 446, - STR_SLEEPHOUR = 447, - STR_SLEEPMGOAL = 448, - STR_REATTIME = 449, - STR_SLEEPTIME = 450, - STR_WALKTIME = 451, - STR_DISTURB = 452, - STR_DISTURBNOTE = 453, - STR_MORNNING = 454, - STR_NOW = 455, - STR_NAP = 456, - STR_TACK = 457, - STR_CLICK = 458, - STR_TACKNUM = 459, - STR_MON = 460, - STR_TUES = 461, - STR_WEDNES = 462, - STR_THURS = 463, - STR_FRI = 464, - STR_SATUR = 465, - STR_SUN = 466, - STR_MAX_ID = 467, + STR_RECORDING = 325, + STR_AUDIO_XX = 326, + STR_VOICE_RECORDING_REMINDER = 327, + STR_VOICE_RECORDING_REMINDER_NOTE = 328, + STR_DELETE_RECORDING = 329, + STR_DELETE_PERMANENTLY = 330, + STR_DO_NOT_DISTURB_MODE = 331, + STR_CONNECTION_STATUS = 332, + STR_HEADSET = 333, + STR_CONNECTED = 334, + STR_DISCONNECTED = 335, + STR_PHONE_RINGING_VIBRATING = 336, + STR_BLUETOOTH_DISCONNECTED = 337, + STR_STOP = 338, + STR_WORKDAY = 339, + STR_REPEAT_NO = 340, + STR_EVERYDAY = 341, + STR_ADD_A_NEW_ALARM = 342, + STR_TIME = 343, + STR_NEXT_STEP = 344, + STR_MONDAY = 345, + STR_TUESDAY = 346, + STR_WEDNESDAY = 347, + STR_THURSDAY = 348, + STR_FRIDAY = 349, + STR_SATURDAY = 350, + STR_SUNDAY = 351, + STR_CALIBRATE_COMPASS = 352, + STR_CALIBRATE_COMPASS_NOTE = 353, + STR_EAST = 354, + STR_SOUTH = 355, + STR_WEST = 356, + STR_NORTH = 357, + STR_SOUTHEAST = 358, + STR_SOUTHWEST = 359, + STR_NORTHEAST = 360, + STR_NORTHWEST = 361, + STR_KEEP_STILL_FOCUS_ON_BREATHING = 362, + STR_EXHALE_NOW = 363, + STR_INHALE_NOW = 364, + STR_TRAINING_COMPLETE = 365, + STR_BREATHING_TRAINING = 366, + STR_THIS_BREATH = 367, + STR_TODAYS_BREATHING_TRAINING = 368, + STR_RECENT_CALLS = 369, + STR_NO_CALLS = 370, + STR_MISSED_CALLS = 371, + STR_DIALED_CALLS = 372, + STR_RECEIVED_CALLS = 373, + STR_NOTE_RECENT_CALLS_LIMITATION = 374, + STR_NO_CONTACTS_ADDED = 375, + STR_DIAL_MODE = 376, + STR_DIAL_VIA_WATCH_SIM = 377, + STR_DIAL_VIA_PHONE = 378, + STR_KUMI_TECHNOLOGY = 379, + STR_CALLING = 380, + STR_NOT_PAIRED = 381, + STR_PAIRED = 382, + STR_UNPAIR = 383, + STR_CONNECTION_ERROR = 384, + STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385, + STR_ENABLE_BLUETOOTH_CALL = 386, + STR_ENABLE_BLUETOOTH_CALL_NOTE = 387, + STR_SIM_CARD_ERROR = 388, + STR_CHECK_SIM_CARD_INSERTION = 389, + STR_WEATHER_REPORT = 390, + STR_ULTRAVIOLET = 391, + STR_WIND_SPEED = 392, + STR_HUMIDITY = 393, + STR_NEXT_7_DAYS = 394, + STR_GET_WEATHER_ERROR = 395, + STR_MUSIC_SOURCE = 396, + STR_MOBILE_MUSIC = 397, + STR_WATCH_MUSIC = 398, + STR_MUSIC_LIST = 399, + STR_BLUETOOTH_CONNECTION_FAILED = 400, + STR_SCANNING_BINDING = 401, + STR_DEVICE_BINDING = 402, + STR_DEVICE_BINDING_NOTE = 403, + STR_EQUIPMENT_UNTYING = 404, + STR_EQUIPMENT_UNTYING_NOTE = 405, + STR_DRINK_WATER_REMINDER = 406, + STR_DRINK_WATER_REMINDER_NOTE = 407, + STR_SEDENTARY_REMINDER = 408, + STR_SEDENTARY_REMINDER_NOTE = 409, + STR_SYSTEM_UPGRADING = 410, + STR_NEWDEVICE_BIND_REMIND_NOTE = 411, + STR_TABULAR_DISPLAY = 412, + STR_RANGE_MILE = 413, + STR_CLOSE = 414, + STR_MORE_APP = 415, + STR_SAVENOTE = 416, + STR_SAVEBACK = 417, + STR_SAVEASK = 418, + STR_BLOOD = 419, + STR_CHECK = 420, + STR_CHECKNEW = 421, + STR_CHECKTIME = 422, + STR_CHECKLONG = 423, + STR_CHECKNO = 424, + STR_CHECKNOTE = 425, + STR_CHECKON = 426, + STR_CHECKSTOP = 427, + STR_CHECKERROR = 428, + STR_WAERKEEP = 429, + STR_WEARRE = 430, + STR_WEARREADY = 431, + STR_RECHECK = 432, + STR_CHECKEWARN = 433, + STR_BLOODSHORT = 434, + STR_HEARTNOTE = 435, + STR_KONW = 436, + STR_EXPLAIN = 437, + STR_HEARTREST = 438, + STR_HEARTDATA = 439, + STR_HEARTTITLE = 440, + STR_HEARTMAX = 441, + STR_HEARTMIN = 442, + STR_TRAINGNO = 443, + STR_TRAINGGO = 444, + STR_MESSAGE = 445, + STR_MESSAGENO = 446, + STR_DIS = 447, + STR_DUR = 448, + STR_STANDUP = 449, + STR_SLEEPHOUR = 450, + STR_SLEEPMGOAL = 451, + STR_REATTIME = 452, + STR_SLEEPTIME = 453, + STR_WALKTIME = 454, + STR_DISTURB = 455, + STR_DISTURBNOTE = 456, + STR_MORNNING = 457, + STR_NOW = 458, + STR_NAP = 459, + STR_TACK = 460, + STR_CLICK = 461, + STR_TACKNUM = 462, + STR_MON = 463, + STR_TUES = 464, + STR_WEDNES = 465, + STR_THURS = 466, + STR_FRI = 467, + STR_SATUR = 468, + STR_SUN = 469, + STR_MAX_ID = 470, }; // UIResourceTextId enum FontLanguageId : uint8_t { 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 c5b1081d1..81c0ab917 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/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 ae14358fa..b93a9ce1f 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 65427ed9d..436b3d501 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 9e192532a..28707bb44 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 @@ -263,7 +263,7 @@ enum UIResourceTextId : uint16_t { STR_CARD_MANAGEMENT = 250, STR_MUSIC = 251, STR_SLEEP = 252, - STR_RECORDING = 253, + STR_RECORD = 253, STR_BREATH_TRAINING = 254, STR_REMOTE_SHOOTING = 255, STR_VOICE_ASSISTANT = 256, @@ -335,126 +335,152 @@ enum UIResourceTextId : uint16_t { STR_RESET_CONFIRM_NOTE = 322, 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, - STR_MON = 437, - STR_TUES = 438, - STR_WEDNES = 439, - STR_THURS = 440, - STR_FRI = 441, - STR_SATUR = 442, - STR_SUN = 443, - STR_MAX_ID = 444, + STR_RECORDING = 325, + STR_AUDIO_XX = 326, + STR_VOICE_RECORDING_REMINDER = 327, + STR_VOICE_RECORDING_REMINDER_NOTE = 328, + STR_DELETE_RECORDING = 329, + STR_DELETE_PERMANENTLY = 330, + STR_DO_NOT_DISTURB_MODE = 331, + STR_CONNECTION_STATUS = 332, + STR_HEADSET = 333, + STR_CONNECTED = 334, + STR_DISCONNECTED = 335, + STR_PHONE_RINGING_VIBRATING = 336, + STR_BLUETOOTH_DISCONNECTED = 337, + STR_STOP = 338, + STR_WORKDAY = 339, + STR_REPEAT_NO = 340, + STR_EVERYDAY = 341, + STR_ADD_A_NEW_ALARM = 342, + STR_TIME = 343, + STR_NEXT_STEP = 344, + STR_MONDAY = 345, + STR_TUESDAY = 346, + STR_WEDNESDAY = 347, + STR_THURSDAY = 348, + STR_FRIDAY = 349, + STR_SATURDAY = 350, + STR_SUNDAY = 351, + STR_CALIBRATE_COMPASS = 352, + STR_CALIBRATE_COMPASS_NOTE = 353, + STR_EAST = 354, + STR_SOUTH = 355, + STR_WEST = 356, + STR_NORTH = 357, + STR_SOUTHEAST = 358, + STR_SOUTHWEST = 359, + STR_NORTHEAST = 360, + STR_NORTHWEST = 361, + STR_KEEP_STILL_FOCUS_ON_BREATHING = 362, + STR_EXHALE_NOW = 363, + STR_INHALE_NOW = 364, + STR_TRAINING_COMPLETE = 365, + STR_BREATHING_TRAINING = 366, + STR_THIS_BREATH = 367, + STR_TODAYS_BREATHING_TRAINING = 368, + STR_RECENT_CALLS = 369, + STR_NO_CALLS = 370, + STR_MISSED_CALLS = 371, + STR_DIALED_CALLS = 372, + STR_RECEIVED_CALLS = 373, + STR_NOTE_RECENT_CALLS_LIMITATION = 374, + STR_NO_CONTACTS_ADDED = 375, + STR_DIAL_MODE = 376, + STR_DIAL_VIA_WATCH_SIM = 377, + STR_DIAL_VIA_PHONE = 378, + STR_KUMI_TECHNOLOGY = 379, + STR_CALLING = 380, + STR_NOT_PAIRED = 381, + STR_PAIRED = 382, + STR_UNPAIR = 383, + STR_CONNECTION_ERROR = 384, + STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385, + STR_ENABLE_BLUETOOTH_CALL = 386, + STR_ENABLE_BLUETOOTH_CALL_NOTE = 387, + STR_SIM_CARD_ERROR = 388, + STR_CHECK_SIM_CARD_INSERTION = 389, + STR_WEATHER_REPORT = 390, + STR_ULTRAVIOLET = 391, + STR_WIND_SPEED = 392, + STR_HUMIDITY = 393, + STR_NEXT_7_DAYS = 394, + STR_GET_WEATHER_ERROR = 395, + STR_MUSIC_SOURCE = 396, + STR_MOBILE_MUSIC = 397, + STR_WATCH_MUSIC = 398, + STR_MUSIC_LIST = 399, + STR_BLUETOOTH_CONNECTION_FAILED = 400, + STR_SCANNING_BINDING = 401, + STR_DEVICE_BINDING = 402, + STR_DEVICE_BINDING_NOTE = 403, + STR_EQUIPMENT_UNTYING = 404, + STR_EQUIPMENT_UNTYING_NOTE = 405, + STR_DRINK_WATER_REMINDER = 406, + STR_DRINK_WATER_REMINDER_NOTE = 407, + STR_SEDENTARY_REMINDER = 408, + STR_SEDENTARY_REMINDER_NOTE = 409, + STR_SYSTEM_UPGRADING = 410, + STR_NEWDEVICE_BIND_REMIND_NOTE = 411, + STR_TABULAR_DISPLAY = 412, + STR_RANGE_MILE = 413, + STR_CLOSE = 414, + STR_MORE_APP = 415, + STR_SAVENOTE = 416, + STR_SAVEBACK = 417, + STR_SAVEASK = 418, + STR_BLOOD = 419, + STR_CHECK = 420, + STR_CHECKNEW = 421, + STR_CHECKTIME = 422, + STR_CHECKLONG = 423, + STR_CHECKNO = 424, + STR_CHECKNOTE = 425, + STR_CHECKON = 426, + STR_CHECKSTOP = 427, + STR_CHECKERROR = 428, + STR_WAERKEEP = 429, + STR_WEARRE = 430, + STR_WEARREADY = 431, + STR_RECHECK = 432, + STR_CHECKEWARN = 433, + STR_BLOODSHORT = 434, + STR_HEARTNOTE = 435, + STR_KONW = 436, + STR_EXPLAIN = 437, + STR_HEARTREST = 438, + STR_HEARTDATA = 439, + STR_HEARTTITLE = 440, + STR_HEARTMAX = 441, + STR_HEARTMIN = 442, + STR_TRAINGNO = 443, + STR_TRAINGGO = 444, + STR_MESSAGE = 445, + STR_MESSAGENO = 446, + STR_DIS = 447, + STR_DUR = 448, + STR_STANDUP = 449, + STR_SLEEPHOUR = 450, + STR_SLEEPMGOAL = 451, + STR_REATTIME = 452, + STR_SLEEPTIME = 453, + STR_WALKTIME = 454, + STR_DISTURB = 455, + STR_DISTURBNOTE = 456, + STR_MORNNING = 457, + STR_NOW = 458, + STR_NAP = 459, + STR_TACK = 460, + STR_CLICK = 461, + STR_TACKNUM = 462, + STR_MON = 463, + STR_TUES = 464, + STR_WEDNES = 465, + STR_THURS = 466, + STR_FRI = 467, + STR_SATUR = 468, + STR_SUN = 469, + STR_MAX_ID = 470, }; // UIResourceTextId enum FontLanguageId : uint8_t { 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 f7fe8d220..81c0ab917 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