屏蔽雷鸟其他Slice的注册

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/activity/src/ActivityPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/activity/src/ActivityPresenter.cpp
index 4603a46..2655d35 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/activity/src/ActivityPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/activity/src/ActivityPresenter.cpp
@@ -14,7 +14,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_MAIN_ACTIVITY, MainActivityView, ActivityPresenter);\r
+//REGIST_SLICE(VIEW_MAIN_ACTIVITY, MainActivityView, ActivityPresenter);\r
 \r
 static ActivityPresenter *g_pActivityPresenter = nullptr;\r
 ActivityPresenter::ActivityPresenter()\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp
index 59474f5..bc8236a 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp
@@ -14,7 +14,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_ADD_CARD, AddCardView, AddCardPresenter);
+//REGIST_SLICE(VIEW_ADD_CARD, AddCardView, AddCardPresenter);
 
     AddCardPresenter::AddCardPresenter()
     {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp
index 972cc0e..d73583b 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp
@@ -15,7 +15,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_ALARM_POP_UP, AlarmPopUpView, AlarmPopUpPresenter);\r
+//REGIST_SLICE(VIEW_ALARM_POP_UP, AlarmPopUpView, AlarmPopUpPresenter);\r
 \r
 static AlarmPopUpPresenter *g_pAlarmPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
index c0e1985..f23e614 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
@@ -16,7 +16,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_MAIN_ALARM, MainAlarmView, AlarmPresenter, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_DEFAULT_IMG, "闹钟");\r
+//REGIST_MENU(VIEW_MAIN_ALARM, MainAlarmView, AlarmPresenter, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_DEFAULT_IMG, "闹钟");\r
 \r
 static AlarmPresenter *g_pAlarmPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp
index 4909bd0..e9e8728 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp
@@ -22,7 +22,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_MAIN_ALIPAY, AlipayMainView, AlipayPresenter, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_DEFAULT_IMG, "支付宝");\r
+//REGIST_MENU(VIEW_MAIN_ALIPAY, AlipayMainView, AlipayPresenter, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_DEFAULT_IMG, "支付宝");\r
 \r
 static AlipayPresenter *g_alipayPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/aod_view/src/AodPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/aod_view/src/AodPresenter.cpp
index 9d47082..0f69af2 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/aod_view/src/AodPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/aod_view/src/AodPresenter.cpp
@@ -10,7 +10,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_AOD, AodView, AodPresenter);
+//REGIST_SLICE(VIEW_AOD, AodView, AodPresenter);
 
 void AodPresenter::Notify()
 {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/applist/src/ApplistPresenter.cpp
index 382786a..3b9daf8 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/applist/src/ApplistPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/applist/src/ApplistPresenter.cpp
@@ -15,7 +15,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_APPLIST, ApplistView, ApplistPresenter);
+//REGIST_SLICE(VIEW_APPLIST, ApplistView, ApplistPresenter);
 
     ApplistPresenter::ApplistPresenter()
     {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/blood/src/BloodPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/blood/src/BloodPresenter.cpp
index 5e98671..76a5077 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/blood/src/BloodPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/blood/src/BloodPresenter.cpp
@@ -12,7 +12,7 @@
 #include "NativeRegisterManager.h"\r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_BLOOD, BloodView, BloodPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_TEMP_IMAGE, "血氧");\r
+//REGIST_MENU(VIEW_BLOOD, BloodView, BloodPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_TEMP_IMAGE, "血氧");\r
 \r
 static BloodPresenter *g_pBloodPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
index 84d8e08..d0176a5 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
@@ -17,7 +17,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_BLOODOXY_SAMPLE, BloodOxygenView, BloodOxygenPresenter, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧饱和度");\r
+//REGIST_MENU(VIEW_BLOODOXY_SAMPLE, BloodOxygenView, BloodOxygenPresenter, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧饱和度");\r
 \r
 static BloodOxygenPresenter *g_pMainView = nullptr;\r
 static constexpr uint16_t PROGRESS_VALUE_MIN = 0;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp
index e3e4724..2e22142 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp
@@ -15,7 +15,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_BLUETOOTH_EARPHONE, MainBluetoothView, BluetoothPresenter);\r
+//REGIST_SLICE(VIEW_BLUETOOTH_EARPHONE, MainBluetoothView, BluetoothPresenter);\r
 \r
 static BluetoothPresenter *g_pBluetoothPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathDurPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathDurPage.cpp
