修改传统蓝牙,查找手机,勿扰模式适配多国语言,需要重新下载字体资源
authorluozheng <1732036298@qq.com>
Fri, 10 May 2024 09:06:24 +0000 (17:06 +0800)
committerluozheng <1732036298@qq.com>
Fri, 10 May 2024 09:06:24 +0000 (17:06 +0800)
21 files changed:
code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h
code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/include/DnotDisturbView.h
code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp
code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneModel.h
code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhonePresenter.h
code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp
code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang

index 9264fc9..ca22b8d 100644 (file)
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-04-25 11:51:04\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-05-06 14:20:02\r
+ * @LastEditTime: 2024-05-10 14:33:18\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h\r
  */\r
 #ifndef CLASSIC_BLUETOOTH_VIEW_H\r
@@ -66,7 +66,7 @@ namespace OHOS
         UILabelExt *BlueToothEarPhoneLabel = nullptr;       // 蓝牙耳机\r
         UILabelExt *TradionalBlueToothLabel = nullptr;      // 传统蓝牙\r
         UILabelExt *BluetoothServiceOptionsLabel = nullptr; // 蓝牙服务选项\r
-        UILabelExt *AttentionLabel = nullptr;\r
+        UILabel *AttentionLabel = nullptr;\r
         UIToggleButton *TradionalBlueToothToggleButton = nullptr;\r
         bool initViewStatus{false};\r
     };\r
index a6403bc..84fbc45 100644 (file)
@@ -2,6 +2,7 @@
 #include "classicbluetooth/include/ClassicBlueToothPresenter.h"\r
 #include "config/include/ConfigModel.h"\r
 #include "UiConfig.h"\r
+#include "uicomponents/UIComponents.h"\r
 namespace OHOS\r
 {\r
     static ClassicBlueToothView *g_pClassicBlueToothView{nullptr};\r
@@ -95,9 +96,9 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小\r
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);                                       // 字体大小\r
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高\r
-        //label->SetText(labelconfig.text);                                                           // 内容\r
-        label->SetTextId(labelconfig.textId);                                                           \r
-        label->SetLineBreakMode(labelconfig.lineBreakMode);                                           // 断行模式。\r
+        // label->SetText(labelconfig.text);                                                           // 内容\r
+        label->SetTextId(labelconfig.textId);\r
+        label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
     }\r
@@ -143,7 +144,7 @@ namespace OHOS
         }\r
         /* -------------------------------------------------------------------------- */\r
         labelconfig.top = 273;\r
-        //labelconfig.text = "传统蓝牙";\r
+        // labelconfig.text = "传统蓝牙";\r
         labelconfig.textId = STR_TRADITIONAL_BLUETOOTH;\r
         TradionalBlueToothLabel = SetClassicBlueToothViewLabel(labelconfig);\r
         if (nullptr == TradionalBlueToothLabel)\r
@@ -153,7 +154,7 @@ namespace OHOS
         }\r
         /* -------------------------------------------------------------------------- */\r
         labelconfig.top = 393;\r
-        //labelconfig.text = "蓝牙服务选项";\r
+        // labelconfig.text = "蓝牙服务选项";\r
         labelconfig.textId = STR_BLUETOOTH_SERVICE_OPTIONS;\r
         BluetoothServiceOptionsLabel = SetClassicBlueToothViewLabel(labelconfig);\r
         if (nullptr == BluetoothServiceOptionsLabel)\r
@@ -162,23 +163,21 @@ namespace OHOS
             return false;\r
         }\r
         /* -------------------------------------------------------------------------- */\r
-        labelconfig = {\r
-            .left = 53,\r
-            .top = 499,\r
-            .width = 360,\r
-            .height = 180,\r
-            .fontSize = 20,\r
-            .lineHeigh = 30,\r
-            //.text = "注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用\n\n(该功能主要用于电话拨打/通知、音乐控制/传输等)",\r
-            .textId = STR_AUTO_OFF_BLUETOOTH_NOTE,\r
-            .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
-        };\r
-        AttentionLabel = SetClassicBlueToothViewLabel(labelconfig);\r
-        if (nullptr == AttentionLabel)\r
+        AttentionLabel = new UILabel();\r
+        if (AttentionLabel == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothView::AttentionLabel is nullptr!");\r
             return false;\r
         }\r
+        AttentionLabel->SetPosition(53, 499, 360, 180);  // 位置大小\r
+        AttentionLabel->SetStyle(STYLE_TEXT_FONT, 20);   // 字体大小\r
+        AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 30); // 字体行高\r
+        //.text = "注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用\n\n(该功能主要用于电话拨打/通知、音乐控制/传输等)",\r
+        SetLabelId(AttentionLabel, STR_AUTO_OFF_BLUETOOTH_NOTE);\r
+        AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
+        AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); // 断行模式。\r
+        AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);\r
+        /* -------------------------------------------------------------------------- */\r
 \r
         return true;\r
     }\r
@@ -205,7 +204,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " ClassicBlueToothView::TradionalBlueToothButton new  fail!");\r
             return false;\r
         }\r
-        TradionalBlueToothButton->SetPosition(43, 240,380,100);      \r
+        TradionalBlueToothButton->SetPosition(43, 240, 380, 100);\r
         TradionalBlueToothButton->SetViewId(TRADIONALBLUETOOTHBUTTON);\r
         TradionalBlueToothButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
         TradionalBlueToothButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 16);\r
@@ -249,7 +248,7 @@ namespace OHOS
         return true;\r
     }\r
 \r
