From 845dfdee6132fa85dd3186da638aa5c25da09b64 Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Wed, 12 Jun 2024 20:54:51 +0800 Subject: [PATCH] =?utf8?q?alarm=E5=90=8C=E6=AD=A5=E5=88=B00512=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/alarm/src/AlarmClockModel.cpp | 4 +- .../nativeui/alarm/src/AlarmMaxClock.cpp | 2 + .../alarm/src/AlarmPopUpPresenter.cpp | 4 +- .../nativeui/alarm/src/AlarmPresenter.cpp | 149 ++++++------------ .../nativeui/alarm/src/AlarmSetTimeView.cpp | 2 +- .../nativeui/alarm/src/MainAlarmView.cpp | 8 +- .../alarmclockmanage/src/AlarmClockManage.cpp | 12 +- 7 files changed, 68 insertions(+), 113 deletions(-) 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 b3a92fff1..e43dbc22a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp @@ -918,7 +918,7 @@ void AlarmClockModel::AlarmClockNotify() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmClockNotify"); - if (PlayersModel::GetInstance()->GetAudioInitStatus() == false) { + if (!PlayersModel::GetInstance()->GetAudioInitStatus()) { PlayersModel::GetInstance()->AudioInit(); } int32_t timeout = -1; @@ -983,7 +983,7 @@ static void Stop(void) bool alarmStatus; AlarmClockModel::GetInstance()->PopInterCancelMusic(); alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId); - if (alarmStatus == false) { + if (!alarmStatus) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPlayerListener::CancelAlarmRing get alarm Id false!"); return; } 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 e2bbd4f42..0fbfb1342 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp @@ -19,6 +19,8 @@ namespace OHOS { 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); static AlarmMaxClock *g_JudgeView = nullptr; constexpr int16_t CONTAINER_X = 0; diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpPresenter.cpp index 04327b6f4..6b1f76ba1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPopUpPresenter.cpp @@ -56,7 +56,7 @@ void AlarmPopUpPresenter::CancelAlarmRing() bool alarmStatus; AlarmClockModel::GetInstance()->PopInterCancelMusic(); alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId); - if (alarmStatus == false) { + if (!alarmStatus) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpPresenter::CancelAlarmRing get alarm Id false!"); return; } @@ -70,7 +70,7 @@ void AlarmPopUpPresenter::DelayAlarmRing() bool alarmStatus; AlarmClockModel::GetInstance()->PopInterCancelMusic(); alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId); - if (alarmStatus == false) { + if (!alarmStatus) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpPresenter::DelayAlarmRing get alarm Id false!"); return; } 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 275eb8f2a..5a2bb94bb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp @@ -109,20 +109,17 @@ 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) - { + if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetTime error"); return; } MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_TIME); - if (MainAlarmView::GetInstance() == nullptr) - { + 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) - { + if (AlarmSetTimeView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new AlarmSetTimeView::GetInstance() error"); return; } @@ -133,22 +130,19 @@ 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) - { + if (!(AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek))) { 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) - { + 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) - { + if (AlarmSetWeekView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new AlarmSetWeekView::GetInstance() error"); return; } @@ -160,8 +154,7 @@ 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) - { + if (MainAlarmView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClockDelete new MainAlarmView::GetInstance() error"); return; } @@ -172,8 +165,7 @@ 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) - { + if (MainAlarmView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeDelete new MainAlarmView::GetInstance() error"); return; } @@ -185,17 +177,14 @@ void AlarmPresenter::ClickJudgeTrue(uint16_t num) UNUSED(num); uint32_t clockTime; AlarmClockModel::GetInstance()->DeleteClockModel(alarmListener); - if (MainAlarmView::GetInstance() == nullptr) - { + 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) - { + for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) { + if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime))) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error"); return; } @@ -212,23 +201,20 @@ void AlarmPresenter::ClickAlarmTimeOk(uint16_t num) AlarmClockModel::GetInstance()->SetAlarmTime(timeHour, timeMin, alarmListener); uint32_t clockTime = ((timeHour << 16) | timeMin); // 闹钟时间小时的存储位需要右移16位 uint8_t clockWeek; - if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) - { + if (!(AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &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); - if (MainAlarmView::GetInstance() == nullptr) - { + if (MainAlarmView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new MainAlarmView::GetInstance() error"); return; } AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true); MainAlarmView::GetInstance()->RefreshAlarm(); - if (AlarmConfigView::GetInstance() == nullptr) - { + if (AlarmConfigView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new AlarmConfigView::GetInstance() error"); return; } @@ -246,24 +232,20 @@ void AlarmPresenter::ClickAlarmClock(uint16_t num) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmListener = %u", alarmListener); uint32_t clockTime; uint8_t clockWeek; - if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) - { + if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error"); return; } - if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false) - { + if (!(AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek))) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error"); return; } - if (MainAlarmView::GetInstance() == nullptr) - { + 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) - { + if (AlarmConfigView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new AlarmConfigView::GetInstance() error"); return; } @@ -278,12 +260,10 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) 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) - { + + if (setListener == SET_TIME_LISTENER) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk set time!"); - if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false) - { + if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); return; } @@ -291,32 +271,27 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) 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) - { + 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) - { + } 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) - { + if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) { 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) - { + if (MainAlarmView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error"); return; } @@ -331,8 +306,7 @@ void AlarmPresenter::ClickAlarmNewTime(uint16_t num) clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty); UNUSED(num); - if (clockQty >= ALARM_MAX_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; @@ -340,14 +314,12 @@ void AlarmPresenter::ClickAlarmNewTime(uint16_t num) setListener = NEW_TIME_LISTENER; timeHour = 0; timeMin = 0; - if (MainAlarmView::GetInstance() == nullptr) - { + 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) - { + if (AlarmNewTimeView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new AlarmNewTimeView::GetInstance() error"); return; } @@ -358,25 +330,21 @@ 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++) - { + for (int i = 0; i < BUTTON_MAX_NUM; i++) { alarmWeek[i] = 0; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[%d] = %u", i, alarmWeek[i]); } interListener = NEW_TIME_LISTENER; - if (MainAlarmView::GetInstance() == nullptr) - { + 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) - { + if (AlarmNewTimeView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmNewTimeView::GetInstance() error"); return; } - if (AlarmSetWeekView::GetInstance() == nullptr) - { + if (AlarmSetWeekView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmSetWeekView::GetInstance() error"); return; } @@ -385,22 +353,19 @@ void AlarmPresenter::ClickAlarmNext(uint16_t num) bool AlarmPresenter::OnDrag(UIView &view, const DragEvent &event) { - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) - { + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { 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 (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH) { MainAlarmView::GetInstance()->DropView(view); } } return true; } -struct AlarmPresentMapper1 -{ +struct AlarmPresentMapper1 { const char *viewId; void (AlarmPresenter::*func)(uint16_t); }; @@ -427,17 +392,13 @@ 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++) - { - for (num = 0; num < CLOCK_NUM; num++) - { - if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) - { + for (uint16_t i = 0; i < sizeof(PresentMapper) / sizeof(PresentMapper[0]); i++) { + for (num = 0; num < CLOCK_NUM; num++) { + if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) { break; } } - if (strcmp(buttonName, PresentMapper[i].viewId) == 0) - { + if (strcmp(buttonName, PresentMapper[i].viewId) == 0) { (this->*(PresentMapper[i].func))(num); return true; } @@ -448,20 +409,15 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName) 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++) - { - if (strcmp(view.GetViewId(), WEEK_CONTAINER[num]) == 0) - { - alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA : SELECT_DATA; - if (alarmWeek[num] == CANCEL_DATA) - { + for (int num = 0; num < BUTTON_MAX_NUM; num++) { + 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) - { + } 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, @@ -492,8 +448,7 @@ bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnClick "); bool jug = ClickFuncId(view.GetViewId()); - if (jug == false) - { + if (!jug) { ClickFuncView(view); } return true; @@ -501,16 +456,14 @@ bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event) bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state) { - if (MainAlarmView::GetInstance()->GetRefreshStatus() == true) - { + if (MainAlarmView::GetInstance()->GetRefreshStatus()) { return true; } - switch (state) - { - case UICheckBox::SELECTED: - AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true"); - break; + 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); 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 5f0d47091..be9ff6075 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp @@ -173,7 +173,7 @@ void AlarmSetTimeView::RefreshSetTime(uint32_t time) } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::RefreshStep 35353535!"); picker->SetSelected(pickerTime.c_str()); - if (picker->SetSelected(pickerTime.c_str()) == false) { + if (!picker->SetSelected(pickerTime.c_str())) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::RefreshStep Timepicker error!"); return; } 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 ac5c70074..e80f76445 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -302,17 +302,17 @@ void MainAlarmView::RefreshAlarm(void) int16_t i; for (i = 0; i < CLOCK_MAX_NUM; i++) { alarmStatus = AlarmClockModel::GetInstance()->GetClockTime(i, &alarmTime); - if (alarmStatus == false) { + if (!alarmStatus) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: GetClockTime fail! i = %d", i); break; } alarmStatus = AlarmClockModel::GetInstance()->GetClockWeek(i, &alarmWeek); - if (alarmStatus == false) { + if (!alarmStatus) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: GetClockWeek fail! i = %d", i); break; } alarmStatus = AlarmClockModel::GetInstance()->GetClockStatus(i, &alarmEnable); - if (alarmStatus == false) { + if (!alarmStatus) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: GetClockStatus fail! i = %d", i); break; } @@ -510,7 +510,7 @@ bool MainAlarmView::ClickFunc(int16_t interface) for (int i = 0; i < funcSize; i++) { if (interface == ViewMapper[i].viewId) { bool jug = (this->*(ViewMapper[i].func))(interface); - if (jug == false) { + if (!jug) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: ChangeInterFace[%d] false", interface); return false; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp index 86cfbd3eb..856698c8f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp @@ -137,8 +137,8 @@ static int32 CreateListAlarmTodaySmart(void) if (g_alarmClockManagement.smartAlarmCnt > 0) { /* 该闹钟今天是否使能判断 */ - if (IsAlarmClockValidToday(&g_alarmClockManagement.smartAlarmInfo) == true && - g_alarmClockManagement.smartAlarmInfo.alarmClockEnable == true) { + if (IsAlarmClockValidToday(&g_alarmClockManagement.smartAlarmInfo) && + g_alarmClockManagement.smartAlarmInfo.alarmClockEnable) { (void)memset_s(&info, size, 0, size); info.alarmType = g_alarmClockManagement.smartAlarmInfo.alarmType; @@ -168,8 +168,8 @@ static int32 CreateListAlarmTodayEvent(void) for (i = 0; i < EVENT_ALARM_CLOCK_MAX; i++) { /* 该闹钟今天是否使能判断 */ - if (IsAlarmClockValidToday(&g_alarmClockManagement.eventAlarmInfo[i]) == true && - g_alarmClockManagement.eventAlarmInfo[i].alarmClockEnable == true) { + if (IsAlarmClockValidToday(&g_alarmClockManagement.eventAlarmInfo[i]) && + g_alarmClockManagement.eventAlarmInfo[i].alarmClockEnable) { (void)memset_s(&info, size, 0, size); info.alarmType = g_alarmClockManagement.eventAlarmInfo[i].alarmType; @@ -256,7 +256,7 @@ static int32 AddAndUpdataListAlarmToday(const AlarmClockInfo *alarmInfo) return ret; } /* 将指定闹钟信息加入当天闹钟列表 */ - if (IsAlarmClockValidToday(alarmInfo) == false || alarmInfo->alarmClockEnable == false) { + if (!IsAlarmClockValidToday(alarmInfo) || (!alarmInfo->alarmClockEnable)) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddAndUpdataListAlarmToday alarmInfo invalid today!!"); return STATUS_OK; } @@ -293,7 +293,7 @@ static int32 UpdataListAlarmToday(const AlarmClockInfo *alarmInfo) /* 将指定ID的闹钟信息刷新 */ for (node = g_alarmTodayList.begin(); node != g_alarmTodayList.end(); node++) { if (node->alarmClockId == alarmInfo->alarmClockId) { - if (IsAlarmClockValidToday(alarmInfo) == true && alarmInfo->alarmClockEnable == true) { + if (IsAlarmClockValidToday(alarmInfo) && alarmInfo->alarmClockEnable) { node->alarmTime = alarmInfo->alarmTime + alarmInfo->delayNum * MINS_EVERY_DELAY; node->alarmTime = (((node->alarmTime >> TWO_BYTES_BITS) + (node->alarmTime & AND_FOR_LOW_TWO_BYTES) / MINUTES_PER_HOUR) << TWO_BYTES_BITS) + -- 2.17.1