From: 罗正yun <1732036298@qq.com> Date: Mon, 4 Dec 2023 01:06:26 +0000 (+0800) Subject: 闹钟修改 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=56923f9b64dc0877073f08edfe60406260784c28;p=mirrors%2FFD230.git 闹钟修改 --- diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp index dd367ada1..21f295e58 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp @@ -374,8 +374,8 @@ 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}, //确认删除闹钟 + {JUDGE_DELETE, &AlarmPresenter::ClickJudgeDelete}, + {JUDGE_TRUE, &AlarmPresenter::ClickJudgeTrue}, {ALARM_OK, &AlarmPresenter::ClickAlarmTimeOk}, {ADD_BUTTON, &AlarmPresenter::ClickAlarmNewTime}, {ALARM_NEXT, &AlarmPresenter::ClickAlarmNext}, @@ -394,7 +394,6 @@ static const AlarmPresentMapper1 PresentMapper[] = { {ALARM_LABELBUTTON[SIX_ALARM],&AlarmPresenter::ClickAlarmClock}, }; -int delfalg = 0; bool AlarmPresenter::ClickFuncId(const char *buttonName) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "buttonName = %s", buttonName); @@ -404,17 +403,10 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName) if (strcmp(buttonName, ALARM_CLOCK[num]) == 0) { break; }else if(strcmp(buttonName, ALARM_LABELBUTTON[num]) == 0){ - if(strcmp(m_lb->GetText(),"删除") == 0){ //第1个闹钟不能删除 - delfalg = 1; - } break; } } if (strcmp(buttonName, PresentMapper[i].viewId) == 0) { - if(delfalg == 1){ - delfalg = 0; - (this->*(PresentMapper[2].func))(num); - } (this->*(PresentMapper[i].func))(num); return true; } @@ -464,18 +456,18 @@ bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state) switch (state) { case UICheckBox::SELECTED: //启用改闹钟可进行编辑 - m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xff292929); - m_lb->SetText("编辑"); - RootView::GetInstance()->Invalidate(); + // m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xff292929); + // m_lb->SetText("编辑"); + // RootView::GetInstance()->Invalidate(); AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, true); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange true"); break; case UICheckBox::UNSELECTED: //停用改闹钟可进行删除 - m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); - m_lb->SetText("删除"); - m_lb->Invalidate(); + // m_lb->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); + // m_lb->SetText("删除"); + // m_lb->Invalidate(); AlarmClockModel::GetInstance()->ButtonStatusRing(alarmStatusNum, false); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmStatusBtnChangeListener::OnChange false"); break; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp index 6cc69da12..725c436c9 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/MainAlarmView.cpp @@ -259,9 +259,9 @@ void MainAlarmView::NewClockCtl(int16_t alarmNum) //Add the CallBack about events UIView::OnClickListener* labelButtonClick = static_cast(new AlarmPresenter(dLabelButton[alarmNum])); dLabelButton[alarmNum]->SetOnClickListener(labelButtonClick); - UICheckBox::OnChangeListener *labelButtonChange ; - labelButtonChange= static_cast(new AlarmStatusBtnChangeListener(dLabelButton[alarmNum])); - statusButton[alarmNum]->SetOnChangeListener(labelButtonChange); + // UICheckBox::OnChangeListener *labelButtonChange ; + // labelButtonChange= static_cast(new AlarmStatusBtnChangeListener(dLabelButton[alarmNum])); + // statusButton[alarmNum]->SetOnChangeListener(labelButtonChange); //Add to rootView group->Add(dLabelButton[alarmNum]); dLabelButton[alarmNum]->SetVisible(true);