From d7ddf25a8e8de5adbc8b1ab87fa9aa943620d2d4 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sat, 8 Nov 2025 17:20:08 +0800 Subject: [PATCH] =?utf8?q?272:=E5=B1=8F=E8=94=BD=E6=8C=87=E5=8D=97?= =?utf8?q?=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativelauncher/include/UiConfig.h | 2 +- .../compass/src/MainCompassPresenter.cpp | 2 +- .../nativeapp/nativeui/main/src/MainModel.cpp | 6 ++-- .../nativeui/main/src/MainPresenterSample.cpp | 35 ++++++++++--------- .../nativeui/main/src/MainViewSample.cpp | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h index 2766c4a95..ba41e664d 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h @@ -20,7 +20,7 @@ namespace OHOS WATCH_FACE = 0, /* 主表盘枚举值不能修改 */ HEART_RATE, TRAINING, - COMPASS, + // COMPASS, SLEEP, BLOODOXGEN, GOAL, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp index d4ec6c62b..4b1b281b2 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp @@ -18,7 +18,7 @@ namespace OHOS { - REGIST_MENU_PRO(VIEW_COMPASS, MainCompassView, MainCompassPresenter, PNG_APPLIST_COMPASS_IMAGE_BIG, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE,"指南针", STR_COMPASS); + // REGIST_MENU_PRO(VIEW_COMPASS, MainCompassView, MainCompassPresenter, PNG_APPLIST_COMPASS_IMAGE_BIG, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE,"指南针", STR_COMPASS); static MainCompassPresenter *g_pMainView = nullptr; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp index 800465e1b..d979f5cd0 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp @@ -36,7 +36,7 @@ namespace OHOS const CardInfo cardInfoMap[] = { {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE}, {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING}, - {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS}, + // {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS}, {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP}, {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN}, {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY}, @@ -51,7 +51,7 @@ namespace OHOS CardInfoSet cardInfoSet[] = { {HEART_RATE, true}, {TRAINING, true}, - {COMPASS, false}, + // {COMPASS, false}, {SLEEP, true}, {BLOODOXGEN, false}, {GOAL, false}, @@ -71,7 +71,7 @@ namespace OHOS //卡片map const CardInfo printfMap[] = { {HEART_RATE, "心率卡片"}, - {COMPASS, "指南针"}, + // {COMPASS, "指南针"}, {MUSIC_PLAYER, "音乐"}, {BLOODOXGEN, "血氧"}, {WEATHER, "天气"}, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp index 99ca8ece1..fcb57c11d 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -277,9 +277,10 @@ void MainPresenterSample::SetTaskPeroid(CardId cardId) { SetLastRun(0); - if (cardId == COMPASS) { - SetPeriod(DEFAULT_TASK_PERIOD); - } else if (cardId == WATCH_FACE) { + // if (cardId == COMPASS) { + // SetPeriod(DEFAULT_TASK_PERIOD); + // } else if (cardId == WATCH_FACE) { + if (cardId == WATCH_FACE) { uint32_t time; DialSetting &setting = GetDialSetting(); if (setting.dialFlag) { @@ -392,12 +393,12 @@ void MainPresenterSample::SetCompassRotate() { - bool status = CompassModel::GetInstance()->GetCalibrationStatus(); - dynamic_cast(view_->GetViewById(COMPASS))->SetCalibrationView(status); - if (!status) - { - DetermineToRotate(); - } + // bool status = CompassModel::GetInstance()->GetCalibrationStatus(); + // dynamic_cast(view_->GetViewById(COMPASS))->SetCalibrationView(status); + // if (!status) + // { + // DetermineToRotate(); + // } } // 滑动到指南针卡片开启指南针传感器 @@ -435,10 +436,10 @@ HeartModel::GetInstance()->Heart_Control(HeartState::End,HeartCheck::CARDCHECK); //主动检测心率 } // 从指南针卡片跳转到其他卡片时切换到关闭长亮屏 - if (previousCardId == COMPASS && currentCardId != COMPASS) - { - CloseCompassSensor(); - } + // if (previousCardId == COMPASS && currentCardId != COMPASS) + // { + // CloseCompassSensor(); + // } // 从睡眠卡片跳转到其他卡片时切换到睡眠卡片主界面 if (previousCardId == SLEEP && currentCardId != SLEEP) @@ -467,10 +468,10 @@ StartHeartRateDetection(); break; - case COMPASS: - OpenCompassSensor(); - SetCompassRotate(); - break; + // case COMPASS: + // OpenCompassSensor(); + // SetCompassRotate(); + // break; case MUSIC_PLAYER: PlayersModel::GetInstance()->SetCircleProgress(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp index 343a1e639..668f74910 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp @@ -37,7 +37,7 @@ namespace OHOS {WATCH_FACE, &MainViewSample::InitWatchFacePage}, {HEART_RATE, &MainViewSample::InitHeartRatePage}, {TRAINING, &MainViewSample::InitTrainingPage}, - {COMPASS, &MainViewSample::InitCompassPage}, + // {COMPASS, &MainViewSample::InitCompassPage}, {SLEEP, &MainViewSample::InitSleepPage}, {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage}, {GOAL, &MainViewSample::InitGoalPage}, -- 2.17.1