static AlarmConfigView *GetInstance(void);\r
void RefreshConfig(const uint32 time, uint8 week, uint16_t alarmNum);\r
private:\r
- UILabelButton *deleteImage{nullptr};\r
+ // UILabelButton *deleteImage{nullptr};\r
UIScrollView *configScroll{nullptr};\r
UIScrollView *group{nullptr};\r
UILabel *editLabel{nullptr};\r
UILabel *labelSetTime{nullptr};\r
UILabel *labelDay{nullptr};\r
UILabel *labelSetWeek{nullptr};\r
- UILabel *labelChangeName{nullptr};\r
- UILabel *labelSetName{nullptr};\r
+ // UILabel *labelChangeName{nullptr};\r
+ // UILabel *labelSetName{nullptr};\r
UIImageView *changeIcon1{nullptr};\r
UIImageView *changeIcon2{nullptr};\r
- UIImageView *changeIcon3{nullptr};\r
+ // UIImageView *changeIcon3{nullptr};\r
UILabel *CreateConfigLabel(const char *buttonText, int16_t labelFont, int16_t x, int16_t y, int16_t width);\r
void CreateConfigButton(void);\r
void CreateChangeIcons(void);\r
#include "components/ui_digital_clock.h"\r
#include "components/ui_scroll_view.h"\r
#include "components/ui_view_group.h"\r
+#include "components/ui_label_button_ext.h"\r
#include "layout/grid_layout.h"\r
#include "font/ui_font.h"\r
#include "BaseView.h"\r
void OnTearDownView();\r
void OnStop();\r
private:\r
- void CreateImage(void);\r
- UIScrollView *container{nullptr};\r
- UILabel *labelText{nullptr};\r
- UIImageView *imageViewDelete{nullptr};\r
- UIImageView *imageViewTrue{nullptr};\r
+ // void CreateImage(void);\r
+ // UIScrollView *container{nullptr};\r
+ // UILabel *labelText{nullptr};\r
+ // UIImageView *imageViewDelete{nullptr};\r
+ // UIImageView *imageViewTrue{nullptr};\r
+\r
+ UIScrollView * InitDeleteScreen();\r
+ void DeinitDeleteScreen();\r
+ UIScrollView * DeleteGroup_{nullptr};\r
+ UILabelExt * DeleteTitleLabelExt_{nullptr};\r
+ UILabelExt * DeletePromptLabelExt_{nullptr};\r
+ UILabelButtonExt * DeleteCancelButton_{nullptr};\r
+ UILabelButtonExt * DeleteOKButton_{nullptr};\r
+\r
+ #define SCREEN_WIDTH (Screen::GetInstance().GetWidth())\r
+ #define SCREEN_HEIGHT (Screen::GetInstance().GetHeight())\r
};\r
} // namespace OHOS\r
#endif
\ No newline at end of file
void ClickAlarmNext(uint16_t alarmNum);\r
void OnTimePickerInaction(uint32_t hour, uint32_t min);\r
uint8_t alarmWeek[7] = {1, 1, 1, 1, 1, 1, 1}; // 闹钟默认所有的日期都选中，因此初始值为1，7是指一个星期中七天\r
+\r
+ void ClickDeleteButtonAlarmClockDelete(uint16_t num);\r
+\r
private:\r
uint32_t timeHour{0};\r
uint32_t timeMin{0};\r
void RefreshSetTime(uint32_t time);\r
private:\r
UIScrollView *group{nullptr};\r
- UILabelButton *timeImage{nullptr};\r
+ // UILabelButton *timeImage{nullptr};\r
+ UILabelButton * labelButton{nullptr};\r
UILabel *title{nullptr};\r
UITimePicker *picker{nullptr};\r
UILabel *GetTitleLabel(const char *titleName);\r
constexpr int16_t MAX_LABEL_H_LEN = 80;\r
constexpr int16_t MAX_DATA_W_LEN = 275;\r
constexpr int16_t DIGITAL_CLOCK_FONT = 45;\r
-constexpr int16_t MAX_LABEL_TIME_Y_LEN = 195;\r
-constexpr int16_t LABEL_SET_TIME_Y = 245;\r
-constexpr int16_t MAX_LABEL_DAY_Y_LEN = 320;\r
-constexpr int16_t MAX_LABEL_SET_WEEK_Y_LEN = 380;\r
+constexpr int16_t MAX_LABEL_TIME_Y_LEN = 195 - 25;\r
+constexpr int16_t LABEL_SET_TIME_Y = 245 - 25;\r
+constexpr int16_t MAX_LABEL_DAY_Y_LEN = 320 - 30;\r
+constexpr int16_t MAX_LABEL_SET_WEEK_Y_LEN = 380 - 30;\r
constexpr int16_t MAX_LABEL_LABEL_CHANGE_NAME_Y_LEN = 460;\r
constexpr int16_t MAX_LABEL_SET_NAME_Y_LEN = 505;\r
constexpr int16_t MAX_DEFAULT_FONT_LEN = 34;\r
constexpr int16_t MAX_DELETE_BUTTON_X_LEN = 63;\r
constexpr int16_t MAX_DELETE_BUTTON_Y_LEN = 365;\r
constexpr int16_t MAX_IMAGE_CHANGE_X_LEN = 370;\r
-constexpr int16_t MAX_IMAGE_CHANGE1_Y_LEN = 210;\r
-constexpr int16_t MAX_IMAGE_CHANGE2_Y_LEN = 350;\r
+constexpr int16_t MAX_IMAGE_CHANGE1_Y_LEN = 210 - 25;\r
+constexpr int16_t MAX_IMAGE_CHANGE2_Y_LEN = 350 - 30;\r
constexpr int16_t MAX_IMAGE_CHANGE3_Y_LEN = 470;\r
constexpr int16_t MAX_IMAGE_CHANGE_WIDTH = 50;\r
constexpr int16_t MAX_IMAGE_CHANGE_HEIGHT = 60;\r
\r
AlarmConfigView::~AlarmConfigView()\r
{\r
- group->RemoveAll();\r
- configScroll->RemoveAll();\r
- delete editLabel;\r
- editLabel = nullptr;\r
- delete deleteImage;\r
- deleteImage = nullptr;\r
- delete configScroll;\r
- configScroll = nullptr;\r
- delete labelTime;\r
- labelTime = nullptr;\r
- delete labelSetTime;\r
- labelSetTime = nullptr;\r
- delete labelDay;\r
- labelDay = nullptr;\r
- delete labelSetWeek;\r
- labelSetWeek = nullptr;\r
- delete labelChangeName;\r
- labelChangeName = nullptr;\r
- delete labelSetName;\r
- labelSetName = nullptr;\r
- delete changeIcon1;\r
- changeIcon1 = nullptr;\r
- delete changeIcon2;\r
- changeIcon2 = nullptr;\r
- delete changeIcon3;\r
- changeIcon3 = nullptr;\r
- delete group;\r
- group = nullptr;\r
+ if(nullptr != group)\r
+ {\r
+ group->RemoveAll();\r
+\r
+ if(nullptr != configScroll)\r
+ {\r
+ configScroll->RemoveAll();\r
+ if(nullptr != editLabel)\r
+ {\r
+ delete editLabel;\r
+ editLabel = nullptr;\r
+ }\r
+ // delete deleteImage;\r
+ // deleteImage = nullptr;\r
+ if(nullptr != labelTime)\r
+ {\r
+ delete labelTime;\r
+ labelTime = nullptr;\r
+ }\r
+ if(nullptr != labelSetTime)\r
+ {\r
+ delete labelSetTime;\r
+ labelSetTime = nullptr;\r
+ }\r
+ if(nullptr != labelDay)\r
+ {\r
+ delete labelDay;\r
+ labelDay = nullptr;\r
+ }\r
+ if(nullptr != labelSetWeek)\r
+ {\r
+ delete labelSetWeek;\r
+ labelSetWeek = nullptr;\r
+ }\r
+ // delete labelChangeName;\r
+ // labelChangeName = nullptr;\r
+ // delete labelSetName;\r
+ // labelSetName = nullptr;\r
+ if(nullptr != changeIcon1)\r
+ {\r
+ delete changeIcon1;\r
+ changeIcon1 = nullptr;\r
+ }\r
+ if(nullptr != changeIcon2)\r
+ {\r
+ delete changeIcon2;\r
+ changeIcon2 = nullptr;\r
+ }\r
+ // delete changeIcon3;\r
+ // changeIcon3 = nullptr;\r
+\r
+ delete configScroll;\r
+ configScroll = nullptr;\r
+ }\r
+ delete group;\r
+ group = nullptr;\r
+ }\r
g_pAlarmConfigView = nullptr;\r
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::~AlarmConfigView");\r
}\r
changeIcon2->SetSrc(PNG_SETTTING_BUTTON_IMAGE);\r
configScroll->Add(changeIcon2);\r
\r
- changeIcon3 = new UIImageView();\r
- if (changeIcon3 == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new changeIcon3 fail");\r
- return;\r
- }\r
- changeIcon3->SetPosition(MAX_IMAGE_CHANGE_X_LEN, MAX_IMAGE_CHANGE3_Y_LEN, MAX_IMAGE_CHANGE_WIDTH, MAX_IMAGE_CHANGE_HEIGHT);\r
- changeIcon3->SetSrc(PNG_SETTTING_BUTTON_IMAGE);\r
- configScroll->Add(changeIcon3);\r
+ // changeIcon3 = new UIImageView();\r
+ // if (changeIcon3 == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new changeIcon3 fail");\r
+ // return;\r
+ // }\r
+ // changeIcon3->SetPosition(MAX_IMAGE_CHANGE_X_LEN, MAX_IMAGE_CHANGE3_Y_LEN, MAX_IMAGE_CHANGE_WIDTH, MAX_IMAGE_CHANGE_HEIGHT);\r
+ // changeIcon3->SetSrc(PNG_SETTTING_BUTTON_IMAGE);\r
+ // configScroll->Add(changeIcon3);\r
\r
UIView::OnDragListener *configDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance();\r
if (configDragListener == nullptr) {\r
\r
void AlarmConfigView::CreateConfigButton(void)\r
{\r
- editLabel = CreateConfigLabel(SET_ALARM, MAX_DEFAULT_FONT_LEN, TITLE_X_LEN, MAX_TITLE_Y_LEN, LABEL_WID);\r
+ // editLabel = CreateConfigLabel(SET_ALARM, MAX_DEFAULT_FONT_LEN, TITLE_X_LEN, MAX_TITLE_Y_LEN, LABEL_WID);\r
+ editLabel = CreateConfigLabel(SET_ALARM, 30, 83, 50, 300);\r
if (editLabel == nullptr) {\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new editLabel fail");\r
return;\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new configScroll fail");\r
return nullptr;\r
}\r
- configScroll->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION - MAX_BACK_BUTTON_HEIGHT_LEN);\r
+ configScroll->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
+ // configScroll->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION - MAX_BACK_BUTTON_HEIGHT_LEN);\r
configScroll->SetReboundSize(CONFIG_SCROLL_SIZE);\r
configScroll->SetHorizontalScrollState(false);\r
CreateConfigButton();\r
- labelChangeName = CreateConfigLabel(CHANGE_NAME, MAX_DEFAULT_FONT_LEN, MAX_TITLE_X_LEN,\r
- MAX_LABEL_LABEL_CHANGE_NAME_Y_LEN, LABEL_WID);\r
- if (labelChangeName == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelChangeName fail");\r
- return nullptr;\r
- }\r
- configScroll->Add(labelChangeName);\r
- labelSetName = CreateConfigLabel(SET_NAME, LITTLE_LABEL_FONT, MAX_TITLE_X_LEN, MAX_LABEL_SET_NAME_Y_LEN, LABEL_WID);\r
- if (labelSetName == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelSetName fail");\r
- return nullptr;\r
- }\r
- labelSetName->SetStyle(STYLE_TEXT_OPA, LABEL_SEMITRANSPARENT);\r
- configScroll->Add(labelSetName);\r
- deleteImage = new UILabelButton();\r
- if (deleteImage == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new deleteImage fail");\r
- return nullptr;\r
- }\r
- deleteImage->SetPosition(MAX_DELETE_BUTTON_X_LEN, MAX_DELETE_BUTTON_Y_LEN, MAX_DELETE_BUTTON_W_LEN, MAX_DELETE_BUTTON_H_LEN);\r
- deleteImage->SetText(DELETE_INTERFACES);\r
- deleteImage->SetTouchable(true);\r
- deleteImage->SetViewId(ALARM_CLOCK_DELETE);\r
- deleteImage->SetTextColor(Color::Red());\r
- deleteImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_DEFAULT_LIT_FONT2_LEN);\r
- UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
- deleteImage->SetOnClickListener(clickListener);\r
- deleteImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
+ // labelChangeName = CreateConfigLabel(CHANGE_NAME, MAX_DEFAULT_FONT_LEN, MAX_TITLE_X_LEN,\r
+ // MAX_LABEL_LABEL_CHANGE_NAME_Y_LEN, LABEL_WID);\r
+ // if (labelChangeName == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelChangeName fail");\r
+ // return nullptr;\r
+ // }\r
+ // configScroll->Add(labelChangeName);\r
+ // labelSetName = CreateConfigLabel(SET_NAME, LITTLE_LABEL_FONT, MAX_TITLE_X_LEN, MAX_LABEL_SET_NAME_Y_LEN, LABEL_WID);\r
+ // if (labelSetName == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelSetName fail");\r
+ // return nullptr;\r
+ // }\r
+ // labelSetName->SetStyle(STYLE_TEXT_OPA, LABEL_SEMITRANSPARENT);\r
+ // configScroll->Add(labelSetName);\r
+ // deleteImage = new UILabelButton();\r
+ // if (deleteImage == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new deleteImage fail");\r
+ // return nullptr;\r
+ // }\r
+ // deleteImage->SetPosition(MAX_DELETE_BUTTON_X_LEN, MAX_DELETE_BUTTON_Y_LEN, MAX_DELETE_BUTTON_W_LEN, MAX_DELETE_BUTTON_H_LEN);\r
+ // deleteImage->SetText(DELETE_INTERFACES);\r
+ // deleteImage->SetTouchable(true);\r
+ // deleteImage->SetViewId(ALARM_CLOCK_DELETE);\r
+ // deleteImage->SetTextColor(Color::Red());\r
+ // deleteImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_DEFAULT_LIT_FONT2_LEN);\r
+ // UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
+ // deleteImage->SetOnClickListener(clickListener);\r
+ // deleteImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
\r
CreateChangeIcons();\r
group->Add(configScroll);\r
- group->Add(deleteImage);\r
+ // group->Add(deleteImage);\r
return group;\r
}\r
\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep labelTime error!");\r
return;\r
}\r
- if (alarmNum == 0) {\r
- deleteImage->SetVisible(false);\r
- } else if (alarmNum >= SET_ONE && alarmNum <= SET_FOUR) {\r
- deleteImage->SetVisible(true);\r
- }\r
+ // if (alarmNum == 0) {\r
+ // deleteImage->SetVisible(false);\r
+ // } else if (alarmNum >= SET_ONE && alarmNum <= SET_FOUR) {\r
+ // deleteImage->SetVisible(true);\r
+ // }\r
labelTime->SetTime24Hour(hour, min, 0);\r
labelDay->SetText(weekStr.c_str());\r
}\r
#include "UiConfig.h"\r
#include <string>\r
#include "AlarmPresenter.h"\r
+#include "ui_resource_string.h"\r
\r
namespace OHOS {\r
#define DELETE_INETERFACES "是否删除此闹钟？"\r
\r
AlarmJudgeView::~AlarmJudgeView()\r
{\r
- container->RemoveAll();\r
- delete labelText;\r
- labelText = nullptr;\r
- delete imageViewDelete;\r
- imageViewDelete = nullptr;\r
- delete container;\r
- container = nullptr;\r
+ DeinitDeleteScreen();\r
+\r
+ // container->RemoveAll();\r
+ // delete labelText;\r
+ // labelText = nullptr;\r
+ // delete imageViewDelete;\r
+ // imageViewDelete = nullptr;\r
+ // delete container;\r
+ // container = nullptr;\r
g_JudgeView = nullptr;\r
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView::~AlarmJudgeView");\r
}\r
\r
-void AlarmJudgeView::CreateImage(void)\r
+// void AlarmJudgeView::CreateImage(void)\r
+// {\r
+// UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
+// if (clickListener == nullptr) {\r
+// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new OnClickListener fail");\r
+// return;\r
+// }\r
+// imageViewDelete = new UIImageView();\r
+// if (imageViewDelete == nullptr) {\r
+// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new imageViewDelete fail");\r
+// return;\r
+// }\r
+// imageViewDelete->SetPosition(MAX_IMAGE_DELETE_X_LEN, MAX_IMAGE_DELETE_Y_LEN);\r
+// imageViewDelete->SetSrc(ALARM_DELETE_ADD_PATH);\r
+// imageViewDelete->SetViewId(JUDGE_DELETE);\r
+// imageViewDelete->SetWidth(MAX_IMAGE_DELETE_WIDTH_LEN);\r
+// imageViewDelete->SetTouchable(true);\r
+// imageViewDelete->SetOnClickListener(clickListener);\r
+// container->Add(imageViewDelete);\r
+\r
+// imageViewTrue = new UIImageView();\r
+// if (imageViewTrue == nullptr) {\r
+// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new imageViewTrue fail");\r
+// return;\r
+// }\r
+// imageViewTrue->SetPosition(MAX_IMAGE_TRUE_X_LEN, MAX_IMAGE_TRUE_Y_LEN); // 50 : size\r
+// imageViewTrue->SetSrc(ALARM_TRUE_ADD_PATH);\r
+// imageViewTrue->SetViewId(JUDGE_TRUE);\r
+// imageViewTrue->SetWidth(MAX_IMAGE_TRUE_WIDTH_LEN);\r
+// imageViewTrue->SetTouchable(true);\r
+// imageViewTrue->SetOnClickListener(clickListener);\r
+// container->Add(imageViewTrue);\r
+// }\r
+\r
+UIScrollView *AlarmJudgeView::InitJudgeView(void)\r
{\r
- UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
- if (clickListener == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new OnClickListener fail");\r
- return;\r
- }\r
- imageViewDelete = new UIImageView();\r
- if (imageViewDelete == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new imageViewDelete fail");\r
- return;\r
- }\r
- imageViewDelete->SetPosition(MAX_IMAGE_DELETE_X_LEN, MAX_IMAGE_DELETE_Y_LEN);\r
- imageViewDelete->SetSrc(ALARM_DELETE_ADD_PATH);\r
- imageViewDelete->SetViewId(JUDGE_DELETE);\r
- imageViewDelete->SetWidth(MAX_IMAGE_DELETE_WIDTH_LEN);\r
- imageViewDelete->SetTouchable(true);\r
- imageViewDelete->SetOnClickListener(clickListener);\r
- container->Add(imageViewDelete);\r
-\r
- imageViewTrue = new UIImageView();\r
- if (imageViewTrue == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new imageViewTrue fail");\r
- return;\r
- }\r
- imageViewTrue->SetPosition(MAX_IMAGE_TRUE_X_LEN, MAX_IMAGE_TRUE_Y_LEN); // 50 : size\r
- imageViewTrue->SetSrc(ALARM_TRUE_ADD_PATH);\r
- imageViewTrue->SetViewId(JUDGE_TRUE);\r
- imageViewTrue->SetWidth(MAX_IMAGE_TRUE_WIDTH_LEN);\r
- imageViewTrue->SetTouchable(true);\r
- imageViewTrue->SetOnClickListener(clickListener);\r
- container->Add(imageViewTrue);\r
+ // container = new UIScrollView();\r
+ // if (container == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new container fail");\r
+ // return nullptr;\r
+ // }\r
+ // container->SetPosition(CONTAINER_X, CONTAINER_Y);\r
+ // container->SetWidth(HORIZONTAL_RESOLUTION);\r
+ // container->SetHeight(VERTICAL_RESOLUTION);\r
+\r
+ // labelText = new UILabel();\r
+ // if (container == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new labelText fail");\r
+ // return nullptr;\r
+ // }\r
+ // labelText->SetPosition(MAX_LABEL_X_LEN, MAX_LABEL_Y_LEN, MAX_LABEL_LENGTH_LEN, MAX_LABEL_WIDTH_LEN);\r
+ // labelText->SetText(DELETE_INETERFACES);\r
+ // labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_LABEL_FONT_LEN);\r
+ // container->Add(labelText);\r
+\r
+ // CreateImage();\r
+ // return container;\r
+\r
+ return InitDeleteScreen();\r
}\r
\r
-UIScrollView *AlarmJudgeView::InitJudgeView(void)\r
+\r
+void AlarmJudgeView::DeinitDeleteScreen()\r
{\r
- container = new UIScrollView();\r
- if (container == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new container fail");\r
- return nullptr;\r
+ if(nullptr != DeleteGroup_)\r
+ {\r
+ DeleteGroup_->RemoveAll();\r
+ if(nullptr != DeleteTitleLabelExt_)\r
+ {\r
+ delete DeleteTitleLabelExt_;\r
+ DeleteTitleLabelExt_ = nullptr;\r
+ }\r
+ if(nullptr != DeletePromptLabelExt_)\r
+ {\r
+ delete DeletePromptLabelExt_;\r
+ DeletePromptLabelExt_ = nullptr;\r
+ }\r
+ if(nullptr != DeleteCancelButton_)\r
+ {\r
+ delete DeleteCancelButton_;\r
+ DeleteCancelButton_ = nullptr;\r
+ }\r
+ if(nullptr != DeleteOKButton_)\r
+ {\r
+ delete DeleteOKButton_;\r
+ DeleteOKButton_ = nullptr;\r
+ }\r
+ \r
+ delete DeleteGroup_;\r
+ DeleteGroup_ = nullptr;\r
}\r
- container->SetPosition(CONTAINER_X, CONTAINER_Y);\r
- container->SetWidth(HORIZONTAL_RESOLUTION);\r
- container->SetHeight(VERTICAL_RESOLUTION);\r
-\r
- labelText = new UILabel();\r
- if (container == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new labelText fail");\r
- return nullptr;\r
+}\r
+\r
+UIScrollView * AlarmJudgeView::InitDeleteScreen()\r
+{\r
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__);\r
+ if(nullptr == DeleteGroup_)\r
+ {\r
+ DeleteGroup_ = new UIScrollView();\r
+ if(nullptr == DeleteGroup_)\r
+ return nullptr;\r
+\r
+ DeleteGroup_->SetPosition(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);\r
+ // DeleteGroup_->SetViewId(SCHEDULE_ViewId_DeleteGroup_);\r
+ DeleteGroup_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);\r
+ DeleteGroup_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
+ // DeleteGroup_->SetTouchable(true);\r
+ // DeleteGroup_->SetDraggable(true);\r
+ // DeleteGroup_->SetOnDragListener(presenter_);\r
+\r
+ if(nullptr == DeleteTitleLabelExt_)\r
+ {\r
+ DeleteTitleLabelExt_ = new UILabelExt();\r
+ if(nullptr == DeleteTitleLabelExt_)\r
+ return nullptr;\r
+\r
+ DeleteTitleLabelExt_->SetPosition(83, 50, 300, 35);\r
+ DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_FONT, 30);\r
+ DeleteTitleLabelExt_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+ DeleteTitleLabelExt_->SetTextId(STR_DELETE);\r
+ DeleteTitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+ DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+ DeleteTitleLabelExt_->SetRollSpeed(70);\r
+ DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+ DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
+ }\r
+\r
+ if(nullptr == DeletePromptLabelExt_)\r
+ {\r
+ DeletePromptLabelExt_ = new UILabelExt();\r
+ if(nullptr == DeletePromptLabelExt_)\r
+ return nullptr;\r
+\r
+ DeletePromptLabelExt_->SetPosition(98, 187, 270, 35);\r
+ DeletePromptLabelExt_->SetStyle(STYLE_TEXT_FONT, 30);\r
+ DeletePromptLabelExt_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+ DeletePromptLabelExt_->SetText(DELETE_INETERFACES);\r
+ DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
+ DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+ DeletePromptLabelExt_->SetRollSpeed(70);\r
+ DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+ DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
+ }\r
+\r
+ UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
+ if(nullptr == DeleteCancelButton_)\r
+ {\r
+ DeleteCancelButton_ = new UILabelButtonExt();\r
+ if(nullptr == DeleteCancelButton_)\r
+ return nullptr;\r
+\r
+ DeleteCancelButton_->SetPosition(111, 299, 100, 100);\r
+ DeleteCancelButton_->SetViewId(JUDGE_DELETE);\r
+ DeleteCancelButton_->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
+ DeleteCancelButton_->SetStyle(STYLE_BACKGROUND_OPA, 25); // 10%\r
+ DeleteCancelButton_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED);\r
+ DeleteCancelButton_->SetStyleForState(STYLE_BACKGROUND_OPA, 25, UIButton::PRESSED);\r
+ DeleteCancelButton_->SetStyle(STYLE_BORDER_RADIUS, 100);\r
+ DeleteCancelButton_->SetImagePosition(0, 0);\r
+ DeleteCancelButton_->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE);\r
+ DeleteCancelButton_->SetOnClickListener(clickListener);\r
+ }\r
+\r
+ if(nullptr == DeleteOKButton_)\r
+ {\r
+ DeleteOKButton_ = new UILabelButtonExt();\r
+ if(nullptr == DeleteOKButton_)\r
+ return nullptr;\r
+\r
+ DeleteOKButton_->SetPosition(256, 299, 100, 100);\r
+ DeleteOKButton_->SetViewId(JUDGE_TRUE);\r
+ DeleteOKButton_->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
+ DeleteOKButton_->SetStyle(STYLE_BACKGROUND_OPA, 25); // 10%\r
+ DeleteOKButton_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED);\r
+ DeleteOKButton_->SetStyleForState(STYLE_BACKGROUND_OPA, 25, UIButton::PRESSED);\r
+ DeleteOKButton_->SetStyle(STYLE_BORDER_RADIUS, 100);\r
+ DeleteOKButton_->SetImagePosition(0, 0);\r
+ DeleteOKButton_->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE);\r
+ DeleteOKButton_->SetOnClickListener(clickListener);\r
+ }\r
+\r
+ DeleteGroup_->Add(DeleteTitleLabelExt_);\r
+ DeleteGroup_->Add(DeletePromptLabelExt_);\r
+ DeleteGroup_->Add(DeleteCancelButton_);\r
+ DeleteGroup_->Add(DeleteOKButton_);\r
}\r
- labelText->SetPosition(MAX_LABEL_X_LEN, MAX_LABEL_Y_LEN, MAX_LABEL_LENGTH_LEN, MAX_LABEL_WIDTH_LEN);\r
- labelText->SetText(DELETE_INETERFACES);\r
- labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_LABEL_FONT_LEN);\r
- container->Add(labelText);\r
\r
- CreateImage();\r
- return container;\r
+ return DeleteGroup_;\r
}\r
}
\ No newline at end of file
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE");\r
UNUSED(num);\r
uint32_t clockTime;\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d,%d", __LINE__, alarmListener, clockQty);\r
AlarmClockModel::GetInstance()->DeleteClockModel(alarmListener);\r
if (MainAlarmView::GetInstance() == nullptr) {\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeTrue new MainAlarmView::GetInstance() error");\r
MainAlarmView::GetInstance()->RefreshAlarm();\r
clockQty--;\r
for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, alarmNum);\r
+\r
if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime))) {\r
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error");\r
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error");\r
return;\r
}\r
MainAlarmView::GetInstance()->RefreshAlarm();\r
return true;\r
}\r
\r
+void AlarmPresenter::ClickDeleteButtonAlarmClockDelete(uint16_t num)\r
+{\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, num);\r
+ UNUSED(num);\r
+ alarmListener = num;\r
+ MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_JUDGE);\r
+ // if (MainAlarmView::GetInstance() == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickDeleteButtonAlarmClockDelete error");\r
+ // return;\r
+ // }\r
+}\r
+\r
+static const AlarmPresentMapper1 DeleteButtonPresentMapper[] = \r
+{\r
+ {ALARM_ITEM_DELETE[THE_FIRST_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete},\r
+ {ALARM_ITEM_DELETE[SECOND_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete},\r
+ {ALARM_ITEM_DELETE[THIRD_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete},\r
+ {ALARM_ITEM_DELETE[FOURTH_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete},\r
+ {ALARM_ITEM_DELETE[FIVE_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete},\r
+ {ALARM_ITEM_DELETE[SIX_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete},\r
+};\r
+\r
bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event)\r
{\r
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnClick ");\r
+\r
+ uint16_t num;\r
+ for (num = 0; num < CLOCK_NUM; num++)\r
+ {\r
+ if (0 == strcmp(view.GetViewId(), ALARM_ITEM_DELETE[num]))\r
+ {\r
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, num);\r
+ (this->*(DeleteButtonPresentMapper[num].func))(num);\r
+ return true;\r
+ }\r
+ }\r
+\r
bool jug = ClickFuncId(view.GetViewId());\r
if (!jug) {\r
ClickFuncView(view);\r
constexpr int16_t TITLE_X = 153;\r
constexpr int16_t TITLE_Y = 30;\r
constexpr int16_t LABEL_X = 0;\r
-constexpr int16_t LABEL_Y = 30;\r
+constexpr int16_t LABEL_Y = 45; // 30;\r
constexpr int16_t LABEL_FONT = 40;\r
constexpr int16_t TIME_PICKER_X = 75;\r
constexpr int16_t TIME_PICKER_WIDTH = 250;\r
constexpr int16_t TIME_LABEL_BUTTON_Y = 360;\r
constexpr int16_t LABEL_BLANK = 38;\r
constexpr int16_t LIST_W = 300;\r
-constexpr int16_t LIST_H = 250;\r
+constexpr int16_t LIST_H = 260; // 250;\r
constexpr int16_t TITLE_LABEL_DEFAULT_HEIGHT = 50;\r
constexpr int16_t BUTTON_WIDHT3 = 320;\r
constexpr int16_t BUTTON_HEIGHT3 = 101;\r
\r
AlarmSetTimeView::~AlarmSetTimeView()\r
{\r
- group->RemoveAll();\r
- delete timeImage;\r
- timeImage = nullptr;\r
- delete picker;\r
- picker = nullptr;\r
- delete title;\r
- title = nullptr;\r
- delete group;\r
- group = nullptr;\r
+ if(nullptr != group)\r
+ {\r
+ group->RemoveAll();\r
+ // delete timeImage;\r
+ // timeImage = nullptr;\r
+ if(nullptr != labelButton)\r
+ {\r
+ delete labelButton;\r
+ labelButton = nullptr;\r
+ }\r
+ if(nullptr != picker)\r
+ {\r
+ delete picker;\r
+ picker = nullptr;\r
+ }\r
+ if(nullptr != title)\r
+ {\r
+ delete title;\r
+ title = nullptr;\r
+ }\r
+\r
+ delete group;\r
+ group = nullptr;\r
+ }\r
g_pAlarmSetTimeView = nullptr;\r
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::~AlarmSetTimeView");\r
}\r
\r
void AlarmSetTimeView::SetLabelButton(void)\r
{\r
- timeImage = new UILabelButton();\r
- if (timeImage == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new timeImage fail");\r
- return;\r
- }\r
- timeImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3);\r
- timeImage->SetText(SURE);\r
- timeImage->SetTouchable(true);\r
- timeImage->SetViewId(ALARM_OK);\r
- if (OHOS::AlarmPresenter::GetInstance() == nullptr) {\r
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail");\r
- return;\r
+ // timeImage = new UILabelButton();\r
+ // if (timeImage == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new timeImage fail");\r
+ // return;\r
+ // }\r
+ // timeImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3);\r
+ // timeImage->SetText(SURE);\r
+ // timeImage->SetTouchable(true);\r
+ // timeImage->SetViewId(ALARM_OK);\r
+ // if (OHOS::AlarmPresenter::GetInstance() == nullptr) {\r
+ // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail");\r
+ // return;\r
+ // }\r
+ // timeImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue());\r
+ // timeImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_TIME_FONT);\r
+ // UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
+ // timeImage->SetOnClickListener(clickListener);\r
+ // timeImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
+ // group->Add(timeImage);\r
+\r
+ \r
+ labelButton = new UILabelButton();\r
+ if (labelButton == nullptr) {\r
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::SetLabelButton");\r
+ return ;\r
}\r
- timeImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue());\r
- timeImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_TIME_FONT);\r
+\r
+ labelButton->SetPosition(0, 366, 466, 100);\r
+ labelButton->SetViewId(ALARM_OK);\r
+ labelButton->SetText(SURE);\r
+ labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+ labelButton->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));\r
+ labelButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);\r
+ labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED);\r
+ labelButton->SetTouchable(true);\r
UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
- timeImage->SetOnClickListener(clickListener);\r
- timeImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
- group->Add(timeImage);\r
+ labelButton->SetOnClickListener(clickListener);\r
+ group->Add(labelButton);\r
}\r
\r
UIScrollView *AlarmSetTimeView::InitSetTimeView(void)\r
return nullptr;\r
}\r
group->Add(title);\r
- title->SetPosition(TITLE_X, TITLE_Y); // 672: x-coordinate\r
+ // title->SetPosition(TITLE_X, TITLE_Y); // 672: x-coordinate\r
+ title->SetPosition(83, 50, 300, 35);\r
+ title->SetStyle(STYLE_TEXT_FONT, 30);\r
+ title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+ title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+ title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
title->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);\r
picker = new UITimePicker();\r
if (picker == nullptr) {\r
picker->EnableSecond(false);\r
picker->SetPosition(TIME_PICKER_X, LABEL_Y + LABEL_BLANK, LIST_W, LIST_H); // 652: x-coordinate\r
picker->SetItemHeight(TIME_ITEM_HEIGHT);\r
- picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT);\r
- picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT);\r
+ // picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT);\r
+ // picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT);\r
+ picker->SetHighlightFont(GILROY_BOLD_FONT, 65); // 设置突出显示文本的字体名称和大小。\r
+ picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, 50); \r
+ picker->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff), Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));\r
picker->SetLoopState(0, true);\r
picker->SetLoopState(1, true);\r
picker->SetTouchable(true);\r
TempGroup_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
TempGroup_->SetStyle(STYLE_BORDER_RADIUS, 100);
- // UIView::OnClickListener *clockListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();
dClock[alarmNum] = new UIDigitalClock();
if (dClock[alarmNum] == nullptr) {
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new dClock fail");
}
dClock[alarmNum]->SetViewId(ALARM_CLOCK[alarmNum]);
dClock[alarmNum]->SetTouchable(true);
- // dClock[alarmNum]->SetOnClickListener(clockListener);
+ UIView::OnClickListener *clockListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();
+ dClock[alarmNum]->SetOnClickListener(clockListener);
dClock[alarmNum]->SetPosition(50, 10, 110, 50);
dClock[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, D_CLOCK_FONT_SIZE);
dClock[alarmNum]->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS);
}
else
{
- TempGroup_->SetPosition(0, 0, 100 + 10, 100);
- TempGroup_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
+ TempGroup_->SetPosition(0, 0, 100 + 15, 100);
+ TempGroup_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
TempGroup_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
TempGroup_->SetStyle(STYLE_BORDER_RADIUS, 100);
if(nullptr == DeleteButton_[alarmNum])
return nullptr;
- DeleteButton_[alarmNum]->SetPosition(10, 0, 100, 100);
+ DeleteButton_[alarmNum]->SetPosition(15, 0, 100, 100);
DeleteButton_[alarmNum]->SetViewId(ALARM_ITEM_DELETE[alarmNum]);
DeleteButton_[alarmNum]->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
DeleteButton_[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, 25); // 10%
SwipeView_[alarmNum]->SetOnSwipeListener(presenter_);
SwipeView_[alarmNum]->SetAnimatorTime(50); // 200:animator drag time(ms)
// SwipeView_[alarmNum]->SetOnDragListener(presenter_);
- SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
+ SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
SwipeView_[alarmNum]->SetStyle(STYLE_BORDER_RADIUS, 100);
// SwipeView_[alarmNum]->SetBlankSize(0);
// SwipeView_[alarmNum]->SetElastic(true);
SwipeViewItem_[alarmNum][0] = NewClockCtlExt(alarmNum, 0);
- SwipeViewItem_[alarmNum][1] = NewClockCtlExt(alarmNum, 1);
-
SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][0]);
- SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][1]);
+ if(0 != alarmNum)
+ {
+ SwipeViewItem_[alarmNum][1] = NewClockCtlExt(alarmNum, 1);
+ SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][1]);
+ }
+ // SwipeViewItem_[alarmNum][0] = NewClockCtlExt(alarmNum, 0);
+ // SwipeViewItem_[alarmNum][1] = NewClockCtlExt(alarmNum, 1);
+
+ // SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][0]);
+ // SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][1]);
SwipeView_[alarmNum]->SetCurrentPage(0);
SwipeView_[alarmNum]->SetIntercept(false);
reflashStatus = false;
dClock[num]->SetVisible(true);
statusButton[num]->SetVisible(true);
+
+ SwipeView_[num]->SetCurrentPage(0);
}
void MainAlarmView::OnStart()
bool MainAlarmView::ChangeJudge(int16_t thisView)
{
if (container[thisView] == nullptr) {
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::AlarmSetWeekView");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::ChangeJudge");
judgeView = new AlarmJudgeView();
if (judgeView == nullptr) {
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new container[%d] fail", thisView);
DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
DeleteTitleLabelExt_->SetRollSpeed(70);\r
DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
- DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xffff5a36);\r
+ DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
}\r
\r
if(nullptr == DeletePromptLabelExt_)\r
DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
DeletePromptLabelExt_->SetRollSpeed(70);\r
DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
- DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
+ DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
}\r
\r
if(nullptr == DeleteCancelButton_)\r
projects / mirrors / FD230.git / commitdiff