From 414ae5b0882b84fff054cff0c7988e6ca927c5e1 Mon Sep 17 00:00:00 2001 From: Caisking Date: Tue, 16 Sep 2025 18:06:39 +0800 Subject: [PATCH] =?utf8?q?=E5=B1=8F=E8=94=BD=E9=9B=B7=E9=B8=9F=E5=85=B6?= =?utf8?q?=E4=BB=96Slice=E7=9A=84=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../ln/nativeapp/nativeui/activity/src/ActivityPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/aod_view/src/AodPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/applist/src/ApplistPresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/blood/src/BloodPresenter.cpp | 2 +- .../nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/breath/src/BreathDurPage.cpp | 2 +- .../ln/nativeapp/nativeui/breath/src/BreathExerPage.cpp | 2 +- .../ln/nativeapp/nativeui/breath/src/BreathMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/breath/src/BreathPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/breath/src/BreathResultPage.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/breath/src/BreathRhyPage.cpp | 2 +- .../ln/nativeapp/nativeui/breath/src/BreathStartPage.cpp | 2 +- .../ln/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/camera/src/CameraMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/camera/src/CameraPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp | 2 +- .../nativeui/connectnewphone/src/ConnectPhonePresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/date/src/DateMainPage.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/date/src/DateMessagePage.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/date/src/DatePresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/emptypage/src/EmptyPage.cpp | 2 +- .../ln/nativeapp/nativeui/emptypage/src/EmptyPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/findphone/src/FindPhoneMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp | 2 +- .../nativeapp/nativeui/flashlight/src/FlashLightBlinkPage.cpp | 2 +- .../nativeapp/nativeui/flashlight/src/FlashLightColorPage.cpp | 2 +- .../nativeapp/nativeui/flashlight/src/FlashLightDefaultPage.cpp | 2 +- .../ln/nativeapp/nativeui/flashlight/src/FlashLightPage.cpp | 2 +- .../ln/nativeapp/nativeui/flashlight/src/FlashLightPlayPage.cpp | 2 +- .../nativeapp/nativeui/flashlight/src/FlashLightPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/flashlight/src/FlashLightSetPage.cpp | 2 +- .../nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/main/src/MainPresenterSample.cpp | 2 +- .../nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp | 2 +- .../nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp | 2 +- .../nativeapp/nativeui/qrcode_conn/src/QrcodeConnPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/recent_app/src/RecentAppPresenter.cpp | 2 +- .../nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp | 2 +- .../ln/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp | 2 +- .../nativeui/set_dial_style/src/SetDialStylePresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/set_ota/src/OTAPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/settings/src/SettingDesktopPage.cpp | 2 +- .../ln/nativeapp/nativeui/settings/src/SettingMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/settings/src/SettingPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/sleep/src/SleepingDetailsPage.cpp | 2 +- .../ln/nativeapp/nativeui/sleep/src/SleepingMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/sleep/src/SleepingPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/sleep/src/TargetSleepTime.cpp | 2 +- .../ln/nativeapp/nativeui/sports/src/SportsPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/stopwatch/src/StopwatchPage.cpp | 2 +- .../ln/nativeapp/nativeui/stopwatch/src/StopwatchPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/temperature/src/TempPresenter.cpp | 2 +- .../wearable/ln/nativeapp/nativeui/timers/src/TimerMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/timers/src/TimerPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/timers/src/TimerSettingPage.cpp | 2 +- .../ln/nativeapp/nativeui/timers/src/TimerTimingPage.cpp | 2 +- .../ln/nativeapp/nativeui/training/src/TrainingPresenter.cpp | 2 +- .../ln/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp | 2 +- .../ln/nativeapp/nativeui/weather/src/WeatherMainPage.cpp | 2 +- .../ln/nativeapp/nativeui/weather/src/WeatherPageSecond.cpp | 2 +- .../ln/nativeapp/nativeui/weather/src/WeatherPageThird.cpp | 2 +- .../ln/nativeapp/nativeui/weather/src/WeatherPresenter.cpp | 2 +- 69 files changed, 69 insertions(+), 69 deletions(-) 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 4603a46c0..2655d354e 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_MAIN_ACTIVITY, MainActivityView, ActivityPresenter); +//REGIST_SLICE(VIEW_MAIN_ACTIVITY, MainActivityView, ActivityPresenter); static ActivityPresenter *g_pActivityPresenter = nullptr; ActivityPresenter::ActivityPresenter() 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 59474f5d9..bc8236abc 100644 --- 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 972cc0e3e..d73583bef 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_ALARM_POP_UP, AlarmPopUpView, AlarmPopUpPresenter); +//REGIST_SLICE(VIEW_ALARM_POP_UP, AlarmPopUpView, AlarmPopUpPresenter); static AlarmPopUpPresenter *g_pAlarmPresenter = nullptr; 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 c0e1985b1..f23e614c2 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_MAIN_ALARM, MainAlarmView, AlarmPresenter, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_DEFAULT_IMG, "闹钟"); +//REGIST_MENU(VIEW_MAIN_ALARM, MainAlarmView, AlarmPresenter, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_DEFAULT_IMG, "闹钟"); static AlarmPresenter *g_pAlarmPresenter = nullptr; 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 4909bd08d..e9e8728cc 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_MAIN_ALIPAY, AlipayMainView, AlipayPresenter, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_DEFAULT_IMG, "支付宝"); +//REGIST_MENU(VIEW_MAIN_ALIPAY, AlipayMainView, AlipayPresenter, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_DEFAULT_IMG, "支付宝"); static AlipayPresenter *g_alipayPresenter = nullptr; 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 9d47082d9..0f69af2f1 100644 --- 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 382786a39..3b9daf8be 100644 --- 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 5e98671cc..76a5077be 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_BLOOD, BloodView, BloodPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_TEMP_IMAGE, "血氧"); +//REGIST_MENU(VIEW_BLOOD, BloodView, BloodPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_TEMP_IMAGE, "血氧"); static BloodPresenter *g_pBloodPresenter = nullptr; 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 84d8e0897..d0176a581 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_BLOODOXY_SAMPLE, BloodOxygenView, BloodOxygenPresenter, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧饱和度"); +//REGIST_MENU(VIEW_BLOODOXY_SAMPLE, BloodOxygenView, BloodOxygenPresenter, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧饱和度"); static BloodOxygenPresenter *g_pMainView = nullptr; static constexpr uint16_t PROGRESS_VALUE_MIN = 0; 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 e3e472450..2e22142b6 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_BLUETOOTH_EARPHONE, MainBluetoothView, BluetoothPresenter); +//REGIST_SLICE(VIEW_BLUETOOTH_EARPHONE, MainBluetoothView, BluetoothPresenter); static BluetoothPresenter *g_pBluetoothPresenter = nullptr; 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 fd888e58a..883088b93 100644 --- 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" namespace OHOS { -REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_DUR_VIEW, BreathDurPage, false); +//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_DUR_VIEW, BreathDurPage, false); #define WND_BTHDUR_BTN_OK_ID "BTH_DUR_OK" #define WND_BTHDUR_TITLE_X 100 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 92c689bb3..c64517456 100644 --- 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" namespace OHOS { -REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_EXER_VIEW, BreathExerPage, false); +//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_EXER_VIEW, BreathExerPage, false); #define BREATH_GROUP_SIZE 454 #define BREATH_ZERO 0 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 3b12ef70f..a30260177 100644 --- 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 #define BREATH_GROUP_SIZE 466 -REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_MAIN_VIEW, BreathMainPage, true); +//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_MAIN_VIEW, BreathMainPage, true); BreathMainPage::~BreathMainPage() { 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 61c31fb7d..825a40a07 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_MAIN_BREATHEASE, BreathView, BreathPresenter, BREATH_MAIN_ICON, BREATH_MAIN_ICON, "呼吸训练"); +//REGIST_MENU(VIEW_MAIN_BREATHEASE, BreathView, BreathPresenter, BREATH_MAIN_ICON, BREATH_MAIN_ICON, "呼吸训练"); } \ 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 1f4796678..2d000a9fd 100644 --- 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" namespace OHOS { -REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RESULT_VIEW, BreathResultPage, false); +//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RESULT_VIEW, BreathResultPage, false); #define WND_BTHMAIN_RESULTS_X 97 #define WND_BTHMAIN_RESULTS_Y 34 #define WND_BTHMAIN_RESULTS_W 260 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 1265c9912..137f625d4 100644 --- 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" namespace OHOS { -REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RHY_VIEW, BreathRhyPage, false); +//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_RHY_VIEW, BreathRhyPage, false); #define WND_BTHRHY_BTN_OK_ID "BTH_RHY_OK" #define WND_BTHRHY_TITLE_X 100 #define WND_BTHRHY_TITLE_Y 38 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 6545ac442..7e70af6b2 100644 --- 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" namespace OHOS { -REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_START_VIEW, BreathStartPage, false); +//REGIST_SLICE_PAGE(VIEW_MAIN_BREATHEASE, BrearhView::BREATH_START_VIEW, BreathStartPage, false); #define WND_BTHSTART_TITLE_X 97 #define WND_BTHSTART_TITLE_Y 40 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 398f25152..3db55ee5e 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_CALLER_SAMPLE, CallerLogView, CallerLogPresenter, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_DEFAULT_IMG, "通话记录"); +//REGIST_MENU(VIEW_CALLER_SAMPLE, CallerLogView, CallerLogPresenter, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_DEFAULT_IMG, "通话记录"); static constexpr uint64_t MS_FOUR_SECONDS = 4000; // 定时器时间 static CallerLogPresenter *g_pMainView = nullptr; 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 6aca1160c..5343aae90 100644 --- 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; static constexpr uint16_t ERROR_NUM = 2; -REGIST_SLICE_PAGE(VIEW_CAMERA, CAMERA_PAGES::CAMERA_MAIN_PAGE, CameraMainPage, true); +//REGIST_SLICE_PAGE(VIEW_CAMERA, CAMERA_PAGES::CAMERA_MAIN_PAGE, CameraMainPage, true); CameraMainPage::CameraMainPage() { 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 4d94013c8..1876854af 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_CAMERA, CameraView, CameraPresenter, CAMERA_MAIN_ICON, PNG_APPLIST_SETTING_IMAGE, "相机"); +//REGIST_MENU(VIEW_CAMERA, CameraView, CameraPresenter, CAMERA_MAIN_ICON, PNG_APPLIST_SETTING_IMAGE, "相机"); } 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 11a3b45cd..a50289159 100644 --- 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 a9a89852c..e4ade00c0 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_CONNECT_PHONE, ConnectPhoneView, ConnectPhonePresenter); +//REGIST_SLICE(VIEW_CONNECT_PHONE, ConnectPhoneView, ConnectPhonePresenter); static ConnectPhonePresenter *g_pConnectPhonePresenter = nullptr; 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 5072468de..dcf5e3f8f 100644 --- 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; namespace OHOS { -REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MAIN_PAGE, DateMainPage, true); +//REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MAIN_PAGE, DateMainPage, true); DateMainPage::DateMainPage() { 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 277e65596..145f79199 100644 --- 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; static constexpr uint16_t DATE_MESSAGE_MAX_LINE_HEIGHT = 140; -REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MESSAGE_PAGE, DateMessagePage, false); +//REGIST_SLICE_PAGE(VIEW_DATE, DATE_PAGES::DATE_MESSAGE_PAGE, DateMessagePage, false); DateMessagePage::DateMessagePage() { 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 64ba20fee..2934bf51d 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_DATE, DateView, DatePresenter, DATE_MAIN_ICON, DATE_MAIN_ICON, "日程"); +//REGIST_MENU(VIEW_DATE, DateView, DatePresenter, DATE_MAIN_ICON, DATE_MAIN_ICON, "日程"); } 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 6860eaec8..1241a1a6b 100644 --- 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 { static const uint16_t MEM_LABEL_FONT_SIZE = 40; static uint32_t EMPTY_PAGE = 1; -REGIST_SLICE_PAGE(VIEW_EMPTY, EMPTY_PAGE, EmptyPage, true); +//REGIST_SLICE_PAGE(VIEW_EMPTY, EMPTY_PAGE, EmptyPage, true); void EmptyPage::OnStart(void *data) { if (container_ == nullptr) { 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 1a429dfa6..ef2d68c74 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_EMPTY, EmptyView, EmptyPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "空页面"); +//REGIST_MENU(VIEW_EMPTY, EmptyView, EmptyPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "空页面"); } 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 54396d287..a8ea7f0ca 100644 --- 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; static constexpr uint16_t FIND_PHONE_PIXELBYTEH = 100; -REGIST_SLICE_PAGE(VIEW_FIND_PHONE, FIND_PHONE_PAGES::FIND_PHONE_MAIN_PAGE, FindPhoneMainPage, true); +//REGIST_SLICE_PAGE(VIEW_FIND_PHONE, FIND_PHONE_PAGES::FIND_PHONE_MAIN_PAGE, FindPhoneMainPage, true); const int g_imageAnimatorInfo[IMAGEANIMATOERVIEW_SIZE] = { IMAGE_CONVERTER_TOOL_FINDPHONE001, IMAGE_CONVERTER_TOOL_FINDPHONE002, IMAGE_CONVERTER_TOOL_FINDPHONE003, 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 96f909c52..5a42cd13d 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_FIND_PHONE, FindPhoneView, FindPhonePresenter, FINDPHONE_MAIN_ICON, FINDPHONE_MAIN_ICON, "查找手机"); +//REGIST_MENU(VIEW_FIND_PHONE, FindPhoneView, FindPhonePresenter, FINDPHONE_MAIN_ICON, FINDPHONE_MAIN_ICON, "查找手机"); } 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 521673522..ef5cabd89 100644 --- 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; static const std::string START_BLINK_BUTTON_ID = "startBlink"; -REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_BLINK_VIEW, FlashLightBlinkPage, false); +//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_BLINK_VIEW, FlashLightBlinkPage, false); void FlashLightBlinkPage::OnStart(void *data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightBlinkPage::OnStart"); 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 20ae1c068..abf2d9b1c 100644 --- 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"; static const std::string COLOR8_BUTTON_ID = "color8Button"; static const std::string COLOR9_BUTTON_ID = "color9Button"; -REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_COLOR_VIEW, FlashLightColorPage, false); +//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_COLOR_VIEW, FlashLightColorPage, false); void FlashLightColorPage::OnStart(void *data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightColorPage::OnStart"); 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 7b6582c39..55e568e77 100644 --- 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"; static const std::string CONFIRM_BUTTON_ID = "confirm"; -REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_DEFAULT_VIEW, FlashLightDefaultPage, false); +//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_DEFAULT_VIEW, FlashLightDefaultPage, false); void FlashLightDefaultPage::OnStart(void *data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightDefaultPage::OnStart"); 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 ba91d99ce..7e26b6696 100644 --- 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; static const std::string SWITCH_BUTTON_ID = "switch"; -REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGTH_VIEW, FlashLightPage, true); +//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGTH_VIEW, FlashLightPage, true); void FlashLightPage::OnStart(void *data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightPage::OnStart"); 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 fdf35dccc..4249661d5 100644 --- 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; static const std::string PLAY_VIEW_ID = "flashLightPlayPage"; -REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_PLAY_VIEW, FlashLightPlayPage, false); +//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_PLAY_VIEW, FlashLightPlayPage, false); void FlashLightPlayPage::OnStart(void *data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightPlayPage::OnStart"); 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 57bb513b2..91cfc853f 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_FLASHLIGHT, FlashLightView, FlashLightPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, +//REGIST_MENU(VIEW_FLASHLIGHT, FlashLightView, FlashLightPresenter, FLASHLIGHT_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "手电筒"); } 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 7a2361a61..b6f33e513 100644 --- 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] = {"黑色", "白色", "红色", "橙色", "黄色", "绿色", "浅蓝色", "深蓝色", "紫色", "彩色"}; -REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_SET_VIEW, FlashLightSetPage, false); +//REGIST_SLICE_PAGE(VIEW_FLASHLIGHT, FlashLightAllView::FLASH_LIGHT_SET_VIEW, FlashLightSetPage, false); void FlashLightSetPage::OnStart(void *data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashLightSetPage::OnStart"); 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 fcffcc433..cb7237fcd 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_INDOORWALK, IndoorWalkView, IndoorWalkPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG, "室内步行"); +//REGIST_MENU(VIEW_INDOORWALK, IndoorWalkView, IndoorWalkPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG, "室内步行"); static IndoorWalkPresenter *g_pIndoorWalkPresenter = nullptr; static std::string g_distancesChar; 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 434c85e11..b3c6ec124 100644 --- 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 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 07b4d2cec..4bd417e32 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_MAEKPHONE_SAMPLE, MainCallingView, MainCallingPresenter); +//REGIST_SLICE(VIEW_MAEKPHONE_SAMPLE, MainCallingView, MainCallingPresenter); static MainCallingPresenter *g_pMainView = nullptr; static constexpr int32 NUM_10 = 10; 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 49596a48b..fa8bbb2fd 100644 --- 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 cf94db4d2..e4696946b 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_QRCODE_CONN, QrcodeConnView, QrcodeConnPresenter, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_DEFAULT_IMG, +//REGIST_MENU(VIEW_QRCODE_CONN, QrcodeConnView, QrcodeConnPresenter, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "二维码连接"); static QrcodeConnPresenter *g_QrcodeConnPresenter = nullptr; 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 223e102dd..bdd3ef7a4 100644 --- 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 63b9a668f..473b6ae5a 100644 --- 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 47a30ab48..3d4c6a2f9 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_RESTORE_DEFAULTS, RestoreDefaultsView, RestoreDefaultsPresenter); +//REGIST_SLICE(VIEW_RESTORE_DEFAULTS, RestoreDefaultsView, RestoreDefaultsPresenter); static RestoreDefaultsPresenter *g_pRestoreDefaultsPresenter = nullptr; 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 0a93f42d8..5e4e0591a 100644 --- 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 e33267320..c78b73ffd 100644 --- 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 8c85a6a34..0079522a1 100644 --- 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 a77f53fc4..a4e170306 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_SET_OTA, OTAView, OTAPresenter); +//REGIST_SLICE(VIEW_SET_OTA, OTAView, OTAPresenter); void OTAPresenter::OnStart() { 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 0c1c2cd3d..cbba118c8 100644 --- 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 207eef016..cd42031b5 100644 --- 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 fbf508ee9..60ac59c4c 100644 --- 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 1341d7b1b..d5a7fe614 100644 --- 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; static constexpr int16_t ACTUALMINUTESTEXT_X = 270; -REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_DEATIL_PAGE, SleepingDetailsPage, false); +//REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_DEATIL_PAGE, SleepingDetailsPage, false); SleepingDetailsPage::SleepingDetailsPage() { 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 d88a582cc..890fbf49d 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_MAIN_PAGE, SleepingMainPage, true); +//REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_MAIN_PAGE, SleepingMainPage, true); static constexpr int16_t SLEEPMAIN_SLEEP_X = 190; static constexpr int16_t SLEEPMAIN_SLEEP_Y = 50; 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 e1b9bf839..615ce6b95 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_SLEEPING, SleepingView, SleepingPresenter, SLEEP_ICON, PNG_APPLIST_DEFAULT_IMG, "睡眠"); +//REGIST_MENU(VIEW_SLEEPING, SleepingView, SleepingPresenter, SLEEP_ICON, PNG_APPLIST_DEFAULT_IMG, "睡眠"); } \ 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 4eab1f32f..ce5aaf1f0 100644 --- 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", "15", "16", "17", "18", "19", "20", "21", "22", "23"}; -REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_TARGET_PAGE, TargetSleepTime, false); +//REGIST_SLICE_PAGE(VIEW_SLEEPING, SLEEPING_PAGES::SLEEPING_TARGET_PAGE, TargetSleepTime, false); TargetSleepTime::~TargetSleepTime() { 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 363bf930f..657a61cc6 100644 --- 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 @@ namespace OHOS { -REGIST_SLICE(VIEW_SPORTS, SportsView, SportsPresenter); +//REGIST_SLICE(VIEW_SPORTS, SportsView, SportsPresenter); static SportsPresenter *g_pSportsPresenter = nullptr; 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 0652df389..d324b2a0b 100644 --- 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; static constexpr uint16_t STOPWATCH_LABEL_REBOUND_SIZE = 60; -REGIST_SLICE_PAGE(VIEW_STOPWATCH, STOPWATCH_PAGES::STOPWATCH_MAIN_PAGE, StopwatchPage, true); +//REGIST_SLICE_PAGE(VIEW_STOPWATCH, STOPWATCH_PAGES::STOPWATCH_MAIN_PAGE, StopwatchPage, true); static std::string GetCurrentTimeStr() { 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 90fcfe210..14519ad42 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_STOPWATCH, StopwatchView, StopwatchPresenter, PNG_APPLIST_STOPWATCH_LOGO, PNG_APPLIST_DEFAULT_IMG, +//REGIST_MENU(VIEW_STOPWATCH, StopwatchView, StopwatchPresenter, PNG_APPLIST_STOPWATCH_LOGO, PNG_APPLIST_DEFAULT_IMG, "秒表"); } \ 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 9b9a81898..33e91d40e 100644 --- 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 @@ namespace OHOS { -REGIST_MENU(VIEW_MAIN_TEMP, TempMainView, TempPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "体温"); +//REGIST_MENU(VIEW_MAIN_TEMP, TempMainView, TempPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "体温"); static TempPresenter *g_tempPresenter = nullptr; 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 35f8c4b99..f7bf87997 100644 --- 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; static constexpr uint8_t MIN = 60; -REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_MAIN_PAGE, TimerMainPage, true); +//REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_MAIN_PAGE, TimerMainPage, true); TimerMainPage::~TimerMainPage() { 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 b7390642f..8e5ed848d 100644 --- 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" namespace OHOS { - REGIST_MENU(VIEW_TIMER, TimerView, TimerPresenter, TIMER_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "计时器"); + //REGIST_MENU(VIEW_TIMER, TimerView, TimerPresenter, TIMER_MAIN_ICON, PNG_APPLIST_DEFAULT_IMG, "计时器"); } \ 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 0f01e9354..198e9e99a 100644 --- 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; static constexpr uint16_t SUM_2 = 2; -REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_SETTING_PAGE, TimerSettingPage, false); +//REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_SETTING_PAGE, TimerSettingPage, false); TimerSettingPage::~TimerSettingPage() { 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 f9da1e9bd..66600cc87 100644 --- 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; static constexpr uint16_t TIMING_HAND_HEIGHT = 5; -REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_TIMING_PAGE, TimerTimingPage, false); +//REGIST_SLICE_PAGE(VIEW_TIMER, TIMER_PAGES::TIMER_TIMING_PAGE, TimerTimingPage, false); static std::string GetCurrentTimeStr() { 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 5c34aa19f..9e576d523 100644 --- 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" namespace OHOS { -REGIST_MENU(VIEW_TRAINING, TrainingView, TrainingPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG, +//REGIST_MENU(VIEW_TRAINING, TrainingView, TrainingPresenter, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_DEFAULT_IMG, "体能训练"); static TrainingPresenter *g_trainingPresenter = nullptr; 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 7d42911b9..d50257cee 100644 --- 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 e1d963039..924224a5b 100644 --- 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[] = {"晴", "多云", "阴", "阵雨", "雷阵雨", " "扬沙", "强沙尘暴", "霾", "无天气数据"}; namespace OHOS { -REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_MAIN_PAGE, WeatherMainPage, true); +//REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_MAIN_PAGE, WeatherMainPage, true); WeatherMainPage::WeatherMainPage() { 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 f9e9e768f..5293e0af1 100644 --- 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; static constexpr uint16_t ANIMATOR_TIME = 50; -REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_SECOND_PAGE, WeatherPageSecond, false); +//REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_SECOND_PAGE, WeatherPageSecond, false); WeatherPageSecond::WeatherPageSecond() { 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 d6ca8fbaf..54c88c391 100644 --- 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; static constexpr int16_t WEATHER_IMAGEPAGEKEY_HEIGHT = 10; -REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_THIRD_PAGE, WeatherPageThird, false); +//REGIST_SLICE_PAGE(VIEW_WEATHER, WEATHER_PAGES::WEATHER_THIRD_PAGE, WeatherPageThird, false); WeatherPageThird::WeatherPageThird() { 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 c9438428f..adea57ea9 100644 --- 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" namespace OHOS { - REGIST_MENU(VIEW_WEATHER, WeatherView, WeatherPresenter, WEATHER_MAIN_ICON, WEATHER_MAIN_ICON, "天气"); + //REGIST_MENU(VIEW_WEATHER, WeatherView, WeatherPresenter, WEATHER_MAIN_ICON, WEATHER_MAIN_ICON, "天气"); } -- 2.17.1