适配健身类列表多国语言

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h
index 5ecbb1b..214f4f5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h
@@ -9,6 +9,7 @@
 #define ACTIVITY_WEEK_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_canvas.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/MainActivityView.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/MainActivityView.h
index aa8c819..aa22bf4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/MainActivityView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/MainActivityView.h
@@ -13,6 +13,7 @@
 #include "BaseView.h"\r
 #include "View.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/root_view.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/MainActivityView.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/MainActivityView.cpp
index 92fa460..9bf0d29 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/MainActivityView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/MainActivityView.cpp
@@ -6,6 +6,7 @@
  */\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "MainActivityView.h"\r
 \r
 namespace OHOS {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmCloseRingView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmCloseRingView.h
index 70faf6f..4e47448 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmCloseRingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmCloseRingView.h
@@ -9,6 +9,7 @@
 #define ALARM_CLOSE_RING_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
index a7aad87..869934e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_digital_clock.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmJudgeView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmJudgeView.h
index 2bc65eb..996dfdf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmJudgeView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmJudgeView.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/root_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmMaxClock.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmMaxClock.h
index e28c54f..55c020d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmMaxClock.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmMaxClock.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/root_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h
index b842fb4..7bdd647 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h
@@ -17,8 +17,10 @@
 #include "AlarmPopUpView.h"\r
 #include "window/window.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/root_view.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_checkbox.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpView.h
index ea34308..acb8f8d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpView.h
@@ -9,6 +9,7 @@
 #define ALARM_POP_UP_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/root_view.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
index d7ababc..33627aa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
@@ -14,8 +14,10 @@
 #include "UiConfig.h"\r
 #include "window/window.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/root_view.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_checkbox.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmRingView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmRingView.h
index 56eff8d..7fd745e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmRingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmRingView.h
@@ -9,6 +9,7 @@
 #define ALARM_RING_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/root_view.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
index abf2f37..665d212 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "font/ui_font.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h
index 0c67315..9d8f847 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h
@@ -12,6 +12,7 @@
 #include "View.h"
 #include "window/window.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/root_view.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp
index bdfc481..b8c5099 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp
@@ -8,6 +8,7 @@
 #include "AlarmCloseRingView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include <string>\r
 #include "cmsis_os.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp
index dda985d..b410711 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp
@@ -8,6 +8,7 @@
 #include "AlarmNewTimeView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include <string>\r
 #include <iostream>\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp
index 3960179..fdb5943 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp
@@ -9,6 +9,7 @@
 #include "AlarmPopUpPresenter.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include <string>\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp
index 1c063fb..7e0d3ea 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp
@@ -8,6 +8,7 @@
 #include "AlarmRingView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include <string>\r
 #include "AlarmPopUpPresenter.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp
index b462b75..84dcdb4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp
@@ -8,6 +8,7 @@
 #include "AlarmSetTimeView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include <string>\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h
index 67cacbb..376e265 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBarCode.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_barcode.h"\r
 #include "AlipayPresenter.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h
index 9adcaee..ef290e6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBind.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
index 959709d..d765f13 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
 #include "AlipayPresenter.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h
index 9d45859..ce57975 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindRes.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
index 48233ff..bacd680 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h
index a1802fd..6b16d87 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayHelp.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h
index 8a62350..0d26748 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListAdapter.h
@@ -12,6 +12,7 @@
 #include <string>
 #include "components/ui_list.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 #include "components/abstract_adapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
index 8e66752..c1a3730 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
@@ -9,6 +9,7 @@
 #define ALIPAY_LIST_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
index afeb6d9..3bb99b3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
@@ -12,6 +12,7 @@
 #include <map>
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_list.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h
index 55b2ffb..47ff86d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPayCode.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h
index 800000b..1ed10cb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayRefreshBindCode.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
index 3f65212..3d52bad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h
index 6a7c235..ece8ce1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h
index 14f2a36..5cf44ed 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
 #include "AlipayPresenter.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h
index 884ef27..9a96b3f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h
index 432a9c9..d3db9aa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h
index 0b24a7e..ca81b10 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h
@@ -12,6 +12,7 @@
 #include <string>
 #include "components/ui_list.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 #include "components/abstract_adapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h
index 1967fa9..1c96396 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h
@@ -9,6 +9,7 @@
 #define ALIPAY_TRANS_LIST_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
index c000bc1..b54cc8a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
@@ -12,6 +12,7 @@
 #include <map>
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_list.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h
index e42fd3a..7650b2a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h
index f6ef45f..85a707a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
index 434f151..24bb884 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h
index 8ac78d6..d265880 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbindFinish.h
@@ -10,6 +10,7 @@
 \r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h
index 00f2f50..12c5591 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h
@@ -10,6 +10,7 @@
 #define APP_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 #include "ApplistModel.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistAdapter.h
index 0108b36..a348aff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistAdapter.h
@@ -12,6 +12,7 @@
 #include <string>
 #include "components/ui_list.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 #include "components/abstract_adapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
index ef8235e..441e983 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
@@ -7,6 +7,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_list.h"
 #include "window/window.h"
 #include "ohos_types.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodBandoffView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodBandoffView.h
index d579872..d230a1a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodBandoffView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodBandoffView.h
@@ -4,6 +4,7 @@
 #define BLOOD_BANDOFF_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_button.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodCheckView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodCheckView.h
index 0cbc7e6..1fc13a8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodCheckView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodCheckView.h
@@ -13,6 +13,7 @@
 #include "wearable_log.h"
 #include "UiConfig.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_label_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenView.h
index dc0eda2..dabea89 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenView.h
@@ -13,6 +13,7 @@
 #include "wearable_log.h"
 #include "UiConfig.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_label_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodResultView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodResultView.h
index 065e56f..514baaa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodResultView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodResultView.h
@@ -13,6 +13,7 @@
 #include "wearable_log.h"
 #include "UiConfig.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_label_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
index cf44452..5f162a3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
@@ -11,6 +11,7 @@
 #include "BloodOxygenModel.h"
 #include "bloodoxygen/include/BloodCheckView.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "BloodBandoffView.h"
 #include "ChangeSliceListener.h"
 #include "broadcast_service.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothCaseListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothCaseListAdapter.h
index 49a590a..5edaa12 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothCaseListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothCaseListAdapter.h
@@ -10,6 +10,7 @@
 #include <string>
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "PlayersPresenter.h"
 #include "BluetoothItemView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h
index a2b0e23..2f8784a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h
@@ -10,6 +10,7 @@
 #include <string>
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "BluetoothItemView.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h
index 72b9b98..a2c076c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothDeviceListView.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_list.h"\r
 #include "BluetoothDeviceCaseListAdapter.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h
index 8a0dd98..a42c631 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarListView.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
 #include "components/ui_list.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarPhoneView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarPhoneView.h
index 2d2cf4d..aa99600 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarPhoneView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothEarPhoneView.h
@@ -10,6 +10,7 @@
 #include <iostream>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
 #include "cmsis_os.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothItemView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothItemView.h
index 3e9d617..b6eea1e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothItemView.h
@@ -9,6 +9,7 @@
 #define BLUETOOTH_ITEM_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h
index 836df4b..7a6d174 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothOptionsView.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
 #include "BluetoothCaseListAdapter.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothReconnectView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothReconnectView.h
index a65be70..52b26c2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothReconnectView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothReconnectView.h
@@ -9,6 +9,7 @@
 \r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_animator.h"\r
 #include "components/abstract_adapter.h"\r
 #include "components/ui_view_group.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsConnFailMessageView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsConnFailMessageView.h
index d0bcc4b..db68663 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsConnFailMessageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsConnFailMessageView.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_view.h"\r
 #include "bts_def.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
index 3420d3e..b99dba6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_view.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsSuccMessageView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsSuccMessageView.h
index 09ed3f2..bb4b780 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsSuccMessageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsSuccMessageView.h
@@ -9,6 +9,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_view.h"\r
 #include "bts_def.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerItemView.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerItemView.h
index a4c09c2..4b5bd51 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerItemView.h
@@ -9,6 +9,7 @@
 #define CALLER_ITEM_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogView.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogView.h
index adc309c..b99e1d5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogView.h
@@ -16,6 +16,7 @@
 #include "components/ui_image_animator.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_list.h"\r
 #include "components/abstract_adapter.h"\r

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 da44ba7..a5ef541 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothView.h
@@ -6,6 +6,7 @@
 #include "components/root_view.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_toggle_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h b/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
index 700bf75..750a39d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
@@ -12,6 +12,7 @@
 #include <time.h>
 #include "View.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/root_view.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
@@ -36,6 +37,7 @@
 #include "components/ui_box_progress.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "battery_hal.h"
 
 #include "hal_tick.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
index 415fae2..826eeb0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
@@ -8,6 +8,7 @@
 #include "MainClockView.h"
 #include "MainPresenterSample.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "wearable_log.h"
 #include "ui_resource_image.h"
 #include "common/image_cache_manager.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h
index 7ee91ba..1c0e93b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h
@@ -9,6 +9,7 @@
 #define COMPASS_CALIBRATION_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "View.h"
 #include "ohos_types.h"
 #include "AppGroupView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h
index 622a74a..3ba9ea6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h
@@ -11,6 +11,7 @@
 #include "View.h"
 #include "components/root_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "ChangeSliceListener.h"
 #include "UiConfig.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h
index cb5a258..4a3c180 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h
@@ -12,6 +12,7 @@
 #include "BaseView.h"
 #include "View.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/root_view.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectOpenView.h b/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectOpenView.h
index 0560c8a..20851c6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectOpenView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectOpenView.h
@@ -8,6 +8,7 @@
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_view.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectSelectView.h b/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectSelectView.h
index 48d9695..5814c5e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectSelectView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/include/ConnectSelectView.h
@@ -10,6 +10,7 @@
 #include "View.h"\r
 #include "ConnectPhonePresenter.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_view_group.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/src/ConnectPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/src/ConnectPhoneView.cpp
index 0738e4b..bcb62e1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/src/ConnectPhoneView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/connectnewphone/src/ConnectPhoneView.cpp
@@ -6,6 +6,7 @@
 \r
 #include "ConnectPhoneView.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateView.h b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateView.h
index 1cc4aad..157693a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateView.h
@@ -19,6 +19,7 @@
 #include "BaseView.h"
 #include "View.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_picker.h"
 #include "components/ui_scroll_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
index 65fd31f..cf17259 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
@@ -4,6 +4,7 @@
 #include "BaseView.h"\r
 #include "View.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_scroll_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
index 786d559..7e8876f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
@@ -6,6 +6,7 @@
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_radio_button.h"\r
 namespace OHOS\r
 {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h
index f98330e..68841c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h
index 060059e..762b5bb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h
@@ -4,6 +4,7 @@
 #define Heart_BANDOFF_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_button.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h
index 3a7379f..fb9941e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h
@@ -13,6 +13,7 @@
 #include "wearable_log.h"
 #include "UiConfig.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_label_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h
index 6b8a48e..b3d30dd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h
@@ -13,6 +13,7 @@
 #include "wearable_log.h"
 #include "UiConfig.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_label_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h
index 947438a..889e565 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h
@@ -13,6 +13,7 @@
 #include "wearable_log.h"
 #include "UiConfig.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_label_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp
index ef2fcdb..c6f22d1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp
@@ -1,6 +1,7 @@
 
 #include "common/task_manager.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "ChangeSliceListener.h"
 #include "broadcast_service.h"
 #include <fstream>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/CustomizationView.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/CustomizationView.h
index 557cde5..e94a38e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/CustomizationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/CustomizationView.h
@@ -10,6 +10,7 @@
 #include "View.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_radio_button.h"\r
 #include "components/ui_label_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkEndView.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkEndView.h
index 06fc19d..42afc8f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkEndView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkEndView.h
@@ -8,6 +8,7 @@
 #define INDOORWALK_END_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_view_group.h"\r
 #include "common/screen.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkModel.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkModel.h
index 679802a..0c13203 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkModel.h
@@ -11,6 +11,7 @@
 #include "string"\r
 #include "gfx_utils/list.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPreparedView.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPreparedView.h
index 8f073ad..26428fb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPreparedView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPreparedView.h
@@ -9,6 +9,7 @@
 \r
 #include "View.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPresenter.h
index 58b7e7e..1048f3f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/IndoorWalkPresenter.h
@@ -9,6 +9,7 @@
 \r
 #include "Presenter.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeLauncher.h"\r
 #include "NativeAbility.h"\r
 #include "components/ui_swipe_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFifth.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFifth.h
index 745f0fc..5b8dcff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFifth.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFifth.h
@@ -12,6 +12,7 @@
 #include "wearable_log.h"\r
 #include "ohos_types.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "AppGroupView.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFirst.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFirst.h
index 8b0c1d1..c782855 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFirst.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFirst.h
@@ -12,6 +12,7 @@
 #include "wearable_log.h"\r
 #include "ohos_types.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "AppGroupView.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFourth.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFourth.h
index f141257..c5671da 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFourth.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageFourth.h
@@ -12,6 +12,7 @@
 #include "wearable_log.h"\r
 #include "ohos_types.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "AppGroupView.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageSecond.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageSecond.h
index 005178a..9c27255 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageSecond.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageSecond.h
@@ -12,6 +12,7 @@
 #include "wearable_log.h"\r
 #include "ohos_types.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "AppGroupView.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageThird.h b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageThird.h
index de2e517..3b1c816 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageThird.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/include/MotionPageThird.h
@@ -12,6 +12,7 @@
 #include "wearable_log.h"\r
 #include "ohos_types.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "AppGroupView.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
index e37b001..95bc5b8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
@@ -15,6 +15,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_box_progress.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h
index 133ae6b..f53fbd4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h
@@ -8,6 +8,7 @@
 #include "stdint.h"
 #include "DialView.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 
 namespace OHOS {
 class DialLabelView : public UILabel, public DialView {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallerDisplayView.h b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallerDisplayView.h
index 2deef9c..de3703d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallerDisplayView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallerDisplayView.h
@@ -10,6 +10,7 @@
 #include "View.h"
 #include "BaseView.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_view_group.h"
 #include "ohos_types.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallingView.h b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallingView.h
index a07ce0b..a82d4a6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/CallingView.h
@@ -10,6 +10,7 @@
 #include "View.h"
 #include "BaseView.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_view_group.h"
 #include "ohos_types.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/DialingScreenView.h b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/DialingScreenView.h
index ee90ef5..2e4edaa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/DialingScreenView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/DialingScreenView.h
@@ -10,6 +10,7 @@
 #include "View.h"
 #include "BaseView.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_view_group.h"
 #include "ohos_types.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/WaitingHintsView.h b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/WaitingHintsView.h
index feeca25..76e8d51 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/include/WaitingHintsView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/include/WaitingHintsView.h
@@ -10,6 +10,7 @@
 #include "View.h"
 #include "BaseView.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_view_group.h"
 #include "ohos_types.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h
index f263dd4..42f3da7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h
@@ -14,6 +14,7 @@
 #include "components/ui_list.h"
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_checkbox.h"
 
 // 音乐列表的适配器

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageItemView.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageItemView.h
index ffb9028..eb2ddc5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageItemView.h
@@ -3,6 +3,7 @@
 #define Message_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h
index e22acc3..51435d4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h
@@ -12,6 +12,7 @@
 #include "components/ui_image_animator.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "dfx/event_injector.h"\r
 #include "wearable_log.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallView.h b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallView.h
index 80dc724..f1575bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallingView.h b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallingView.h
index 9e2ed69..697e7b0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallingView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallupView.h b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallupView.h
index e4e7cf3..3e6c05b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallupView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneCallupView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_toggle_button.h"\r
 #include "components/ui_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneDirView.h b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneDirView.h
index c586407..32d5944 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneDirView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneDirView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_label_button_ext.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneRingView.h b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneRingView.h
index 45d65d2..29b896c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneRingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneRingView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_toggle_button.h"\r
 #include "components/ui_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneView.h b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneView.h
index f1e5ba4..77b27c8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/PhoneView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/BluetoothView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/BluetoothView.h
index 7e12904..5d7b75a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/BluetoothView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/BluetoothView.h
@@ -8,6 +8,7 @@
 #define BLUETOOTH_VIEW_H\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_radio_button.h"\r
 #include "components/ui_label_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h
index 6c5ff7a..41f95ba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h
@@ -6,6 +6,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListitemView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListitemView.h
index 171d36e..73aa781 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListitemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListitemView.h
@@ -2,6 +2,7 @@
 #define PLAYER_LIST_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_button.h"
 #include "player/include/PlayersCaseListAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h
index 678b335..39f2da3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h
@@ -12,6 +12,7 @@
 #include <string>\r
 #include "components/abstract_adapter.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "UiConfig.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h
index 27d3b87..bf208e8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h
@@ -11,6 +11,7 @@
 #include <string>\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/root_view.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h
index 643d8a6..750592f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "producttest/include/testLCD.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testTP.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testTP.h
index befe67f..8da8c72 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testTP.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testTP.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "producttest/include/testTP.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testView.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testView.h
index 112907a..be9dfe6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testView.h
@@ -7,6 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_label_button_ext.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testabout.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testabout.h
index 135acef..62b80ab 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testabout.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testabout.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "producttest/include/testabout.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h
index e92c4df..02d5bca 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testbutton.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h
index 55da899..a76eb5e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testchanging.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testchanging.h
index 66c80ed..0992a41 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testchanging.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testchanging.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testgsenson.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testgsenson.h
index fd5018f..86c26f3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testgsenson.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testgsenson.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "producttest/include/testmagnetic.h"
 #include "CompassModel.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testhrsenson.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testhrsenson.h
index ce8b5dc..cb42b9d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testhrsenson.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testhrsenson.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testluminance.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testluminance.h
index 7f1a9ec..543b479 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testluminance.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testluminance.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "producttest/include/testTP.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmagnetic.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmagnetic.h
index 18e8eaf..8577d6f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmagnetic.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmagnetic.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "producttest/include/testmagnetic.h"
 #include "CompassModel.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmakephone.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmakephone.h
index 65294bf..57c9740 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmakephone.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmakephone.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmotor.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmotor.h
index ad18979..66ef480 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmotor.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmotor.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testspeak.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testspeak.h
index a532878..0358e4b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testspeak.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testspeak.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootDeviceView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootDeviceView.h
index b331447..dffd6fd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootDeviceView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootDeviceView.h
@@ -11,6 +11,7 @@
 #include "View.h"
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 
 namespace OHOS {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h
index 612c164..309a62a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h
@@ -15,6 +15,7 @@
 #include "rebootdevice/include/ShutDownAnimatorView.h"
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"
 #include "config/include/ConfigModel.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutdownDeviceView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutdownDeviceView.h
index 33d776d..ca77334 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutdownDeviceView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutdownDeviceView.h
@@ -9,6 +9,7 @@
 #include "View.h"
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 
 namespace OHOS {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h
index 9dde355..f8dfc48 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h
@@ -5,6 +5,7 @@
 #include "View.h"\r
 \r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_scroll_view.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h
index 179b5e5..38576f1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h
@@ -7,6 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_list.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingListitemView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingListitemView.h
index 6cba24d..97d105d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingListitemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingListitemView.h
@@ -4,6 +4,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_button.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "record/include/RecordingListAdapter.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h
index 99ea392..7592a6b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h
@@ -7,6 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h b/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h
index 6064b9e..d57643c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h
@@ -19,6 +19,7 @@
 #include "BaseView.h"
 #include "View.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_picker.h"
 #include "components/ui_scroll_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatView.h b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatView.h
index 14ac33a..bbaf4fb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_digital_clock.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleView.h b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleView.h
index 02a7630..3464edc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingAttentionView.h b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingAttentionView.h
index df1f7c2..d918a43 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingAttentionView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingAttentionView.h
@@ -6,6 +6,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_button.h"\r
 namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingView.h b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingView.h
index 193e980..a316969 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/FastTrainingView.h
@@ -7,6 +7,7 @@
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_checkbox.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/QuickAccessView.h b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/QuickAccessView.h
index 5ee548a..bde51de 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/QuickAccessView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/QuickAccessView.h
@@ -6,6 +6,7 @@
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_radio_button.h"\r
 #include "wearable_log.h"\r
 namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionView.h b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionView.h
index 84678ee..e512d59 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionView.h
@@ -5,6 +5,7 @@
 #include "View.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "wearable_log.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h
index a47ed01..2f194da 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h
@@ -12,6 +12,7 @@
 #include <string>
 #include "components/ui_list.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 #include "components/abstract_adapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h
index bd3213f..0e0de32 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h
@@ -9,6 +9,7 @@
 #define SETTING_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_image_view.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
index bfcfc01..e859137 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
@@ -13,6 +13,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_list.h"
 #include "window/window.h"
 #include "BaseView.h"

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 e218b3e..d09295d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationView.h
@@ -5,6 +5,7 @@
 #include "View.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_toggle_button.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
index 6521e90..f54a1ce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
@@ -5,6 +5,7 @@
 #include "View.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include <iostream>\r
 namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h
index 9c3f07c..72c5de6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h
@@ -5,6 +5,7 @@
 #include "View.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_radio_button.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_ext.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemSuperviseView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemSuperviseView.h
index 3438a7a..f18b799 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemSuperviseView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemSuperviseView.h
@@ -5,6 +5,7 @@
 #include "View.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 namespace OHOS\r
 {\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
index d09e732..89c7df9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
@@ -7,6 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_label_button_ext.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/Systemupgrade.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/Systemupgrade.h
index 1d7c3fc..2127bee 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/Systemupgrade.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/Systemupgrade.h
@@ -8,6 +8,7 @@
 #include "components/ui_button.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button_ext.h"
 #include "cat1_ctl.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempClickMea.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempClickMea.h
index bb6b860..5954d78 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempClickMea.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempClickMea.h
@@ -9,6 +9,7 @@
 #define TEMP_CLICK_MEA_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempContinueWarn.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempContinueWarn.h
index c40604e..b7859eb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempContinueWarn.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempContinueWarn.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitInter.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitInter.h
index 841819f..7e337cc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitInter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitInter.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "AppGroupView.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitPrompt.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitPrompt.h
index c1ad07a..32a7e03 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitPrompt.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempExitPrompt.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempInitInter.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempInitInter.h
index 98aec0e..5a66150 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempInitInter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempInitInter.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "AppGroupView.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempJoinStudy.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempJoinStudy.h
index 322185f..446c9a6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempJoinStudy.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempJoinStudy.h
@@ -9,6 +9,7 @@
 #define TEMP_JOIN_STUDY_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempLittleTip.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempLittleTip.h
index 1d7a92b..863e479 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempLittleTip.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempLittleTip.h
@@ -9,6 +9,7 @@
 #define TEMP_LITTLE_TIP
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeaProcess.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeaProcess.h
index e5a72f2..d794b3d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeaProcess.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeaProcess.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_circle_progress.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeasure.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeasure.h
index acc7a40..c391620 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeasure.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempMeasure.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "AppGroupView.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempPromptWear.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempPromptWear.h
index 76262ac..21af318 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempPromptWear.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempPromptWear.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempRemindWear.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempRemindWear.h
index 298c97a..eb86705 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempRemindWear.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempRemindWear.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempReport.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempReport.h
index 2f89dee..4221bf7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempReport.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempReport.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "AppGroupView.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempStudyAbout.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempStudyAbout.h
index 6826bf8..a7114c9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempStudyAbout.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempStudyAbout.h
@@ -9,6 +9,7 @@
 #define TEMP_STUDY_ABOUT
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempWarn.h b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempWarn.h
index 2a6461a..3273e6d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempWarn.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/temperature/include/TempWarn.h
@@ -10,6 +10,7 @@
 
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 #include "components/ui_scroll_view.h"
 #include "TempPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h
index 080ff80..743699b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDataView.h
index 307dcb2..9b86968 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDataView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDataView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDetailView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDetailView.h
index f965c97..1d1d68c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDetailView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingDetailView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
index 505bdfb..3c4d292 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnote2View.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnote2View.h
index e741a54..49108ce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnote2View.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnote2View.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnoteView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnoteView.h
index 71e68c5..c8cc0cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnoteView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEndnoteView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index 1e80cc1..44714bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMusicView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMusicView.h
index f0813a6..1e28558 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMusicView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingMusicView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h
index f05867b..07c0fb7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetCaluliView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetCaluliView.h
index 24792f2..d657397 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetCaluliView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetCaluliView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetDistView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetDistView.h
index 877915c..b6bb000 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetDistView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetDistView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetSeptView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetSeptView.h
index d3651a8..d56e430 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetSeptView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetSeptView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetTimeView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetTimeView.h
index 79fc626..81699a1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetTimeView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetTimeView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
index a9e6d4d..7b2c17f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h
index db70d9e..c3f66a3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingWinView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingWinView.h
index a42a7b7..d64a20a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingWinView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingWinView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h
index 843da14..234fcd1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h
index 18ccd77..060abba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h
index 60cf6b3..bd41450 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h
index 5d03797..363b696 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h
index 6e6cd8f..333aa0b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h
@@ -7,6 +7,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h
index 1a95a8d..e0f752d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
index 31371ad..2126ea1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_image_animator.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h
index 1012661..cdd377c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
index f4425a7..6c914a9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -11,6 +11,7 @@
 #include "common/screen.h"\r
 #include "components/ui_digital_clock.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "font/ui_font.h"\r
 namespace OHOS\r
 {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h
index c6fd188..84c5506 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h
@@ -14,6 +14,7 @@
 #include "components/ui_list.h"
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
index 2fd7194..ff6b446 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
@@ -19,6 +19,7 @@
 #define TraingDance_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessAdapter.h
index 0d9dabe..f2a711f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessAdapter.h
@@ -1,4 +1,4 @@
-/*** 
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-27 11:09:52
  * @LastEditors: Caisking 3449750381@qq.com
@@ -14,6 +14,8 @@
 #include "components/ui_list.h"
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 
@@ -24,7 +26,7 @@ namespace OHOS
     typedef struct
     {
         AppViewId id;
-        const char *label;       // 标签
+        UIResourceTextId labelid; // 标签
     } TraingFitnessItem;
 
     class TraingFitnessAdapter : public AbstractAdapter

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessItemView.h
index 113732c..b25a569 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessItemView.h
@@ -4,6 +4,8 @@
 #define TraingFitness_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
 #include "components/ui_view_group.h"
 #include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"
@@ -27,8 +29,8 @@ namespace OHOS
         TraingFitnessItemView(const TraingFitnessItemView &);
         UIImageView sbackground; // 背景
         UIImageView sicon;        // 箭头
-        UILabel sLabel;          // 标签
-        TraingFitnessItem sItemInfo = {VIEW_INVALID, nullptr};
+        UILabelExt sLabel;          // 标签
+        TraingFitnessItem sItemInfo = {VIEW_INVALID, STR_EXERCISE_GENERAL};
     };
 
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h
index ad24d37..e76735b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h
@@ -26,7 +26,7 @@ namespace OHOS
         TraingFitnessModel &operator=(const TraingFitnessModel &);
         virtual ~TraingFitnessModel();
         static const uint16_t TraingFitnessListMaxNum = 58;
-        TraingFitnessItem TraingFitnesss[TraingFitnessListMaxNum] = {VIEW_INVALID, nullptr};
+        TraingFitnessItem TraingFitnesss[TraingFitnessListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL};
         // std::map<int, AppViewId> TraingFitnessIdToViewId;
         bool btConnectStatus{false};
     };

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
index 1f579e0..7f021d5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
@@ -40,7 +40,7 @@ namespace OHOS
     void TraingFitnessItemView::SetItemInfo(const TraingFitnessItem itemInfo)
     {
         sItemInfo = itemInfo;
-        sLabel.SetText(itemInfo.label);
+        sLabel.SetTextId(itemInfo.labelid);
     }
 
     /// @brief 设置每一个itemview上的组件

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp
index 488deec..1747979 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp
@@ -24,65 +24,64 @@ namespace OHOS
         static TraingFitnessModel instance;
         return instance;
     }
-    static char *text[] = {
-        "一般锻炼",
-        "自由训练",
-        "肌力训练",
-        "飞轮车/室内健身车",
-        "踏步机",
-        "漫步机",
-        "HIIT/高强度间歇训练",
-        "健身",
-        "团体操",
-        "瑜珈",
-        "瑜珈猫式",
-        "瑜珈牛式",
-        "瑜珈眼镜蛇式",
-        "瑜珈英雄式1",
-        "瑜珈英雄式2",
-        "瑜珈英雄式3",
-        "瑜珈滚轮",
-        "室外走路",
-        "室外跑步",
-        "室内走路",
-        "室内跑步",
-        "室外骑行",
-        "跳绳",
-        "皮拉提斯",
-        "混合健身",
-        "功能性训练",
-        "体能训练",
-        "跆拳道/踢拳",
-        "拳击",
-        "自由搏击",
-        "空手道",
-        "击剑",
-        "核心训练",
-        "拳击有氧",
-        "剑道",
-        "单杠",
-        "双杠",
-        "循环训练",
-        "有氧运动",
-        "健美操",
-        "P90X",
-        "壶铃训练",
-        "综合格斗",
-        "爬楼梯机",
-        "举重",
-        "Barre",
-        "手轮",
-        "田径",
-        "角力",
-        "身心运动",
-        "柔软操",
-        "混和有氧",
-        "传统肌力训练",
-        "交叉训练",
-        "体操",
-        "阶梯训练",
-        "椭圆机",
-        "划船机"};
+    UIResourceTextId text[] = {
+        STR_EXERCISE_GENERAL,
+        STR_EXERCISE_FREETRAINING,
+        STR_EXERCISE_RESISTANCETRAINING,
+        STR_EXERCISE_SPINBIKE,
+        STR_EXERCISE_TREADMILL,
+        STR_EXERCISE_STROLLMACHINE,
+        STR_EXERCISE_HIIT,
+        STR_EXERCISE_CROSSFIT,
+        STR_EXERCISE_GROUPCALISTHENICS,
+        STR_EXERCISE_YOGA,
+        STR_EXERCISE_YOGACAT,
+        STR_EXERCISE_YOGACOW,
+        STR_EXERCISE_YOGACOBRA,
+        STR_EXERCISE_YOGAHERO1,
+        STR_EXERCISE_YOGAHERO2,
+        STR_EXERCISE_YOGAHERO3,
+        STR_EXERCISE_YOGAROLLING,
+        STR_EXERCISE_OUTDOORWALKING,
+        STR_EXERCISE_OUTDOORRUNNING,
+        STR_EXERCISE_INDOORWALKING,
+        STR_EXERCISE_INDOORRUNNING,
+        STR_EXERCISE_OUTDOORBIKING,
+        STR_EXERCISE_JUMPINGROPE,
+        STR_EXERCISE_PILATES,
+        STR_EXERCISE_CROSS_FIT,
+        STR_EXERCISE_FUNCTIONALTRAINING,
+        STR_EXERCISE_PHYSICALTRAINING,
+        STR_EXERCISE_TAEKWONDO,
+        STR_EXERCISE_BOXING,
+        STR_EXERCISE_KICKBOXING,
+        STR_EXERCISE_KARATE,
+        STR_EXERCISE_FENCING,
+        STR_EXERCISE_CORETRAINING,
+        STR_EXERCISE_BODYCOMBAT,
+        STR_EXERCISE_KENDO,
+        STR_EXERCISE_HORIZONTALBAR,
+        STR_EXERCISE_PARALLELBARS,
+        STR_EXERCISE_AEROBICS,
+        STR_EXERCISE_CALISTHENICE,
+        STR_EXERCISE_P90X,
+        STR_EXERCISE_KETTLEBELLTRAINING,
+        STR_EXERCISE_MIXEDMARTIALARTS,
+        STR_EXERCISE_STAIRCLIMBINGMACHINE,
+        STR_EXERCISE_WEIGHTLIFTING,
+        STR_EXERCISE_BARRE,
+        STR_EXERCISE_HANDCYCLING,
+        STR_EXERCISE_TRACKFIELD,
+        STR_EXERCISE_WRESTLING,
+        STR_EXERCISE_MINDBODY,
+        STR_EXERCISE_FLEXIBILITY,
+        STR_EXERCISE_MIXEDCARDIO,
+        STR_EXERCISE_TRADITIONALSTRENGTHTRAINING,
+        STR_EXERCISE_CROSSTRAINING,
+        STR_EXERCISE_GYMNASTICS,
+        STR_EXERCISE_STEPTRAINING,
+        STR_EXERCISE_ELLIPTICALTRAINER,
+        STR_EXERCISE_ROWINGMACHINE};
 
     void TraingFitnessModel::InitTraingFitnessListItem()
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
index 50e8363..f706e6d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
@@ -14,6 +14,7 @@
 #include "components/ui_list.h"
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
index aa1cbe6..7ee035c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
@@ -4,6 +4,7 @@
 #define TraingIce_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
index 8075161..857df6a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
@@ -14,10 +14,12 @@
 #include "components/ui_list.h"
 #include "components/abstract_adapter.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
-#include "language/font/ui_resource_string.h"
+
 
 // 列表的适配器
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
index f144c8d..43ff02d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
@@ -11,6 +11,8 @@
 #define TraingLimit_ITEM_VIEW_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
 #include "components/ui_view_group.h"
 #include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreView.h
index fe97afc..2b9253d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h
index d1df345..e2cfe4b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h
@@ -6,6 +6,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_view_group.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleView.h b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleView.h
index e7e902c..ff130de 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleView.h
@@ -13,6 +13,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_list.h"
 #include "window/window.h"
 #include "BaseView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/test_case_list_adapter.h b/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/test_case_list_adapter.h
index eeaddcb..f9060cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/test_case_list_adapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/test_case_list_adapter.h
@@ -19,6 +19,7 @@
 #include "components/abstract_adapter.h"
 #include "components/root_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_label_button.h"
 
 namespace OHOS {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/ui_test.h b/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/ui_test.h
index b434ba9..dfc1da0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/ui_test.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/uitest/framework/include/ui_test.h
@@ -17,6 +17,7 @@
 #define UI_TEST_H
 
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
 #include "common/screen.h"
 #include "gfx_utils/style.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherView.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherView.h
index d4ba47d..8a6aca6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherView.h
@@ -6,6 +6,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_list.h"\r
 #include "components/icon_adapter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/GetWeatherDataErrorView.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/GetWeatherDataErrorView.h
index b22d633..ccc9ac9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/GetWeatherDataErrorView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/GetWeatherDataErrorView.h
@@ -6,6 +6,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
+#include "components/ui_label_ext.h"\r
 #include "components/ui_image_view.h"\r
 namespace OHOS\r
 {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherView.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherView.h
index 707061c..f0e2d99 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherView.h
@@ -8,6 +8,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_label.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_image_view.h"
 #include "components/ui_image_animator.h"
 #include "wearable_log.h"