-    UIToggleButton * ClassicBlueToothView::GetTradionalBlueToothToggleButton(void)\r
+    UIToggleButton *ClassicBlueToothView::GetTradionalBlueToothToggleButton(void)\r
     {\r
         return TradionalBlueToothToggleButton;\r
     }\r
index c634f96..e6c78af 100644 (file)
@@ -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;
     };
index 6b2733a..b6a9bae 100644 (file)
@@ -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);
index 7e303fb..af97544 100644 (file)
@@ -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
index 0e4f436..6fce8bb 100644 (file)
@@ -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<FindPhoneView>,
index dee76b5..b2cbdee 100644 (file)
@@ -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 <custom_runtime.h>
+#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
index 6b4982c..312ffae 100644 (file)
@@ -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 <custom_utils.h>
 #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<uint16_t>(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;
     }
index 642b2b2..03779a7 100644 (file)
@@ -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
         {
index e56f97e..8256ed8 100644 (file)
@@ -250,7 +250,7 @@ STR_DISPLAY_MODE$Display Mode
 STR_CARD_MANAGEMENT$Card Management\r
 STR_MUSIC$Music\r
 STR_SLEEP$Sleep\r
-STR_RECORDING$Recording\r
+STR_RECORD$Record\r
 STR_BREATH_TRAINING$Breath Training\r
 STR_REMOTE_SHOOTING$Remote Shooting\r
 STR_VOICE_ASSISTANT$Voice Assistant\r
@@ -289,7 +289,7 @@ STR_SYSTEM_UPDATE$System Update
 STR_ONLINE_MUSIC$Online music\r
 STR_BLUETOOTH_HEADPHONES$Bluetooth Headphones\r
 STR_TRADITIONAL_BLUETOOTH$Traditional Bluetooth\r
-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.)\r
+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.)\r
 STR_BLUETOOTH_SERVICE_OPTIONS$Bluetooth Service Options\r
 STR_HFP$HFP\r
 STR_A2DP$A2DP\r
@@ -335,6 +335,8 @@ STR_HEADSET$Headset
 STR_CONNECTED$Connected\r
 STR_DISCONNECTED$Disconnected\r
 STR_PHONE_RINGING_VIBRATING$The mobile phone is ringing/vibrating\r
+STR_BLUETOOTH_DISCONNECTED$Bluetooth not connected\r
+STR_STOP$Stop\r
 STR_WORKDAY$WorkDay\r
 STR_REPEAT_NO$no-repeat\r
 STR_EVERYDAY$Everyday\r
index c8c81c5..0193218 100644 (file)
@@ -286,7 +286,7 @@ STR_DISPLAY_MODE$显示方式
 STR_CARD_MANAGEMENT$卡片管理\r
 STR_MUSIC$音乐\r
 STR_SLEEP$睡眠\r
-STR_RECORDING$录音\r
+STR_RECORD$录音\r
 STR_BREATH_TRAINING$呼吸训练\r
 STR_REMOTE_SHOOTING$遥控拍照\r
 STR_VOICE_ASSISTANT$语音助手\r
@@ -325,7 +325,7 @@ STR_SYSTEM_UPDATE$系统更新
 STR_ONLINE_MUSIC$在线音乐\r
 STR_BLUETOOTH_HEADPHONES$蓝牙耳机\r
 STR_TRADITIONAL_BLUETOOTH$传统蓝牙\r
-STR_AUTO_OFF_BLUETOOTH_NOTE$注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用\n\n(该功能主要用于电话拨打/通知、音乐控制/传输等)\r
+STR_AUTO_OFF_BLUETOOTH_NOTE$注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用(该功能主要用于电话拨打/通知、音乐控制/传输等)\r
 STR_BLUETOOTH_SERVICE_OPTIONS$蓝牙服务选项\r
 STR_HFP$通话蓝牙\r
 STR_A2DP$媒体蓝牙\r
@@ -371,6 +371,8 @@ STR_HEADSET$耳机
 STR_CONNECTED$已连接\r
 STR_DISCONNECTED$未连接\r
 STR_PHONE_RINGING_VIBRATING$手机正在响铃/震动\r
+STR_BLUETOOTH_DISCONNECTED$蓝牙未连接\r
+STR_STOP$停止\r
 STR_WORKDAY$工作日\r
 STR_REPEAT_NO$不重复\r
 STR_EVERYDAY$每日\r
index 99f7a0c..abb51b6 100644 (file)
        <lanstr id="STR_CARD_MANAGEMENT" value="Card Management"/>
        <lanstr id="STR_MUSIC" value="Music"/>
        <lanstr id="STR_SLEEP" value="Sleep"/>
-       <lanstr id="STR_RECORDING" value="Recording"/>
+       <lanstr id="STR_RECORD" value="Record"/>
        <lanstr id="STR_BREATH_TRAINING" value="Breath Training"/>
        <lanstr id="STR_REMOTE_SHOOTING" value="Remote Shooting"/>
        <lanstr id="STR_VOICE_ASSISTANT" value="Voice Assistant"/>
        <lanstr id="STR_ONLINE_MUSIC" value="Online music"/>
        <lanstr id="STR_BLUETOOTH_HEADPHONES" value="Bluetooth Headphones"/>
        <lanstr id="STR_TRADITIONAL_BLUETOOTH" value="Traditional Bluetooth"/>
