From e29e2cc880c6d15fec4b796b09d5d4069bba7c2e Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 28 May 2024 18:30:03 +0800 Subject: [PATCH] =?utf8?q?activity=E6=96=87=E4=BB=B6=E5=A4=B9=E6=9B=B4?= =?utf8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/activity/include/ActivityModel.h | 4 +- .../activity/include/ActivityPresenter.h | 4 +- .../activity/include/ActivityWeekView.h | 2 +- .../nativeui/activity/src/ActivityModel.cpp | 73 +++++++++---------- .../activity/src/ActivityWeekView.cpp | 38 +++++----- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h index 7bf138e32..7c694f9f8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h @@ -10,8 +10,8 @@ #define NUM_7 7 -#include -#include "stdio.h" +#include +#include #include "ohos_types.h" #include "RtcService.h" #include "samgr_lite.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h index a65060de4..1842d3ba7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h @@ -9,7 +9,7 @@ #define ACTIVITY_PRESENTER_H #include -#include +#include #include "BaseView.h" #include "Presenter.h" #include "MainActivityView.h" @@ -27,7 +27,7 @@ public: void OnResume() override; void OnStop() override; static ActivityPresenter *GetInstance(); - virtual bool OnDrag(UIView& view, const DragEvent& event) override; + bool OnDrag(UIView& view, const DragEvent& event) override; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h index 214f4f5db..93da20d0e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h @@ -27,7 +27,7 @@ namespace OHOS { class ActivityWeekView : public UICardPage { public: ActivityWeekView(); - virtual ~ActivityWeekView(); + ~ActivityWeekView() override; static ActivityWeekView *GetInstance(void); int GetDigits(int stepValue); void InitSteps(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp index fe8dcad70..a073d8424 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp @@ -32,22 +32,22 @@ using namespace OHOS; static void Notify(void *args, const Topic topic, Request* request); Subscriber subscirber = { - .identity = NULL, - .args = NULL, + .identity = nullptr, + .args = nullptr, .Notify = Notify, }; void StepSubscribeTopic(Topic topic) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, topic=%u", topic); - BroadcastApi *broadcastApi = NULL; + BroadcastApi *broadcastApi = nullptr; IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); - if (api == NULL) { + if (api == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, GetFeatureApi failed"); return; } int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == NULL) { + if (result != 0 || broadcastApi == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, QueryInterface failed"); return; } @@ -58,14 +58,14 @@ void StepSubscribeTopic(Topic topic) void StepUnsubscribeTopic(Topic topic) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, topic=%u", topic); - BroadcastApi *broadcastApi = NULL; + BroadcastApi *broadcastApi = nullptr; IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); - if (api == NULL) { + if (api == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, GetFeatureApi failed"); return; } int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == NULL) { + if (result != 0 || broadcastApi == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, QueryInterface failed"); return; } @@ -77,30 +77,32 @@ static void RefreshStepControls(const uint32_t &value, const uint16 &msgId) { MainClockView *mainClockView = OHOS::MainClockView::GetInstance(); if (mainClockView != nullptr) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&MainClockView::RefreshStep, mainClockView, value)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&MainClockView::RefreshStep, mainClockView, value)); } + IndoorWalkPresenter *indoorWalkPresenter = OHOS::IndoorWalkPresenter::GetInstance(); if (indoorWalkPresenter != nullptr) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&IndoorWalkPresenter::ModifiesSteps, - indoorWalkPresenter, value)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&IndoorWalkPresenter::ModifiesSteps, indoorWalkPresenter, value)); } ActivityWeekView *activityWeekView = OHOS::ActivityWeekView::GetInstance(); if (activityWeekView == nullptr) { return; } - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::RefreshSteps, - activityWeekView, value)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&ActivityWeekView::RefreshSteps, activityWeekView, value)); if (msgId == TOPIC_EVENT_STEPDATA_UPDATE) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::RefreshTodayView, - activityWeekView, value)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&ActivityWeekView::RefreshTodayView, activityWeekView, value)); } else if (msgId == TOPIC_EVENT_NEXTDAY_UPDATE) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::InitAvgStep, - activityWeekView)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&ActivityWeekView::InitAvgStep, activityWeekView)); if (OHOS::ActivityModel::GetInstance()->GetWeekToday() == MONDAY_STEP_COUNTER) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::InitWeekView, - activityWeekView)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&ActivityWeekView::InitWeekView, activityWeekView)); } } } @@ -109,12 +111,12 @@ static void Notify(void *args, const Topic topic, Request* request) { UNUSED(args); UNUSED(topic); - if (request == NULL) { + if (request == nullptr) { return; } if (request->msgId == TOPIC_EVENT_STEPDATA_UPDATE) { - if (request->data == NULL) { + if (request->data == nullptr) { return; } // 计步数据累加 @@ -122,10 +124,9 @@ static void Notify(void *args, const Topic topic, Request* request) // counter += *(uint32_t *)request->data; uint32 counter = *(uint32_t *)request->data; OHOS::ActivityModel::GetInstance()->ReviseStepCounter(counter); - OHOS::DialModelSteps::GetInstance()->UpdateSteps(counter);//更新表盘步数 - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityModel::SetStepData, - ActivityModel::GetInstance(), counter)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&ActivityModel::SetStepData, ActivityModel::GetInstance(), counter)); RefreshStepControls(counter, TOPIC_EVENT_STEPDATA_UPDATE); } @@ -141,13 +142,13 @@ static void Notify(void *args, const Topic topic, Request* request) #endif namespace OHOS { -StepAllData g_stepData1 = {0, 0, 0, 0, 0, 0, 0}; +StepAllData g_stepData1 = {10050, 13421, 12312, 4252, 8993, 12314, 3423}; static constexpr const char *STEP_DATA_PATH = "/user/userdata/step_"; static constexpr uint32_t SECONDS_ONEDAY = 86400; static constexpr uint16_t ONT_MIN_STEP_CONTER = 120; -osTimerId_t g_saveEveryMinHandle = NULL; +osTimerId_t g_saveEveryMinHandle = nullptr; void SaveEveryMinCallback(int data); ActivityModel::ActivityModel() @@ -160,13 +161,13 @@ ActivityModel::~ActivityModel() WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityModel::~ActivityModel"); StepUnsubscribeTopic(TOPIC_EVENT_STEPDATA_UPDATE); StepUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE); - if (g_saveEveryMinHandle != NULL) { + if (g_saveEveryMinHandle != nullptr) { osStatus_t ret = osTimerDelete(g_saveEveryMinHandle); if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~ActivityModel osTimerDelete failed, ret = %lx!!", ret); return; } - g_saveEveryMinHandle = NULL; + g_saveEveryMinHandle = nullptr; } } @@ -210,8 +211,7 @@ static void SaveEveryMinCallbackProc(int data) uint32 savedValue = ActivityModel::GetInstance()->GetLastSavedValue(); if (savedValue != g_stepData1.weekSteps[today]) { struct tm curTime; - time_t second; - second = time(NULL); + time_t second = time(nullptr); (void)gmtime_r((const time_t *)&second, &curTime); ActivityModel::GetInstance()->SaveStepToFile(&curTime); } @@ -226,11 +226,11 @@ void ActivityModel::SetStepData(uint32_t &value) { g_stepData1.weekSteps[weekToday] = value; // 第一次上报数据后打开定时器 - if (g_saveEveryMinHandle != NULL) { + if (g_saveEveryMinHandle != nullptr) { return; } - g_saveEveryMinHandle = osTimerNew((osTimerFunc_t)SaveEveryMinCallback, osTimerPeriodic, NULL, NULL); - if (g_saveEveryMinHandle == NULL) { + g_saveEveryMinHandle = osTimerNew((osTimerFunc_t)SaveEveryMinCallback, osTimerPeriodic, nullptr, nullptr); + if (g_saveEveryMinHandle == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::SetStepData osTimerNew failed!!"); return; } @@ -238,13 +238,13 @@ void ActivityModel::SetStepData(uint32_t &value) osStatus_t retTimer = osTimerStart(g_saveEveryMinHandle, tick); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::SetStepData osTimerStart failed, ret = %lx!!", retTimer); - if (g_saveEveryMinHandle != NULL) { + if (g_saveEveryMinHandle != nullptr) { retTimer = osTimerDelete(g_saveEveryMinHandle); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::SetStepData osTimerDelete ret = %lx!!", retTimer); return; } - g_saveEveryMinHandle = NULL; + g_saveEveryMinHandle = nullptr; } return; } @@ -273,8 +273,7 @@ uint32_t ActivityModel::ZeroHourStepHandle(void) { g_stepData1.weekSteps[weekToday] = stepCounter; struct tm historyTime; - time_t second; - second = time(NULL) - SECONDS_ONEDAY; + time_t second = time(nullptr) - SECONDS_ONEDAY; (void)gmtime_r((const time_t *)&second, &historyTime); SaveStepToFile(&historyTime); stepCounter = 0; diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp index 3eb986e41..54a62e3e6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp @@ -110,27 +110,27 @@ ActivityWeekView *ActivityWeekView::GetInstance(void) UIView *ActivityWeekView::CreateUIView(int16_t x, int16_t y) { - UIView *view = new UIView(); - if (view == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityWeekView::InitView view is nullptr"); + UIView *uiView = new UIView(); + if (uiView == nullptr) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityWeekView::InitView uiView is nullptr"); return nullptr; } - view->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x00, 165, 230).full); - view->SetStyle(STYLE_BACKGROUND_OPA, 127); // 127 : background opacity - view->SetStyle(STYLE_BORDER_COLOR, Color::Gray().full); - view->SetStyle(STYLE_BORDER_OPA, 127); // 127 : border opacity - view->SetStyle(STYLE_BORDER_WIDTH, 0); // 0 : border width - view->SetStyle(STYLE_PADDING_LEFT, 0); - view->SetStyle(STYLE_PADDING_RIGHT, 0); - view->SetStyle(STYLE_PADDING_TOP, 0); - view->SetStyle(STYLE_PADDING_BOTTOM, 0); - view->SetStyle(STYLE_MARGIN_LEFT, 0); - view->SetStyle(STYLE_MARGIN_RIGHT, 0); - view->SetStyle(STYLE_MARGIN_TOP, 0); - view->SetStyle(STYLE_MARGIN_BOTTOM, 0); - view->SetPosition(x, y); - view->SetStyle(STYLE_BORDER_RADIUS, UIVIEW_WIDTH / 2 + 10); // 2 : half width 10 : offset - return view; + uiView->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x00, 165, 230).full); + uiView->SetStyle(STYLE_BACKGROUND_OPA, 127); // 127 : background opacity + uiView->SetStyle(STYLE_BORDER_COLOR, Color::Gray().full); + uiView->SetStyle(STYLE_BORDER_OPA, 127); // 127 : border opacity + uiView->SetStyle(STYLE_BORDER_WIDTH, 0); // 0 : border width + uiView->SetStyle(STYLE_PADDING_LEFT, 0); + uiView->SetStyle(STYLE_PADDING_RIGHT, 0); + uiView->SetStyle(STYLE_PADDING_TOP, 0); + uiView->SetStyle(STYLE_PADDING_BOTTOM, 0); + uiView->SetStyle(STYLE_MARGIN_LEFT, 0); + uiView->SetStyle(STYLE_MARGIN_RIGHT, 0); + uiView->SetStyle(STYLE_MARGIN_TOP, 0); + uiView->SetStyle(STYLE_MARGIN_BOTTOM, 0); + uiView->SetPosition(x, y); + uiView->SetStyle(STYLE_BORDER_RADIUS, UIVIEW_WIDTH / 2 + 10); // 2 : half width 10 : offset + return uiView; } void ActivityWeekView::InitSteps() -- 2.17.1