修改声音与震动Slice以适配多国语言

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 b1b9505..52e36d1 100644 (file)
--- 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
@@ -265,4 +265,8 @@ STR_AUTO_OFF_BLUETOOTH_NOTE$Note: It will be automatically turned off if the con
 STR_BLUETOOTH_SERVICE_OPTIONS$Bluetooth Service Options\r
 STR_HFP$HFP\r
 STR_A2DP$A2DP\r
+STR_SYSTEM_VOLUME$System Volume\r
+STR_MEDIA_VOLUME$Media Volume\r
+STR_VIBRATION_MODE$Vibration Mode\r
+STR_SILENT_MODE$Silent Mode\r
 STR_LANGUAGE$Language 
\ 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 839acad..880204d 100644 (file)
--- 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
@@ -265,4 +265,8 @@ STR_AUTO_OFF_BLUETOOTH_NOTE$注：开启后10分钟没连接成功会自动关
 STR_BLUETOOTH_SERVICE_OPTIONS$蓝牙服务选项\r
 STR_HFP$通话蓝牙\r
 STR_A2DP$媒体蓝牙\r
+STR_SYSTEM_VOLUME$系统音量\r
+STR_MEDIA_VOLUME$媒体音量\r
+STR_VIBRATION_MODE$震动模式\r
+STR_SILENT_MODE$静音模式\r
 STR_LANGUAGE$语言
\ No newline at end of file

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 02a50b4..a841ce1 100644 (file)
--- 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
@@ -266,5 +266,9 @@
        <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_SYSTEM_VOLUME" value="System Volume"/>
+       <lanstr id="STR_MEDIA_VOLUME" value="Media Volume"/>
+       <lanstr id="STR_VIBRATION_MODE" value="Vibration Mode"/>
+       <lanstr id="STR_SILENT_MODE" value="Silent Mode"/>
        <lanstr id="STR_LANGUAGE" value="Language"/>
 </language>

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 8a29365..9beb267 100644 (file)
--- 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
@@ -266,5 +266,9 @@
        <lanstr id="STR_BLUETOOTH_SERVICE_OPTIONS" value="蓝牙服务选项"/>
        <lanstr id="STR_HFP" value="通话蓝牙"/>
        <lanstr id="STR_A2DP" value="媒体蓝牙"/>
+       <lanstr id="STR_SYSTEM_VOLUME" value="系统音量"/>
+       <lanstr id="STR_MEDIA_VOLUME" value="媒体音量"/>
+       <lanstr id="STR_VIBRATION_MODE" value="震动模式"/>
+       <lanstr id="STR_SILENT_MODE" value="静音模式"/>
        <lanstr id="STR_LANGUAGE" value="语言"/>
 </language>

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 283b2fa..a37dcef 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

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 fc7289d..1836343 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

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 8eac6e1..10c1947 100644 (file)
--- 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
@@ -280,8 +280,12 @@ enum UIResourceTextId : uint16_t {
     STR_BLUETOOTH_SERVICE_OPTIONS = 267,\r
     STR_HFP = 268,\r
     STR_A2DP = 269,\r
-    STR_LANGUAGE = 270,\r
-    STR_MAX_ID = 271,\r
+    STR_SYSTEM_VOLUME = 270,\r
+    STR_MEDIA_VOLUME = 271,\r
+    STR_VIBRATION_MODE = 272,\r
+    STR_SILENT_MODE = 273,\r
+    STR_LANGUAGE = 274,\r
+    STR_MAX_ID = 275,\r
 }; // UIResourceTextId\r
 
 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 1c3af03..ed6997f 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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h
index df21fdb..7ce0244 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h
@@ -1,3 +1,10 @@
+/*\r
+ * @Author: luozheng 1732036298@qq.com\r
+ * @Date: 2024-04-19 21:03:26\r
+ * @LastEditors: luozheng 1732036298@qq.com\r
+ * @LastEditTime: 2024-05-06 15:13:58\r
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h\r
+ */\r
 #ifndef SOUND_AND_VIBRATION_VIEW_H\r
 #define SOUND_AND_VIBRATION_VIEW_H\r
 \r
@@ -36,7 +43,8 @@ namespace OHOS
             int16_t w;\r
             int16_t h;\r
             const char *ViewId;\r
-            std::string Text;\r
+            //std::string Text;\r
+            int16_t TextId;\r
         };\r
         SoundAndVibrationView();\r
         virtual ~SoundAndVibrationView();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