-       <lanstr id="STR_AUTO_OFF_BLUETOOTH_NOTE" value="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.)"/>
+       <lanstr id="STR_AUTO_OFF_BLUETOOTH_NOTE" value="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.)"/>
        <lanstr id="STR_BLUETOOTH_SERVICE_OPTIONS" value="Bluetooth Service Options"/>
        <lanstr id="STR_HFP" value="HFP"/>
        <lanstr id="STR_A2DP" value="A2DP"/>
        <lanstr id="STR_CONNECTED" value="Connected"/>
        <lanstr id="STR_DISCONNECTED" value="Disconnected"/>
        <lanstr id="STR_PHONE_RINGING_VIBRATING" value="The mobile phone is ringing/vibrating"/>
+       <lanstr id="STR_BLUETOOTH_DISCONNECTED" value="Bluetooth not connected"/>
+       <lanstr id="STR_STOP" value="Stop"/>
        <lanstr id="STR_WORKDAY" value="WorkDay"/>
        <lanstr id="STR_REPEAT_NO" value="no-repeat"/>
        <lanstr id="STR_EVERYDAY" value="Everyday"/>
index b772e48..8d461f2 100644 (file)
        <lanstr id="STR_CARD_MANAGEMENT" value="卡片管理"/>
        <lanstr id="STR_MUSIC" value="音乐"/>
        <lanstr id="STR_SLEEP" value="睡眠"/>
-       <lanstr id="STR_RECORDING" value="录音"/>
+       <lanstr id="STR_RECORD" value="录音"/>
        <lanstr id="STR_BREATH_TRAINING" value="呼吸训练"/>
        <lanstr id="STR_REMOTE_SHOOTING" value="遥控拍照"/>
        <lanstr id="STR_VOICE_ASSISTANT" value="语音助手"/>
        <lanstr id="STR_ONLINE_MUSIC" value="在线音乐"/>
        <lanstr id="STR_BLUETOOTH_HEADPHONES" value="蓝牙耳机"/>
        <lanstr id="STR_TRADITIONAL_BLUETOOTH" value="传统蓝牙"/>
-       <lanstr id="STR_AUTO_OFF_BLUETOOTH_NOTE" value="注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用\n\n(该功能主要用于电话拨打/通知、音乐控制/传输等)"/>
+       <lanstr id="STR_AUTO_OFF_BLUETOOTH_NOTE" value="注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用(该功能主要用于电话拨打/通知、音乐控制/传输等)"/>
        <lanstr id="STR_BLUETOOTH_SERVICE_OPTIONS" value="蓝牙服务选项"/>
        <lanstr id="STR_HFP" value="通话蓝牙"/>
        <lanstr id="STR_A2DP" value="媒体蓝牙"/>
        <lanstr id="STR_CONNECTED" value="已连接"/>
        <lanstr id="STR_DISCONNECTED" value="未连接"/>
        <lanstr id="STR_PHONE_RINGING_VIBRATING" value="手机正在响铃/震动"/>
+       <lanstr id="STR_BLUETOOTH_DISCONNECTED" value="蓝牙未连接"/>
+       <lanstr id="STR_STOP" value="停止"/>
        <lanstr id="STR_WORKDAY" value="工作日"/>
        <lanstr id="STR_REPEAT_NO" value="不重复"/>
        <lanstr id="STR_EVERYDAY" value="每日"/>
