From 8dc65d64ef83163cf64670dd4af0518ea0af59a4 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 6 May 2024 17:57:39 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E5=8A=A8=E8=AF=86?= =?utf8?q?=E5=88=ABSlice=E5=B9=B6=E9=80=82=E9=85=8D=E5=A4=9A=E5=9B=BD?= =?utf8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../language/Language_xml/input_list_en.txt | 4 ++++ .../language/Language_xml/input_list_zh.txt | 4 ++++ .../language/Language_xml/language_en.xml | 4 ++++ .../language/Language_xml/language_zh.xml | 4 ++++ .../fd230app/nativeui/language/font/en.lang | Bin 5604 -> 5675 bytes .../fd230app/nativeui/language/font/ja.lang | Bin 6414 -> 6434 bytes .../language/font/ui_resource_string.h | 8 +++++-- .../fd230app/nativeui/language/font/zh.lang | Bin 5085 -> 5153 bytes .../include/MotionRecognitionView.h | 6 +++--- .../src/MotionRecognitionView.cpp | 20 ++++++++++++------ .../fd230/fs/user/res/font/en.lang | Bin 5604 -> 5675 bytes .../fd230/fs/user/res/font/ja.lang | Bin 6414 -> 6434 bytes .../fs/user/res/font/ui_resource_string.h | 8 +++++-- .../fd230/fs/user/res/font/zh.lang | Bin 5085 -> 5153 bytes 14 files changed, 44 insertions(+), 14 deletions(-) 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 27331c392..c4042f1f6 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 @@ -297,4 +297,8 @@ STR_SYSTEM_VOLUME$System Volume STR_MEDIA_VOLUME$Media Volume STR_VIBRATION_MODE$Vibration Mode STR_SILENT_MODE$Silent Mode +STR_LIST_DISPLAY$List display +STR_GRID_DISPLAY$Grid Display +STR_CELLULAR_DISPLAY$Cellular Display +STR_AUTO_DETECT$Auto Detect 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 fee9516de..6e435c7c5 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 @@ -297,4 +297,8 @@ STR_SYSTEM_VOLUME$系统音量 STR_MEDIA_VOLUME$媒体音量 STR_VIBRATION_MODE$震动模式 STR_SILENT_MODE$静音模式 +STR_LIST_DISPLAY$列表显示 +STR_GRID_DISPLAY$网格显示 +STR_CELLULAR_DISPLAY$蜂窝显示 +STR_AUTO_DETECT$自动识别 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 a2dffb09c..bdddb5422 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 @@ -298,5 +298,9 @@ + + + + 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 a99f7d62d..6597a5a85 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 @@ -298,5 +298,9 @@ + + + + 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 0969d9af655e3f9e4964808602b7aaeb79cffb3c..75b51af23e3a89324c61ec412f8e047130f80eaf 100644 GIT binary patch delta 113 zcmaE&y;?_f|1@^R)I0_hV7O6qD+{ljAOnLo5ZeH;$L8ZKqJs9B#U%MnhYEDjRPGS*Uz_GL>U%@4{BsIB&!6z{q<({V!Z diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/include/MotionRecognitionView.h b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/include/MotionRecognitionView.h index 28e9bf1ad..de1ee9181 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/include/MotionRecognitionView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/include/MotionRecognitionView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-23 17:29:18 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-23 18:03:26 + * @LastEditTime: 2024-05-06 17:48:35 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/include/MotionRecognitionView.h */ #ifndef MOTION_RECOGNITION_VIEW_H @@ -35,9 +35,9 @@ namespace OHOS void MotionRecognitionViewInit(void); void ClearAll(void); UIScrollView *scrollView = nullptr; - UILabel *Title = nullptr; + UILabelExt *Title = nullptr; UIImageView *MotionRecognitionImage = nullptr; - UILabel *MotionRecognitionLabel = nullptr; + UILabelExt *MotionRecognitionLabel = nullptr; UIToggleButton *MotionRecognitionToggleButton = nullptr; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp index 46d56c4d8..1aa165a4d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-23 17:28:52 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-24 14:26:44 + * @LastEditTime: 2024-05-06 17:52:26 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp */ #include "motionrecognition/include/MotionRecognitionPresenter.h" @@ -85,17 +85,20 @@ namespace OHOS } scrollView->SetOnDragListener(draglistener); /* -------------------------------------------------------------------------- */ + Title = new UILabelExt(); if (Title == nullptr) { - Title = new UILabel(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::Title can not be nullptr!"); + return; } Title->SetPosition(83, 50, 300, 40); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("运动识别"); + //Title->SetText("运动识别"); + Title->SetTextId(STR_MOTION_RECOGNITION); Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + //Title->SetRollSpeed(40); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); Title->SetVisible(true); /* -------------------------------------------------------------------------- */ @@ -108,16 +111,19 @@ namespace OHOS MotionRecognitionImage->SetStyle(STYLE_BACKGROUND_OPA, 0xff); MotionRecognitionImage->SetStyle(STYLE_BORDER_RADIUS, 100); /* -------------------------------------------------------------------------- */ + MotionRecognitionLabel = new UILabelExt(); if (MotionRecognitionLabel == nullptr) { - MotionRecognitionLabel = new UILabel(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::MotionRecognitionLabel can not be nullptr!"); + return; } MotionRecognitionLabel->SetPosition(90, 153, 180, 40); MotionRecognitionLabel->SetStyle(STYLE_TEXT_FONT, 30); MotionRecognitionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - MotionRecognitionLabel->SetText("自动识别"); + //MotionRecognitionLabel->SetText("自动识别"); + MotionRecognitionLabel->SetTextId(STR_AUTO_DETECT); MotionRecognitionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - MotionRecognitionLabel->SetRollSpeed(40); + //MotionRecognitionLabel->SetRollSpeed(40); MotionRecognitionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ MotionRecognitionToggleButton = new UIToggleButton(); 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 0969d9af655e3f9e4964808602b7aaeb79cffb3c..75b51af23e3a89324c61ec412f8e047130f80eaf 100644 GIT binary patch delta 113 zcmaE&y;?_f|1@^R)I0_hV7O6qD+{ljAOnLo5ZeH;$L8ZKqJs9B#U%MnhYEDjRPGS*Uz_GL>U%@4{BsIB&!6z{q<({V!Z -- 2.17.1