alarm同步到0512 patch

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 b3a92ff..e43dbc2 100644 (file)
--- 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 e2bbd4f..0fbfb13 100644 (file)
--- 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;\r
 static AlarmMaxClock *g_AlarmMaxClock = nullptr;\r
 static constexpr uint64_t MS_THREE_SECONDS = 3000;\r
+static void ScanTimerCallback(int data);\r
+static void EndScanHandle(void);\r
 \r
 static AlarmMaxClock *g_JudgeView = nullptr;\r
 constexpr int16_t CONTAINER_X = 0;\r

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 04327b6..6b1f76b 100644 (file)
--- 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;\r
     AlarmClockModel::GetInstance()->PopInterCancelMusic();\r
     alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId);\r
-    if (alarmStatus == false) {\r
+    if (!alarmStatus) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpPresenter::CancelAlarmRing get alarm Id false!");\r
         return;\r
     }\r
@@ -70,7 +70,7 @@ void AlarmPopUpPresenter::DelayAlarmRing()
     bool alarmStatus;\r
     AlarmClockModel::GetInstance()->PopInterCancelMusic();\r
     alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId);\r
-    if (alarmStatus == false) {\r
+    if (!alarmStatus) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpPresenter::DelayAlarmRing get alarm Id false!");\r
         return;\r
     }\r

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 275eb8f..5a2bb94 100644 (file)
--- 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");\r
     UNUSED(num);\r
     uint32_t clockTime;\r
-    if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false)\r
-    {\r
+    if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetTime error");\r
         return;\r
     }\r
     MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_TIME);\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     AlarmSetTimeView::GetInstance()->RefreshSetTime(clockTime);\r
-    if (AlarmSetTimeView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmSetTimeView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetTime new AlarmSetTimeView::GetInstance() error");\r
         return;\r
     }\r
@@ -133,22 +130,19 @@ void AlarmPresenter::ClickSetWeek(uint16_t num)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter VIEW_ALARM_SET_WEEK");\r
     UNUSED(num);\r
     uint8_t clockWeek;\r
-    if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false)\r
-    {\r
+    if (!(AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek))) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickSetWeek error");\r
         return;\r
     }\r
     interListener = SET_TIME_LISTENER;\r
     MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_SET_WEEK);\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     memset_s(alarmWeek, sizeof(alarmWeek), 0, sizeof(alarmWeek));\r
     AlarmSetWeekView::GetInstance()->RefreshSetWeek1();\r
-    if (AlarmSetWeekView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmSetWeekView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickSetWeek new AlarmSetWeekView::GetInstance() error");\r
         return;\r
     }\r
@@ -160,8 +154,7 @@ void AlarmPresenter::ClickAlarmClockDelete(uint16_t num)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClockDelete");\r
     UNUSED(num);\r
     MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_CONFIG, CHANGE_INTERFACE_JUDGE);\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClockDelete new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
@@ -172,8 +165,7 @@ void AlarmPresenter::ClickJudgeDelete(uint16_t num)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE");\r
     UNUSED(num);\r
     MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE);\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeDelete new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
@@ -185,17 +177,14 @@ void AlarmPresenter::ClickJudgeTrue(uint16_t num)
     UNUSED(num);\r
     uint32_t clockTime;\r
     AlarmClockModel::GetInstance()->DeleteClockModel(alarmListener);\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeTrue new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     MainAlarmView::GetInstance()->RefreshAlarm();\r
     clockQty--;\r
-    for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++)\r
-    {\r
-        if ((AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime)) == false)\r
-        {\r
+    for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) {\r
+        if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime))) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error");\r
             return;\r
         }\r
@@ -212,23 +201,20 @@ void AlarmPresenter::ClickAlarmTimeOk(uint16_t num)
     AlarmClockModel::GetInstance()->SetAlarmTime(timeHour, timeMin, alarmListener);\r
     uint32_t clockTime = ((timeHour << 16) | timeMin); // 闹钟时间小时的存储位需要右移16位\r
     uint8_t clockWeek;\r
-    if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false)\r
-    {\r
+    if (!(AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek))) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmTimeOk error");\r
         return;\r
     }\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter time = %u", clockTime);\r
     AlarmClockModel::GetInstance()->DelAlarmDelay(alarmListener);\r
 \r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true);\r
     MainAlarmView::GetInstance()->RefreshAlarm();\r
-    if (AlarmConfigView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmConfigView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmTimeOk new AlarmConfigView::GetInstance() error");\r
         return;\r
     }\r
@@ -246,24 +232,20 @@ void AlarmPresenter::ClickAlarmClock(uint16_t num)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmListener = %u", alarmListener);\r
     uint32_t clockTime;\r
     uint8_t clockWeek;\r