index 6567541..b93a9ce 100644 (file)
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
index f5336af..436b3d5 100644 (file)
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
index 47818ab..28707bb 100644 (file)
@@ -263,7 +263,7 @@ enum UIResourceTextId : uint16_t {
     STR_CARD_MANAGEMENT = 250,\r
     STR_MUSIC = 251,\r
     STR_SLEEP = 252,\r
-    STR_RECORDING = 253,\r
+    STR_RECORD = 253,\r
     STR_BREATH_TRAINING = 254,\r
     STR_REMOTE_SHOOTING = 255,\r
     STR_VOICE_ASSISTANT = 256,\r
@@ -335,149 +335,152 @@ enum UIResourceTextId : uint16_t {
     STR_RESET_CONFIRM_NOTE = 322,\r
     STR_RECORDER = 323,\r
     STR_CLICK_TO_RECORD = 324,\r
-    STR_AUDIO_XX = 325,\r
-    STR_VOICE_RECORDING_REMINDER = 326,\r
-    STR_VOICE_RECORDING_REMINDER_NOTE = 327,\r
-    STR_DELETE_RECORDING = 328,\r
-    STR_DELETE_PERMANENTLY = 329,\r
-    STR_DO_NOT_DISTURB_MODE = 330,\r
-    STR_CONNECTION_STATUS = 331,\r
-    STR_HEADSET = 332,\r
-    STR_CONNECTED = 333,\r
-    STR_DISCONNECTED = 334,\r
-    STR_PHONE_RINGING_VIBRATING = 335,\r
-    STR_WORKDAY = 336,\r
-    STR_REPEAT_NO = 337,\r
-    STR_EVERYDAY = 338,\r
-    STR_ADD_A_NEW_ALARM = 339,\r
-    STR_TIME = 340,\r
-    STR_NEXT_STEP = 341,\r
-    STR_MONDAY = 342,\r
-    STR_TUESDAY = 343,\r
-    STR_WEDNESDAY = 344,\r
-    STR_THURSDAY = 345,\r
-    STR_FRIDAY = 346,\r
-    STR_SATURDAY = 347,\r
-    STR_SUNDAY = 348,\r
-    STR_CALIBRATE_COMPASS = 349,\r
-    STR_CALIBRATE_COMPASS_NOTE = 350,\r
-    STR_EAST = 351,\r
-    STR_SOUTH = 352,\r
-    STR_WEST = 353,\r
-    STR_NORTH = 354,\r
-    STR_SOUTHEAST = 355,\r
-    STR_SOUTHWEST = 356,\r
-    STR_NORTHEAST = 357,\r
-    STR_NORTHWEST = 358,\r
-    STR_KEEP_STILL_FOCUS_ON_BREATHING = 359,\r
-    STR_EXHALE_NOW = 360,\r
-    STR_INHALE_NOW = 361,\r
-    STR_TRAINING_COMPLETE = 362,\r
-    STR_BREATHING_TRAINING = 363,\r
-    STR_THIS_BREATH = 364,\r
-    STR_TODAYS_BREATHING_TRAINING = 365,\r
-    STR_RECENT_CALLS = 366,\r
-    STR_NO_CALLS = 367,\r
-    STR_MISSED_CALLS = 368,\r
-    STR_DIALED_CALLS = 369,\r
-    STR_RECEIVED_CALLS = 370,\r
-    STR_NOTE_RECENT_CALLS_LIMITATION = 371,\r
-    STR_NO_CONTACTS_ADDED = 372,\r
-    STR_DIAL_MODE = 373,\r
-    STR_DIAL_VIA_WATCH_SIM = 374,\r
-    STR_DIAL_VIA_PHONE = 375,\r
-    STR_KUMI_TECHNOLOGY = 376,\r
-    STR_CALLING = 377,\r
-    STR_NOT_PAIRED = 378,\r
-    STR_PAIRED = 379,\r
-    STR_UNPAIR = 380,\r
-    STR_CONNECTION_ERROR = 381,\r
-    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 382,\r
-    STR_ENABLE_BLUETOOTH_CALL = 383,\r
-    STR_ENABLE_BLUETOOTH_CALL_NOTE = 384,\r
-    STR_SIM_CARD_ERROR = 385,\r
-    STR_CHECK_SIM_CARD_INSERTION = 386,\r
-    STR_WEATHER_REPORT = 387,\r
-    STR_ULTRAVIOLET = 388,\r
-    STR_WIND_SPEED = 389,\r
-    STR_HUMIDITY = 390,\r
-    STR_NEXT_7_DAYS = 391,\r
-    STR_GET_WEATHER_ERROR = 392,\r
-    STR_MUSIC_SOURCE = 393,\r
-    STR_MOBILE_MUSIC = 394,\r
-    STR_WATCH_MUSIC = 395,\r
-    STR_MUSIC_LIST = 396,\r
-    STR_BLUETOOTH_CONNECTION_FAILED = 397,\r
-    STR_SCANNING_BINDING = 398,\r
-    STR_DEVICE_BINDING = 399,\r
-    STR_DEVICE_BINDING_NOTE = 400,\r
-    STR_EQUIPMENT_UNTYING = 401,\r
-    STR_EQUIPMENT_UNTYING_NOTE = 402,\r
-    STR_DRINK_WATER_REMINDER = 403,\r
-    STR_DRINK_WATER_REMINDER_NOTE = 404,\r
-    STR_SEDENTARY_REMINDER = 405,\r
-    STR_SEDENTARY_REMINDER_NOTE = 406,\r
-    STR_SYSTEM_UPGRADING = 407,\r
-    STR_NEWDEVICE_BIND_REMIND_NOTE = 408,\r
-    STR_TABULAR_DISPLAY = 409,\r
-    STR_RANGE_MILE = 410,\r
-    STR_CLOSE = 411,\r
-    STR_MORE_APP = 412,\r
-    STR_SAVENOTE = 413,\r
-    STR_SAVEBACK = 414,\r
-    STR_SAVEASK = 415,\r
-    STR_BLOOD = 416,\r
-    STR_CHECK = 417,\r
-    STR_CHECKNEW = 418,\r
-    STR_CHECKTIME = 419,\r
-    STR_CHECKLONG = 420,\r
-    STR_CHECKNO = 421,\r
-    STR_CHECKNOTE = 422,\r
-    STR_CHECKON = 423,\r
-    STR_CHECKSTOP = 424,\r
-    STR_CHECKERROR = 425,\r
-    STR_WAERKEEP = 426,\r
-    STR_WEARRE = 427,\r
-    STR_WEARREADY = 428,\r
-    STR_RECHECK = 429,\r
-    STR_CHECKEWARN = 430,\r
-    STR_BLOODSHORT = 431,\r
-    STR_HEARTNOTE = 432,\r
-    STR_KONW = 433,\r
-    STR_EXPLAIN = 434,\r
-    STR_HEARTREST = 435,\r
-    STR_HEARTDATA = 436,\r
-    STR_HEARTTITLE = 437,\r
-    STR_HEARTMAX = 438,\r
-    STR_HEARTMIN = 439,\r
-    STR_TRAINGNO = 440,\r
-    STR_TRAINGGO = 441,\r
-    STR_MESSAGE = 442,\r
-    STR_MESSAGENO = 443,\r
-    STR_DIS = 444,\r
-    STR_DUR = 445,\r
-    STR_STANDUP = 446,\r
-    STR_SLEEPHOUR = 447,\r
-    STR_SLEEPMGOAL = 448,\r
-    STR_REATTIME = 449,\r
-    STR_SLEEPTIME = 450,\r
-    STR_WALKTIME = 451,\r
-    STR_DISTURB = 452,\r
-    STR_DISTURBNOTE = 453,\r
-    STR_MORNNING = 454,\r
-    STR_NOW = 455,\r
-    STR_NAP = 456,\r
-    STR_TACK = 457,\r
-    STR_CLICK = 458,\r
-    STR_TACKNUM = 459,\r
-    STR_MON = 460,\r
-    STR_TUES = 461,\r
-    STR_WEDNES = 462,\r
-    STR_THURS = 463,\r
-    STR_FRI = 464,\r
-    STR_SATUR = 465,\r
-    STR_SUN = 466,\r
-    STR_MAX_ID = 467,\r
+    STR_RECORDING = 325,\r
+    STR_AUDIO_XX = 326,\r
+    STR_VOICE_RECORDING_REMINDER = 327,\r
+    STR_VOICE_RECORDING_REMINDER_NOTE = 328,\r
+    STR_DELETE_RECORDING = 329,\r
+    STR_DELETE_PERMANENTLY = 330,\r
+    STR_DO_NOT_DISTURB_MODE = 331,\r
+    STR_CONNECTION_STATUS = 332,\r
+    STR_HEADSET = 333,\r
+    STR_CONNECTED = 334,\r
+    STR_DISCONNECTED = 335,\r
+    STR_PHONE_RINGING_VIBRATING = 336,\r
+    STR_BLUETOOTH_DISCONNECTED = 337,\r
+    STR_STOP = 338,\r
+    STR_WORKDAY = 339,\r
+    STR_REPEAT_NO = 340,\r
+    STR_EVERYDAY = 341,\r
+    STR_ADD_A_NEW_ALARM = 342,\r
+    STR_TIME = 343,\r
+    STR_NEXT_STEP = 344,\r
+    STR_MONDAY = 345,\r
+    STR_TUESDAY = 346,\r
+    STR_WEDNESDAY = 347,\r
+    STR_THURSDAY = 348,\r
+    STR_FRIDAY = 349,\r
+    STR_SATURDAY = 350,\r
+    STR_SUNDAY = 351,\r
+    STR_CALIBRATE_COMPASS = 352,\r
+    STR_CALIBRATE_COMPASS_NOTE = 353,\r
+    STR_EAST = 354,\r
+    STR_SOUTH = 355,\r
+    STR_WEST = 356,\r
+    STR_NORTH = 357,\r
+    STR_SOUTHEAST = 358,\r
+    STR_SOUTHWEST = 359,\r
+    STR_NORTHEAST = 360,\r
+    STR_NORTHWEST = 361,\r
+    STR_KEEP_STILL_FOCUS_ON_BREATHING = 362,\r
+    STR_EXHALE_NOW = 363,\r
+    STR_INHALE_NOW = 364,\r
+    STR_TRAINING_COMPLETE = 365,\r
+    STR_BREATHING_TRAINING = 366,\r
+    STR_THIS_BREATH = 367,\r
+    STR_TODAYS_BREATHING_TRAINING = 368,\r
+    STR_RECENT_CALLS = 369,\r
+    STR_NO_CALLS = 370,\r
+    STR_MISSED_CALLS = 371,\r
+    STR_DIALED_CALLS = 372,\r
+    STR_RECEIVED_CALLS = 373,\r
+    STR_NOTE_RECENT_CALLS_LIMITATION = 374,\r
+    STR_NO_CONTACTS_ADDED = 375,\r
+    STR_DIAL_MODE = 376,\r
+    STR_DIAL_VIA_WATCH_SIM = 377,\r
+    STR_DIAL_VIA_PHONE = 378,\r
+    STR_KUMI_TECHNOLOGY = 379,\r
+    STR_CALLING = 380,\r
+    STR_NOT_PAIRED = 381,\r
+    STR_PAIRED = 382,\r
+    STR_UNPAIR = 383,\r
+    STR_CONNECTION_ERROR = 384,\r
+    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385,\r
+    STR_ENABLE_BLUETOOTH_CALL = 386,\r
+    STR_ENABLE_BLUETOOTH_CALL_NOTE = 387,\r
+    STR_SIM_CARD_ERROR = 388,\r
+    STR_CHECK_SIM_CARD_INSERTION = 389,\r
+    STR_WEATHER_REPORT = 390,\r
+    STR_ULTRAVIOLET = 391,\r
+    STR_WIND_SPEED = 392,\r
+    STR_HUMIDITY = 393,\r
+    STR_NEXT_7_DAYS = 394,\r
+    STR_GET_WEATHER_ERROR = 395,\r
+    STR_MUSIC_SOURCE = 396,\r
+    STR_MOBILE_MUSIC = 397,\r
+    STR_WATCH_MUSIC = 398,\r
+    STR_MUSIC_LIST = 399,\r
+    STR_BLUETOOTH_CONNECTION_FAILED = 400,\r
+    STR_SCANNING_BINDING = 401,\r
+    STR_DEVICE_BINDING = 402,\r
+    STR_DEVICE_BINDING_NOTE = 403,\r
+    STR_EQUIPMENT_UNTYING = 404,\r
+    STR_EQUIPMENT_UNTYING_NOTE = 405,\r
+    STR_DRINK_WATER_REMINDER = 406,\r
+    STR_DRINK_WATER_REMINDER_NOTE = 407,\r
+    STR_SEDENTARY_REMINDER = 408,\r
+    STR_SEDENTARY_REMINDER_NOTE = 409,\r
+    STR_SYSTEM_UPGRADING = 410,\r
+    STR_NEWDEVICE_BIND_REMIND_NOTE = 411,\r
+    STR_TABULAR_DISPLAY = 412,\r
+    STR_RANGE_MILE = 413,\r
+    STR_CLOSE = 414,\r
+    STR_MORE_APP = 415,\r
+    STR_SAVENOTE = 416,\r
+    STR_SAVEBACK = 417,\r
+    STR_SAVEASK = 418,\r
+    STR_BLOOD = 419,\r
+    STR_CHECK = 420,\r
+    STR_CHECKNEW = 421,\r
+    STR_CHECKTIME = 422,\r
+    STR_CHECKLONG = 423,\r
+    STR_CHECKNO = 424,\r
+    STR_CHECKNOTE = 425,\r
+    STR_CHECKON = 426,\r
+    STR_CHECKSTOP = 427,\r
+    STR_CHECKERROR = 428,\r
+    STR_WAERKEEP = 429,\r
+    STR_WEARRE = 430,\r
+    STR_WEARREADY = 431,\r
+    STR_RECHECK = 432,\r
+    STR_CHECKEWARN = 433,\r
+    STR_BLOODSHORT = 434,\r
+    STR_HEARTNOTE = 435,\r
+    STR_KONW = 436,\r
+    STR_EXPLAIN = 437,\r
+    STR_HEARTREST = 438,\r
+    STR_HEARTDATA = 439,\r
+    STR_HEARTTITLE = 440,\r
+    STR_HEARTMAX = 441,\r
+    STR_HEARTMIN = 442,\r
+    STR_TRAINGNO = 443,\r
+    STR_TRAINGGO = 444,\r
+    STR_MESSAGE = 445,\r
+    STR_MESSAGENO = 446,\r
+    STR_DIS = 447,\r
+    STR_DUR = 448,\r
+    STR_STANDUP = 449,\r
+    STR_SLEEPHOUR = 450,\r
+    STR_SLEEPMGOAL = 451,\r
+    STR_REATTIME = 452,\r
+    STR_SLEEPTIME = 453,\r
+    STR_WALKTIME = 454,\r
+    STR_DISTURB = 455,\r
+    STR_DISTURBNOTE = 456,\r
+    STR_MORNNING = 457,\r
+    STR_NOW = 458,\r
+    STR_NAP = 459,\r
+    STR_TACK = 460,\r
+    STR_CLICK = 461,\r
+    STR_TACKNUM = 462,\r
+    STR_MON = 463,\r
+    STR_TUES = 464,\r
+    STR_WEDNES = 465,\r
+    STR_THURS = 466,\r
+    STR_FRI = 467,\r
+    STR_SATUR = 468,\r
+    STR_SUN = 469,\r
+    STR_MAX_ID = 470,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index c5b1081..81c0ab9 100644 (file)
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
index ae14358..b93a9ce 100644 (file)
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
index 65427ed..436b3d5 100644 (file)
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
index 9e19253..28707bb 100644 (file)
@@ -263,7 +263,7 @@ enum UIResourceTextId : uint16_t {
     STR_CARD_MANAGEMENT = 250,\r
     STR_MUSIC = 251,\r
     STR_SLEEP = 252,\r
-    STR_RECORDING = 253,\r
+    STR_RECORD = 253,\r
     STR_BREATH_TRAINING = 254,\r
     STR_REMOTE_SHOOTING = 255,\r
     STR_VOICE_ASSISTANT = 256,\r
@@ -335,126 +335,152 @@ enum UIResourceTextId : uint16_t {
     STR_RESET_CONFIRM_NOTE = 322,\r
     STR_RECORDER = 323,\r
     STR_CLICK_TO_RECORD = 324,\r
-    STR_AUDIO_XX = 325,\r
-    STR_VOICE_RECORDING_REMINDER = 326,\r
-    STR_VOICE_RECORDING_REMINDER_NOTE = 327,\r
-    STR_DELETE_RECORDING = 328,\r
-    STR_DELETE_PERMANENTLY = 329,\r
-    STR_DO_NOT_DISTURB_MODE = 330,\r
-    STR_CONNECTION_STATUS = 331,\r
-    STR_HEADSET = 332,\r
-    STR_CONNECTED = 333,\r
-    STR_DISCONNECTED = 334,\r
-    STR_PHONE_RINGING_VIBRATING = 335,\r
-    STR_WORKDAY = 336,\r
-    STR_REPEAT_NO = 337,\r
-    STR_EVERYDAY = 338,\r
-    STR_ADD_A_NEW_ALARM = 339,\r
-    STR_TIME = 340,\r
-    STR_NEXT_STEP = 341,\r
-    STR_MONDAY = 342,\r
-    STR_TUESDAY = 343,\r
-    STR_WEDNESDAY = 344,\r
-    STR_THURSDAY = 345,\r
-    STR_FRIDAY = 346,\r
-    STR_SATURDAY = 347,\r
-    STR_SUNDAY = 348,\r
-    STR_CALIBRATE_COMPASS = 349,\r
-    STR_CALIBRATE_COMPASS_NOTE = 350,\r
-    STR_EAST = 351,\r
-    STR_SOUTH = 352,\r
-    STR_WEST = 353,\r
-    STR_NORTH = 354,\r
-    STR_SOUTHEAST = 355,\r
-    STR_SOUTHWEST = 356,\r
-    STR_NORTHEAST = 357,\r
-    STR_NORTHWEST = 358,\r
-    STR_KEEP_STILL_FOCUS_ON_BREATHING = 359,\r
-    STR_EXHALE_NOW = 360,\r
-    STR_INHALE_NOW = 361,\r
-    STR_TRAINING_COMPLETE = 362,\r
-    STR_BREATHING_TRAINING = 363,\r
-    STR_THIS_BREATH = 364,\r
-    STR_TODAYS_BREATHING_TRAINING = 365,\r
-    STR_RECENT_CALLS = 366,\r
-    STR_NO_CALLS = 367,\r
-    STR_MISSED_CALLS = 368,\r
-    STR_DIALED_CALLS = 369,\r
-    STR_RECEIVED_CALLS = 370,\r
-    STR_NOTE_RECENT_CALLS_LIMITATION = 371,\r
-    STR_NO_CONTACTS_ADDED = 372,\r
-    STR_DIAL_MODE = 373,\r
-    STR_DIAL_VIA_WATCH_SIM = 374,\r
-    STR_DIAL_VIA_PHONE = 375,\r
-    STR_KUMI_TECHNOLOGY = 376,\r
-    STR_CALLING = 377,\r
-    STR_NOT_PAIRED = 378,\r
-    STR_PAIRED = 379,\r
-    STR_UNPAIR = 380,\r
-    STR_CONNECTION_ERROR = 381,\r
-    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 382,\r
-    STR_ENABLE_BLUETOOTH_CALL = 383,\r
-    STR_ENABLE_BLUETOOTH_CALL_NOTE = 384,\r
-    STR_SIM_CARD_ERROR = 385,\r
-    STR_CHECK_SIM_CARD_INSERTION = 386,\r
-    STR_RANGE_MILE = 387,\r
-    STR_CLOSE = 388,\r
-    STR_MORE_APP = 389,\r
-    STR_SAVENOTE = 390,\r
-    STR_SAVEBACK = 391,\r
-    STR_SAVEASK = 392,\r
-    STR_BLOOD = 393,\r
-    STR_CHECK = 394,\r
-    STR_CHECKNEW = 395,\r
-    STR_CHECKTIME = 396,\r
-    STR_CHECKLONG = 397,\r
-    STR_CHECKNO = 398,\r
-    STR_CHECKNOTE = 399,\r
-    STR_CHECKON = 400,\r
-    STR_CHECKSTOP = 401,\r
-    STR_CHECKERROR = 402,\r
-    STR_WAERKEEP = 403,\r
-    STR_WEARRE = 404,\r
-    STR_WEARREADY = 405,\r
-    STR_RECHECK = 406,\r
-    STR_CHECKEWARN = 407,\r
-    STR_BLOODSHORT = 408,\r
-    STR_HEARTNOTE = 409,\r
-    STR_KONW = 410,\r
-    STR_EXPLAIN = 411,\r
-    STR_HEARTREST = 412,\r
-    STR_HEARTDATA = 413,\r
-    STR_HEARTTITLE = 414,\r
-    STR_HEARTMAX = 415,\r
-    STR_HEARTMIN = 416,\r
-    STR_TRAINGNO = 417,\r
-    STR_TRAINGGO = 418,\r
-    STR_MESSAGE = 419,\r
-    STR_MESSAGENO = 420,\r
-    STR_DIS = 421,\r
-    STR_DUR = 422,\r
-    STR_STANDUP = 423,\r
-    STR_SLEEPHOUR = 424,\r
-    STR_SLEEPMGOAL = 425,\r
-    STR_REATTIME = 426,\r
-    STR_SLEEPTIME = 427,\r
-    STR_WALKTIME = 428,\r
-    STR_DISTURB = 429,\r
-    STR_DISTURBNOTE = 430,\r
-    STR_MORNNING = 431,\r
-    STR_NOW = 432,\r
-    STR_NAP = 433,\r
-    STR_TACK = 434,\r
-    STR_CLICK = 435,\r
-    STR_TACKNUM = 436,\r
-    STR_MON = 437,\r
-    STR_TUES = 438,\r
-    STR_WEDNES = 439,\r
-    STR_THURS = 440,\r
-    STR_FRI = 441,\r
-    STR_SATUR = 442,\r
-    STR_SUN = 443,\r
-    STR_MAX_ID = 444,\r
+    STR_RECORDING = 325,\r
+    STR_AUDIO_XX = 326,\r
+    STR_VOICE_RECORDING_REMINDER = 327,\r
+    STR_VOICE_RECORDING_REMINDER_NOTE = 328,\r
+    STR_DELETE_RECORDING = 329,\r
+    STR_DELETE_PERMANENTLY = 330,\r
+    STR_DO_NOT_DISTURB_MODE = 331,\r
+    STR_CONNECTION_STATUS = 332,\r
+    STR_HEADSET = 333,\r
+    STR_CONNECTED = 334,\r
+    STR_DISCONNECTED = 335,\r
+    STR_PHONE_RINGING_VIBRATING = 336,\r
+    STR_BLUETOOTH_DISCONNECTED = 337,\r
+    STR_STOP = 338,\r
+    STR_WORKDAY = 339,\r
+    STR_REPEAT_NO = 340,\r
+    STR_EVERYDAY = 341,\r
+    STR_ADD_A_NEW_ALARM = 342,\r
+    STR_TIME = 343,\r
+    STR_NEXT_STEP = 344,\r
+    STR_MONDAY = 345,\r
+    STR_TUESDAY = 346,\r
+    STR_WEDNESDAY = 347,\r
+    STR_THURSDAY = 348,\r
+    STR_FRIDAY = 349,\r
+    STR_SATURDAY = 350,\r
+    STR_SUNDAY = 351,\r
+    STR_CALIBRATE_COMPASS = 352,\r
+    STR_CALIBRATE_COMPASS_NOTE = 353,\r
+    STR_EAST = 354,\r
+    STR_SOUTH = 355,\r
+    STR_WEST = 356,\r
+    STR_NORTH = 357,\r
+    STR_SOUTHEAST = 358,\r
+    STR_SOUTHWEST = 359,\r
+    STR_NORTHEAST = 360,\r
+    STR_NORTHWEST = 361,\r
+    STR_KEEP_STILL_FOCUS_ON_BREATHING = 362,\r
+    STR_EXHALE_NOW = 363,\r
+    STR_INHALE_NOW = 364,\r
+    STR_TRAINING_COMPLETE = 365,\r
+    STR_BREATHING_TRAINING = 366,\r
+    STR_THIS_BREATH = 367,\r
+    STR_TODAYS_BREATHING_TRAINING = 368,\r
+    STR_RECENT_CALLS = 369,\r
+    STR_NO_CALLS = 370,\r
+    STR_MISSED_CALLS = 371,\r
+    STR_DIALED_CALLS = 372,\r
+    STR_RECEIVED_CALLS = 373,\r
+    STR_NOTE_RECENT_CALLS_LIMITATION = 374,\r
+    STR_NO_CONTACTS_ADDED = 375,\r
+    STR_DIAL_MODE = 376,\r
+    STR_DIAL_VIA_WATCH_SIM = 377,\r
+    STR_DIAL_VIA_PHONE = 378,\r
+    STR_KUMI_TECHNOLOGY = 379,\r
+    STR_CALLING = 380,\r
+    STR_NOT_PAIRED = 381,\r
+    STR_PAIRED = 382,\r
+    STR_UNPAIR = 383,\r
+    STR_CONNECTION_ERROR = 384,\r
+    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385,\r
+    STR_ENABLE_BLUETOOTH_CALL = 386,\r
+    STR_ENABLE_BLUETOOTH_CALL_NOTE = 387,\r
+    STR_SIM_CARD_ERROR = 388,\r
+    STR_CHECK_SIM_CARD_INSERTION = 389,\r
+    STR_WEATHER_REPORT = 390,\r
+    STR_ULTRAVIOLET = 391,\r
+    STR_WIND_SPEED = 392,\r
+    STR_HUMIDITY = 393,\r
+    STR_NEXT_7_DAYS = 394,\r
+    STR_GET_WEATHER_ERROR = 395,\r
+    STR_MUSIC_SOURCE = 396,\r
+    STR_MOBILE_MUSIC = 397,\r
+    STR_WATCH_MUSIC = 398,\r
+    STR_MUSIC_LIST = 399,\r
+    STR_BLUETOOTH_CONNECTION_FAILED = 400,\r
+    STR_SCANNING_BINDING = 401,\r
+    STR_DEVICE_BINDING = 402,\r
+    STR_DEVICE_BINDING_NOTE = 403,\r
+    STR_EQUIPMENT_UNTYING = 404,\r
+    STR_EQUIPMENT_UNTYING_NOTE = 405,\r
+    STR_DRINK_WATER_REMINDER = 406,\r
+    STR_DRINK_WATER_REMINDER_NOTE = 407,\r
+    STR_SEDENTARY_REMINDER = 408,\r
+    STR_SEDENTARY_REMINDER_NOTE = 409,\r
+    STR_SYSTEM_UPGRADING = 410,\r
+    STR_NEWDEVICE_BIND_REMIND_NOTE = 411,\r
+    STR_TABULAR_DISPLAY = 412,\r
+    STR_RANGE_MILE = 413,\r
+    STR_CLOSE = 414,\r
+    STR_MORE_APP = 415,\r
+    STR_SAVENOTE = 416,\r
+    STR_SAVEBACK = 417,\r
+    STR_SAVEASK = 418,\r
+    STR_BLOOD = 419,\r
+    STR_CHECK = 420,\r
+    STR_CHECKNEW = 421,\r
+    STR_CHECKTIME = 422,\r
+    STR_CHECKLONG = 423,\r
+    STR_CHECKNO = 424,\r
+    STR_CHECKNOTE = 425,\r
+    STR_CHECKON = 426,\r
+    STR_CHECKSTOP = 427,\r
+    STR_CHECKERROR = 428,\r
+    STR_WAERKEEP = 429,\r
+    STR_WEARRE = 430,\r
+    STR_WEARREADY = 431,\r
+    STR_RECHECK = 432,\r
+    STR_CHECKEWARN = 433,\r
+    STR_BLOODSHORT = 434,\r
+    STR_HEARTNOTE = 435,\r
+    STR_KONW = 436,\r
+    STR_EXPLAIN = 437,\r
+    STR_HEARTREST = 438,\r
+    STR_HEARTDATA = 439,\r
+    STR_HEARTTITLE = 440,\r
+    STR_HEARTMAX = 441,\r
+    STR_HEARTMIN = 442,\r
+    STR_TRAINGNO = 443,\r
+    STR_TRAINGGO = 444,\r
+    STR_MESSAGE = 445,\r
+    STR_MESSAGENO = 446,\r
+    STR_DIS = 447,\r
+    STR_DUR = 448,\r
+    STR_STANDUP = 449,\r
+    STR_SLEEPHOUR = 450,\r
+    STR_SLEEPMGOAL = 451,\r
+    STR_REATTIME = 452,\r
+    STR_SLEEPTIME = 453,\r
+    STR_WALKTIME = 454,\r
+    STR_DISTURB = 455,\r
+    STR_DISTURBNOTE = 456,\r
+    STR_MORNNING = 457,\r
+    STR_NOW = 458,\r
+    STR_NAP = 459,\r
+    STR_TACK = 460,\r
+    STR_CLICK = 461,\r
+    STR_TACKNUM = 462,\r
+    STR_MON = 463,\r
+    STR_TUES = 464,\r
+    STR_WEDNES = 465,\r
+    STR_THURS = 466,\r
+    STR_FRI = 467,\r
+    STR_SATUR = 468,\r
+    STR_SUN = 469,\r
+    STR_MAX_ID = 470,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index f7fe8d2..81c0ab9 100644 (file)
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