index 5694295..3d5bd14 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
@@ -2,13 +2,14 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-02-19 10:39:14\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-04-22 16:53:42\r
+ * @LastEditTime: 2024-05-06 15:19:39\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp\r
  */\r
 #include "soundandvibration/include/SoundAndVibrationView.h"\r
 #include "soundandvibration/include/SoundAndVibrationPresenter.h"\r
 #include "soundandvibration/include/SoundAndVibrationModel.h"\r
 #include "wearable_log.h"\r
+#include "language/font/ui_resource_string.h"\r
 /*\r
 按优先级分为\r
 1.系统音量\r
@@ -123,10 +124,11 @@ namespace OHOS
         Title->SetPosition(93, 52, 280, 40);\r
         Title->SetStyle(STYLE_TEXT_FONT, 30);\r
         Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        Title->SetText("声音与震动");\r
+        //Title->SetText("声音与震动");\r
+        Title->SetTextId(STR_SOUND_AND_VIBRATION);\r
         Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        Title->SetRollSpeed(40);\r
+        //Title->SetRollSpeed(40);\r
         Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
 \r
         return true;\r
@@ -152,7 +154,8 @@ namespace OHOS
             labelButton->SetImageSrc(NextImgSrc, NextImgSrc);\r
             labelButton->SetImagePosition(326, 37);\r
         }\r
-        labelButton->SetText(buttonconfig.Text.c_str());\r
+        //labelButton->SetText(buttonconfig.Text.c_str());\r
+        labelButton->SetTextId(buttonconfig.TextId);\r
         labelButton->SetAlign(TEXT_ALIGNMENT_LEFT);\r
         labelButton->SetLabelPosition(47, 0);\r
         labelButton->SetStyle(STYLE_TEXT_FONT, 30);\r
@@ -171,15 +174,16 @@ namespace OHOS
         {\r
             int y;\r
             const char *viewId;\r
-            const char *text;\r
+            //const char *text;\r
+            const  int16_t textId;\r
             bool clickEffect;\r
         };\r
 \r
         ButtonSetup buttonSetups[] = {\r
-            {120, SYSTEM_VOLUME_BUTTON, "系统音量", true},\r
-            {240, CALL_VOLUME_BUTTON, "通话音量", true},\r
-            {360, VIBRATION_REMINDER_BUTTON, "震动模式", true},\r
-            {480, SILENT_MODE_BUTTON, "静音模式", false}};\r
+            {120, SYSTEM_VOLUME_BUTTON, STR_SYSTEM_VOLUME, true},\r
+            {240, CALL_VOLUME_BUTTON, STR_MEDIA_VOLUME, true},\r
+            {360, VIBRATION_REMINDER_BUTTON, STR_VIBRATION_MODE, true},\r
+            {480, SILENT_MODE_BUTTON, STR_SILENT_MODE, false}};\r
 \r
         UILabelButtonExt **buttonPointers[] = {&SystemVolumeButton, &CallVolumeButton, &VibrationReminderButton, &SilentModeButton};\r
 \r
@@ -191,11 +195,13 @@ namespace OHOS
                 .w = 380,\r
                 .h = 100,\r
                 .ViewId = buttonSetups[i].viewId,\r
-                .Text = buttonSetups[i].text};\r
+                //.Text = buttonSetups[i].text};\r
+                .TextId = buttonSetups[i].textId};\r
             *buttonPointers[i] = SetUpButton_Ext(buttonconfig, buttonSetups[i].clickEffect);\r
             if (*buttonPointers[i] == nullptr)\r
             {\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::%s Button new fail!", buttonSetups[i].text);\r
+                //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::%s Button new fail!", buttonSetups[i].text);\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::Button[%d] new fail!", i);\r
                 return false;\r
             }\r
         }\r

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 283b2fa..a37dcef 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

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 fc7289d..1836343 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

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 8eac6e1..10c1947 100644 (file)
--- 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
@@ -280,8 +280,12 @@ enum UIResourceTextId : uint16_t {
     STR_BLUETOOTH_SERVICE_OPTIONS = 267,\r
     STR_HFP = 268,\r
     STR_A2DP = 269,\r
-    STR_LANGUAGE = 270,\r
-    STR_MAX_ID = 271,\r
+    STR_SYSTEM_VOLUME = 270,\r
+    STR_MEDIA_VOLUME = 271,\r
+    STR_VIBRATION_MODE = 272,\r
+    STR_SILENT_MODE = 273,\r
+    STR_LANGUAGE = 274,\r
+    STR_MAX_ID = 275,\r
 }; // UIResourceTextId\r
 
 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 1c3af03..ed6997f 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