index fd888e5..883088b 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathDurPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathDurPage.cpp
@@ -18,7 +18,7 @@
 #include "breath/BreathDurPage.h"\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_DUR_VIEW, BreathDurPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_DUR_VIEW, BreathDurPage, false);\r
 \r
 #define WND_BTHDUR_BTN_OK_ID "BTH_DUR_OK"\r
 #define WND_BTHDUR_TITLE_X 100\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathExerPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathExerPage.cpp
index 92c689b..c645174 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathExerPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathExerPage.cpp
@@ -22,7 +22,7 @@
 #include "breath/BreathExerPage.h"\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_EXER_VIEW, BreathExerPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_EXER_VIEW, BreathExerPage, false);\r
 \r
 #define BREATH_GROUP_SIZE 454\r
 #define BREATH_ZERO 0\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathMainPage.cpp
index 3b12ef7..a302601 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathMainPage.cpp
@@ -54,7 +54,7 @@ namespace OHOS {
 #define WND_BTHMAIN_lableTime_FONT_SIZE 20\r
 #define BREATH_GROUP_SIZE 466\r
 \r
-REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_MAIN_VIEW, BreathMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_MAIN_VIEW, BreathMainPage, true);\r
 \r
 BreathMainPage::~BreathMainPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathPresenter.cpp
index 61c31fb..825a40a 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathPresenter.cpp
@@ -9,5 +9,5 @@
 #include "breath/BreathPresenter.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_MAIN_BREATHEASE, BreathView, BreathPresenter, BREATH_MAIN_ICON, BREATH_MAIN_ICON, "呼吸训练");\r
+//REGIST_MENU(VIEW_MAIN_BREATHEASE, BreathView, BreathPresenter, BREATH_MAIN_ICON, BREATH_MAIN_ICON, "呼吸训练");\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathResultPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathResultPage.cpp
index 1f47966..2d000a9 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathResultPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathResultPage.cpp
@@ -18,7 +18,7 @@
 #include "breath/BreathResultPage.h"\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RESULT_VIEW, BreathResultPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RESULT_VIEW, BreathResultPage, false);\r
 #define WND_BTHMAIN_RESULTS_X 97\r
 #define WND_BTHMAIN_RESULTS_Y 34\r
 #define WND_BTHMAIN_RESULTS_W 260\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathRhyPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathRhyPage.cpp
index 1265c99..137f625 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathRhyPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathRhyPage.cpp
@@ -17,7 +17,7 @@
 #include "breath/BreathRhyPage.h"\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RHY_VIEW, BreathRhyPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RHY_VIEW, BreathRhyPage, false);\r
 #define WND_BTHRHY_BTN_OK_ID "BTH_RHY_OK"\r
 #define WND_BTHRHY_TITLE_X 100\r
 #define WND_BTHRHY_TITLE_Y 38\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathStartPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathStartPage.cpp
index 6545ac4..7e70af6 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathStartPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/breath/src/BreathStartPage.cpp
@@ -23,7 +23,7 @@
 #include "breath/BreathStartPage.h"\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_START_VIEW, BreathStartPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_START_VIEW, BreathStartPage, false);\r
 \r
 #define WND_BTHSTART_TITLE_X 97\r
 #define WND_BTHSTART_TITLE_Y 40\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
index 398f251..3db55ee 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
@@ -14,7 +14,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_CALLER_SAMPLE, CallerLogView, CallerLogPresenter, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_DEFAULT_IMG, "通话记录");\r
+//REGIST_MENU(VIEW_CALLER_SAMPLE, CallerLogView, CallerLogPresenter, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_DEFAULT_IMG, "通话记录");\r
 \r
 static constexpr uint64_t MS_FOUR_SECONDS = 4000; // 定时器时间\r
 static CallerLogPresenter *g_pMainView = nullptr;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraMainPage.cpp
index 6aca116..5343aae 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraMainPage.cpp
@@ -47,7 +47,7 @@ static constexpr uint16_t TIME_FONT_SIZE = 50;
 static constexpr uint16_t CAMERATIME_HIGHT = 55;\r
 static constexpr uint16_t ERROR_NUM = 2;\r
 \r
-REGIST_SLICE_PAGE(VIEW_CAMERA, CAMERA_PAGES::CAMERA_MAIN_PAGE, CameraMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_CAMERA, CAMERA_PAGES::CAMERA_MAIN_PAGE, CameraMainPage, true);\r
 \r
 CameraMainPage::CameraMainPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraPresenter.cpp
index 4d94013..1876854 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/camera/src/CameraPresenter.cpp
@@ -11,5 +11,5 @@
 #include "camera/CameraPresenter.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_CAMERA, CameraView, CameraPresenter, CAMERA_MAIN_ICON, PNG_APPLIST_SETTING_IMAGE, "相机");\r
