From 82f4868ef8f27acb5fe825b5deabd7cebbeff690 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Tue, 23 Jul 2024 17:52:53 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E9=97=B9=E9=92=9F=E5=88=B7?= =?utf8?q?=E6=96=B0model=20UI=E8=BF=98=E9=9C=80=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/alarm/include/AlarmClockModel.h | 3 ++- .../wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h index 89e6b7180..9e965a3dd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h @@ -120,6 +120,7 @@ public: int AlarmPlayerStart(); int testPlayerStart(char *); int AlarmPlayerStop(); + int InitAlarmData(void); private: void SetAlarmId(uint8_t id); void DeleteAlarmId(uint8_t id); @@ -130,7 +131,7 @@ private: int32_t InitAlarmClockData(void); int32_t FetchedAlarmClockData(AlarmClockQueueMsg *alarmClockMsg); int32_t GettManagement(AlarmClockManagement *management); - int InitAlarmData(void); + bool JudgeClockModel(uint16_t alarmNum); std::string uri; std::shared_ptr playerCallback{nullptr}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp index e80f76445..bfbf8aff9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -232,7 +232,7 @@ void MainAlarmView::RefreshAlarmStatus(uint8_t alarmEnable, int16_t num) void MainAlarmView::OnStart() { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnStart"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnStart"); View::OnStart(); BaseView::RootView(Color::Black().full); // 增加按键监听 @@ -259,13 +259,15 @@ void MainAlarmView::OnStart() void MainAlarmView::OnSetUpView() { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnSetUpView"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnSetUpView"); View::OnSetUpView(); + OHOS::AlarmClockModel::GetInstance()->InitAlarmData(); RefreshAlarm(); if (group != nullptr) { container[0] = group; RootView::GetInstance()->Add(container[0]); } + // show timerView Draw(); } -- 2.17.1