-    if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false)\r
-    {\r
+    if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error");\r
         return;\r
     }\r
-    if ((AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek)) == false)\r
-    {\r
+    if (!(AlarmClockModel::GetInstance()->GetClockWeek(alarmListener, &clockWeek))) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmClock error");\r
         return;\r
     }\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_CONFIG);\r
-    if (AlarmConfigView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmConfigView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmClock new AlarmConfigView::GetInstance() error");\r
         return;\r
     }\r
@@ -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) |\r
                             (alarmWeek[WEEK_BIT3] << WEEK_BIT3) | (alarmWeek[WEEK_BIT2] << WEEK_BIT2) | (alarmWeek[WEEK_BIT1] << WEEK_BIT1) | alarmWeek[WEEK_BIT0]);\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk setListener = %u!", setListener);\r
-\r
-    if (setListener == SET_TIME_LISTENER)\r
-    {\r
+    \r
+    if (setListener == SET_TIME_LISTENER) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk set time!");\r
-        if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false)\r
-        {\r
+        if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error");\r
             return;\r
         }\r
@@ -291,32 +271,27 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num)
         AlarmClockModel::GetInstance()->SetAlarmWeek(clockWeek, alarmListener);\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk  week = %u", clockWeek);\r
         AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, UNUSED_NUM);\r
-        if (MainAlarmView::GetInstance() == nullptr)\r
-        {\r
+        if (MainAlarmView::GetInstance() == nullptr) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error");\r
             return;\r
         }\r
         AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true);\r
         MainAlarmView::GetInstance()->RefreshAlarm();\r
         MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, CHANGE_INTERFACE_CONFIG);\r
-    }\r
-    else if (setListener == NEW_TIME_LISTENER)\r
-    {\r
+    } else if (setListener == NEW_TIME_LISTENER) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk new time!");\r
         clockQty++;\r
         alarmListener = clockQty;\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "******************ClickAlarmWeekOk  alarmListener = %d***************", alarmListener);\r
         AlarmClockModel::GetInstance()->SetSerialAdd();\r
         AlarmClockModel::GetInstance()->SetAlarmInfo(timeHour, timeMin, clockWeek, alarmListener, setListener);\r
-        if ((AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime)) == false)\r
-        {\r
+        if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error");\r
             return;\r
         }\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk  time = %d", clockTime);\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk  week = %u", clockWeek);\r
-        if (MainAlarmView::GetInstance() == nullptr)\r
-        {\r
+        if (MainAlarmView::GetInstance() == nullptr) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmWeekOk new MainAlarmView::GetInstance() error");\r
             return;\r
         }\r
@@ -331,8 +306,7 @@ void AlarmPresenter::ClickAlarmNewTime(uint16_t num)
     clockQty = AlarmClockModel::GetInstance()->GetAlarmNum();\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty);\r
     UNUSED(num);\r
-    if (clockQty >= ALARM_MAX_NUM)\r
-    {\r
+    if (clockQty >= ALARM_MAX_NUM) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new alarm max");\r
         MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_MAXCLOCK);\r
         return;\r
@@ -340,14 +314,12 @@ void AlarmPresenter::ClickAlarmNewTime(uint16_t num)
     setListener = NEW_TIME_LISTENER;\r
     timeHour = 0;\r
     timeMin = 0;\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_NEW_TIME);\r
-    if (AlarmNewTimeView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmNewTimeView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new AlarmNewTimeView::GetInstance() error");\r
         return;\r
     }\r
@@ -358,25 +330,21 @@ void AlarmPresenter::ClickAlarmNext(uint16_t num)
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEXT");\r
     UNUSED(num);\r