+//REGIST_MENU(VIEW_CAMERA, CameraView, CameraPresenter, CAMERA_MAIN_ICON, PNG_APPLIST_SETTING_IMAGE, "相机");\r
 }\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp
index 11a3b45..a502891 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp
@@ -10,7 +10,7 @@
 
 namespace OHOS {
 
-REGIST_MENU(VIEW_COMPASS, MainCompassView, MainCompassPresenter, PNG_APPLIST_COMPASS_IMAGE,
+//REGIST_MENU(VIEW_COMPASS, MainCompassView, MainCompassPresenter, PNG_APPLIST_COMPASS_IMAGE,
     PNG_APPLIST_DEFAULT_IMG, "指南针");
 
 bool MainCompassPresenter::OnDrag(UIView& view, const DragEvent& event)

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp
index a9a8985..e4ade00 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp
@@ -15,7 +15,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_CONNECT_PHONE, ConnectPhoneView, ConnectPhonePresenter);\r
+//REGIST_SLICE(VIEW_CONNECT_PHONE, ConnectPhoneView, ConnectPhonePresenter);\r
 \r
 static ConnectPhonePresenter *g_pConnectPhonePresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMainPage.cpp
index 5072468..dcf5e3f 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMainPage.cpp
@@ -35,7 +35,7 @@ static constexpr uint16_t DATE_MONTH_HEIGHT = 50;
 static constexpr uint8_t FONT_FORTY_SIZE = 36;\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MAIN_PAGE, DateMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MAIN_PAGE, DateMainPage, true);\r
 \r
 DateMainPage::DateMainPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMessagePage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMessagePage.cpp
index 277e655..145f791 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMessagePage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DateMessagePage.cpp
@@ -31,7 +31,7 @@ static constexpr uint16_t DATE_MESSAGE_TWO_WIDTH = 392;
 static constexpr uint16_t DATE_MESSAGE_TWO_HEIGHT = 120;\r
 static constexpr uint16_t DATE_MESSAGE_MAX_LINE_HEIGHT = 140;\r
 \r
-REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MESSAGE_PAGE, DateMessagePage, false);\r
+//REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MESSAGE_PAGE, DateMessagePage, false);\r
 \r
 DateMessagePage::DateMessagePage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DatePresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DatePresenter.cpp
index 64ba20f..2934bf5 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DatePresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/date/src/DatePresenter.cpp
@@ -12,5 +12,5 @@
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_DATE, DateView, DatePresenter, DATE_MAIN_ICON, DATE_MAIN_ICON, "日程");\r
+//REGIST_MENU(VIEW_DATE, DateView, DatePresenter, DATE_MAIN_ICON, DATE_MAIN_ICON, "日程");\r
 }\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPage.cpp
