闹钟修改
author罗正yun <1732036298@qq.com>
Mon, 4 Dec 2023 01:06:26 +0000 (09:06 +0800)
committer罗正yun <1732036298@qq.com>
Mon, 4 Dec 2023 01:06:26 +0000 (09:06 +0800)
code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp

index dd367ad..21f295e 100644 (file)
@@ -374,8 +374,8 @@ static const AlarmPresentMapper1 PresentMapper[] = {
     {SET_TIME, &AlarmPresenter::ClickSetTime},\r
     {SET_WEEK, &AlarmPresenter::ClickSetWeek},\r
     {ALARM_CLOCK_DELETE, &AlarmPresenter::ClickAlarmClockDelete}, //进入删除闹钟视图的按钮\r
-    {JUDGE_DELETE, &AlarmPresenter::ClickJudgeDelete},            //不删除闹钟\r
-    {JUDGE_TRUE, &AlarmPresenter::ClickJudgeTrue},                //确认删除闹钟\r
+    {JUDGE_DELETE, &AlarmPresenter::ClickJudgeDelete},\r
+    {JUDGE_TRUE, &AlarmPresenter::ClickJudgeTrue},\r
     {ALARM_OK, &AlarmPresenter::ClickAlarmTimeOk},\r
     {ADD_BUTTON, &AlarmPresenter::ClickAlarmNewTime},\r
     {ALARM_NEXT, &AlarmPresenter::ClickAlarmNext},\r
@@ -394,7 +394,6 @@ static const AlarmPresentMapper1 PresentMapper[] = {
     {ALARM_LABELBUTTON[SIX_ALARM],&AlarmPresenter::ClickAlarmClock},\r
 };\r
 \r
-int delfalg = 0;\r
 bool AlarmPresenter::ClickFuncId(const char *buttonName)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "buttonName = %s", buttonName);\r
@@ -404,17 +403,10 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName)
             if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) {\r
                 break;\r
             }else if(strcmp(buttonName, ALARM_LABELBUTTON[num]) == 0){\r
-                if(strcmp(m_lb->GetText(),"删除") == 0){  //第1个闹钟不能删除\r
-                    delfalg = 1;\r
-                }\r
                 break;\r
             }\r
         }\r
         if (strcmp(buttonName, PresentMapper[i].viewId) == 0) {\r
-            if(delfalg == 1){\r
-                delfalg = 0;\r
-                (this->*(PresentMapper[2].func))(num);\r
-            }\r
             (this->*(PresentMapper[i].func))(num);\r
             return true;\r
         }\r
@@ -464,18 +456,18 @@ bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state)
     switch (state) {\r
         case UICheckBox::SELECTED:\r
             //启用改闹钟可进行编辑\r
-            m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xff292929);\r
-            m_lb->SetText("编辑");\r
-            RootView::GetInstance()->Invalidate();\r
+            // m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xff292929);\r
+            // m_lb->SetText("编辑");\r
+            // RootView::GetInstance()->Invalidate();\r
             AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true);\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true");\r
             break;\r
 \r
         case UICheckBox::UNSELECTED:\r
             //停用改闹钟可进行删除\r
-            m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36);\r
-            m_lb->SetText("删除");\r
-            m_lb->Invalidate();\r
+            // m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36);\r
+            // m_lb->SetText("删除");\r
+            // m_lb->Invalidate();\r
             AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, false);\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange false");\r
             break;\r
index 6cc69da..725c436 100644 (file)
@@ -259,9 +259,9 @@ void MainAlarmView::NewClockCtl(int16_t alarmNum)
     //Add the CallBack about events\r
     UIView::OnClickListener* labelButtonClick = static_cast<UIView::OnClickListener*>(new AlarmPresenter(dLabelButton[alarmNum]));\r
     dLabelButton[alarmNum]->SetOnClickListener(labelButtonClick);\r
-    UICheckBox::OnChangeListener *labelButtonChange ;\r
-    labelButtonChange= static_cast<UICheckBox::OnChangeListener*>(new AlarmStatusBtnChangeListener(dLabelButton[alarmNum]));\r
-    statusButton[alarmNum]->SetOnChangeListener(labelButtonChange);\r
+    // UICheckBox::OnChangeListener *labelButtonChange ;\r
+    // labelButtonChange= static_cast<UICheckBox::OnChangeListener*>(new AlarmStatusBtnChangeListener(dLabelButton[alarmNum]));\r
+    // statusButton[alarmNum]->SetOnChangeListener(labelButtonChange);\r
     //Add to rootView\r
     group->Add(dLabelButton[alarmNum]);\r
     dLabelButton[alarmNum]->SetVisible(true);\r