-    for (int i = 0; i < BUTTON_MAX_NUM; i++)\r
-    {\r
+    for (int i = 0; i < BUTTON_MAX_NUM; i++) {\r
         alarmWeek[i] = 0;\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[%d] = %u", i, alarmWeek[i]);\r
     }\r
     interListener = NEW_TIME_LISTENER;\r
-    if (MainAlarmView::GetInstance() == nullptr)\r
-    {\r
+    if (MainAlarmView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new MainAlarmView::GetInstance() error");\r
         return;\r
     }\r
     MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_NEW_TIME, CHANGE_INTERFACE_SET_WEEK);\r
-    if (AlarmNewTimeView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmNewTimeView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmNewTimeView::GetInstance() error");\r
         return;\r
     }\r
-    if (AlarmSetWeekView::GetInstance() == nullptr)\r
-    {\r
+    if (AlarmSetWeekView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmSetWeekView::GetInstance() error");\r
         return;\r
     }\r
@@ -385,22 +353,19 @@ void AlarmPresenter::ClickAlarmNext(uint16_t num)
 \r
 bool AlarmPresenter::OnDrag(UIView &view, const DragEvent &event)\r
 {\r
-    if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
-    {\r
+    if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) {\r
         int16_t deltaX;\r
         int16_t deltaY;\r
         deltaX = event.GetDeltaX();\r
         deltaY = event.GetDeltaY();\r
-        if (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH)\r
-        {\r
+        if (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH) {\r
             MainAlarmView::GetInstance()->DropView(view);\r
         }\r
     }\r
     return true;\r
 }\r
 \r
-struct AlarmPresentMapper1\r
-{\r
+struct AlarmPresentMapper1 {\r
     const char *viewId;\r
     void (AlarmPresenter::*func)(uint16_t);\r
 };\r
@@ -427,17 +392,13 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName)
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "buttonName = %s", buttonName);\r
     uint16_t num;\r
-    for (uint16_t i = 0; i < sizeof(PresentMapper) / sizeof(PresentMapper[0]); i++)\r
-    {\r
-        for (num = 0; num < CLOCK_NUM; num++)\r
-        {\r
-            if (strcmp(buttonName, ALARM_CLOCK[num]) == 0)\r
-            {\r
+    for (uint16_t i = 0; i < sizeof(PresentMapper) / sizeof(PresentMapper[0]); i++) {\r
+        for (num = 0; num < CLOCK_NUM; num++) {\r
+            if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) {\r
                 break;\r
             }\r
         }\r
-        if (strcmp(buttonName, PresentMapper[i].viewId) == 0)\r
-        {\r
+        if (strcmp(buttonName, PresentMapper[i].viewId) == 0) {\r
             (this->*(PresentMapper[i].func))(num);\r
             return true;\r
         }\r
@@ -448,20 +409,15 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName)
 bool AlarmPresenter::ClickFuncView(UIView &view)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickFuncView view = %s", view.GetViewId());\r
-    for (int num = 0; num < BUTTON_MAX_NUM; num++)\r
-    {\r
-        if (strcmp(view.GetViewId(), WEEK_CONTAINER[num]) == 0)\r
-        {\r
-            alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA : SELECT_DATA;\r
-            if (alarmWeek[num] == CANCEL_DATA)\r
-            {\r
+    for (int num = 0; num < BUTTON_MAX_NUM; num++) {\r
+        if (strcmp(view.GetViewId(), WEEK_CONTAINER[num]) == 0) {\r
+            alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA: SELECT_DATA;\r
+            if (alarmWeek[num] == CANCEL_DATA) {\r
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]);\r
                 view.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
                 dynamic_cast<UIButton &>(view).SetStyleForState(STYLE_BACKGROUND_COLOR,\r
                                                                 Color::Black().full, UIButton::PRESSED);\r
-            }\r
-            else if (alarmWeek[num] == SELECT_DATA)\r
-            {\r
+            } else if (alarmWeek[num] == SELECT_DATA) {\r
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]);\r
                 view.SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full);\r
                 dynamic_cast<UIButton &>(view).SetStyleForState(STYLE_BACKGROUND_COLOR,\r
@@ -492,8 +448,7 @@ bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event)
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnClick ");\r
     bool jug = ClickFuncId(view.GetViewId());\r
-    if (jug == false)\r
-    {\r
+    if (!jug) {\r
         ClickFuncView(view);\r
     }\r
     return true;\r
@@ -501,16 +456,14 @@ bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event)
 \r
 bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state)\r
 {\r
-    if (MainAlarmView::GetInstance()->GetRefreshStatus() == true)\r
-    {\r
+    if (MainAlarmView::GetInstance()->GetRefreshStatus()) {\r
         return true;\r
     }\r
-    switch (state)\r
-    {\r
-    case UICheckBox::SELECTED:\r
-        AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true);\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true");\r
-        break;\r
+    switch (state) {\r
+        case UICheckBox::SELECTED:\r
+            AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true");\r
+            break;\r
 \r
     case UICheckBox::UNSELECTED:\r
         AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, false);\r

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 5f0d470..be9ff60 100644 (file)
--- 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)
     }\r
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::RefreshStep 35353535!");\r
     picker->SetSelected(pickerTime.c_str());\r
-    if (picker->SetSelected(pickerTime.c_str()) == false) {\r
+    if (!picker->SetSelected(pickerTime.c_str())) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::RefreshStep Timepicker error!");\r
         return;\r
     }\r

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 ac5c700..e80f764 100644 (file)
--- 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 86cfbd3..856698c 100644 (file)
--- 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) +