index 6860eae..1241a1a 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPage.cpp
@@ -15,7 +15,7 @@
 namespace OHOS {\r
 static const uint16_t MEM_LABEL_FONT_SIZE = 40;\r
 static uint32_t EMPTY_PAGE = 1;\r
-REGIST_SLICE_PAGE(VIEW_EMPTY, EMPTY_PAGE, EmptyPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_EMPTY, EMPTY_PAGE, EmptyPage, true);\r
 void EmptyPage::OnStart(void *data)\r
 {\r
     if (container_ == nullptr) {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPresenter.cpp
index 1a429df..ef2d68c 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPresenter.cpp
@@ -9,5 +9,5 @@
 #include "NativeRegisterManager.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_EMPTY, EmptyView, EmptyPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "空页面");\r
+//REGIST_MENU(VIEW_EMPTY, EmptyView, EmptyPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "空页面");\r
 }\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhoneMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhoneMainPage.cpp
index 54396d2..a8ea7f0 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhoneMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhoneMainPage.cpp
@@ -66,7 +66,7 @@ static constexpr uint16_t FIND_PHONE_IMAGE_y = 1;
 static constexpr uint16_t FIND_PHONE_PIXELBYTE_SIZE = 4;\r
 static constexpr uint16_t FIND_PHONE_PIXELBYTEH = 100;\r
 \r
-REGIST_SLICE_PAGE(VIEW_FIND_PHONE, FIND_PHONE_PAGES::FIND_PHONE_MAIN_PAGE, FindPhoneMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_FIND_PHONE, FIND_PHONE_PAGES::FIND_PHONE_MAIN_PAGE, FindPhoneMainPage, true);\r
 \r
 const int g_imageAnimatorInfo[IMAGEANIMATOERVIEW_SIZE] = {\r
     IMAGE_CONVERTER_TOOL_FINDPHONE001, IMAGE_CONVERTER_TOOL_FINDPHONE002, IMAGE_CONVERTER_TOOL_FINDPHONE003,\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp
index 96f909c..5a42cd1 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp
@@ -11,5 +11,5 @@
 #include "findphone/FindPhoneView.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_FIND_PHONE, FindPhoneView, FindPhonePresenter, FINDPHONE_MAIN_ICON, FINDPHONE_MAIN_ICON, "查找手机");\r
+//REGIST_MENU(VIEW_FIND_PHONE, FindPhoneView, FindPhonePresenter, FINDPHONE_MAIN_ICON, FINDPHONE_MAIN_ICON, "查找手机");\r
 }\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightBlinkPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightBlinkPage.cpp
index 5216735..ef5cabd 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightBlinkPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightBlinkPage.cpp
@@ -34,7 +34,7 @@ static const uint16_t BLINK_TEXT_HEIGHT = 53;
 static const uint16_t BLINK_TEXT_FONT_SIZE = 38;\r
 static const std::string START_BLINK_BUTTON_ID = "startBlink";\r
 \r
-REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_BLINK_VIEW, FlashLightBlinkPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_BLINK_VIEW, FlashLightBlinkPage, false);\r
 void FlashLightBlinkPage::OnStart(void *data)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightBlinkPage::OnStart");\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightColorPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightColorPage.cpp
index 20ae1c0..abf2d9b 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightColorPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightColorPage.cpp
@@ -53,7 +53,7 @@ static const std::string COLOR6_BUTTON_ID = "color6Button";
 static const std::string COLOR7_BUTTON_ID = "color7Button";\r
 static const std::string COLOR8_BUTTON_ID = "color8Button";\r
 static const std::string COLOR9_BUTTON_ID = "color9Button";\r
-REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_COLOR_VIEW, FlashLightColorPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_COLOR_VIEW, FlashLightColorPage, false);\r
 void FlashLightColorPage::OnStart(void *data)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightColorPage::OnStart");\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightDefaultPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightDefaultPage.cpp
index 7b6582c..55e568e 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightDefaultPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightDefaultPage.cpp
@@ -28,7 +28,7 @@ static const uint16_t CANCLE_BUTTON_HEIGHT = 85;
 static const std::string CANCLE_BUTTON_ID = "cancle";\r
 static const std::string CONFIRM_BUTTON_ID = "confirm";\r
 \r
-REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_DEFAULT_VIEW, FlashLightDefaultPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_DEFAULT_VIEW, FlashLightDefaultPage, false);\r
 void FlashLightDefaultPage::OnStart(void *data)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightDefaultPage::OnStart");\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPage.cpp
index ba91d99..7e26b66 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPage.cpp
@@ -34,7 +34,7 @@ static const uint16_t TIME_TEXT_HEIGHT = 53;
 static const uint16_t Y_OFFSET = 300;\r
 static const std::string SWITCH_BUTTON_ID = "switch";\r
 \r
-REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGTH_VIEW, FlashLightPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGTH_VIEW, FlashLightPage, true);\r
 void FlashLightPage::OnStart(void *data)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightPage::OnStart");\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPlayPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPlayPage.cpp
index fdf35dc..4249661 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPlayPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPlayPage.cpp
@@ -24,7 +24,7 @@ static const uint32_t FLASHLIGHT_BLINK_FREQ[3] = {500, 100, 0};
 static const uint32_t IMAGE_NUM = 2;\r
 static const std::string PLAY_VIEW_ID = "flashLightPlayPage";\r
 \r
-REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_PLAY_VIEW, FlashLightPlayPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_PLAY_VIEW, FlashLightPlayPage, false);\r
 void FlashLightPlayPage::OnStart(void *data)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightPlayPage::OnStart");\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPresenter.cpp
index 57bb513..91cfc85 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightPresenter.cpp
@@ -9,6 +9,6 @@
 #include "NativeRegisterManager.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_FLASHLIGHT, FlashLightView, FlashLightPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG,\r
+//REGIST_MENU(VIEW_FLASHLIGHT, FlashLightView, FlashLightPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG,\r
             "手电筒");\r
 }\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightSetPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightSetPage.cpp
index 7a2361a..b6f33e5 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightSetPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/flashlight/src/FlashLightSetPage.cpp
@@ -39,7 +39,7 @@ static std::string BLINK_ITEM_CONTENT[3] = {"慢", "快", "不闪烁"};
 static std::string COLOR_ITEM_CONTENT[10] = {"黑色", "白色",   "红色",   "橙色", "黄色",\r
                                              "绿色", "浅蓝色", "深蓝色", "紫色", "彩色"};\r
 \r
-REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_SET_VIEW, FlashLightSetPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_SET_VIEW, FlashLightSetPage, false);\r
 void FlashLightSetPage::OnStart(void *data)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightSetPage::OnStart");\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp
index fcffcc4..cb7237f 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp
@@ -16,7 +16,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_INDOORWALK, IndoorWalkView, IndoorWalkPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG, "室内步行");\r
+//REGIST_MENU(VIEW_INDOORWALK, IndoorWalkView, IndoorWalkPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG, "室内步行");\r
 \r
 static IndoorWalkPresenter *g_pIndoorWalkPresenter = nullptr;\r
 static std::string g_distancesChar;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/main/src/MainPresenterSample.cpp
index 434c85e..b3c6ec1 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/main/src/MainPresenterSample.cpp
@@ -27,7 +27,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_MAIN_SAMPLE, MainViewSample, MainPresenterSample);
+//REGIST_SLICE(VIEW_MAIN_SAMPLE, MainViewSample, MainPresenterSample);
 
 std::map<std::string, AppViewId> g_jumpView = { { MAIN_CLICK_WEATHER, VIEW_MAIN_SAMPLE },            // 天气界面
                                                 { MAIN_CLICK_ACTIVITY, VIEW_MAIN_ACTIVITY },         // 活动记录界面

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
index 07b4d2c..4bd417e 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
@@ -20,7 +20,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_MAEKPHONE_SAMPLE, MainCallingView, MainCallingPresenter);\r
+//REGIST_SLICE(VIEW_MAEKPHONE_SAMPLE, MainCallingView, MainCallingPresenter);\r
 \r
 static MainCallingPresenter *g_pMainView = nullptr;\r
 static constexpr int32 NUM_10 = 10;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp
index 49596a4..fa8bbb2 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp
@@ -12,7 +12,7 @@
 
 namespace OHOS {
 
-REGIST_MENU(VIEW_OFFLINEVOICE, MainVocassistView, VocassistPresenter, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_DEFAULT_IMG, "语音助手");
+//REGIST_MENU(VIEW_OFFLINEVOICE, MainVocassistView, VocassistPresenter, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_DEFAULT_IMG, "语音助手");
 
 static VocassistPresenter *g_pVocassistPresenter = nullptr;
 

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/qrcode_conn/src/QrcodeConnPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/qrcode_conn/src/QrcodeConnPresenter.cpp
index cf94db4..e469694 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/qrcode_conn/src/QrcodeConnPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/qrcode_conn/src/QrcodeConnPresenter.cpp
@@ -10,7 +10,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_QRCODE_CONN, QrcodeConnView, QrcodeConnPresenter, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_DEFAULT_IMG,\r
+//REGIST_MENU(VIEW_QRCODE_CONN, QrcodeConnView, QrcodeConnPresenter, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_DEFAULT_IMG,\r
             "二维码连接");\r
 \r
 static QrcodeConnPresenter *g_QrcodeConnPresenter = nullptr;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp
index 223e102..bdd3ef7 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp
@@ -13,7 +13,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_REBOOT, RebootView, RebootPresenter);
+//REGIST_SLICE(VIEW_REBOOT, RebootView, RebootPresenter);
 
 static RebootPresenter *g_pRebootPresenter = nullptr;
 

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/recent_app/src/RecentAppPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/recent_app/src/RecentAppPresenter.cpp
index 63b9a66..473b6ae 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/recent_app/src/RecentAppPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/recent_app/src/RecentAppPresenter.cpp
@@ -21,7 +21,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_RECENT_APP, RecentAppView, RecentAppPresenter);
+//REGIST_SLICE(VIEW_RECENT_APP, RecentAppView, RecentAppPresenter);
 
     RecentAppPresenter::RecentAppPresenter()
     {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp
index 47a30ab..3d4c6a2 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp
@@ -24,7 +24,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_RESTORE_DEFAULTS, RestoreDefaultsView, RestoreDefaultsPresenter);\r
+//REGIST_SLICE(VIEW_RESTORE_DEFAULTS, RestoreDefaultsView, RestoreDefaultsPresenter);\r
 \r
 static RestoreDefaultsPresenter *g_pRestoreDefaultsPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp
