From: luozheng <1732036298@qq.com> Date: Mon, 8 Apr 2024 08:33:52 +0000 (+0800) Subject: 1.添加计时器视图,差最重要的功能未实现 X-Git-Tag: release_V1.2.70_20241020_135402~1200^2~22^2~1^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9b6f8e543b6d4b7b93c1c65e371e8225e9f850fc;p=mirrors%2FFD230.git 1.添加计时器视图,差最重要的功能未实现 2.添加秒表图标和计时器图标,删除不必要图片 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index e2ff02ffd..197ad7b21 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -252,6 +252,13 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/src/HeartCardView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/health_service/health_service.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/MainCountDownPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/CountDownModel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/MainCountDownView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/CountDownTimeConfigView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/CountDownTimeNotNullView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/StartCountDownView.cpp + # 语言切换 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchListAdapter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchListitemView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h index 113b71df6..45da6f1ba 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h @@ -57,6 +57,7 @@ typedef enum : uint16_t VIEW_FIND_PHONE, // 查找手机 VIEW_LANGUAGE_SWITCH, // 语言切换 VIEW_MAIN_STOPWATCH, // 秒表 + VIEW_MAIN_COUNTDOWN, // 计时器 /* ----------------------------------- 录音 ----------------------------------- */ VIEW_RECORD, /* ---------------------------------- 界面 ---------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h index 830bad2a0..12e0fd777 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h @@ -46,6 +46,7 @@ namespace OHOS void InitFindPhoneSlice(void); void InitLanguageSwitchSlice(void); void InitMainStopWatchSlice(void); + void InitMainCountDownSlice(void); /* --------------------------------界面------------------------------------ */ void InitRotateSlice(void); void InitBloodSlice(void); diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 61bea2d6f..ba63c7a72 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -220,6 +220,7 @@ namespace OHOS static constexpr const char *PNG_APPLIST_TRAINING_IMAGE = APP_RES_PATH "/APPLIST_TRAINING.bin"; // 训练 static constexpr const char *PNG_APPLIST_TRAINING_RECORD_IMAGE = APP_RES_PATH "/APPLIST_TRAINING_RECORD.bin"; // 训练记录 static constexpr const char *PNG_APPLIST_STOPWATCH_IMAGE = APP_RES_PATH "/APPLIST_STOPWATCH.bin"; // 秒表 + static constexpr const char *PNG_APPLIST_COUNTDOWN_IMAGE = APP_RES_PATH "/APPLIST_COUNTDOWN.bin"; // 计时器 /* ---------------------------------- 快速训练 ---------------------------------- */ static constexpr const char *PNG_TRAING_BOUTTONMORE_IMAGE = APP_RES_PATH "/Training/More.bin"; static constexpr const char *PNG_TRAING_BUTTONGRONG_IMAGE = APP_RES_PATH "/Training/Bouttonground.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index ae32d0041..cfadc512f 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -146,6 +146,9 @@ #include "stopwatch/include/MainStopWatchPresenter.h" #include "stopwatch/include/MainStopWatchView.h" + +#include "countdown/include/MainCountDownPresenter.h" +#include "countdown/include/MainCountDownView.h" /* -------------------------------------------------------------------------- */ #include "traing/include/TraingView.h" #include "traing/include/TraingPresenter.h" @@ -265,6 +268,8 @@ namespace OHOS {VIEW_FIND_PHONE, &NativeLauncher::InitFindPhoneSlice}, {VIEW_LANGUAGE_SWITCH, &NativeLauncher::InitLanguageSwitchSlice}, {VIEW_MAIN_STOPWATCH, &NativeLauncher::InitMainStopWatchSlice}, + {VIEW_MAIN_COUNTDOWN, &NativeLauncher::InitMainCountDownSlice}, + {VIEW_MESSAGE, &NativeLauncher::InitMessageSlice}, {VIEW_ROTATE, &NativeLauncher::InitRotateSlice}, {VIEW_DIALUPDATE, &NativeLauncher::InitDialUpdateSlice}, @@ -1111,9 +1116,22 @@ namespace OHOS SliceProxy *mainstopwatch = new AbilitySliceProxy; if (mainstopwatch == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainstopwatch"); return; } NativeAbility::GetInstance().AddSliceProxy(VIEW_MAIN_STOPWATCH, mainstopwatch); } + /*倒计时*/ + void NativeLauncher::InitMainCountDownSlice(void) + { + SliceProxy *maincountdown = new AbilitySliceProxy; + if (maincountdown == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "maincountdown"); + return; + } + NativeAbility::GetInstance().AddSliceProxy(VIEW_MAIN_COUNTDOWN, maincountdown); + } + } diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 5cfe6b578..661cafeab 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -37,6 +37,7 @@ namespace OHOS {VIEW_CALLER_LOG, PNG_APPLIST_CALLLOG_IMAGE, PNG_APPLIST_CALLLOG_IMAGE, "通话记录", nullptr}, {VIEW_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, "电话", nullptr}, {VIEW_MAIN_STOPWATCH, PNG_APPLIST_STOPWATCH_IMAGE, PNG_APPLIST_STOPWATCH_IMAGE, "秒表", nullptr}, + {VIEW_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_IMAGE, "计时器", nullptr}, //{VIEW_CONNECT_PHONE, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "连接手机", nullptr}, //{VIEW_LANGUAGE_SWITCH, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "语言切换", nullptr}, #ifdef SUPPORT_ALIPAY_SEC diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h new file mode 100644 index 000000000..47b8e6e3a --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h @@ -0,0 +1,33 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-07 18:15:53 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-07 21:14:31 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h + */ +#ifndef COUNTDOWN_MODEL_H +#define COUNTDOWN_MODEL_H + +#include +namespace OHOS +{ + class CountDownModel + { + public: + + static CountDownModel *GetInstance(); // shared_ptr:当没有引用指向这个实例时会自动释放内存 + + void SetCountDownTime(const std::string &countdowntime); // 设置倒计时时间 + std::string GetCountDownTime(void); // 获取倒计时时间 + void SetRingTime(const std::string &ringtime); // 设置响铃时间 + std::string GetRingTime(void); // 获取响铃时间 + + private: + CountDownModel() {} + ~CountDownModel() {} + + std::string RingTime{"00:00:00"}; // 响铃时间 + std::string CountTime{"00:00:00"}; // 倒计时时间 + }; +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeConfigView.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeConfigView.h new file mode 100644 index 000000000..d225853ab --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeConfigView.h @@ -0,0 +1,43 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-07 18:15:53 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-08 10:17:48 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeConfigView.h + */ +#ifndef COUNTDOWN_TIME_CONFIG_VIEW_H +#define COUNTDOWN_TIME_CONFIG_VIEW_H + +#include "BaseView.h" +#include "View.h" +#include "components/ui_view_group.h" +#include "components/ui_scroll_view.h" +#include "components/ui_label_ext.h" +#include "components/ui_time_picker.h" +#include "components/ui_image_view.h" +#include "components/ui_button.h" +/*倒计时时间配置*/ +namespace OHOS +{ + static constexpr const char *COLONEIMAGESPATH = "/user/res/countdown/COUNTDOWN_COLONE.bin"; // 冒号图片 + static constexpr const char *START_COUNTDOWN_BUTTON_IMAGEPATH = "/user/res/countdown/COUNTDOWM_PAUSE.bin"; // 开始倒计时按钮图片 + static constexpr const char *STARTCOUNTDOWN_BUTTON = "startCountdownButton"; // 开始倒计时按钮视图id + static constexpr const char *COUNTDOWN_TIMECONFIG_VIEW = "CountDownTimeConfigView"; + class CountDownTimeConfigView + { + public: + CountDownTimeConfigView(); + virtual ~CountDownTimeConfigView(); + static CountDownTimeConfigView *GetInstance(void); + UIScrollView *CountDownTimeConfigViewInit(void); + void ClearAll(void); + + private: + UIScrollView *scrollView = nullptr; + UILabelExt *Title = nullptr; + UITimePicker *timePicker = nullptr; + UIImageView *Img[2]{nullptr}; + UIButton *startCountdownButton{nullptr}; + }; +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeNotNullView.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeNotNullView.h new file mode 100644 index 000000000..0e3d77785 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeNotNullView.h @@ -0,0 +1,41 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-07 18:15:53 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-08 14:52:37 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownTimeNotNullView.h + */ +#ifndef COUNTDOWN_TIME_NOT_NULL_VIEW_H +#define COUNTDOWN_TIME_NOT_NULL_VIEW_H + +#include "BaseView.h" +#include "View.h" +#include "components/ui_scroll_view.h" +#include "components/ui_label_ext.h" +#include "components/ui_image_view.h" +#include "components/ui_label_button_ext.h" + +/*倒计时时间不能为0*/ +namespace OHOS +{ + static constexpr const char *COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON = "ReturnButton"; // 点击该按钮后回到倒计时设置界面 + static constexpr const char *COUNTDOWNTIMENOTNULLVIEW = "CountDownTimeNotNullView"; + class CountDownTimeNotNullView + { + + public: + CountDownTimeNotNullView(); + virtual ~CountDownTimeNotNullView(); + static CountDownTimeNotNullView *GetInstance(void); + UIScrollView * CountDownTimeNotNullViewInit(void); + void ClearAll(void); + + private: + UIScrollView *scrollView = nullptr; + UILabelExt *Title = nullptr; + UIImageView *Attention = nullptr; + UILabelExt *AttentionLabel = nullptr; + UILabelButtonExt *button = nullptr; + }; +} // namespace OHOS +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h new file mode 100644 index 000000000..c3b8ead24 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h @@ -0,0 +1,60 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-07 18:15:53 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-08 14:39:58 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h + */ +#ifndef MAIN_COUNTDOWN_PRESENTER_H +#define MAIN_COUNTDOWN_PRESENTER_H + +#include "View.h" +#include "Presenter.h" +#include "MainCountDownView.h" + +/*倒计时的主界面*/ +namespace OHOS +{ + typedef enum + { + MAIN_COUNTDOWN = 0, // 倒计时主视图 + TIMECONFIG_COUNTDOWN, // 自定义倒计时 + START_COUNTDOWN, // 开始倒计时 + COUNTDOWN_TIMENOTNULL, // 倒计时时间不能为空 + COUNTDOWN_MAX, + } CountDownViewId; + + class MainCountDownView; + class MainCountDownPresenter : public Presenter, + public UIView::OnClickListener, + public UIView::OnDragListener, + UITimePicker::SelectedListener, + public UICheckBox::OnChangeListener, + public RootView::OnKeyActListener + { + public: + MainCountDownPresenter(); + virtual ~MainCountDownPresenter(); + + void OnStart() override; + void OnPause() override; + void OnResume() override; + void OnStop() override; + + static MainCountDownPresenter *GetInstance(); + + private: + // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; + bool OnClick(UIView &view, const ClickEvent &event) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + bool OnDragEnd(UIView &view, const DragEvent &event) override; + bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 + bool OnChange(UICheckBox::UICheckBoxState state) override; + void OnTimePickerStoped(UITimePicker &picker) override; + + std::string countdowntime{0}; + std::string ringtime{0}; + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h new file mode 100644 index 000000000..2eaf8ca2a --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h @@ -0,0 +1,83 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-07 18:15:53 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-08 16:15:10 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h + */ +#ifndef MAIN_COUNTDOWN_VIEW_H +#define MAIN_COUNTDOWN_VIEW_H + +#include "BaseView.h" +#include "View.h" +#include "components/ui_view_group.h" +#include "components/ui_scroll_view.h" +#include "components/ui_label_ext.h" +#include "components/ui_label_button_ext.h" +#include "countdown/include/CountDownTimeConfigView.h" +#include "countdown/include/CountDownTimeNotNullView.h" +#include "countdown/include/StartCountDownView.h" +/*倒计时的主界面*/ +namespace OHOS +{ +#define CountDownImageSrc "/user/res/countdown/" + + // 图片路径 + static const char *COUNTDOWM_TIMER_ICON = CountDownImageSrc "COUNTDOWM_TIMER_ICON.bin"; + + // 视图ID + static constexpr const char *COUNTDOWN_LABELBUTTON_VIEWID = "COUNTDOWN_LABELBUTTON"; // 自定义时间ID + static constexpr const char *COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID = "COUNTDOWN_ONE_MINUTE_BUTTON"; // 1分钟 + static constexpr const char *COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID = "COUNTDOWN_FIVE_MINUTE_BUTTON"; // 5分钟 + static constexpr const char *COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID = "COUNTDOWN_TEN_MINUTE_BUTTON"; // 10分钟 + static constexpr const char *COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID = "COUNTDOWN_THIRTY_MINUTE_BUTTON"; // 30 分钟 + static constexpr const char *MAINCOUNTDOWNVIEW = "MainCountDownView"; +} +namespace OHOS +{ +#define COUNTDOWN_MAX_VIEW 4 + + class MainCountDownPresenter; + class MainCountDownView : public View + { + + public: + MainCountDownView(); + virtual ~MainCountDownView(); + static MainCountDownView *GetInstance(void); + bool ClickFunc(int16_t interface); + void ChangeView(int16_t hideView, int16_t showView); + bool ChangeMainCountDown(int16_t thisView); + bool ChangeTimeConfigCountdown(int16_t thisView); + bool ChangeCountdownTimeNotNull(int16_t thisView); + bool ChangeStartCountDown(int16_t thisView); + StartCountDownView *GetStartCountDownView(void); + + public: + void OnStart() override; + void OnSetUpView() override; + void OnTearDownView() override; + void OnStop() override; + + private: + CountDownTimeConfigView *p_CountDownTimeConfigView{nullptr}; + CountDownTimeNotNullView *p_CountDownTimeNotNullView{nullptr}; + StartCountDownView *p_StartCountDownView{nullptr}; + + private: + void MainCountDownViewInit(void); + void ClearAll(void); + UILabelButtonExt *SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text); + UIViewGroup *group = nullptr; + UIScrollView *scrollView[COUNTDOWN_MAX_VIEW]{nullptr}; + UILabelExt *Title{nullptr}; + UILabelExt *QuickStart{nullptr}; + UILabelButtonExt *CUSTOM_COUNTDOWN{nullptr}; // 自定义倒计时 + UILabelButtonExt *COUNTDOWN_ONE_MINUTE_BUTTON = nullptr; + UILabelButtonExt *COUNTDOWN_FIVE_MINUTE_BUTTON = nullptr; + UILabelButtonExt *COUNTDOWN_TEN_MINUTE_BUTTON = nullptr; + UILabelButtonExt *COUNTDOWN_THIRTY_MINUTE_BUTTON = nullptr; + bool viewInitStatus{false}; + }; +} // namespace OHOS +#endif // MainCountDown_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h new file mode 100644 index 000000000..b8ac24e67 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h @@ -0,0 +1,46 @@ +#ifndef START_COUNTDOWN_VIEW_H +#define START_COUNTDOWN_VIEW_H + +#include "BaseView.h" +#include "View.h" + +#include "components/ui_scroll_view.h" +#include "components/ui_label_ext.h" +#include "components/ui_image_view.h" +#include "components/ui_toggle_button.h" +#include "components/ui_button.h" +#include "components/ui_checkbox.h" + +/*开始倒计时*/ +namespace OHOS +{ + static constexpr const char *EndButton_ImagePath = "/user/res/countdown/COUNTDOWM_END.bin"; // 结束返回按钮图片 + static constexpr const char *CountDown_Play_ImagePath = "/user/res/countdown/COUNTDOWM_PLAY.bin"; // 开始倒计时image + static constexpr const char *CountDown_PAUSE_ImagePath = "/user/res/countdown/COUNTDOWM_PAUSE.bin"; // 暂停倒计时image + static constexpr const char *VectorImagesPath = "/user/res/countdown/COUNTDOWM_VECTOR.bin"; + static constexpr const char *PlayOrPauseToggleButton_ViewID = "PlayOrPauseToggleButton"; // 暂停和开始toggleButton视图id + static constexpr const char *STARTCOUNTDOWNVIEWRETURNBUTTON = "StartCountDownViewReturnButton"; + static constexpr const char *STARTCOUNTDOWNVIEW = "StartCountDownView"; + class StartCountDownView + { + + public: + StartCountDownView(); + virtual ~StartCountDownView(); + static StartCountDownView *GetInstance(void); + UIScrollView *StartCountDownViewInit(void); + void ClearAll(void); + UILabelExt *GetShowCountDownTimelabel(void); // 获取显示倒计时时间标签 + UILabelExt *GetShowTheRingTimelabel(void); // 获取显示响铃时间标签 + private: + UIScrollView *scrollView = nullptr; + UILabelExt *Title = nullptr; + UILabelExt *showCountDownTimelabel = nullptr; + UILabelExt *showTheRingTime = nullptr; + UIImageView *vectorImage = nullptr; + UIToggleButton *play_or_pause_toggleButton = nullptr; + UIButton *endbutton = nullptr; + bool viewInitStatus{false}; + }; +} // namespace OHOS +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp new file mode 100644 index 000000000..61ad9b789 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp @@ -0,0 +1,82 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-07 18:15:53 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-07 21:13:35 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp + */ +#include "countdown/include/CountDownModel.h" +#include +#include +#include +namespace OHOS +{ + /* -------------------------------------------------------------------------- */ + struct Time + { + int hour; + int minute; + int second; + }; + // 解析时间字符串并返回 Time 结构体 + static Time ParseTimeString(const std::string &timeString) + { + Time time; + + std::stringstream ss(timeString); + char delimiter; + + ss >> time.hour >> delimiter >> time.minute >> delimiter >> time.second; + + return time; + } + // 格式化时间:确保它是 “hh:mm:ss” 格式 + std::string FormatTime(int hours, int minutes, int seconds) + { + std::ostringstream oss; + oss << std::setw(2) << std::setfill('0') << hours << ":" + << std::setw(2) << std::setfill('0') << minutes << ":" + << std::setw(2) << std::setfill('0') << seconds; + + return oss.str(); + } + /* -------------------------------------------------------------------------- */ + // 定义了 GetInstance() 方法来获取 CountDownModel 的实例,确保只有一个全局实例存在。 + CountDownModel *CountDownModel::GetInstance() + { + static CountDownModel instance; + return &instance; + } + + // 设置倒计时时间 + void CountDownModel::SetCountDownTime(const std::string &countdowntime) + { + CountTime = countdowntime; + } + + // 获取倒计时时间 + std::string CountDownModel::GetCountDownTime(void) + { + return CountTime; + } + + // 设置响铃时间 + void CountDownModel::SetRingTime(const std::string &ringtime) + { + Time time = ParseTimeString(ringtime); + if (time.hour == 0) // 如果倒计时时间小于一小时就只显示分钟和秒 + { + std::string rt = ringtime.substr(3, 5); //"00:05:00":从第3个位置开始截图5个字符 ,substr不会修改原来的字符串 + RingTime = rt; + return; + } + RingTime = ringtime; + } + + // 获取响铃时间 + std::string CountDownModel::GetRingTime(void) + { + return RingTime; + } + +} diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp new file mode 100644 index 000000000..ca9fdfc9d --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp @@ -0,0 +1,165 @@ +#include "countdown/include/CountDownTimeConfigView.h" +#include "countdown/include/MainCountDownPresenter.h" +#include "countdown/include/CountDownModel.h" +#include "UiConfig.h" +#include "wearable_log.h" +/*倒计时时间配置*/ +namespace OHOS +{ + + static CountDownTimeConfigView *g_pCountDownTimeConfigView{nullptr}; + + CountDownTimeConfigView::CountDownTimeConfigView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::CountDownTimeConfigView"); + g_pCountDownTimeConfigView = this; + } + + CountDownTimeConfigView::~CountDownTimeConfigView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::~CountDownTimeConfigView"); + ClearAll(); + g_pCountDownTimeConfigView = nullptr; + } + + CountDownTimeConfigView *CountDownTimeConfigView::GetInstance() + { + return g_pCountDownTimeConfigView; + } + + void CountDownTimeConfigView::ClearAll() + { + scrollView->RemoveAll(); + + if (Title != nullptr) + { + delete Title; + Title = nullptr; + } + + if (timePicker != nullptr) + { + delete timePicker; + timePicker = nullptr; + } + + for (int i = 0; i < 2; i++) + { + delete Img[i]; + Img[i] = nullptr; + } + + if (startCountdownButton != nullptr) + { + delete startCountdownButton; + startCountdownButton = nullptr; + } + + if (scrollView != nullptr) + { + delete scrollView; + scrollView = nullptr; + } + } + + UIScrollView *CountDownTimeConfigView::CountDownTimeConfigViewInit() + { + if (scrollView == nullptr) + { + scrollView = new UIScrollView(); + if (scrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::scrollView is new fail!!"); + return nullptr; + } + scrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + UIView::OnDragListener *dragListener = static_cast(MainCountDownPresenter::GetInstance()); + if (dragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dragListener is nullptr!!"); + return nullptr; + } + scrollView->SetViewId(COUNTDOWN_TIMECONFIG_VIEW); + scrollView->SetOnDragListener(dragListener); + scrollView->SetHorizontalScrollState(false); + scrollView->SetVerticalScrollState(false); + /* -------------------------------------------------------------------------- */ + Title = new UILabelExt(); + if (Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::Title is new fail!!"); + return nullptr; + } + Title->SetPosition(83, 52, 300, 40); + Title->SetStyle(STYLE_TEXT_FONT, 30); + Title->SetStyle(STYLE_LINE_HEIGHT, 35); + Title->SetText("倒计时"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(40); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------------------------------------------------------- */ + timePicker = new UITimePicker(); + if (timePicker == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::timePicker is new fail!!"); + return nullptr; + } + timePicker->SetPosition(74, 121, 320, 180); + timePicker->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + timePicker->SetStyle(STYLE_BORDER_RADIUS, 51); + timePicker->SetItemHeight(60); // 设置时间选择器中每个项目的高度。 + timePicker->EnableSecond(true); // 设置在时间选择器中启用秒。 + timePicker->SetSelected(CountDownModel::GetInstance()->GetCountDownTime().c_str()); // 设置时间选择器中当前选择的时间。 + timePicker->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff), Color::GetColorFromRGBA(0xff, 0xa8, 0x00, 0xff)); // 设置时间选择器中的文本颜色。 + timePicker->SetLoopState(UITimePicker::PickerType::PICKER_HOUR, true); // 设置是否开启循环 :时 + timePicker->SetLoopState(UITimePicker::PickerType::PICKER_MIN, true); // 设置是否开启循环:分 + timePicker->SetLoopState(UITimePicker::PickerType::PICKER_SEC, true); // 设置是否开启循环:秒 + timePicker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, 60); // 设置突出显示文本的字体名称和大小。 + timePicker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置背景文本的字体名称和大小。 + UITimePicker::SelectedListener *selectTimeListener = + (UITimePicker::SelectedListener *)OHOS::MainCountDownPresenter::GetInstance(); + timePicker->RegisterSelectedListener(selectTimeListener); + /* -------------------------------------------------------------------------- */ + for (int i = 0; i < 2; i++) + { + // 计算每个图片的x位置,这里第一张图片的x坐标是 175,第二张图片的x坐标是 280 + int xpos = (i == 0) ? 175 : 280; + Img[i] = new UIImageView(); + if (Img[i] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::Img[%d] is new fail!!", i); + return nullptr; + } + + Img[i]->SetPosition(xpos, 200, 18, 79); + Img[i]->SetSrc(COLONEIMAGESPATH); + } + /* -------------------------------------------------------------------------- */ + startCountdownButton = new UIButton(); + if (startCountdownButton == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::startCountdownButton is new fail!!"); + return nullptr; + } + startCountdownButton->SetPosition(183, 321, 100, 100); + startCountdownButton->SetViewId(STARTCOUNTDOWN_BUTTON); + startCountdownButton->SetStyle(STYLE_BORDER_RADIUS, 52); + startCountdownButton->SetImageSrc(START_COUNTDOWN_BUTTON_IMAGEPATH, START_COUNTDOWN_BUTTON_IMAGEPATH); + startCountdownButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); + startCountdownButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + startCountdownButton->SetStyleForState(STYLE_BORDER_RADIUS, 52, UIButton::PRESSED); + UIView::OnClickListener *start_countdown_button_Click = static_cast(MainCountDownPresenter::GetInstance()); + startCountdownButton->SetOnClickListener(start_countdown_button_Click); + + /* ----------------------------------- Add ---------------------------------- */ + scrollView->Add(Title); + scrollView->Add(timePicker); + scrollView->Add(Img[0]); + scrollView->Add(Img[1]); + scrollView->Add(startCountdownButton); + } + return scrollView; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp new file mode 100644 index 000000000..dbb2cd97b --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp @@ -0,0 +1,133 @@ +#include "countdown/include/CountDownTimeNotNullView.h" +#include "countdown/include/MainCountDownPresenter.h" +#include "UiConfig.h" +#include "wearable_log.h" +/*倒计时时间不能为0*/ +namespace OHOS +{ + + static CountDownTimeNotNullView *g_pCountDownTimeNotNullView{nullptr}; + + CountDownTimeNotNullView::CountDownTimeNotNullView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::CountDownTimeNotNullView"); + + g_pCountDownTimeNotNullView = this; + } + + CountDownTimeNotNullView::~CountDownTimeNotNullView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::~CountDownTimeNotNullView"); + ClearAll(); + g_pCountDownTimeNotNullView = nullptr; + } + + CountDownTimeNotNullView *CountDownTimeNotNullView::GetInstance() + { + + return g_pCountDownTimeNotNullView; + } + + void CountDownTimeNotNullView::ClearAll() + { + scrollView->RemoveAll(); + if (Title != nullptr) + { + delete Title; + Title = nullptr; + } + if (Attention != nullptr) + { + delete Attention; + Attention = nullptr; + } + if (AttentionLabel != nullptr) + { + delete AttentionLabel; + AttentionLabel = nullptr; + } + if (button != nullptr) + { + delete button; + button = nullptr; + } + if (scrollView != nullptr) + { + delete scrollView; + scrollView = nullptr; + } + } + + UIScrollView *CountDownTimeNotNullView::CountDownTimeNotNullViewInit() + { + if (scrollView == nullptr) + { + scrollView = new UIScrollView(); + scrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + scrollView->SetViewId(COUNTDOWNTIMENOTNULLVIEW); + scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + /* -------------------------------------------------------------------------- */ + Title = new UILabelExt(); + if (Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::Title is new fail!!"); + return nullptr; + } + Title->SetPosition(83, 52, 300, 40); + Title->SetStyle(STYLE_TEXT_FONT, 30); + Title->SetStyle(STYLE_LINE_HEIGHT, 35); + Title->SetText("倒计时"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(40); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------------------------------------------------------- */ + Attention = new UIImageView(); + if (Attention == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::Attention is new fail!!"); + return nullptr; + } + Attention->SetPosition(193, 121, 80, 80); + Attention->SetStyle(STYLE_BORDER_RADIUS, 100); + Attention->SetSrc(PNG_ATTENTION_IMAGE); + /* -------------------------------------------------------------------------- */ + AttentionLabel = new UILabelExt(); + if (AttentionLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::AttentionLabel is new fail!!"); + return nullptr; + } + AttentionLabel->SetPosition(33, 253, 400, 40); + AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30); + AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + AttentionLabel->SetText("请先设置好倒计时间"); + AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + AttentionLabel->SetRollSpeed(40); + AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------------------------------------------------------- */ + if (button == nullptr) + { + button = new UILabelButtonExt(); + } + button->SetPosition(0, 366, 466, 100); + button->SetViewId(COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON); + button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE); + button->SetText("知道了"); + button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + button->SetStyle(STYLE_LINE_HEIGHT, 35); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); + UIView::OnClickListener *buttonClick = static_cast(MainCountDownPresenter::GetInstance()); + button->SetOnClickListener(buttonClick); + /* ----------------------------------- Add ---------------------------------- */ + scrollView->Add(Title); + scrollView->Add(Attention); + scrollView->Add(AttentionLabel); + scrollView->Add(button); + } + + return scrollView; + } + +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp new file mode 100644 index 000000000..0d964612f --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp @@ -0,0 +1,209 @@ +#include "AppViewIDs.h" +#include "NativeAbility.h" +#include "countdown/include/MainCountDownPresenter.h" +#include "countdown/include/CountDownModel.h" +#include "common/key_code.h" +#include +/*倒计时的主界面*/ + +namespace OHOS +{ + static constexpr const char *OneMinuteTime = "00:01:00"; // 1分钟 + static constexpr const char *FiveMinuteTime = "00:05:00"; // 5分钟 + static constexpr const char *TenMinuteTime = "00:10:00"; // 10分钟 + static constexpr const char *ThirtyMinuteTime = "00:30:00"; // 30分钟 + + // 当前Presenter属性实例化的内存指针 + static MainCountDownPresenter *g_pMainCountDownPresenter = nullptr; + + MainCountDownPresenter::MainCountDownPresenter() + { + + g_pMainCountDownPresenter = this; + } + + MainCountDownPresenter::~MainCountDownPresenter() + { + + g_pMainCountDownPresenter = nullptr; + } + + MainCountDownPresenter *MainCountDownPresenter::GetInstance() + { + + return g_pMainCountDownPresenter; + } + + void MainCountDownPresenter::OnStart() + { + + Presenter::OnStart(); + } + + void MainCountDownPresenter::OnPause(void) + { + + Presenter::OnPause(); + } + + void MainCountDownPresenter::OnResume(void) + { + + Presenter::OnResume(); + } + + void MainCountDownPresenter::OnStop(void) + { + + Presenter::OnStop(); + } + + bool MainCountDownPresenter::OnDrag(UIView &view, const DragEvent &event) + { + UNUSED(view); + UNUSED(event); + return true; + } + + bool MainCountDownPresenter::OnDragEnd(UIView &view, const DragEvent &event) + { + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && strcmp(view.GetViewId(), MAINCOUNTDOWNVIEW) == 0) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + } + else if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && strcmp(view.GetViewId(), COUNTDOWN_TIMECONFIG_VIEW) == 0) + { + MainCountDownView::GetInstance()->ChangeView(TIMECONFIG_COUNTDOWN, MAIN_COUNTDOWN); + } + return true; + } + + static bool SetCountDownAndChangeView(MainCountDownView *p_MainCountDownView, const std::string &timeValue) + { + CountDownModel *model = CountDownModel::GetInstance(); + model->SetCountDownTime(timeValue); + model->SetRingTime(timeValue); + + // Update label texts if necessary + if (p_MainCountDownView->GetStartCountDownView() != nullptr) + { + p_MainCountDownView->GetStartCountDownView()->GetShowCountDownTimelabel()->SetText(timeValue.c_str()); + p_MainCountDownView->GetStartCountDownView()->GetShowTheRingTimelabel()->SetText(timeValue.c_str()); + } + + p_MainCountDownView->ChangeView(MAIN_COUNTDOWN, START_COUNTDOWN); + return true; + } + + bool MainCountDownPresenter::OnClick(UIView &view, const ClickEvent &event) + { + UNUSED(event); + MainCountDownView *p_MainCountDownView = MainCountDownView::GetInstance(); + if (p_MainCountDownView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCountDownView::GetInstance fail!!"); + return false; + } + + if (strcmp(view.GetViewId(), COUNTDOWN_LABELBUTTON_VIEWID) == 0) + { + p_MainCountDownView->ChangeView(MAIN_COUNTDOWN, TIMECONFIG_COUNTDOWN); + return true; + } + + /*四个快速开始倒计时按钮*/ + if (strcmp(view.GetViewId(), COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID) == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID"); + return SetCountDownAndChangeView(p_MainCountDownView, OneMinuteTime); + } + else if (strcmp(view.GetViewId(), COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID) == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID"); + return SetCountDownAndChangeView(p_MainCountDownView, FiveMinuteTime); + } + else if (strcmp(view.GetViewId(), COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID) == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID"); + return SetCountDownAndChangeView(p_MainCountDownView, TenMinuteTime); + } + else if (strcmp(view.GetViewId(), COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID) == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID"); + return SetCountDownAndChangeView(p_MainCountDownView, ThirtyMinuteTime); + } + + if (strcmp(view.GetViewId(), STARTCOUNTDOWN_BUTTON) == 0) // 在自定义倒计时界面点击开始按钮跳转到开始倒计时界面 + { + if (strcmp(CountDownModel::GetInstance()->GetCountDownTime().c_str(), "00:00:00") == 0) + { + p_MainCountDownView->ChangeView(TIMECONFIG_COUNTDOWN, COUNTDOWN_TIMENOTNULL); + return true; + } + else + { + if (p_MainCountDownView->GetStartCountDownView() != nullptr) + { + p_MainCountDownView->GetStartCountDownView()->GetShowCountDownTimelabel()->SetText(CountDownModel::GetInstance()->GetCountDownTime().c_str()); + p_MainCountDownView->GetStartCountDownView()->GetShowTheRingTimelabel()->SetText(CountDownModel::GetInstance()->GetRingTime().c_str()); + } + + p_MainCountDownView->ChangeView(TIMECONFIG_COUNTDOWN, START_COUNTDOWN); + return true; + } + } + + if (strcmp(view.GetViewId(), COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON) == 0) // 从倒计时不为空视图退到自定义倒计时界面 + { + p_MainCountDownView->ChangeView(COUNTDOWN_TIMENOTNULL, TIMECONFIG_COUNTDOWN); + return true; + } + + if (strcmp(view.GetViewId(), STARTCOUNTDOWNVIEWRETURNBUTTON) == 0) // 从开始倒计时视图退到倒计时主视图 + { + CountDownModel::GetInstance()->SetCountDownTime("00:00:00"); + CountDownModel::GetInstance()->SetRingTime(""); + p_MainCountDownView->ChangeView(START_COUNTDOWN, MAIN_COUNTDOWN); + return true; + } + return true; + } + + // 增加按键事件 + bool MainCountDownPresenter::OnKeyAct(UIView &view, const KeyEvent &event) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCountDownPresenter::OnKeyAct"); + uint16_t keyID = event.GetKeyId(); + uint16_t keyState = event.GetState(); + // 如果是power键就返回上一级 + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) + { + uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); + NativeAbility::GetInstance().ChangeSlice(preSlice); + } + return true; + } + + bool MainCountDownPresenter::OnChange(UICheckBox::UICheckBoxState state) + { + switch (state) + { + case UICheckBox::SELECTED: + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "start countdown..."); + + case UICheckBox::UNSELECTED: + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "countdown pause..."); + break; + default: + break; + } + return true; + } + + void MainCountDownPresenter::OnTimePickerStoped(UITimePicker &picker) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "picker.GetSelectValue = %s", picker.GetSelectValue()); + CountDownModel::GetInstance()->SetCountDownTime(picker.GetSelectValue()); // 设置倒计时时间 + CountDownModel::GetInstance()->SetRingTime(picker.GetSelectValue()); // 设置响铃时间 + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp new file mode 100644 index 000000000..4b474624e --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp @@ -0,0 +1,402 @@ +#include "countdown/include/MainCountDownView.h" +#include "countdown/include/MainCountDownPresenter.h" +#include "wearable_log.h" +#include "common/image_cache_manager.h" +/*倒计时的主界面*/ +namespace OHOS +{ +#define VISIBLE_XBAR(visible) + + static MainCountDownView *g_pMainCountDownView{nullptr}; + + MainCountDownView::MainCountDownView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCountDownView::MainCountDownView"); + g_pMainCountDownView = this; + } + + MainCountDownView::~MainCountDownView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCountDownView::~MainCountDownView"); + ClearAll(); + g_pMainCountDownView = nullptr; + } + + MainCountDownView *MainCountDownView::GetInstance() + { + return g_pMainCountDownView; + } + + void MainCountDownView::ClearAll() + { + group->RemoveAll(); + scrollView[MAIN_COUNTDOWN]->RemoveAll(); + ImageCacheManager::GetInstance().UnloadSingleRes(COUNTDOWM_TIMER_ICON); + + if (Title != nullptr) + { + delete Title; + Title = nullptr; + } + + if (QuickStart != nullptr) + { + delete QuickStart; + QuickStart = nullptr; + } + + if (CUSTOM_COUNTDOWN != nullptr) + { + delete CUSTOM_COUNTDOWN; + CUSTOM_COUNTDOWN = nullptr; + } + + if (COUNTDOWN_ONE_MINUTE_BUTTON != nullptr) + { + delete COUNTDOWN_ONE_MINUTE_BUTTON; + COUNTDOWN_ONE_MINUTE_BUTTON = nullptr; + } + + if (COUNTDOWN_FIVE_MINUTE_BUTTON != nullptr) + { + delete COUNTDOWN_FIVE_MINUTE_BUTTON; + COUNTDOWN_FIVE_MINUTE_BUTTON = nullptr; + } + + if (COUNTDOWN_TEN_MINUTE_BUTTON != nullptr) + { + delete COUNTDOWN_TEN_MINUTE_BUTTON; + COUNTDOWN_TEN_MINUTE_BUTTON = nullptr; + } + + if (COUNTDOWN_THIRTY_MINUTE_BUTTON != nullptr) + { + delete COUNTDOWN_THIRTY_MINUTE_BUTTON; + COUNTDOWN_THIRTY_MINUTE_BUTTON = nullptr; + } + + if (p_CountDownTimeConfigView != nullptr) + { + delete p_CountDownTimeConfigView; + p_CountDownTimeConfigView = nullptr; + } + + if (p_CountDownTimeNotNullView != nullptr) + { + delete p_CountDownTimeNotNullView; + p_CountDownTimeNotNullView = nullptr; + } + + if (p_StartCountDownView != nullptr) + { + delete p_StartCountDownView; + p_StartCountDownView = nullptr; + } + + if (scrollView[MAIN_COUNTDOWN] != nullptr) + { + delete scrollView[MAIN_COUNTDOWN]; + scrollView[MAIN_COUNTDOWN] = nullptr; + } + + if (group != nullptr) + { + delete group; + group = nullptr; + } + } + + void MainCountDownView::MainCountDownViewInit() + { + if (group == nullptr) + { + /* ---------------------------------- group --------------------------------- */ + group = new UIViewGroup(); + group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + UIView::OnDragListener *draglistener = static_cast(MainCountDownPresenter::GetInstance()); + if (draglistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "draglistener is nullptr!!"); + return; + } + group->SetOnDragListener(draglistener); + group->SetTouchable(true); + group->SetDraggable(true); + /* ----------------------- scrollView[MAIN_COUNTDOWN] ----------------------- */ + scrollView[MAIN_COUNTDOWN] = new UIScrollView(); + if (scrollView[MAIN_COUNTDOWN] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "scrollView[MAIN_COUNTDOWN] is new fail!!"); + return; + } + scrollView[MAIN_COUNTDOWN]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + scrollView[MAIN_COUNTDOWN]->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + scrollView[MAIN_COUNTDOWN]->SetViewId(MAINCOUNTDOWNVIEW); + scrollView[MAIN_COUNTDOWN]->SetReboundSize(50); // 设置回弹大小 + scrollView[MAIN_COUNTDOWN]->SetHorizontalScrollState(false); // 设置横向不可以滚动 + scrollView[MAIN_COUNTDOWN]->SetScrollBlankSize(50); // 设置高位50可滑动空白区域 + /* ---------------------------------- Title --------------------------------- */ + Title = new UILabelExt(); + if (Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title is new fail!!"); + return; + } + Title->SetPosition(83, 55, 300, 40); + Title->SetStyle(STYLE_TEXT_FONT, 30); + Title->SetStyle(STYLE_LINE_HEIGHT, 35); + Title->SetText("倒计时"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(40); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------- CUSTOM_COUNTDOWN ------------------------- */ + CUSTOM_COUNTDOWN = new UILabelButtonExt(); + if (CUSTOM_COUNTDOWN == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CUSTOM_COUNTDOWN is new fail!!"); + return; + } + CUSTOM_COUNTDOWN->SetPosition(43, 130, 380, 100); + CUSTOM_COUNTDOWN->SetViewId(COUNTDOWN_LABELBUTTON_VIEWID); + CUSTOM_COUNTDOWN->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffa800); + CUSTOM_COUNTDOWN->SetStyle(STYLE_BORDER_RADIUS, 100); + CUSTOM_COUNTDOWN->SetText("自定义时间"); + CUSTOM_COUNTDOWN->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + CUSTOM_COUNTDOWN->SetStyle(STYLE_LINE_HEIGHT, 35); + CUSTOM_COUNTDOWN->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); + /* ------------------------------- QuickStart ------------------------------- */ + QuickStart = new UILabelExt(); + if (QuickStart == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QuickStart is new fail!!"); + return; + } + QuickStart->SetPosition(83, 270, 300, 40); + QuickStart->SetStyle(STYLE_TEXT_FONT, 30); + QuickStart->SetStyle(STYLE_LINE_HEIGHT, 35); + QuickStart->SetText("快速开始"); + QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + QuickStart->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + QuickStart->SetRollSpeed(40); + QuickStart->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ----------------------- COUNTDOWN_ONE_MINUTE_BUTTON ---------------------- */ + COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟"); + if (COUNTDOWN_ONE_MINUTE_BUTTON == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_ONE_MINUTE_BUTTON is new fail!!"); + return; + } + /* ---------------------- COUNTDOWN_FIVE_MINUTE_BUTTON ---------------------- */ + COUNTDOWN_FIVE_MINUTE_BUTTON = SetUILabelButton(243, 345, 180, 150, COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID, "5分钟"); + if (COUNTDOWN_FIVE_MINUTE_BUTTON == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_FIVE_MINUTE_BUTTON is new fail!!"); + return; + } + /* ----------------------- COUNTDOWN_TEN_MINUTE_BUTTON ---------------------- */ + COUNTDOWN_TEN_MINUTE_BUTTON = SetUILabelButton(43, 515, 180, 150, COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID, "10分钟"); + if (COUNTDOWN_TEN_MINUTE_BUTTON == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_TEN_MINUTE_BUTTON is new fail!!"); + return; + } + /* --------------------- COUNTDOWN_THIRTY_MINUTE_BUTTON --------------------- */ + COUNTDOWN_THIRTY_MINUTE_BUTTON = SetUILabelButton(243, 515, 180, 150, COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID, "30分钟"); + if (COUNTDOWN_THIRTY_MINUTE_BUTTON == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_THIRTY_MINUTE_BUTTON is new fail!!"); + return; + } + /* -------------------------------------------------------------------------- */ + UIView::OnClickListener *ButtonOnClick = static_cast(MainCountDownPresenter::GetInstance()); + CUSTOM_COUNTDOWN->SetOnClickListener(ButtonOnClick); + COUNTDOWN_ONE_MINUTE_BUTTON->SetOnClickListener(ButtonOnClick); + COUNTDOWN_FIVE_MINUTE_BUTTON->SetOnClickListener(ButtonOnClick); + COUNTDOWN_TEN_MINUTE_BUTTON->SetOnClickListener(ButtonOnClick); + COUNTDOWN_THIRTY_MINUTE_BUTTON->SetOnClickListener(ButtonOnClick); + } + } + + UILabelButtonExt *MainCountDownView::SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text) + { + UILabelButtonExt *button = new UILabelButtonExt(); + if (button == nullptr) + { + return nullptr; + } + button->SetPosition(x, y, w, h); + button->SetViewId(id); + button->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + button->SetStyle(STYLE_BORDER_RADIUS, 50); + button->SetImagePosition(72, 30); + ImageInfo *img = ImageCacheManager::GetInstance().LoadSingleRes(COUNTDOWM_TIMER_ICON); + button->SetImageSrc(img, img); + button->SetText(text); + button->SetAlign(TEXT_ALIGNMENT_LEFT); + button->SetLabelPosition(51, 61); + button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + button->SetStyle(STYLE_LINE_HEIGHT, 35); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); + button->SetStyleForState(STYLE_BORDER_RADIUS, 50, UIButton::PRESSED); + return button; + } + + StartCountDownView *MainCountDownView::GetStartCountDownView(void) + { + return p_StartCountDownView; + } + + /*1.切换到主倒计时视图*/ + bool MainCountDownView::ChangeMainCountDown(int16_t thisView) + { + if (scrollView[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCountDownView::ChangeMainCountDown"); + group->Add(scrollView[thisView]); + } + return true; + } + + /*2.切换到自定义倒计时界面*/ + bool MainCountDownView::ChangeTimeConfigCountdown(int16_t thisView) + { + if (scrollView[thisView] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCountDownView::ChangeTimeConfigCountdown"); + p_CountDownTimeConfigView = new CountDownTimeConfigView(); + if (p_CountDownTimeConfigView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCountDownView:: new scrollView[%d] fail", thisView); + return false; + } + scrollView[thisView] = p_CountDownTimeConfigView->CountDownTimeConfigViewInit(); + group->Add(scrollView[thisView]); + } + return true; + } + + /*3.开始倒计时*/ + bool MainCountDownView::ChangeStartCountDown(int16_t thisView) + { + if (scrollView[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCountDownView::ChangeCountdownTimeNotNull"); + p_StartCountDownView = new StartCountDownView(); + if (p_StartCountDownView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCountDownView:: new scrollView[%d] fail", thisView); + return false; + } + scrollView[thisView] = p_StartCountDownView->StartCountDownViewInit(); + group->Add(scrollView[thisView]); + } + return true; + } + + /*4.切换到倒计时不能为空界面*/ + bool MainCountDownView::ChangeCountdownTimeNotNull(int16_t thisView) + { + if (scrollView[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCountDownView::ChangeCountdownTimeNotNull"); + p_CountDownTimeNotNullView = new CountDownTimeNotNullView(); + if (p_CountDownTimeNotNullView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCountDownView:: new scrollView[%d] fail", thisView); + return false; + } + scrollView[thisView] = p_CountDownTimeNotNullView->CountDownTimeNotNullViewInit(); + group->Add(scrollView[thisView]); + } + return true; + } + + /* -------------------------------------------------------------------------- */ + // 1.MainCountDownViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。 + struct MainCountDownViewMapper + { + const int16_t viewId; + bool (MainCountDownView::*func)(int16_t thisView); + }; + + // 2.ViewMapper[] 是一个静态的视图映射数组,将视图ID与MainCountDownView类中的特定成员函数指针进行了绑定。 + static const MainCountDownViewMapper ViewMapper[] = { + {MAIN_COUNTDOWN, &MainCountDownView::ChangeMainCountDown}, + {TIMECONFIG_COUNTDOWN, &MainCountDownView::ChangeTimeConfigCountdown}, + {START_COUNTDOWN, &MainCountDownView::ChangeStartCountDown}, + {COUNTDOWN_TIMENOTNULL, &MainCountDownView::ChangeCountdownTimeNotNull}, + }; + + // 3.根据传入的interface参数执行相应视图ID关联的成员函数。 + bool MainCountDownView::ClickFunc(int16_t interface) + { + int funcSize = sizeof(ViewMapper) / sizeof(ViewMapper[0]); + for (int i = 0; i < funcSize; i++) + { + if (interface == ViewMapper[i].viewId) + { + bool jug = (this->*(ViewMapper[i].func))(interface); + if (jug == false) + { + return false; + } + return true; + } + } + return false; + } + + // 4.切换视图 + void MainCountDownView::ChangeView(int16_t hideView, int16_t showView) + { + if (hideView > COUNTDOWN_MAX) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCountDownView:: CountDownViewId Overstep ones bounds"); + return; + } + scrollView[hideView]->SetVisible(false); + ClickFunc(showView); + scrollView[showView]->SetVisible(true); + Draw(); + } + /* -------------------------------------------------------------------------- */ + + void MainCountDownView::OnStart() + { + View::OnStart(); + MainCountDownViewInit(); + // 增加按键监听 + RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::MainCountDownPresenter::GetInstance(); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); + } + + void MainCountDownView::OnSetUpView() + { + View::OnSetUpView(); + scrollView[MAIN_COUNTDOWN]->Add(Title); + scrollView[MAIN_COUNTDOWN]->Add(CUSTOM_COUNTDOWN); + scrollView[MAIN_COUNTDOWN]->Add(QuickStart); + scrollView[MAIN_COUNTDOWN]->Add(COUNTDOWN_ONE_MINUTE_BUTTON); + scrollView[MAIN_COUNTDOWN]->Add(COUNTDOWN_FIVE_MINUTE_BUTTON); + scrollView[MAIN_COUNTDOWN]->Add(COUNTDOWN_TEN_MINUTE_BUTTON); + scrollView[MAIN_COUNTDOWN]->Add(COUNTDOWN_THIRTY_MINUTE_BUTTON); + group->Add(scrollView[MAIN_COUNTDOWN]); + RootView::GetInstance()->Add(group); + Draw(); + } + + void MainCountDownView::OnTearDownView() + { + View::OnTearDownView(); + return; + } + + void MainCountDownView::OnStop() + { + View::OnStop(); + RootView::GetInstance()->ClearOnKeyActListener(); + RootView::GetInstance()->RemoveAll(); + return; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp new file mode 100644 index 000000000..4f4bb9a5d --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp @@ -0,0 +1,190 @@ +#include "countdown/include/StartCountDownView.h" +#include "countdown/include/MainCountDownPresenter.h" +#include "countdown/include/CountDownModel.h" +#include "UiConfig.h" +#include "wearable_log.h" + +/*开始倒计时*/ +namespace OHOS +{ + + static StartCountDownView *g_pStartCountDownView{nullptr}; + + StartCountDownView::StartCountDownView() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCountDownView::StartCountDownView"); + g_pStartCountDownView = this; + } + + StartCountDownView::~StartCountDownView() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCountDownView::~StartCountDownView"); + ClearAll(); + g_pStartCountDownView = nullptr; + } + + StartCountDownView *StartCountDownView::GetInstance() + { + return g_pStartCountDownView; + } + + void StartCountDownView::ClearAll() + { + scrollView->RemoveAll(); + + if (Title != nullptr) + { + delete Title; + Title = nullptr; + } + + if (showCountDownTimelabel != nullptr) + { + delete showCountDownTimelabel; + showCountDownTimelabel = nullptr; + } + + if (vectorImage != nullptr) + { + delete vectorImage; + vectorImage = nullptr; + } + if (showTheRingTime != nullptr) + { + delete showTheRingTime; + showTheRingTime = nullptr; + } + + if (play_or_pause_toggleButton != nullptr) + { + delete play_or_pause_toggleButton; + play_or_pause_toggleButton = nullptr; + } + + if (endbutton != nullptr) + { + delete endbutton; + endbutton = nullptr; + } + + if (scrollView != nullptr) + { + delete scrollView; + scrollView = nullptr; + } + } + + UIScrollView *StartCountDownView::StartCountDownViewInit() + { + if (scrollView == nullptr) + { + scrollView = new UIScrollView(); + scrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + scrollView->SetViewId(STARTCOUNTDOWNVIEW); + scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + /* -------------------------------------------------------------------------- */ + Title = new UILabelExt(); + if (Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::Title is is new fail!!"); + return nullptr; + } + Title->SetPosition(83, 52, 300, 40); + Title->SetStyle(STYLE_TEXT_FONT, 30); + Title->SetStyle(STYLE_LINE_HEIGHT, 35); + Title->SetText("倒计时"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(40); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------------------------------------------------------- */ + showCountDownTimelabel = new UILabelExt(); + if (showCountDownTimelabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showCountDownTimelabel is new fail!!"); + return nullptr; + } + showCountDownTimelabel->SetPosition(73, 138); + showCountDownTimelabel->SetStyle(STYLE_TEXT_FONT, 80); + showCountDownTimelabel->SetStyle(STYLE_LINE_HEIGHT, 94); + showCountDownTimelabel->SetText(CountDownModel::GetInstance()->GetCountDownTime().c_str()); + showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + showCountDownTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 84); + /* -------------------------------------------------------------------------- */ + vectorImage = new UIImageView(); + if (vectorImage == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "vectorImage is new fail!!"); + return nullptr; + } + vectorImage->SetPosition(174, 247, 28, 28); + vectorImage->SetSrc(VectorImagesPath); + /* -------------------------------------------------------------------------- */ + showTheRingTime = new UILabelExt(); + if (showTheRingTime == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showTheRingTime is new fail!!"); + return nullptr; + } + showTheRingTime->SetPosition(209, 241, 84, 41); + showTheRingTime->SetStyle(STYLE_TEXT_FONT, 35); + showTheRingTime->SetStyle(STYLE_LINE_HEIGHT, 41); + showTheRingTime->SetText(CountDownModel::GetInstance()->GetRingTime().c_str()); + showTheRingTime->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + showTheRingTime->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff)); + showTheRingTime->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + showTheRingTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35); + /* -------------------------------------------------------------------------- */ + if (play_or_pause_toggleButton == nullptr) + { + play_or_pause_toggleButton = new UIToggleButton(); + } + play_or_pause_toggleButton->SetPosition(248, 321, 100, 100); + play_or_pause_toggleButton->SetViewId(PlayOrPauseToggleButton_ViewID); + play_or_pause_toggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + play_or_pause_toggleButton->SetStyle(STYLE_BORDER_RADIUS, 100); + play_or_pause_toggleButton->SetImages(CountDown_Play_ImagePath, CountDown_PAUSE_ImagePath); + UICheckBox::OnChangeListener *ToggleButtonChange = static_cast(MainCountDownPresenter::GetInstance()); + play_or_pause_toggleButton->SetOnChangeListener(ToggleButtonChange); + /* -------------------------------------------------------------------------- */ + // Add Button to App + if (endbutton == nullptr) + { + endbutton = new UIButton(); + } + endbutton->SetPosition(118, 321); + endbutton->Resize(100, 100); + endbutton->SetViewId(STARTCOUNTDOWNVIEWRETURNBUTTON); + endbutton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + endbutton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + endbutton->SetStyle(STYLE_BORDER_RADIUS, 100); + endbutton->SetImageSrc(EndButton_ImagePath, EndButton_ImagePath); + endbutton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); + endbutton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED); + UIView::OnClickListener *buttonClick = static_cast(MainCountDownPresenter::GetInstance()); + endbutton->SetOnClickListener(buttonClick); + /* ----------------------------------- Add ---------------------------------- */ + scrollView->Add(Title); + scrollView->Add(showCountDownTimelabel); + scrollView->Add(vectorImage); + scrollView->Add(showTheRingTime); + scrollView->Add(endbutton); + scrollView->Add(play_or_pause_toggleButton); + } + + return scrollView; + } + + // 获取显示倒计时时间标签 + UILabelExt *StartCountDownView::GetShowCountDownTimelabel(void) + { + return showCountDownTimelabel; + } + + // 获取显示响铃时间标签 + UILabelExt *StartCountDownView::GetShowTheRingTimelabel(void) + { + return showTheRingTime; + } +} \ No newline at end of file diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/APPLIST_COUNTDOWN.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/APPLIST_COUNTDOWN.bin new file mode 100644 index 000000000..16a718da3 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/APPLIST_COUNTDOWN.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/APPLIST_STOPWATCH.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/APPLIST_STOPWATCH.bin new file mode 100644 index 000000000..2284a6a5d Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/APPLIST_STOPWATCH.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_FIVE_MINUTE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_FIVE_MINUTE.bin deleted file mode 100644 index 7dd2cf845..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_FIVE_MINUTE.bin and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_ONE_MINUTE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_ONE_MINUTE.bin deleted file mode 100644 index d0efbc507..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_ONE_MINUTE.bin and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_TEN_MINUTE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_TEN_MINUTE.bin deleted file mode 100644 index 7a2e1029f..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_TEN_MINUTE.bin and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_THIRTY_MINUTE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_THIRTY_MINUTE.bin deleted file mode 100644 index ba69e921b..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_THIRTY_MINUTE.bin and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_TIMER_ICON.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_TIMER_ICON.bin new file mode 100644 index 000000000..ff8eb2dbd Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/countdown/COUNTDOWM_TIMER_ICON.bin differ