From: luozheng <1732036298@qq.com> Date: Tue, 28 May 2024 11:06:55 +0000 (+0800) Subject: alarm文件夹修改 X-Git-Tag: release_V1.2.70_20241020_135402~1101 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a90764823a68e23510517c9fd398431353860e6a;p=mirrors%2FFD230.git alarm文件夹修改 --- 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 09e6a9a83..89e6b7180 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h @@ -116,6 +116,7 @@ public: int AlarmPlayerStat(); int AlarmPlayerInit(void); int AlarmPlayerInit_BY_fir_name(char *); + int AlarmPlayerStart(); int testPlayerStart(char *); int AlarmPlayerStop(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h index 7bdd647ef..e579b4356 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPopUpPresenter.h @@ -16,8 +16,6 @@ #include "UiConfig.h" #include "AlarmPopUpView.h" #include "window/window.h" -#include "components/ui_label.h" -#include "components/ui_label_ext.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" @@ -56,7 +54,7 @@ class AlarmPopUpPresenter : public Presenter, public UIView::OnC public UIView::OnDragListener, public ModelListenerSample { public: AlarmPopUpPresenter(); - virtual ~AlarmPopUpPresenter(); + ~AlarmPopUpPresenter() override; void OnStart() override; void OnPause() override; void OnResume() override; @@ -65,7 +63,7 @@ public: bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView& view, const DragEvent& event) override; bool OnDragEnd(UIView& view, const DragEvent& event) override; - virtual void Notify() override; + void Notify() override; void CancelAlarmRing(void); void DelayAlarmRing(void); private: diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h index 33627aaa0..af323453f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h @@ -13,8 +13,6 @@ #include "ChangeSliceListener.h" #include "UiConfig.h" #include "window/window.h" -#include "components/ui_label.h" -#include "components/ui_label_ext.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" @@ -98,7 +96,7 @@ typedef enum { class AlarmStatusBtnChangeListener : public OHOS::UICheckBox::OnChangeListener { public: - AlarmStatusBtnChangeListener(UIView *uiView) + explicit AlarmStatusBtnChangeListener(UIView *uiView) { std::string alarmStatusId = uiView->GetViewId(); std::string alarmCmpId; @@ -121,7 +119,7 @@ class AlarmPresenter : public Presenter, public UIView::OnClickLi public UITimePicker::SelectedListener, public UIView::OnDragListener { public: AlarmPresenter(); - virtual ~AlarmPresenter(); + ~AlarmPresenter() override; void OnStart() override; void OnPause() override; void OnResume() override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h index 665d21298..fa667aec4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h @@ -35,7 +35,6 @@ private: UIScrollView *group{nullptr}; UILabelButton *weekImage{nullptr}; UILabel *labelRespeat{nullptr}; - UILabelButton *labelButton{nullptr}; UILabelButton *buttonWeek[7]{nullptr}; // 星期一共有7天,因此设置了七个星期的按钮 void CreateWeekButton1(void); void CreateWeekButton2(void); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h index 9d8f847ac..9140a477e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h @@ -12,7 +12,6 @@ #include "View.h" #include "window/window.h" #include "components/ui_label.h" -#include "components/ui_label_ext.h" #include "components/root_view.h" #include "components/ui_view_group.h" #include "components/ui_image_view.h" @@ -40,7 +39,7 @@ class AlarmPresenter; class MainAlarmView : public View { public: MainAlarmView(); - virtual ~MainAlarmView(); + ~MainAlarmView() override; static MainAlarmView *GetInstance(void); void OnStart() override; void OnSetUpView() override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp index 32eb5323b..d01e843ed 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp @@ -90,8 +90,8 @@ int32_t AlarmClockModel::SaveGlobalAlarmToFile(void) int32_t AlarmClockModel::GetAlarmGlobalData(uint8 id, AlarmClockInfo *info) { int32_t ret; - if (info == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetAlarmGlobalData info NULL!!"); + if (info == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetAlarmGlobalData info nullptr!!"); return -1; } if (g_alarmClockData[id].alarmClockId != id) { @@ -120,11 +120,11 @@ void AlarmClockModel::PushAlarmClockData(AlarmClockQueueMsg alarmClockMsg) int32_t AlarmClockModel::FetchedAlarmClockData(AlarmClockQueueMsg *alarmClockMsg) { - if (alarmClockMsg == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FetchedAlarmClockData alarmClockMsg NULL!!"); + if (alarmClockMsg == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FetchedAlarmClockData alarmClockMsg nullptr!!"); return -1; } - if (listAlarmClock.IsEmpty() == true) { + if (listAlarmClock.IsEmpty()) { return -1; } else { MUTEX_Lock(g_alarmClockDataMutex); @@ -299,17 +299,17 @@ bool AlarmClockModel::GetClockListenerTime(uint32_t &alarmGetTime) return true; } -bool AlarmClockModel::GetListenClockId(uint8_t *alarmId) +bool AlarmClockModel::GetListenClockId(uint8_t *alarm) { - if (alarmId == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetClockStatus alarmId == nullptr error!"); + if (alarm == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetClockStatus alarm == nullptr error!"); } if (currentAlarm[clockListener] == nullptr) { return false; } else if (currentAlarm[clockListener]->alarmType == TYPE_INVALID_ALARM_CLOCK) { return false; } - *alarmId = currentAlarm[clockListener]->alarmClockId; + *alarm = currentAlarm[clockListener]->alarmClockId; return true; } @@ -434,9 +434,9 @@ bool AlarmClockModel::ButtonStatusRing(int16_t num, bool alarmStatus) return false; } uint8 tempAlarmEnable = currentAlarm[num]->alarmClockEnable; - if (alarmStatus == true) { + if (alarmStatus) { currentAlarm[num]->alarmClockEnable = 1; - } else if (alarmStatus == false) { + } else if (!alarmStatus) { currentAlarm[num]->alarmClockEnable = 0; } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing alarm[%d] status is %u", num, @@ -449,7 +449,7 @@ bool AlarmClockModel::ButtonStatusRing(int16_t num, bool alarmStatus) return true; } -void AlarmClockModel::SetDelayAlarm(uint8_t alarmId) +void AlarmClockModel::SetDelayAlarm(uint8_t alarm) { AlarmClockQueueMsg *clockQueueMsg = new AlarmClockQueueMsg(); if (clockQueueMsg == nullptr) { @@ -460,12 +460,12 @@ void AlarmClockModel::SetDelayAlarm(uint8_t alarmId) clockQueueMsg->eventType = EVENT_ALARM_RING_DELAY; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing clockQueueMsg->eventType is %u", clockQueueMsg->eventType); - (clockQueueMsg->data).value = alarmId; + (clockQueueMsg->data).value = alarm; AlmmgrAlarmClockEventProcess(clockQueueMsg); return; } -void AlarmClockModel::SetCancelAlarm(uint8_t alarmId) +void AlarmClockModel::SetCancelAlarm(uint8_t alarm) { AlarmClockQueueMsg *clockQueueMsg = new AlarmClockQueueMsg(); if (clockQueueMsg == nullptr) { @@ -475,7 +475,7 @@ void AlarmClockModel::SetCancelAlarm(uint8_t alarmId) clockQueueMsg->eventType = EVENT_ALARM_RING_CANCEL; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing clockQueueMsg->eventType is %u", clockQueueMsg->eventType); - (clockQueueMsg->data).value = alarmId; + (clockQueueMsg->data).value = alarm; AlmmgrAlarmClockEventProcess(clockQueueMsg); return; } @@ -620,8 +620,6 @@ void AlarmClockModel::GetPopTimeData(int16 *hour, int16 *min) void AlarmClockModel::AlarmGetClockNum() { struct tm curTime; - int32 hour, min; - if (AlarmGetCurrentTimeInfo(&curTime) != 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmTimerCallback AlarmGetCurrentTimeInfo failed!!"); return; @@ -634,8 +632,8 @@ void AlarmClockModel::AlarmGetClockNum() WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum get num(%d)fail!", num); return; } - hour = currentAlarm[num]->alarmTime >> TWO_BYTES_BITS; - min = ((currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES) + (currentAlarm[num]->delayNum * DELAY_TEM_MIN)); + int32_t hour = currentAlarm[num]->alarmTime >> TWO_BYTES_BITS; + int32_t min = ((currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES) + (currentAlarm[num]->delayNum * DELAY_TEM_MIN)); hour = (hour + min / ONE_HOUR_MIN) % TWENTY_FOUR_HOUR; min = min % ONE_HOUR_MIN; if (curTime.tm_hour == hour && curTime.tm_min == min) { @@ -650,15 +648,14 @@ void AlarmClockModel::AlarmGetClockNum() } } -void AlarmClockModel::GetAlarmCallId(uint8_t *alarmId) +void AlarmClockModel::GetAlarmCallId(uint8_t *alarm) { - if (alarmId == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::alarmId is nullptr!"); + if (alarm == nullptr) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::alarm is nullptr!"); return; } struct tm curTime; - int32 hour, min; if (AlarmGetCurrentTimeInfo(&curTime) != 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmTimerCallback AlarmGetCurrentTimeInfo failed!!"); return; @@ -670,14 +667,14 @@ void AlarmClockModel::GetAlarmCallId(uint8_t *alarmId) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum get num fail!"); return; } - hour = currentAlarm[num]->alarmTime >> TWO_BYTES_BITS; - min = ((currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES) + (currentAlarm[num]->delayNum * DELAY_TEM_MIN)); + int32_t hour = currentAlarm[num]->alarmTime >> TWO_BYTES_BITS; + int32_t min = ((currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES) + (currentAlarm[num]->delayNum * DELAY_TEM_MIN)); hour = (hour + min / ONE_HOUR_MIN) % TWENTY_FOUR_HOUR; min = min % ONE_HOUR_MIN; if (curTime.tm_hour == hour && curTime.tm_min == min) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum %d:%d!", currentAlarm[num]->alarmTime >> TWO_BYTES_BITS, currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES); - *alarmId = currentAlarm[num]->alarmClockId; + *alarm = currentAlarm[num]->alarmClockId; return; } } @@ -685,7 +682,7 @@ void AlarmClockModel::GetAlarmCallId(uint8_t *alarmId) void AlarmClockModel::PopInterCancelMusic() { - SendMsgToUIService(SCREEN_TURN_OFF_TO_UI, 0, NULL, 0); + SendMsgToUIService(SCREEN_TURN_OFF_TO_UI, 0, nullptr, 0); GraphicService::GetInstance()->PostGraphicEvent( std::bind(&AlarmClockModel::AlarmPlayerStop, AlarmClockModel::GetInstance())); } @@ -758,12 +755,11 @@ int AlarmClockModel::AlarmPlayerInit(void) { // 本地播放文件路径和状态 sliceId = (char *)"alarm.mp3"; // 播放音乐的文件名 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayerInit start!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit start!"); std::string strSongName = sliceId; std::string pureName = strSongName.substr(0, strSongName.rfind(".")); // 播放音乐的路径需要引用.号 - const char *songName = pureName.c_str(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); std::string strSrcMusic(APP_MUSIC_PATH); std::string tempStr("/"); std::string strName = sliceId; @@ -780,7 +776,7 @@ int AlarmClockModel::AlarmPlayerInit(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerCallback new fail"); return OHOS_FAILURE; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayerInit end!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit end!"); return OHOS_SUCCESS; } @@ -876,14 +872,14 @@ uint16_t AlarmClockModel::JudgePreSlice(void) void AlarmClockModel::DeactAudioInter(void) { bool alarmStatus; - uint8_t alarmId = 0; - alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId); - if (alarmStatus == false) { + uint8_t alarm = 0; + alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarm); + if (!alarmStatus) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpPresenter::CancelAlarmRing get alarm Id false!"); return; } AlarmClockModel::GetInstance()->ResetRingClockStatus(); - AlarmClockModel::GetInstance()->SetDelayAlarm(alarmId); + AlarmClockModel::GetInstance()->SetDelayAlarm(alarm); PopInterCancelMusic(); } @@ -909,7 +905,7 @@ void AlarmClockModel::AlarmNextDayNotify() { for (uint8_t num = 0; num < CLOCK_MAX; num++) { if (currentAlarm[num] == nullptr || currentAlarm[num]->alarmType == TYPE_INVALID_ALARM_CLOCK) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::currentAlarm[%u] is NULL"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::currentAlarm[%u] is nullptr"); return; } currentAlarm[num]->delayNum = 0; @@ -928,17 +924,17 @@ void AlarmClockModel::AlarmClockNotify() int32_t timeout = -1; SendMsgToUIService(SCREEN_TURN_ON_TO_UI, 0, &timeout, sizeof(int32_t)); AlarmGetClockNum(); - NativeAbility::GetInstance().ChangeSlice(VIEW_ALARM_POP_UP, TRANSITION_INVALID, PRIORITY_TWO); + NativeAbility::GetInstance().ChangeSlice(VIEW_ALARM_POP_UP, TransitionType::TRANSITION_INVALID, PRIORITY_TWO); return; } void AlarmClockModel::PhoneCallAlarm() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::PhoneCallAlarm"); - uint8_t alarmId = 0; + uint8_t alarm = 0; OHOS::AlarmClockModel::GetInstance()->AlarmGetClockNum(); - OHOS::AlarmClockModel::GetInstance()->GetAlarmCallId(&alarmId); - OHOS::AlarmClockModel::GetInstance()->SetDelayAlarm(alarmId); + OHOS::AlarmClockModel::GetInstance()->GetAlarmCallId(&alarm); + OHOS::AlarmClockModel::GetInstance()->SetDelayAlarm(alarm); } uint32 AlarmClockModel::GetAlarmData() diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp index b8c509950..dcd5a2661 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmCloseRingView.cpp @@ -18,7 +18,7 @@ namespace OHOS { #define CLOSE "关闭" -osTimerId_t g_stopAlarmCloseHandle = NULL; +osTimerId_t g_stopAlarmCloseHandle = nullptr; static AlarmCloseRingView *g_pAlarmCloseRingView = nullptr; constexpr int16_t MAX_SET_ZERO_LEN = 0; constexpr int16_t MAX_SET_SRC_LEN = 90; @@ -91,7 +91,7 @@ UIViewGroup *AlarmCloseRingView::InitCloseRingView(void) label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_LABEL_FONT_LEN); label->SetText(CLOSE); group->Add(label); - UIView::OnDragListener *listener =static_cast(AlarmPopUpPresenter::GetInstance()); + UIView::OnDragListener *listener = static_cast(AlarmPopUpPresenter::GetInstance()); group->SetOnDragListener(listener); group->SetDraggable(true); group->SetTouchable(true); @@ -100,13 +100,13 @@ UIViewGroup *AlarmCloseRingView::InitCloseRingView(void) void AlarmCloseRingView::CancelCloseHandle(void) { - if (g_stopAlarmCloseHandle != NULL) { + if (g_stopAlarmCloseHandle != nullptr) { osStatus_t ret = osTimerDelete(g_stopAlarmCloseHandle); if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CloseTimerCallback osTimerDelete failed, ret = %lx!!", ret); return; } - g_stopAlarmCloseHandle = NULL; + g_stopAlarmCloseHandle = nullptr; } } @@ -135,8 +135,8 @@ void CloseTimerCallback(int data) void AlarmCloseRingView::AlarmCloseShowTimer(void) { - g_stopAlarmCloseHandle = osTimerNew((osTimerFunc_t)CloseTimerCallback, osTimerPeriodic, NULL, NULL); - if (g_stopAlarmCloseHandle == NULL) { + g_stopAlarmCloseHandle = osTimerNew((osTimerFunc_t)CloseTimerCallback, osTimerPeriodic, nullptr, nullptr); + if (g_stopAlarmCloseHandle == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmCloseShowTimer osTimerNew failed!!"); return; } @@ -144,13 +144,13 @@ void AlarmCloseRingView::AlarmCloseShowTimer(void) osStatus_t retTimer = osTimerStart(g_stopAlarmCloseHandle, tick); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmCloseShowTimer osTimerStart failed, ret = %lx!!", retTimer); - if (g_stopAlarmCloseHandle != NULL) { + if (g_stopAlarmCloseHandle != nullptr) { retTimer = osTimerDelete(g_stopAlarmCloseHandle); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmCloseShowTimer osTimerDelete failed, ret = %lx!!", retTimer); return; } - g_stopAlarmCloseHandle = NULL; + g_stopAlarmCloseHandle = nullptr; } return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp index b5d4e8f99..171caef71 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp @@ -112,13 +112,13 @@ AlarmConfigView *AlarmConfigView::GetInstance(void) UILabel *AlarmConfigView::CreateConfigLabel(const char *buttonText, int16_t labelFont, int16_t x, int16_t y, int16_t width) { if (buttonText == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: buttonText NULL!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: buttonText nullptr!"); return nullptr; } UILabel *label = nullptr; label = new UILabel(); if (label == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: CreateConfigLabel return NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: CreateConfigLabel return nullptr"); return nullptr; } label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelFont); @@ -175,7 +175,7 @@ void AlarmConfigView::CreateConfigButton(void) configScroll->Add(editLabel); UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); if (clickListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::OnStart clickListener NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::OnStart clickListener nullptr"); return; } labelTime = new UIDigitalClock(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp index 1a8903c25..823ff674f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp @@ -16,11 +16,11 @@ namespace OHOS { #define MAX_INETERFACES "当前闹钟个数已达上限" #define INTERFACE_ID "maxclock" -osTimerId_t g_stopAlarmMaxHandle = NULL; +osTimerId_t g_stopAlarmMaxHandle = nullptr; static AlarmMaxClock *g_AlarmMaxClock = nullptr; static constexpr uint64_t MS_THREE_SECONDS = 3000; -static void ScanTimerCallback(int data); -static void EndScanHandle(void); +void ScanTimerCallback(int data); +void EndScanHandle(void); static AlarmMaxClock *g_JudgeView = nullptr; constexpr int16_t CONTAINER_X = 0; @@ -59,7 +59,7 @@ AlarmMaxClock *AlarmMaxClock::GetInstance(void) return g_AlarmMaxClock; } -UIScrollView * AlarmMaxClock::InitAlarmMax(void) +UIScrollView *AlarmMaxClock::InitAlarmMax(void) { container = new UIScrollView(); if (container == nullptr) { @@ -83,7 +83,7 @@ UIScrollView * AlarmMaxClock::InitAlarmMax(void) container->SetDraggable(true); UIView::OnDragListener *maxClockDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); if (maxClockDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: maxClockDragListener is NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: maxClockDragListener is nullptr"); return container; } container->SetOnDragListener(maxClockDragListener); @@ -94,17 +94,17 @@ UIScrollView * AlarmMaxClock::InitAlarmMax(void) void CancelScanHandle(void) { - if (g_stopAlarmMaxHandle != NULL) { + if (g_stopAlarmMaxHandle != nullptr) { osStatus_t ret = osTimerDelete(g_stopAlarmMaxHandle); if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScanTimerCallback osTimerDelete failed, ret = %lx!!", ret); return; } - g_stopAlarmMaxHandle = NULL; + g_stopAlarmMaxHandle = nullptr; } } -static void EndScanHandle(void) +void EndScanHandle(void) { OHOS::MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_MAXCLOCK, MAIN_INTERFACE); } @@ -117,15 +117,15 @@ static void ScanTimerCallbackProc(int data) EndScanHandle(); } -static void ScanTimerCallback(int data) +void ScanTimerCallback(int data) { GraphicService::GetInstance()->PostGraphicEvent(std::bind(ScanTimerCallbackProc, data)); } void AlarmMaxClock::AlarmMaxDelayExit(void) { - g_stopAlarmMaxHandle = osTimerNew((osTimerFunc_t)ScanTimerCallback, osTimerPeriodic, NULL, NULL); - if (g_stopAlarmMaxHandle == NULL) { + g_stopAlarmMaxHandle = osTimerNew((osTimerFunc_t)ScanTimerCallback, osTimerPeriodic, nullptr, nullptr); + if (g_stopAlarmMaxHandle == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmMaxDelayExit osTimerNew failed!!"); return; } @@ -133,13 +133,13 @@ void AlarmMaxClock::AlarmMaxDelayExit(void) osStatus_t retTimer = osTimerStart(g_stopAlarmMaxHandle, tick); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmMaxDelayExit osTimerStart failed, ret = %lx!!", retTimer); - if (g_stopAlarmMaxHandle != NULL) { + if (g_stopAlarmMaxHandle != nullptr) { retTimer = osTimerDelete(g_stopAlarmMaxHandle); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmMaxDelayExit osTimerDelete failed, ret = %lx!!", retTimer); return; } - g_stopAlarmMaxHandle = NULL; + g_stopAlarmMaxHandle = nullptr; } return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp index b410711db..55db62df7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp @@ -105,7 +105,7 @@ void AlarmNewTimeView::CreateLabelTime(void) UITimePicker::SelectedListener *selectedListener = (UITimePicker::SelectedListener *)OHOS::AlarmPresenter::GetInstance(); if (selectedListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime:: selectedListener is NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime:: selectedListener is nullptr"); return; } picker->EnableSecond(false); @@ -168,13 +168,13 @@ void AlarmNewTimeView::RefreshNewTime(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::RefreshStep"); struct tm local_time; - time_t seconds = time(NULL); - - if (localtime_r(&seconds, &local_time) == NULL) { + time_t seconds = time(nullptr); + if (localtime_r(&seconds, &local_time) == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum get localtime error!"); return; } - std::ostringstream ostrHour, ostMin; + std::ostringstream ostrHour; + std::ostringstream ostMin; ostrHour << local_time.tm_hour; ostMin << local_time.tm_min; std::string weekStr = ostrHour.str() + ":" + ostMin.str(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp index fdb5943aa..9d1324af7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpView.cpp @@ -79,8 +79,7 @@ void AlarmPopUpView::AlarmCreateLabel(void) return; } struct tm local_time; - time_t seconds = time(NULL); - int16 thisHour, thisMin; + time_t seconds = time(nullptr); labelPopup->SetPosition(LABEL_X, LABEL_Y, LABEL_WIDTH, LABEL_HEIGHT); labelPopup->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT); @@ -95,10 +94,13 @@ void AlarmPopUpView::AlarmCreateLabel(void) dClock->SetPosition(CLOCK_X, CLOCK_Y); dClock->Resize(DIGITAL_CLOCK_WIDTH, DIGITAL_CLOCK_HEIGHT); dClock->SetFont(DEFAULT_VECTOR_FONT_FILENAME, CLOCK_FONT); - if (localtime_r(&seconds, &local_time) == NULL) { + if (localtime_r(&seconds, &local_time) == nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPopUpView::AlarmCreateLabel get localtime error!"); return; } + + int16_t thisHour; + int16_t thisMin; AlarmClockModel::GetInstance()->GetPopTimeData(&thisHour, &thisMin); dClock->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS); dClock->SetTime24Hour(thisHour, thisMin, 0); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp index d0dca0503..275eb8f2a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp @@ -1,9 +1,9 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: Alarm - * Author: - * Create: 2021-09-11 - */ +* Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. +* Description: Alarm +* Author: +* Create: 2021-09-11 +*/ #include "AlarmPresenter.h" #include "MainAlarmView.h" @@ -14,512 +14,512 @@ namespace OHOS { - static AlarmPresenter *g_pAlarmPresenter = nullptr; +static AlarmPresenter *g_pAlarmPresenter = nullptr; + +constexpr int16_t CLOSE_SWITCHES = 0; +constexpr int16_t OPEN_SWITCHES = 1; +constexpr int16_t SET_ZERO = 0; +constexpr int16_t NEW_TIME_LISTENER = 0; +constexpr int16_t SET_TIME_LISTENER = 1; +constexpr uint16_t THE_FIRST_ALARM = 0; +constexpr uint16_t SECOND_ALARM = 1; +constexpr uint16_t THIRD_ALARM = 2; +constexpr uint16_t FOURTH_ALARM = 3; +constexpr uint16_t FIVE_ALARM = 4; +constexpr uint16_t SIX_ALARM = 5; +constexpr uint16_t UNUSED_NUM = 6; +constexpr int16_t FIRST_ALARM = 0; +constexpr uint8_t WEEK_BIT6 = 6; +constexpr uint8_t WEEK_BIT5 = 5; +constexpr uint8_t WEEK_BIT4 = 4; +constexpr uint8_t WEEK_BIT3 = 3; +constexpr uint8_t WEEK_BIT2 = 2; +constexpr uint8_t WEEK_BIT1 = 1; +constexpr uint8_t WEEK_BIT0 = 0; +constexpr uint16_t ALARM_MAX_NUM = 4; +constexpr int32_t BUTTON_MAX_NUM = 7; +constexpr uint16_t CLOCK_NUM = 5; +constexpr uint8_t CANCEL_DATA = 0; +constexpr uint8_t SELECT_DATA = 1; +constexpr uint8_t SLIDING_LENGTH = 30; + +AlarmPresenter::AlarmPresenter() +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new"); + g_pAlarmPresenter = this; +} + +AlarmPresenter::~AlarmPresenter() +{ + g_pAlarmPresenter = nullptr; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::~AlarmPresenter"); +} + +ColorType AlarmPresenter::ShadowBlue() +{ + return Color::GetColorFromRGB(0x17, 0x8F, 0xF8); +} + +void AlarmPresenter::OnStart() +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter OnStart"); + Presenter::OnStart(); +} + +void AlarmPresenter::OnPause(void) {} + +void AlarmPresenter::OnResume(void) {} + +void AlarmPresenter::OnStop(void) {} + +AlarmPresenter *AlarmPresenter::GetInstance() +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter GetInstance"); + return g_pAlarmPresenter; +} + +void AlarmPresenter::OnTimePickerStoped(UITimePicker &picker) +{ + std::string hour(picker.GetSelectHour()); + std::string minute(picker.GetSelectMinute()); + timeHour = stoi(hour); + timeMin = stoi(minute); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnTimePickerStoped the hour is %u,and the minute is %u", timeHour, timeMin); +} + +void AlarmPresenter::OnTimePickerInaction(uint32_t hour, uint32_t min) +{ + timeHour = hour; + timeMin = min; +} - constexpr int16_t CLOSE_SWITCHES = 0; - constexpr int16_t OPEN_SWITCHES = 1; - constexpr int16_t SET_ZERO = 0; - constexpr int16_t NEW_TIME_LISTENER = 0; - constexpr int16_t SET_TIME_LISTENER = 1; - constexpr uint16_t THE_FIRST_ALARM = 0; - constexpr uint16_t SECOND_ALARM = 1; - constexpr uint16_t THIRD_ALARM = 2; - constexpr uint16_t FOURTH_ALARM = 3; - constexpr uint16_t FIVE_ALARM = 4; - constexpr uint16_t SIX_ALARM = 5; - constexpr uint16_t UNUSED_NUM = 6; - constexpr int16_t FIRST_ALARM = 0; - constexpr uint8_t WEEK_BIT6 = 6; - constexpr uint8_t WEEK_BIT5 = 5; - constexpr uint8_t WEEK_BIT4 = 4; - constexpr uint8_t WEEK_BIT3 = 3; - constexpr uint8_t WEEK_BIT2 = 2; - constexpr uint8_t WEEK_BIT1 = 1; - constexpr uint8_t WEEK_BIT0 = 0; - constexpr uint16_t ALARM_MAX_NUM = 4; - constexpr int32_t BUTTON_MAX_NUM = 7; - constexpr uint16_t CLOCK_NUM = 5; - constexpr uint8_t CANCEL_DATA = 0; - constexpr uint8_t SELECT_DATA = 1; - constexpr uint8_t SLIDING_LENGTH = 30; +void AlarmPresenter::PlayRing(void *arg) +{ + UNUSED(arg); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::playRing"); +} - AlarmPresenter::AlarmPresenter() +int16_t AlarmPresenter::GetInterStatus(void) +{ + return interListener; +} + +void AlarmPresenter::ClickSetTime(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter VIEW_ALARM_SET_TIME"); + UNUSED(num); + uint32_t clockTime; + if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new"); - g_pAlarmPresenter = this; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetTime error"); + return; } - - AlarmPresenter::~AlarmPresenter() + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_TIME); + if (MainAlarmView::GetInstance() == nullptr) { - g_pAlarmPresenter = nullptr; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::~AlarmPresenter"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new MainAlarmView::GetInstance() error"); + return; } - - ColorType AlarmPresenter::ShadowBlue() + AlarmSetTimeView::GetInstance()->RefreshSetTime(clockTime); + if (AlarmSetTimeView::GetInstance() == nullptr) { - return Color::GetColorFromRGB(0x17, 0x8F, 0xF8); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new AlarmSetTimeView::GetInstance() error"); + return; } +} - void AlarmPresenter::OnStart() +void AlarmPresenter::ClickSetWeek(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter VIEW_ALARM_SET_WEEK"); + UNUSED(num); + uint8_t clockWeek; + if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter OnStart"); - Presenter::OnStart(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetWeek error"); + return; } - - void AlarmPresenter::OnPause(void) {} - - void AlarmPresenter::OnResume(void) {} - - void AlarmPresenter::OnStop(void) {} - - AlarmPresenter *AlarmPresenter::GetInstance() + interListener = SET_TIME_LISTENER; + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_WEEK); + if (MainAlarmView::GetInstance() == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter GetInstance"); - return g_pAlarmPresenter; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new MainAlarmView::GetInstance() error"); + return; } - - void AlarmPresenter::OnTimePickerStoped(UITimePicker &picker) + memset_s(alarmWeek, sizeof(alarmWeek), 0, sizeof(alarmWeek)); + AlarmSetWeekView::GetInstance()->RefreshSetWeek1(); + if (AlarmSetWeekView::GetInstance() == nullptr) { - std::string hour(picker.GetSelectHour()); - std::string minute(picker.GetSelectMinute()); - timeHour = stoi(hour); - timeMin = stoi(minute); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnTimePickerStoped the hour is %u,and the minute is %u", timeHour, timeMin); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new AlarmSetWeekView::GetInstance() error"); + return; } + AlarmSetWeekView::GetInstance()->RefreshSetWeek2(clockWeek); +} - void AlarmPresenter::OnTimePickerInaction(uint32_t hour, uint32_t min) +void AlarmPresenter::ClickAlarmClockDelete(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClockDelete"); + UNUSED(num); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_JUDGE); + if (MainAlarmView::GetInstance() == nullptr) { - timeHour = hour; - timeMin = min; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClockDelete new MainAlarmView::GetInstance() error"); + return; } +} - void AlarmPresenter::PlayRing(void *arg) +void AlarmPresenter::ClickJudgeDelete(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE"); + UNUSED(num); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); + if (MainAlarmView::GetInstance() == nullptr) { - UNUSED(arg); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::playRing"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeDelete new MainAlarmView::GetInstance() error"); + return; } +} - int16_t AlarmPresenter::GetInterStatus(void) +void AlarmPresenter::ClickJudgeTrue(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE"); + UNUSED(num); + uint32_t clockTime; + AlarmClockModel::GetInstance()->DeleteClockModel(alarmListener); + if (MainAlarmView::GetInstance() == nullptr) { - return interListener; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeTrue new MainAlarmView::GetInstance() error"); + return; } - - void AlarmPresenter::ClickSetTime(uint16_t num) + MainAlarmView::GetInstance()->RefreshAlarm(); + clockQty--; + for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter VIEW_ALARM_SET_TIME"); - UNUSED(num); - uint32_t clockTime; - if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) + if ((AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetTime error"); - return; - } - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_TIME); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new MainAlarmView::GetInstance() error"); - return; - } - AlarmSetTimeView::GetInstance()->RefreshSetTime(clockTime); - if (AlarmSetTimeView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new AlarmSetTimeView::GetInstance() error"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error"); return; } + MainAlarmView::GetInstance()->RefreshAlarm(); } + AlarmClockModel::GetInstance()->SetSerialRdc(); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); +} - void AlarmPresenter::ClickSetWeek(uint16_t num) +void AlarmPresenter::ClickAlarmTimeOk(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_OK"); + UNUSED(num); + AlarmClockModel::GetInstance()->SetAlarmTime(timeHour, timeMin, alarmListener); + uint32_t clockTime = ((timeHour << 16) | timeMin); // 闹钟时间小时的存储位需要右移16位 + uint8_t clockWeek; + if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter VIEW_ALARM_SET_WEEK"); - UNUSED(num); - uint8_t clockWeek; - if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetWeek error"); - return; - } - interListener = SET_TIME_LISTENER; - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_WEEK); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new MainAlarmView::GetInstance() error"); - return; - } - memset_s(alarmWeek, sizeof(alarmWeek), 0, sizeof(alarmWeek)); - AlarmSetWeekView::GetInstance()->RefreshSetWeek1(); - if (AlarmSetWeekView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new AlarmSetWeekView::GetInstance() error"); - return; - } - AlarmSetWeekView::GetInstance()->RefreshSetWeek2(clockWeek); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmTimeOk error"); + return; } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter time = %u", clockTime); + AlarmClockModel::GetInstance()->DelAlarmDelay(alarmListener); - void AlarmPresenter::ClickAlarmClockDelete(uint16_t num) + if (MainAlarmView::GetInstance() == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClockDelete"); - UNUSED(num); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_JUDGE); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClockDelete new MainAlarmView::GetInstance() error"); - return; - } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new MainAlarmView::GetInstance() error"); + return; } - - void AlarmPresenter::ClickJudgeDelete(uint16_t num) + AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true); + MainAlarmView::GetInstance()->RefreshAlarm(); + if (AlarmConfigView::GetInstance() == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE"); - UNUSED(num); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeDelete new MainAlarmView::GetInstance() error"); - return; - } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new AlarmConfigView::GetInstance() error"); + return; } + AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, UNUSED_NUM); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_TIME, CHANGE_INTERFACE_CONFIG); +} - void AlarmPresenter::ClickJudgeTrue(uint16_t num) +void AlarmPresenter::ClickAlarmClock(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter AlarmClock1"); + clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "------AlarmPresenter alarmNumbel = %u", clockQty); + setListener = SET_TIME_LISTENER; + alarmListener = num; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmListener = %u", alarmListener); + uint32_t clockTime; + uint8_t clockWeek; + if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE"); - UNUSED(num); - uint32_t clockTime; - AlarmClockModel::GetInstance()->DeleteClockModel(alarmListener); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeTrue new MainAlarmView::GetInstance() error"); - return; - } - MainAlarmView::GetInstance()->RefreshAlarm(); - clockQty--; - for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) - { - if ((AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime)) == false) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error"); - return; - } - MainAlarmView::GetInstance()->RefreshAlarm(); - } - AlarmClockModel::GetInstance()->SetSerialRdc(); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error"); + return; + } + if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error"); + return; + } + if (MainAlarmView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new MainAlarmView::GetInstance() error"); + return; + } + MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_CONFIG); + if (AlarmConfigView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new AlarmConfigView::GetInstance() error"); + return; } + AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, num); +} - void AlarmPresenter::ClickAlarmTimeOk(uint16_t num) +void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_WEEK_OK"); + UNUSED(num); + uint32_t clockTime; + uint8_t clockWeek = ((alarmWeek[WEEK_BIT6] << WEEK_BIT6) | (alarmWeek[WEEK_BIT5] << WEEK_BIT5) | (alarmWeek[WEEK_BIT4] << WEEK_BIT4) | + (alarmWeek[WEEK_BIT3] << WEEK_BIT3) | (alarmWeek[WEEK_BIT2] << WEEK_BIT2) | (alarmWeek[WEEK_BIT1] << WEEK_BIT1) | alarmWeek[WEEK_BIT0]); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk setListener = %u!", setListener); + + if (setListener == SET_TIME_LISTENER) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_OK"); - UNUSED(num); - AlarmClockModel::GetInstance()->SetAlarmTime(timeHour, timeMin, alarmListener); - uint32_t clockTime = ((timeHour << 16) | timeMin); // 闹钟时间小时的存储位需要右移16位 - uint8_t clockWeek; - if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk set time!"); + if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmTimeOk error"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); return; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter time = %u", clockTime); - AlarmClockModel::GetInstance()->DelAlarmDelay(alarmListener); - + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk time = %d", clockTime); + AlarmClockModel::GetInstance()->SetAlarmWeek(clockWeek, alarmListener); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk week = %u", clockWeek); + AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, UNUSED_NUM); if (MainAlarmView::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new MainAlarmView::GetInstance() error"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error"); return; } AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true); MainAlarmView::GetInstance()->RefreshAlarm(); - if (AlarmConfigView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new AlarmConfigView::GetInstance() error"); - return; - } - AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, UNUSED_NUM); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_TIME, CHANGE_INTERFACE_CONFIG); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, CHANGE_INTERFACE_CONFIG); } - - void AlarmPresenter::ClickAlarmClock(uint16_t num) + else if (setListener == NEW_TIME_LISTENER) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter AlarmClock1"); - clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "------AlarmPresenter alarmNumbel = %u", clockQty); - setListener = SET_TIME_LISTENER; - alarmListener = num; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmListener = %u", alarmListener); - uint32_t clockTime; - uint8_t clockWeek; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk new time!"); + clockQty++; + alarmListener = clockQty; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "******************ClickAlarmWeekOk alarmListener = %d***************", alarmListener); + AlarmClockModel::GetInstance()->SetSerialAdd(); + AlarmClockModel::GetInstance()->SetAlarmInfo(timeHour, timeMin, clockWeek, alarmListener, setListener); if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error"); - return; - } - if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); return; } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk time = %d", clockTime); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk week = %u", clockWeek); if (MainAlarmView::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new MainAlarmView::GetInstance() error"); - return; - } - MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_CONFIG); - if (AlarmConfigView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new AlarmConfigView::GetInstance() error"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error"); return; } - AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, num); + MainAlarmView::GetInstance()->RefreshAlarm(); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, MAIN_INTERFACE); } +} - void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) +void AlarmPresenter::ClickAlarmNewTime(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEW_TIME"); + clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty); + UNUSED(num); + if (clockQty >= ALARM_MAX_NUM) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_WEEK_OK"); - UNUSED(num); - uint32_t clockTime; - uint8_t clockWeek = ((alarmWeek[WEEK_BIT6] << WEEK_BIT6) | (alarmWeek[WEEK_BIT5] << WEEK_BIT5) | (alarmWeek[WEEK_BIT4] << WEEK_BIT4) | - (alarmWeek[WEEK_BIT3] << WEEK_BIT3) | (alarmWeek[WEEK_BIT2] << WEEK_BIT2) | (alarmWeek[WEEK_BIT1] << WEEK_BIT1) | alarmWeek[WEEK_BIT0]); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk setListener = %u!", setListener); - - if (setListener == SET_TIME_LISTENER) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk set time!"); - if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); - return; - } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk time = %d", clockTime); - AlarmClockModel::GetInstance()->SetAlarmWeek(clockWeek, alarmListener); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk week = %u", clockWeek); - AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, UNUSED_NUM); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error"); - return; - } - AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true); - MainAlarmView::GetInstance()->RefreshAlarm(); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, CHANGE_INTERFACE_CONFIG); - } - else if (setListener == NEW_TIME_LISTENER) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk new time!"); - clockQty++; - alarmListener = clockQty; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "******************ClickAlarmWeekOk alarmListener = %d***************", alarmListener); - AlarmClockModel::GetInstance()->SetSerialAdd(); - AlarmClockModel::GetInstance()->SetAlarmInfo(timeHour, timeMin, clockWeek, alarmListener, setListener); - if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); - return; - } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk time = %d", clockTime); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk week = %u", clockWeek); - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error"); - return; - } - MainAlarmView::GetInstance()->RefreshAlarm(); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, MAIN_INTERFACE); - } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new alarm max"); + MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_MAXCLOCK); + return; + } + setListener = NEW_TIME_LISTENER; + timeHour = 0; + timeMin = 0; + if (MainAlarmView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new MainAlarmView::GetInstance() error"); + return; } + MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_NEW_TIME); + if (AlarmNewTimeView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new AlarmNewTimeView::GetInstance() error"); + return; + } + AlarmNewTimeView::GetInstance()->RefreshNewTime(); +} - void AlarmPresenter::ClickAlarmNewTime(uint16_t num) +void AlarmPresenter::ClickAlarmNext(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEXT"); + UNUSED(num); + for (int i = 0; i < BUTTON_MAX_NUM; i++) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEW_TIME"); - clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty); - UNUSED(num); - if (clockQty >= ALARM_MAX_NUM) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new alarm max"); - MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_MAXCLOCK); - return; - } - setListener = NEW_TIME_LISTENER; - timeHour = 0; - timeMin = 0; - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new MainAlarmView::GetInstance() error"); - return; - } - MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_NEW_TIME); - if (AlarmNewTimeView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new AlarmNewTimeView::GetInstance() error"); - return; - } - AlarmNewTimeView::GetInstance()->RefreshNewTime(); + alarmWeek[i] = 0; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[%d] = %u", i, alarmWeek[i]); + } + interListener = NEW_TIME_LISTENER; + if (MainAlarmView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new MainAlarmView::GetInstance() error"); + return; + } + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_NEW_TIME, CHANGE_INTERFACE_SET_WEEK); + if (AlarmNewTimeView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmNewTimeView::GetInstance() error"); + return; + } + if (AlarmSetWeekView::GetInstance() == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmSetWeekView::GetInstance() error"); + return; } + AlarmSetWeekView::GetInstance()->RefreshSetWeek1(); +} - void AlarmPresenter::ClickAlarmNext(uint16_t num) +bool AlarmPresenter::OnDrag(UIView &view, const DragEvent &event) +{ + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEXT"); - UNUSED(num); - for (int i = 0; i < BUTTON_MAX_NUM; i++) + int16_t deltaX; + int16_t deltaY; + deltaX = event.GetDeltaX(); + deltaY = event.GetDeltaY(); + if (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH) { - alarmWeek[i] = 0; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[%d] = %u", i, alarmWeek[i]); + MainAlarmView::GetInstance()->DropView(view); } - interListener = NEW_TIME_LISTENER; - if (MainAlarmView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new MainAlarmView::GetInstance() error"); - return; - } - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_NEW_TIME, CHANGE_INTERFACE_SET_WEEK); - if (AlarmNewTimeView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmNewTimeView::GetInstance() error"); - return; - } - if (AlarmSetWeekView::GetInstance() == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmSetWeekView::GetInstance() error"); - return; - } - AlarmSetWeekView::GetInstance()->RefreshSetWeek1(); } + return true; +} - bool AlarmPresenter::OnDrag(UIView &view, const DragEvent &event) +struct AlarmPresentMapper1 +{ + const char *viewId; + void (AlarmPresenter::*func)(uint16_t); +}; + +static const AlarmPresentMapper1 PresentMapper[] = { + {SET_TIME, &AlarmPresenter::ClickSetTime}, + {SET_WEEK, &AlarmPresenter::ClickSetWeek}, + {ALARM_CLOCK_DELETE, &AlarmPresenter::ClickAlarmClockDelete}, + {JUDGE_DELETE, &AlarmPresenter::ClickJudgeDelete}, + {JUDGE_TRUE, &AlarmPresenter::ClickJudgeTrue}, + {ALARM_OK, &AlarmPresenter::ClickAlarmTimeOk}, + {ADD_BUTTON, &AlarmPresenter::ClickAlarmNewTime}, + {ALARM_NEXT, &AlarmPresenter::ClickAlarmNext}, + {ALARM_WEEK_OK, &AlarmPresenter::ClickAlarmWeekOk}, + {ALARM_CLOCK[THE_FIRST_ALARM], &AlarmPresenter::ClickAlarmClock}, + {ALARM_CLOCK[SECOND_ALARM], &AlarmPresenter::ClickAlarmClock}, + {ALARM_CLOCK[THIRD_ALARM], &AlarmPresenter::ClickAlarmClock}, + {ALARM_CLOCK[FOURTH_ALARM], &AlarmPresenter::ClickAlarmClock}, + {ALARM_CLOCK[FIVE_ALARM], &AlarmPresenter::ClickAlarmClock}, + {ALARM_CLOCK[SIX_ALARM], &AlarmPresenter::ClickAlarmClock}, +}; + +bool AlarmPresenter::ClickFuncId(const char *buttonName) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "buttonName = %s", buttonName); + uint16_t num; + for (uint16_t i = 0; i < sizeof(PresentMapper) / sizeof(PresentMapper[0]); i++) { - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + for (num = 0; num < CLOCK_NUM; num++) { - int16_t deltaX; - int16_t deltaY; - deltaX = event.GetDeltaX(); - deltaY = event.GetDeltaY(); - if (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH) + if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) { - MainAlarmView::GetInstance()->DropView(view); + break; } } - return true; - } - - struct AlarmPresentMapper1 - { - const char *viewId; - void (AlarmPresenter::*func)(uint16_t); - }; - - static const AlarmPresentMapper1 PresentMapper[] = { - {SET_TIME, &AlarmPresenter::ClickSetTime}, - {SET_WEEK, &AlarmPresenter::ClickSetWeek}, - {ALARM_CLOCK_DELETE, &AlarmPresenter::ClickAlarmClockDelete}, - {JUDGE_DELETE, &AlarmPresenter::ClickJudgeDelete}, - {JUDGE_TRUE, &AlarmPresenter::ClickJudgeTrue}, - {ALARM_OK, &AlarmPresenter::ClickAlarmTimeOk}, - {ADD_BUTTON, &AlarmPresenter::ClickAlarmNewTime}, - {ALARM_NEXT, &AlarmPresenter::ClickAlarmNext}, - {ALARM_WEEK_OK, &AlarmPresenter::ClickAlarmWeekOk}, - {ALARM_CLOCK[THE_FIRST_ALARM], &AlarmPresenter::ClickAlarmClock}, - {ALARM_CLOCK[SECOND_ALARM], &AlarmPresenter::ClickAlarmClock}, - {ALARM_CLOCK[THIRD_ALARM], &AlarmPresenter::ClickAlarmClock}, - {ALARM_CLOCK[FOURTH_ALARM], &AlarmPresenter::ClickAlarmClock}, - {ALARM_CLOCK[FIVE_ALARM], &AlarmPresenter::ClickAlarmClock}, - {ALARM_CLOCK[SIX_ALARM], &AlarmPresenter::ClickAlarmClock}, - }; - - bool AlarmPresenter::ClickFuncId(const char *buttonName) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "buttonName = %s", buttonName); - uint16_t num; - for (uint16_t i = 0; i < sizeof(PresentMapper) / sizeof(PresentMapper[0]); i++) + if (strcmp(buttonName, PresentMapper[i].viewId) == 0) { - for (num = 0; num < CLOCK_NUM; num++) - { - if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) - { - break; - } - } - if (strcmp(buttonName, PresentMapper[i].viewId) == 0) - { - (this->*(PresentMapper[i].func))(num); - return true; - } + (this->*(PresentMapper[i].func))(num); + return true; } - return false; } + return false; +} - bool AlarmPresenter::ClickFuncView(UIView &view) +bool AlarmPresenter::ClickFuncView(UIView &view) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickFuncView view = %s", view.GetViewId()); + for (int num = 0; num < BUTTON_MAX_NUM; num++) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickFuncView view = %s", view.GetViewId()); - for (int num = 0; num < BUTTON_MAX_NUM; num++) + if (strcmp(view.GetViewId(), WEEK_CONTAINER[num]) == 0) { - if (strcmp(view.GetViewId(), WEEK_CONTAINER[num]) == 0) + alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA : SELECT_DATA; + if (alarmWeek[num] == CANCEL_DATA) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]); + view.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + dynamic_cast(view).SetStyleForState(STYLE_BACKGROUND_COLOR, + Color::Black().full, UIButton::PRESSED); + } + else if (alarmWeek[num] == SELECT_DATA) { - alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA : SELECT_DATA; - if (alarmWeek[num] == CANCEL_DATA) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]); - view.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - dynamic_cast(view).SetStyleForState(STYLE_BACKGROUND_COLOR, - Color::Black().full, UIButton::PRESSED); - } - else if (alarmWeek[num] == SELECT_DATA) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]); - view.SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); - dynamic_cast(view).SetStyleForState(STYLE_BACKGROUND_COLOR, - Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full, UIButton::PRESSED); - } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]); + view.SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + dynamic_cast(view).SetStyleForState(STYLE_BACKGROUND_COLOR, + Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full, UIButton::PRESSED); } } - view.Invalidate(); - return true; } + view.Invalidate(); + return true; +} - bool AlarmPresenter::OnKeyAct(UIView &view, const KeyEvent &event) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnKeyAct"); +bool AlarmPresenter::OnKeyAct(UIView &view, const KeyEvent &event) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnKeyAct"); #if 0 - uint16 keyID = event.GetKeyId(); - // 如果是power键就返回上一级 - if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) - { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - } +uint16 keyID = event.GetKeyId(); +// 如果是power键就返回上一级 +if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) +{ + uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); + NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); +} #endif - return true; - } + return true; +} - bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event) +bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnClick "); + bool jug = ClickFuncId(view.GetViewId()); + if (jug == false) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnClick "); - bool jug = ClickFuncId(view.GetViewId()); - if (jug == false) - { - ClickFuncView(view); - } - return true; + ClickFuncView(view); } + return true; +} - bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state) +bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state) +{ + if (MainAlarmView::GetInstance()->GetRefreshStatus() == true) { - if (MainAlarmView::GetInstance()->GetRefreshStatus() == true) - { - return true; - } - switch (state) - { - case UICheckBox::SELECTED: - AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true"); - break; - - case UICheckBox::UNSELECTED: - AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, false); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange false"); - break; - default: - break; - } return true; } + switch (state) + { + case UICheckBox::SELECTED: + AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true"); + break; + + case UICheckBox::UNSELECTED: + AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, false); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange false"); + break; + default: + break; + } + return true; +} } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp index 7e0d3eaeb..f62867524 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmRingView.cpp @@ -18,7 +18,7 @@ namespace OHOS { #define RING_AGAIN "响铃将在十分钟后再次响起" -osTimerId_t g_stopAlarmRingHandle = NULL; +osTimerId_t g_stopAlarmRingHandle = nullptr; static AlarmRingView *g_pAlarmRingView = nullptr; constexpr int16_t SET_ZERO = 0; constexpr int16_t SET_SRC = 150; @@ -98,13 +98,13 @@ UIViewGroup *AlarmRingView::InitRingView(void) void AlarmRingView::CancelTimerHandle(void) { - if (g_stopAlarmRingHandle != NULL) { + if (g_stopAlarmRingHandle != nullptr) { osStatus_t ret = osTimerDelete(g_stopAlarmRingHandle); if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScanTimerCallback osTimerDelete failed, ret = %lx!!", ret); return; } - g_stopAlarmRingHandle = NULL; + g_stopAlarmRingHandle = nullptr; } } @@ -124,8 +124,8 @@ void RingTimerCallbacks(int data) void AlarmRingView::AlarmRingDelayShowtimer(void) { - g_stopAlarmRingHandle = osTimerNew((osTimerFunc_t)RingTimerCallbacks, osTimerPeriodic, NULL, NULL); - if (g_stopAlarmRingHandle == NULL) { + g_stopAlarmRingHandle = osTimerNew((osTimerFunc_t)RingTimerCallbacks, osTimerPeriodic, nullptr, nullptr); + if (g_stopAlarmRingHandle == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmRingDelayShowtimer osTimerNew failed!!"); return; } @@ -133,13 +133,13 @@ void AlarmRingView::AlarmRingDelayShowtimer(void) osStatus_t retTimer = osTimerStart(g_stopAlarmRingHandle, tick); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmRingDelayShowtimer osTimerStart failed, ret = %lx!!", retTimer); - if (g_stopAlarmRingHandle != NULL) { + if (g_stopAlarmRingHandle != nullptr) { retTimer = osTimerDelete(g_stopAlarmRingHandle); if (retTimer != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::AlarmRingDelayShowtimer osTimerDelete failed, ret = %lx!!", retTimer); return; } - g_stopAlarmRingHandle = NULL; + g_stopAlarmRingHandle = nullptr; } return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp index 84dcdb4ac..5f0d47091 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp @@ -133,7 +133,7 @@ UIScrollView *AlarmSetTimeView::InitSetTimeView(void) UITimePicker::SelectedListener *selectedListener = (UITimePicker::SelectedListener *)OHOS::AlarmPresenter::GetInstance(); if (selectedListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: selectedListener is NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: selectedListener is nullptr"); return nullptr; } picker->EnableSecond(false); @@ -153,7 +153,7 @@ UIScrollView *AlarmSetTimeView::InitSetTimeView(void) group->SetDraggable(true); UIView::OnDragListener *setTimeDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); if (setTimeDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: setTimeDragListener is NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: setTimeDragListener is nullptr"); return group; } group->SetOnDragListener(setTimeDragListener); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp index df9e819d2..397430b78 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp @@ -77,8 +77,6 @@ AlarmSetWeekView::~AlarmSetWeekView() group->RemoveAll(); delete labelRespeat; labelRespeat = nullptr; - delete labelButton; - labelButton = nullptr; delete weekImage; weekImage = nullptr; for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) { 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 07c98f0eb..ac5c70074 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -164,7 +164,6 @@ void MainAlarmView::NewClockCtl(int16_t alarmNum) statusButton[0]->SetPosition(STATUS_BUTTON_X, alarmPositionY, STATUS_BUTTON_W, STATUS_BUTTON_H); } else { statusButton[alarmNum]->SetPosition(STATUS_BUTTON_X, statusButton[0]->GetY() + (alarmInterval * alarmNum), STATUS_BUTTON_W, STATUS_BUTTON_H); - } statusButton[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, alarmNum); UICheckBox::OnChangeListener *statusListener{nullptr};