index 0a93f42..5e4e059 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp
@@ -14,7 +14,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_SET_CARD, SetCardView, SetCardPresenter);
+//REGIST_SLICE(VIEW_SET_CARD, SetCardView, SetCardPresenter);
 
     SetCardPresenter::SetCardPresenter()
     {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
index e332673..c78b73f 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
@@ -17,7 +17,7 @@ namespace {
 SetDialPresenter *g_presenter = nullptr;
 }  // anonymous namespace
 
-REGIST_SLICE(VIEW_SET_DIAL, SetDialView, SetDialPresenter);
+//REGIST_SLICE(VIEW_SET_DIAL, SetDialView, SetDialPresenter);
 
     SetDialPresenter::SetDialPresenter()
     {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
index 8c85a6a..0079522 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
@@ -12,7 +12,7 @@
 
 namespace OHOS {
 
-REGIST_SLICE(VIEW_SET_DIAL_STYLE, SetDialStyleView, SetDialStylePresenter);
+//REGIST_SLICE(VIEW_SET_DIAL_STYLE, SetDialStyleView, SetDialStylePresenter);
 
 SetDialStylePresenter::SetDialStylePresenter()
 {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_ota/src/OTAPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_ota/src/OTAPresenter.cpp
index a77f53f..a4e1703 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/set_ota/src/OTAPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/set_ota/src/OTAPresenter.cpp
@@ -16,7 +16,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_SET_OTA, OTAView, OTAPresenter);\r
+//REGIST_SLICE(VIEW_SET_OTA, OTAView, OTAPresenter);\r
 \r
 void OTAPresenter::OnStart()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingDesktopPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingDesktopPage.cpp
index 0c1c2cd..cbba118 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingDesktopPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingDesktopPage.cpp
@@ -21,7 +21,7 @@ static const char *SET_DESKTOP_HEXAGONS = "setdesktopHexagons";
 static const char *SET_DESKTOP_FOOTBALL = "setdesktopFootball";
 static const char *SET_DESKTOP_WATERFALL = "setdesktopWaterfall";
 
-REGIST_SLICE_PAGE(VIEW_SETTING, SETTING_PAGES::SETTING_DESKTOP_PAGE, SettingDesktopPage, false);
+//REGIST_SLICE_PAGE(VIEW_SETTING, SETTING_PAGES::SETTING_DESKTOP_PAGE, SettingDesktopPage, false);
 SettingDesktopPage::SettingDesktopPage()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingDesktopPage::SettingDesktopPage");

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingMainPage.cpp
index 207eef0..cd42031 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingMainPage.cpp
@@ -21,7 +21,7 @@
 #include "settings/SettingModel.h"
 
 namespace OHOS {
-REGIST_SLICE_PAGE(VIEW_SETTING, SETTING_PAGES::SETTING_MAIN_PAGE, SettingMainPage, true);
+//REGIST_SLICE_PAGE(VIEW_SETTING, SETTING_PAGES::SETTING_MAIN_PAGE, SettingMainPage, true);
 
 static constexpr uint8_t SETTINGS_ITEM_FONT_SIZE = 40;
 static constexpr int16_t SETTINGS_RESIZE_SIZE_WIDTH = 100;

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingPresenter.cpp
index fbf508e..60ac59c 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/settings/src/SettingPresenter.cpp
@@ -10,5 +10,5 @@
 #include "NativeRegisterManager.h"
 
 namespace OHOS {
-REGIST_MENU(VIEW_SETTING, SettingView, SettingPresenter, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "设置");
+//REGIST_MENU(VIEW_SETTING, SettingView, SettingPresenter, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "设置");
 }

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingDetailsPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingDetailsPage.cpp
index 1341d7b..d5a7fe6 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingDetailsPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingDetailsPage.cpp
@@ -68,7 +68,7 @@ static constexpr int16_t ACTUALHOURS_X = 140;
 static constexpr int16_t ACTUALHOURSTEXT_X = 180;\r
 static constexpr int16_t ACTUALMINUTESTEXT_X = 270;\r
 \r
-REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_DEATIL_PAGE, SleepingDetailsPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_DEATIL_PAGE, SleepingDetailsPage, false);\r
 \r
 SleepingDetailsPage::SleepingDetailsPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingMainPage.cpp
index d88a582..890fbf4 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingMainPage.cpp
@@ -23,7 +23,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_MAIN_PAGE, SleepingMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_MAIN_PAGE, SleepingMainPage, true);\r
 \r
 static constexpr int16_t SLEEPMAIN_SLEEP_X = 190;\r
 static constexpr int16_t SLEEPMAIN_SLEEP_Y = 50;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingPresenter.cpp
index e1b9bf8..615ce6b 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/SleepingPresenter.cpp
@@ -9,5 +9,5 @@
 #include "sleep/SleepingPresenter.h"\r
 \r
 namespace OHOS {\r
-REGIST_MENU(VIEW_SLEEPING, SleepingView, SleepingPresenter, SLEEP_ICON, PNG_APPLIST_DEFAULT_IMG, "睡眠");\r
+//REGIST_MENU(VIEW_SLEEPING, SleepingView, SleepingPresenter, SLEEP_ICON, PNG_APPLIST_DEFAULT_IMG, "睡眠");\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/TargetSleepTime.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/TargetSleepTime.cpp
index 4eab1f3..ce5aaf1 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/TargetSleepTime.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/sleep/src/TargetSleepTime.cpp
@@ -66,7 +66,7 @@ const char *uiPickerMinute[] = {"00", "01", "02", "03", "04", "05", "06", "07",
 const char *uiPickerHour[] = {"00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14",\r
                               "15", "16", "17", "18", "19", "20", "21", "22", "23"};\r
 \r
-REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_TARGET_PAGE, TargetSleepTime, false);\r
+//REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_TARGET_PAGE, TargetSleepTime, false);\r
 \r
 TargetSleepTime::~TargetSleepTime()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/sports/src/SportsPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/sports/src/SportsPresenter.cpp
index 363bf93..657a61c 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/sports/src/SportsPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/sports/src/SportsPresenter.cpp
@@ -12,7 +12,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_SLICE(VIEW_SPORTS, SportsView, SportsPresenter);\r
+//REGIST_SLICE(VIEW_SPORTS, SportsView, SportsPresenter);\r
 \r
 static SportsPresenter *g_pSportsPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPage.cpp
index 0652df3..d324b2a 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPage.cpp
@@ -66,7 +66,7 @@ static constexpr uint16_t STOPWATCH_LIST_RECORD_WIDTH = 312;
 static constexpr uint16_t STOPWATCH_LIST_RECORD_HEIGHT = 122;\r
 static constexpr uint16_t STOPWATCH_LABEL_REBOUND_SIZE = 60;\r
 \r
-REGIST_SLICE_PAGE(VIEW_STOPWATCH, STOPWATCH_PAGES::STOPWATCH_MAIN_PAGE, StopwatchPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_STOPWATCH, STOPWATCH_PAGES::STOPWATCH_MAIN_PAGE, StopwatchPage, true);\r
 \r
 static std::string GetCurrentTimeStr()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPresenter.cpp
index 90fcfe2..14519ad 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/stopwatch/src/StopwatchPresenter.cpp
@@ -9,6 +9,6 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_STOPWATCH, StopwatchView, StopwatchPresenter, PNG_APPLIST_STOPWATCH_LOGO, PNG_APPLIST_DEFAULT_IMG,\r
+//REGIST_MENU(VIEW_STOPWATCH, StopwatchView, StopwatchPresenter, PNG_APPLIST_STOPWATCH_LOGO, PNG_APPLIST_DEFAULT_IMG,\r
             "秒表");\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/temperature/src/TempPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/temperature/src/TempPresenter.cpp
index 9b9a818..33e91d4 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/temperature/src/TempPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/temperature/src/TempPresenter.cpp
@@ -17,7 +17,7 @@
 \r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_MAIN_TEMP, TempMainView, TempPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "体温");\r
+//REGIST_MENU(VIEW_MAIN_TEMP, TempMainView, TempPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "体温");\r
 \r
 static TempPresenter *g_tempPresenter = nullptr;\r
 \r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerMainPage.cpp
index 35f8c4b..f7bf879 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerMainPage.cpp
@@ -37,7 +37,7 @@ static constexpr int16_t SELECTMIN_SIZE = 100;
 static constexpr int16_t MAX_SCR_DIS = 1000;\r
 static constexpr uint8_t MIN = 60;\r
 \r
-REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_MAIN_PAGE, TimerMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_MAIN_PAGE, TimerMainPage, true);\r
 \r
 TimerMainPage::~TimerMainPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerPresenter.cpp
index b739064..8e5ed84 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerPresenter.cpp
@@ -11,5 +11,5 @@
 #include "ohos_timer.h"\r
 \r
 namespace OHOS {\r
-    REGIST_MENU(VIEW_TIMER, TimerView, TimerPresenter, TIMER_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "计时器");\r
+    //REGIST_MENU(VIEW_TIMER, TimerView, TimerPresenter, TIMER_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "计时器");\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerSettingPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerSettingPage.cpp
index 0f01e93..198e9e9 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerSettingPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerSettingPage.cpp
@@ -65,7 +65,7 @@ static constexpr uint16_t POY_MAX = 308;
 static constexpr uint16_t SLEEP = 500;\r
 static constexpr uint16_t SUM_2 = 2;\r
 \r
-REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_SETTING_PAGE, TimerSettingPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_SETTING_PAGE, TimerSettingPage, false);\r
 \r
 TimerSettingPage::~TimerSettingPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerTimingPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerTimingPage.cpp
index f9da1e9..66600cc 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerTimingPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/timers/src/TimerTimingPage.cpp
@@ -58,7 +58,7 @@ static constexpr uint16_t TIMING_HAND_CENTER_YPOS = 223;
 static constexpr uint16_t TIMING_HAND_WIDTH = 2;\r
 static constexpr uint16_t TIMING_HAND_HEIGHT = 5;\r
 \r
-REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_TIMING_PAGE, TimerTimingPage, false);\r
+//REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_TIMING_PAGE, TimerTimingPage, false);\r
 \r
 static std::string GetCurrentTimeStr()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/training/src/TrainingPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/training/src/TrainingPresenter.cpp
index 5c34aa1..9e576d5 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/training/src/TrainingPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/training/src/TrainingPresenter.cpp
@@ -10,7 +10,7 @@
 #include "NativeRegisterManager.h"\r
 namespace OHOS {\r
 \r
-REGIST_MENU(VIEW_TRAINING, TrainingView, TrainingPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG,\r
+//REGIST_MENU(VIEW_TRAINING, TrainingView, TrainingPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG,\r
             "体能训练");\r
 \r
 static TrainingPresenter *g_trainingPresenter = nullptr;\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp
index 7d42911..d50257c 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp
@@ -13,7 +13,7 @@
 
 namespace OHOS {
 
-REGIST_MENU(VIEW_UISAMPLE, UISampleView, UISamplePresenter, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "示例");
+//REGIST_MENU(VIEW_UISAMPLE, UISampleView, UISamplePresenter, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "示例");
 
     UISamplePresenter::UISamplePresenter()
     {

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherMainPage.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherMainPage.cpp
index e1d9630..924224a 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherMainPage.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherMainPage.cpp
@@ -71,7 +71,7 @@ const char *weatherNames[] = {"晴", "多云", "阴", "阵雨", "雷阵雨", "
                               "扬沙", "强沙尘暴", "霾", "无天气数据"};\r
 \r
 namespace OHOS {\r
-REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_MAIN_PAGE, WeatherMainPage, true);\r
+//REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_MAIN_PAGE, WeatherMainPage, true);\r
 \r
 WeatherMainPage::WeatherMainPage()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageSecond.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageSecond.cpp
index f9e9e76..5293e0a 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageSecond.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageSecond.cpp
@@ -32,7 +32,7 @@ static constexpr int16_t WEATHER_IMAGEPAGEKEY_WIDTH = 56;
 static constexpr int16_t WEATHER_IMAGEPAGEKEY_HEIGHT = 10;\r
 static constexpr uint16_t ANIMATOR_TIME = 50;\r
 \r
-REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_SECOND_PAGE, WeatherPageSecond, false);\r
+//REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_SECOND_PAGE, WeatherPageSecond, false);\r
 \r
 WeatherPageSecond::WeatherPageSecond()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageThird.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageThird.cpp
index d6ca8fb..54c88c3 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageThird.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPageThird.cpp
@@ -34,7 +34,7 @@ static constexpr int16_t WEATHER_IMAGEPAGEKEY_Y = 429;
 static constexpr int16_t WEATHER_IMAGEPAGEKEY_WIDTH = 56;\r
 static constexpr int16_t WEATHER_IMAGEPAGEKEY_HEIGHT = 10;\r
 \r
-REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_THIRD_PAGE, WeatherPageThird, false);\r
+//REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_THIRD_PAGE, WeatherPageThird, false);\r
 \r
 WeatherPageThird::WeatherPageThird()\r
 {\r

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPresenter.cpp
index c943842..adea57e 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/weather/src/WeatherPresenter.cpp
@@ -12,5 +12,5 @@
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r
-    REGIST_MENU(VIEW_WEATHER, WeatherView, WeatherPresenter, WEATHER_MAIN_ICON, WEATHER_MAIN_ICON, "天气");\r
+    //REGIST_MENU(VIEW_WEATHER, WeatherView, WeatherPresenter, WEATHER_MAIN_ICON, WEATHER_MAIN_ICON, "天气");\r
 }\r