From: luozheng <1732036298@qq.com> Date: Mon, 19 May 2025 08:13:15 +0000 (+0800) Subject: 闹钟相关文件夹合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~302 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8ab945c9b7c3556dc7174a6396607afbe151c048;p=mirrors%2FFD230.git 闹钟相关文件夹合并 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp index cfdcb8c20..3b0418358 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp @@ -471,7 +471,7 @@ namespace OHOS if (scrollView == view_->GetAiVoiceScrollView(AIVOICE_STARTCHAT_VIEWID)) { /*AI对话界面右滑退出当前Slice*/ - // NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + // NativeAbility::GetInstance().Back(); DragLeftToRightChangeAIModel(); } else if (scrollView == view_->GetAiVoiceScrollView(AIVOICE_ALERT_APPBLUETOOTH_AND_4GNETWORK_VIEWID)) @@ -530,7 +530,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); AiVoiceModel::GetInstance().CancelCurAIChat(); } return true; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h index 074df441b..59177efe9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h @@ -86,6 +86,7 @@ public: bool GetClockWeek(int16_t alarmNum, uint8_t *alarmWeek); bool GetClockStatus(int16_t num, uint8_t *alarmEnable); void GetPopTimeData(int16 *hour, int16* min); + void SetPopTimeData(int16 hour, int16 min); bool GetClockListenerTime(uint32_t &alarmTime); bool GetListenClockId(uint8_t *alarmId); void GetAlarmCallId(uint8_t *alarmId); @@ -104,7 +105,7 @@ public: void NextDayNotify(void); void ResetRingClockStatus(void); void DeactAudioInter(void); - void PushAlarmClockData(AlarmClockQueueMsg alarmClockMsg); + // void PushAlarmClockData(AlarmClockQueueMsg alarmClockMsg); void PopInterCancelMusic(void); void PopInterPlayMusic(void); void SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8 week, uint16_t alarmListener, uint16_t setListener); @@ -115,19 +116,28 @@ public: void AlarmGetClockNum(void); int AlarmPlayerStat(); int AlarmPlayerInit(void); + int AlarmPlayerInit_BY_fir_name(char *); + int AlarmPlayerStart(); + int testPlayerStart(char *); int AlarmPlayerStop(); -private: + int InitAlarmData(void); + + void UpdateAlarmInfoByAppSet(void); + void CancelAlarmRing(); + void DelayAlarmRing(); void SetAlarmId(uint8_t id); void DeleteAlarmId(uint8_t id); - void NewFirstTime(void); + +private: + // void NewFirstTime(void); uint8_t GetAlarmId(void); - int32_t SaveGlobalAlarmToFile(void); - int32_t GetAlarmGlobalData(uint8 id, AlarmClockInfo *info); - int32_t InitAlarmClockData(void); - int32_t FetchedAlarmClockData(AlarmClockQueueMsg *alarmClockMsg); + // int32_t SaveGlobalAlarmToFile(void); + // int32_t GetAlarmGlobalData(uint8 id, AlarmClockInfo *info); + // int32_t InitAlarmClockData(void); + // int32_t FetchedAlarmClockData(AlarmClockQueueMsg *alarmClockMsg); int32_t GettManagement(AlarmClockManagement *management); - int InitAlarmData(void); + bool JudgeClockModel(uint16_t alarmNum); std::string uri; std::shared_ptr playerCallback{nullptr}; @@ -140,7 +150,7 @@ private: std::shared_ptr playerCtr{nullptr}; AlarmClockManagement managementAlarm; uint8_t alarmId[5]{0}; // 事件闹钟的个数是5个 - uint16_t alarmSerial{0}; + uint16_t alarmSerial{0};//闹钟数量 uint16_t clockListener{0}; uint16 preSliceId{0}; uint32_t listAlarmClockNum{0}; @@ -152,8 +162,8 @@ private: List listAlarmClock; }; -extern "C" { - void PushAlarmClockDataToModel(AlarmClockQueueMsg alarmClockMsg); -} +// extern "C" { +// void PushAlarmClockDataToModel(AlarmClockQueueMsg alarmClockMsg); +// } } #endif // ALARM_CLOCK_MODEL_H diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModelC.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModelC.h new file mode 100644 index 000000000..86f778225 --- /dev/null +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModelC.h @@ -0,0 +1,35 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-09-25 16:48:17 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-10-24 14:14:08 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModelC.h + */ + +#ifndef ALARM_CLOCK_MODEL_C_H +#define ALARM_CLOCK_MODEL_C_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" +{ +#endif +#endif +#include + + void delete_alarm_id(uint8_t id); + + void set_alarm_id(uint8_t id); + + int testPlayerStart_(char *); + + int AlarmPlayerStop_(void); + + void custom_timer_callback(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif +#endif +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h index f995da7ee..c5cfb0019 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h @@ -16,6 +16,7 @@ #include "UiConfig.h" #include "AlarmClockModel.h" #include "ChangeSliceListener.h" +#include "components/ui_label_ext.h" namespace OHOS { class AlarmCloseRingView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h index 48c844ca4..3982b029e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h @@ -19,6 +19,8 @@ #include "common/screen.h" #include "gfx_utils/graphic_log.h" #include "AlarmClockModel.h" +#include "components/ui_label_button_ext.h" +#include "components/ui_label_ext.h" namespace OHOS { class AlarmConfigView { @@ -29,22 +31,18 @@ public: static AlarmConfigView *GetInstance(void); void RefreshConfig(const uint32 time, uint8 week, uint16_t alarmNum); private: - UILabelButton *deleteImage{nullptr}; - UIScrollView *configScroll{nullptr}; + void InitLabel(); + void InitButton(); UIScrollView *group{nullptr}; - UILabel *editLabel{nullptr}; - UIDigitalClock *labelTime{nullptr}; - UILabel *labelSetTime{nullptr}; - UILabel *labelDay{nullptr}; - UILabel *labelSetWeek{nullptr}; - UILabel *labelChangeName{nullptr}; - UILabel *labelSetName{nullptr}; - UIImageView *changeIcon1{nullptr}; - UIImageView *changeIcon2{nullptr}; - UIImageView *changeIcon3{nullptr}; - UILabel *CreateConfigLabel(const char *buttonText, int16_t labelFont, int16_t x, int16_t y, int16_t width); - void CreateConfigButton(void); - void CreateChangeIcons(void); + UIScrollView *configScroll{nullptr}; + UILabelExt *editLabel{nullptr}; + UILabelButtonExt* button1{nullptr}; + UILabelButtonExt* button2{nullptr}; + UILabelExt *labelTime{nullptr}; + UILabelExt *labelSetTime{nullptr}; + UILabelExt *labelDay{nullptr}; + UILabelExt *labelSetWeek{nullptr}; + char showtime[12]{0}; }; } // namespace OHOS #endif // ALARM_CONFIG_VIEW_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h index c5a7cd1ba..e13d6e6d7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h @@ -22,20 +22,25 @@ #include "common/screen.h" #include "AlarmPresenter.h" #include "AlarmClockModel.h" - +#include "components/ui_label_ext.h" +#include "components/ui_label_button_ext.h" namespace OHOS { class AlarmJudgeView { public: AlarmJudgeView(); virtual ~AlarmJudgeView(); UIScrollView *InitJudgeView(); - void OnStop(); private: - void CreateImage(void); - UIScrollView *container{nullptr}; - UILabel *labelText{nullptr}; - UIImageView *imageViewDelete{nullptr}; - UIImageView *imageViewTrue{nullptr}; + UIScrollView * InitDeleteScreen(); + void DeinitDeleteScreen(); + UIScrollView * DeleteGroup_{nullptr}; + UILabelExt * DeleteTitleLabelExt_{nullptr}; + UILabelExt * DeletePromptLabelExt_{nullptr}; + UILabelButtonExt * DeleteCancelButton_{nullptr}; + UILabelButtonExt * DeleteOKButton_{nullptr}; + + #define SCREEN_WIDTH (Screen::GetInstance().GetWidth()) + #define SCREEN_HEIGHT (Screen::GetInstance().GetHeight()) }; } // namespace OHOS #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h index f5798f421..fb1eef049 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h @@ -22,6 +22,7 @@ #include "common/screen.h" #include "AlarmPresenter.h" #include "AlarmClockModel.h" +#include "components/ui_label_ext.h" namespace OHOS { void CancelScanHandle(void); @@ -35,7 +36,7 @@ public: void AlarmMaxDelayExit(void); private: UIScrollView *container{nullptr}; - UILabel *labelText{nullptr}; + UILabelExt *labelText{nullptr}; }; } // namespace OHOS #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h index ec6286a05..9aac650dd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h @@ -15,6 +15,7 @@ #include "View.h" #include "AlarmPresenter.h" #include "AlarmClockModel.h" +#include "components/ui_label_button_ext.h" namespace OHOS { class AlarmNewTimeView : public UITimePicker::SelectedListener { @@ -27,10 +28,9 @@ public: private: void CreateLabelTime(void); UIScrollView *group{nullptr}; - UILabel *title{nullptr}; + UILabelExt *title{nullptr}; UITimePicker *picker{nullptr}; - UILabelButton *labelButton{nullptr}; - UILabel *GetTitleLabel(const char *titleName); + UILabelButtonExt *labelButton{nullptr}; }; } // namespace OHOS #endif // ALARM_SET_TIME_VIEW_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h index 11ba16cae..c28a0c152 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h @@ -28,8 +28,12 @@ #include "wearable_log.h" #include "color.h" +#include "common/key_code.h" +#include "components/ui_label_ext.h" +#include "components/ui_swipe_view.h" + namespace OHOS { -constexpr char* EVERY_DAY = (char *)"每天"; +constexpr char* EVERY_DAY = (char *)"每日"; constexpr char* DO_NOT_REPEAT = (char *)"不重复"; constexpr char* MON_DAY = (char *)"一 "; @@ -40,6 +44,17 @@ constexpr char* FRI_DAY = (char *)"五 "; constexpr char* SAT_DAY = (char *)"六 "; constexpr char* SUN_DAY = (char *)"日"; +constexpr char* EVERY_DAY_EN = (char *)"Everyday"; +constexpr char* DO_NOT_REPEAT_EN = (char *)"no-repeat"; + +constexpr char* MON_DAY_EN = (char *)"Mon "; +constexpr char* TUE_DAY_EN = (char *)"Tue "; +constexpr char* WED_DAY_EN = (char *)"Wed "; +constexpr char* THUR_DAY_EN = (char *)"Thu "; +constexpr char* FRI_DAY_EN = (char *)"Fri "; +constexpr char* SAT_DAY_EN = (char *)"Sat "; +constexpr char* SUN_DAY_EN = (char *)"Sun"; + constexpr char* SET_TIME = (char *)"settime"; constexpr char* SET_WEEK = (char *)"setweek"; constexpr char* ALARM_CLOCK_DELETE = (char *)"alarmclockdelete"; @@ -47,8 +62,9 @@ constexpr char* ALARM_NEXT = (char *)"alarmnext"; constexpr char* ALARM_OK = (char *)"alarmok"; constexpr char* JUDGE_DELETE = (char *)"judgedelete"; constexpr char* JUDGE_TRUE = (char *)"judgetrue"; -constexpr char* ADD_BUTTON = (char *)"addbutton"; +constexpr char* ADD_BUTTON = (char *)"addbutton"; // 增加闹钟按钮viewId +//星期设置按钮的viewId周一到周日 constexpr char* MONDAY = (char *)"monday"; constexpr char* TUESDAY = (char *)"tuesday"; constexpr char* WEDNESDAY = (char *)"wednesday"; @@ -56,8 +72,9 @@ constexpr char* THURSDAY = (char *)"thursday"; constexpr char* FRIDAY = (char *)"friday"; constexpr char* SATURDAY = (char *)"saturday"; constexpr char* SUNDAY = (char *)"sunday"; -constexpr char* ALARM_WEEK_OK = (char *)"alarmweekok"; +constexpr char* ALARM_WEEK_OK = (char *)"alarmweekok"; // 星期设置确认按钮viewId +// 闹钟开关按钮的viewId constexpr char* ALARM_STATUS_ONE = (char *)"alarmstatus0"; constexpr char* ALARM_STATUS_TWO = (char *)"alarmstatus1"; constexpr char* ALARM_STATUS_THREE = (char *)"alarmstatus2"; @@ -74,24 +91,36 @@ constexpr char* ALARM_CLOCK_SIX = (char *)"alarmclock5"; constexpr int16_t SET_SIX = 6; -constexpr char* ALARM_STATUS[6] = {ALARM_STATUS_ONE, ALARM_STATUS_TWO, ALARM_STATUS_THREE, // 闹钟按钮最大个数为6个 +constexpr char* ALARM_STATUS[6] = {ALARM_STATUS_ONE, ALARM_STATUS_TWO, ALARM_STATUS_THREE, // 闹钟开关按钮viewId最大个数为6个 ALARM_STATUS_FOUR, ALARM_STATUS_FIVE, ALARM_STATUS_SIX}; constexpr char* ALARM_CLOCK[6] = {ALARM_CLOCK_ONE, ALARM_CLOCK_TWO, ALARM_CLOCK_THREE, // 闹钟个数最大个数为6个 ALARM_CLOCK_FOUR, ALARM_CLOCK_FIVE, ALARM_CLOCK_SIX}; -constexpr char* WEEK_CONTAINER[7] = {SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY}; // 日期按钮最大个数为7个 +constexpr char* WEEK_BUTTON_VIEWID[7] = {SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY}; // 星期按钮viewId最大个数为7个 + + +constexpr char * ALARM_ITEM_DELETE_00 = (char *)"ALARM_ITEM_DELETE_00"; +constexpr char * ALARM_ITEM_DELETE_01 = (char *)"ALARM_ITEM_DELETE_01"; +constexpr char * ALARM_ITEM_DELETE_02 = (char *)"ALARM_ITEM_DELETE_02"; +constexpr char * ALARM_ITEM_DELETE_03 = (char *)"ALARM_ITEM_DELETE_03"; +constexpr char * ALARM_ITEM_DELETE_04 = (char *)"ALARM_ITEM_DELETE_04"; +constexpr char * ALARM_ITEM_DELETE_05 = (char *)"ALARM_ITEM_DELETE_05"; +constexpr char * ALARM_ITEM_DELETE[6] = {ALARM_ITEM_DELETE_00, ALARM_ITEM_DELETE_01, ALARM_ITEM_DELETE_02, + ALARM_ITEM_DELETE_03, ALARM_ITEM_DELETE_04, ALARM_ITEM_DELETE_05}; typedef enum { - MAIN_INTERFACE = 0, - CHANGE_INTERFACE_CONFIG, - CHANGE_INTERFACE_SET_TIME, - CHANGE_INTERFACE_SET_WEEK, - CHANGE_INTERFACE_JUDGE, - CHANGE_INTERFACE_NEW_TIME, + MAIN_INTERFACE = 0, // 主界面 + CHANGE_INTERFACE_CONFIG, // 闹钟编辑页面[包括更改时间和更改星期] + CHANGE_INTERFACE_SET_TIME, // 时间设置页面 + CHANGE_INTERFACE_SET_WEEK, //星期设置页面 + CHANGE_INTERFACE_JUDGE, // 确认删除闹钟页面 + CHANGE_INTERFACE_NEW_TIME, // 新建闹钟的[时间设置]页面 CHANGE_INTERFACE_MAXCLOCK, } InterfacesId; -class AlarmStatusBtnChangeListener : public OHOS::UICheckBox::OnChangeListener -{ +constexpr int16_t NEW_TIME_LISTENER = 0; // 新建闹钟的[时间设置]标志 +constexpr int16_t SET_TIME_LISTENER = 1; // 更新已存在闹钟的[星期设置]标志 + +class AlarmStatusBtnChangeListener : public OHOS::UICheckBox::OnChangeListener { public: explicit AlarmStatusBtnChangeListener(UIView *uiView) { @@ -112,8 +141,8 @@ private: }; class MainAlarmView; -class AlarmPresenter : public Presenter, public UIView::OnClickListener, - public UITimePicker::SelectedListener, public UIView::OnDragListener { +class AlarmPresenter : public Presenter, public UIView::OnClickListener, public RootView::OnKeyActListener, + public UITimePicker::SelectedListener, public UIView::OnDragListener, public UISwipeView::OnSwipeListener { public: AlarmPresenter(); ~AlarmPresenter() override; @@ -123,12 +152,15 @@ public: ColorType ShadowBlue(void); bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView& view, const DragEvent& event) override; + bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 + bool OnDragEnd(UIView& view, const DragEvent& event) override; + void OnSwipe(UISwipeView &view) override; bool ClickFuncId(const char *buttonName); bool ClickFuncView(UIView &view); void OnTimePickerStoped(UITimePicker &picker) override; - void ClickBlue(UIView &view); - void ClickBlack(UIView &view); - void GetAlarmNum(uint16_t alarmNum); + // void ClickBlue(UIView &view);三个函数都没实现 + // void ClickBlack(UIView &view); + // void GetAlarmNum(uint16_t alarmNum); void ClickSetTime(uint16_t alarmNum); void ClickSetWeek(uint16_t alarmNum); void ClickAlarmClockDelete(uint16_t alarmNum); @@ -141,14 +173,20 @@ public: void ClickAlarmNext(uint16_t alarmNum); void OnTimePickerInaction(uint32_t hour, uint32_t min); uint8_t alarmWeek[7] = {1, 1, 1, 1, 1, 1, 1}; // 闹钟默认所有的日期都选中,因此初始值为1,7是指一个星期中七天 + + void ClickDeleteButtonAlarmClockDelete(uint16_t num); + void UpdateAlarmInfoByAppSet(void); + void RefreshAlarmStatus(int i); + private: uint32_t timeHour{0}; uint32_t timeMin{0}; - uint16_t setListener; - uint16_t alarmListener{0}; + uint16_t setListener; // 新建闹钟还是修改闹钟的标志 + uint16_t alarmListener{0};//闹钟编号 uint16_t clockQty{0}; int16_t interListener; bool buttonStratus = true; + bool X_DRAG_FLAG{false}; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h index 5c7486ba8..a21cc54d7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h @@ -16,6 +16,7 @@ #include "AlarmPresenter.h" #include "AlarmClockModel.h" #include "wearable_log.h" +#include "components/ui_label_button_ext.h" namespace OHOS { class AlarmSetTimeView { @@ -27,8 +28,9 @@ public: void RefreshSetTime(uint32_t time); private: UIScrollView *group{nullptr}; - UILabelButton *timeImage{nullptr}; - UILabel *title{nullptr}; + // UILabelButton *timeImage{nullptr}; + UILabelButtonExt * labelButton{nullptr}; + UILabelExt *title{nullptr}; UITimePicker *picker{nullptr}; UILabel *GetTitleLabel(const char *titleName); void SetLabelButton(void); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h index 3f4b8848c..04d3719a1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h @@ -19,6 +19,10 @@ #include "components/ui_time_picker.h" #include "AlarmPresenter.h" #include "AlarmClockModel.h" +#include "components/ui_label_ext.h" +#include "components/ui_label_button_ext.h" + +#define WEEK_NUM 7 // 星期一共有7天 namespace OHOS { class AlarmSetWeekView { @@ -31,14 +35,13 @@ public: void RefreshSetWeek2(uint8_t week); private: UIScrollView *group{nullptr}; - UILabelButton *weekImage{nullptr}; - UILabel *labelRespeat{nullptr}; - UILabelButton *buttonWeek[7]{nullptr}; // 星期一共有7天,因此设置了七个星期的按钮 + UILabelButtonExt *weekImage{nullptr}; + UILabelExt *labelRespeat{nullptr}; + UILabelButton *buttonWeek[WEEK_NUM]{nullptr}; // 星期一共有7天,因此设置了七个星期的按钮 void CreateWeekButton1(void); void CreateWeekButton2(void); void SetLabelButton(void); - UILabelButton *CreateUILabelButton(const char *buttonText, int16_t x, int16_t y); - UIView *CreateUIView(int16_t x, int16_t y); + UILabelButtonExt *CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y); }; } // namespace OHOS #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h index 0982563a6..13ac3db54 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h @@ -27,11 +27,11 @@ #include "AlarmNewTimeView.h" #include "AlarmMaxClock.h" #include "AlarmClockModel.h" +#include "components/ui_swipe_view.h" +#include "components/ui_label_button_ext.h" namespace OHOS { -constexpr int16_t D_CLOCK_Y = 210; -constexpr int16_t LABEL_ZERO_Y = 270; -constexpr int16_t ALARM_INTER_ADD = 150; +constexpr int16_t ALARM_INTER_ADD = 120; // 120; class AlarmPresenter; class MainAlarmView : public View { @@ -42,7 +42,6 @@ public: void OnStart() override; void ChangeView(int16_t hideView, int16_t showView); void DropView(UIView& view); - void CreateImage(); void RefreshAlarm(void); bool ChangeMainAlarm(int16_t thisView); bool ChangeConfig(int16_t thisView); @@ -51,31 +50,43 @@ public: bool ChangeJudge(int16_t thisView); bool ChangeNewTime(int16_t thisView); bool ChangeMaxClock(int16_t thisView); - bool ClickFunc(int16_t interf); + bool ClickFunc(int16_t interface); bool GetRefreshStatus(void); + void RefreshAlarmStatus(uint8_t alarmEnable, int16_t num); private: void LabelGetWeek(uint8_t week, int16_t alarmNum); - void RefreshAlarmStatus(uint8_t alarmEnable, int16_t num); void NewClockCtl(int16_t alarmNum); - AlarmConfigView *configView{nullptr}; - AlarmSetTimeView *setTimeView{nullptr}; - AlarmSetWeekView *setWeekView{nullptr}; + UIViewGroup * NewClockCtlExt(int16_t alarmNum, uint8_t index); + void AlarmTitleCreate(void); + void AlarmAddButtonCreate(void); + void AlarmAddButtonUpdate(uint8_t count); + +private: + AlarmConfigView *configView{nullptr}; //编辑闹钟页面【包括更改时间和更改星期】 + AlarmSetTimeView *setTimeView{nullptr};//时间设置页面 + AlarmSetWeekView *setWeekView{nullptr};//星期设置页面 AlarmJudgeView *judgeView{nullptr}; AlarmNewTimeView *newTimeView{nullptr}; AlarmMaxClock *maxClockView{nullptr}; UIScrollView *group{nullptr}; + UISwipeView * SwipeView_[6]{nullptr}; + UIViewGroup * SwipeViewItem_[6][2]{nullptr}; + UILabelButtonExt * DeleteButton_[6]{nullptr}; UIToggleButton *statusButton[6]{nullptr}; // 6代表界面中最多存在六个按键 - UIImageView *addButton{nullptr}; UIDigitalClock *dClock[6]{nullptr}; // 6代表界面中最多存在六个闹钟 - UILabel *dLabel[6]{nullptr}; // 6代表界面中显示闹钟日期的控件个数 + UILabelExt *dLabel[6]{nullptr}; // 6代表界面中显示闹钟日期的控件个数 UIScrollView *container[7]{nullptr}; // 7代表容器存有主界面以及跳转的四个副界面,用于跳转后显示或隐藏界面 uint8_t alarmHour, alarmMin; int8_t dClockNum{-1}; int16_t weekStatus{-1}; - int16_t alarmPositionY{D_CLOCK_Y}; - int16_t labelPositionY{LABEL_ZERO_Y}; - int16_t alarmInterval{ALARM_INTER_ADD}; + int16_t alarmInterval{ALARM_INTER_ADD}; // 闹钟之间的间隔 bool reflashStatus{false}; + UILabelExt * TitleLabelExt_{nullptr}; + UILabelButtonExt * AddButton_{nullptr}; + UICheckBox::OnChangeListener *statusListener[6]{nullptr}; + bool viewInitstatus_{false}; + + #define ALARM_DELETE_IMAGE "/user/res/Alarm/alarm_delete.bin" }; } // namespace OHOS #endif // MAIN_ALARM_VIEW_Ha \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp index a5b21c016..f0e45af6d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp @@ -10,14 +10,18 @@ #include "securec.h" #include "los_mux.h" #include "samgr_lite.h" -#include "graphic_mutex.h" +#include "thread_adapter.h" #include "UiConfig.h" -#include "AlarmClockModel.h" -#include "AlarmPopUpPresenter.h" +#include "alarm/include/AlarmClockModel.h" +#include "alarm/include/AlarmPopUpPresenter.h" #include "graphic_service.h" -#include "PlayersModel.h" -#include "PhoneService.h" +#include "player/include/PlayersModel.h" +#include "phoneservice/include/PhoneService.h" #include "ui_service.h" +#include "notification_manager.h" +#include "ConfigModel.h" +#include "custom_runtime.h" +#include "alarm/include/AlarmClockModelC.h" #ifdef __cplusplus extern "C" { @@ -25,7 +29,7 @@ extern "C" { namespace OHOS { #define BUFFER_SIZE 15 -static GraphicMutex g_alarmClockDataMutex; +// static MutexId g_alarmClockDataMutex; constexpr char *ALARM_CLOCK_DATA_PATH = (char *)"/user/res/alarm.bin"; constexpr char *ALARM_CLOCK_DIRECTORY = (char *)"/user/res/"; constexpr int ALARM_CLOCK_MAX = 5; @@ -43,7 +47,8 @@ AlarmClockInfo g_alarmClockData[ALARM_CLOCK_MAX]; AlarmClockModel::AlarmClockModel() { - InitAlarmData(); + // g_alarmClockDataMutex = MUTEX_InitValue(); + // InitAlarmData(); } AlarmClockModel::~AlarmClockModel() @@ -59,6 +64,7 @@ AlarmClockModel::~AlarmClockModel() for (uint16_t num = 0; num < CLOCK_NUM; num++) { alarmName[num] = nullptr; } + // g_alarmClockDataMutex = nullptr; } AlarmClockModel *AlarmClockModel::GetInstance(void) @@ -67,94 +73,94 @@ AlarmClockModel *AlarmClockModel::GetInstance(void) return &alarmClockModel; } -int32_t AlarmClockModel::SaveGlobalAlarmToFile(void) -{ - std::ofstream fd(ALARM_CLOCK_DATA_PATH); - if (!fd.good()) { - (void)mkdir(ALARM_CLOCK_DIRECTORY, S_IREAD | S_IWRITE); - std::ofstream fd(ALARM_CLOCK_DATA_PATH); - if (!fd.good()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SaveGlobalAlarmToFile open fail"); - fd.close(); - return -1; - } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "mkdir success!!"); - } - fd.write((const char *)(&g_alarmClockData), sizeof(g_alarmClockData)); - fd.close(); - return 0; -} - -int32_t AlarmClockModel::GetAlarmGlobalData(uint8 id, AlarmClockInfo *info) -{ - int32_t ret; - if (info == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetAlarmGlobalData info nullptr!!"); - return -1; - } - if (g_alarmClockData[id].alarmClockId != id) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_alarmClockData id %u error!", id); - return -1; - } - ret = memcpy_s(info, sizeof(AlarmClockInfo), &g_alarmClockData[id], sizeof(AlarmClockInfo)); - if (ret != EOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetAlarmGlobalData fail. ret=%d", ret); - return ret; - } - return 0; -} - -void AlarmClockModel::PushAlarmClockData(AlarmClockQueueMsg alarmClockMsg) -{ - if (listAlarmClockNum >= LIST_ALARM_CLOCK_MAX) { - return; - } - g_alarmClockDataMutex.Lock(); - listAlarmClockNum++; - listAlarmClock.PushBack(alarmClockMsg); - g_alarmClockDataMutex.Unlock(); - SaveGlobalAlarmToFile(); -} - -int32_t AlarmClockModel::FetchedAlarmClockData(AlarmClockQueueMsg *alarmClockMsg) -{ - if (alarmClockMsg == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FetchedAlarmClockData alarmClockMsg nullptr!!"); - return -1; - } - if (listAlarmClock.IsEmpty()) { - return -1; - } else { - g_alarmClockDataMutex.Lock(); - if (listAlarmClockNum >= 1) { - listAlarmClockNum--; - } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FetchedAlarmClockData listAlarmClockNum invalid, num=%u", - listAlarmClockNum); - return -1; - } - *alarmClockMsg = listAlarmClock.Front(); - listAlarmClock.PopFront(); - g_alarmClockDataMutex.Unlock(); - } - return 0; -} - -int32_t AlarmClockModel::InitAlarmClockData(void) -{ - (void)memset_s(&g_alarmClockData, sizeof(g_alarmClockData), 0, sizeof(g_alarmClockData)); - std::ifstream fd(ALARM_CLOCK_DATA_PATH); - if (!fd.good()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitAlarmClockData open fail"); - fd.close(); - return -1; - } else { - fd.read((char *)(&g_alarmClockData), sizeof(g_alarmClockData)); - fd.close(); - return 0; - } - return 0; -} +// int32_t AlarmClockModel::SaveGlobalAlarmToFile(void) +// { +// std::ofstream fd(ALARM_CLOCK_DATA_PATH); +// if (!fd.good()) { +// (void)mkdir(ALARM_CLOCK_DIRECTORY, S_IREAD | S_IWRITE); +// std::ofstream fd(ALARM_CLOCK_DATA_PATH); +// if (!fd.good()) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SaveGlobalAlarmToFile open fail"); +// fd.close(); +// return -1; +// } +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mkdir success!!"); +// } +// fd.write((const char *)(&g_alarmClockData), sizeof(g_alarmClockData)); +// fd.close(); +// return 0; +// } + +// int32_t AlarmClockModel::GetAlarmGlobalData(uint8 id, AlarmClockInfo *info) +// { +// int32_t ret; +// if (info == nullptr) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetAlarmGlobalData info nullptr!!"); +// return -1; +// } +// if (g_alarmClockData[id].alarmClockId != id) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_alarmClockData id %u error!", id); +// return -1; +// } +// ret = memcpy_s(info, sizeof(AlarmClockInfo), &g_alarmClockData[id], sizeof(AlarmClockInfo)); +// if (ret != EOK) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetAlarmGlobalData fail. ret=%d", ret); +// return ret; +// } +// return 0; +// } + +// void AlarmClockModel::PushAlarmClockData(AlarmClockQueueMsg alarmClockMsg) +// { +// if (listAlarmClockNum >= LIST_ALARM_CLOCK_MAX) { +// return; +// } +// MUTEX_Lock(g_alarmClockDataMutex); +// listAlarmClockNum++; +// listAlarmClock.PushBack(alarmClockMsg); +// MUTEX_Unlock(g_alarmClockDataMutex); +// SaveGlobalAlarmToFile(); +// } + +// int32_t AlarmClockModel::FetchedAlarmClockData(AlarmClockQueueMsg *alarmClockMsg) +// { +// if (alarmClockMsg == nullptr) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FetchedAlarmClockData alarmClockMsg nullptr!!"); +// return -1; +// } +// if (listAlarmClock.IsEmpty()) { +// return -1; +// } else { +// MUTEX_Lock(g_alarmClockDataMutex); +// if (listAlarmClockNum >= 1) { +// listAlarmClockNum--; +// } else { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FetchedAlarmClockData listAlarmClockNum invalid, num=%u", +// listAlarmClockNum); +// return -1; +// } +// *alarmClockMsg = listAlarmClock.Front(); +// listAlarmClock.PopFront(); +// MUTEX_Unlock(g_alarmClockDataMutex); +// } +// return 0; +// } + +// int32_t AlarmClockModel::InitAlarmClockData(void) +// { +// (void)memset_s(&g_alarmClockData, sizeof(g_alarmClockData), 0, sizeof(g_alarmClockData)); +// std::ifstream fd(ALARM_CLOCK_DATA_PATH); +// if (!fd.good()) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitAlarmClockData open fail"); +// fd.close(); +// return -1; +// } else { +// fd.read((char *)(&g_alarmClockData), sizeof(g_alarmClockData)); +// fd.close(); +// return 0; +// } +// return 0; +// } int32_t AlarmClockModel::InitAlarmData(void) { @@ -165,27 +171,33 @@ int32_t AlarmClockModel::InitAlarmData(void) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::InitAlarmData get managementAlarm error!"); return -1; } - if (managementAlarm.eventAlarmInfo[0].alarmType == TYPE_INVALID_ALARM_CLOCK) { - NewFirstTime(); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::InitAlarmData new first alarm"); + // if (managementAlarm.eventAlarmInfo[0].alarmType == TYPE_INVALID_ALARM_CLOCK) { + // NewFirstTime(); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::InitAlarmData new first alarm"); + // } + alarmSerial = 0; + for (num = 0; num < CLOCK_MAX; num++) { + delete currentAlarm[num]; + currentAlarm[num] = nullptr; } - for (uint16_t i = 0; i < ALARM_CLOCK_MAX; i++) { + for (uint16_t i = 0, num = 0; i < ALARM_CLOCK_MAX; i++) { for (int j = 0; j < ALARM_CLOCK_MAX; j++) { if (managementAlarm.eventAlarmInfo[j].index == i && managementAlarm.eventAlarmInfo[j].alarmType == TYPE_EVENT_ALARM_CLOCK) { currentAlarm[num] = &managementAlarm.eventAlarmInfo[j]; SetAlarmId(currentAlarm[num]->alarmClockId); num++; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::InitAlarmData get managementAlarm[%u], the unmber of alarm is %u!", j, alarmSerial); - if (i > 0) { + // if (i > 0) { alarmSerial++; - } + // } } } } return 0; } +//获取闹钟数量 int32_t AlarmClockModel::GetAlarmNum(void) { return alarmSerial; @@ -321,16 +333,21 @@ bool AlarmClockModel::JudgeClockModel(uint16_t num) } } +//获取一个可用的闹钟 ID uint8_t AlarmClockModel::GetAlarmId(void) { for (int num = 0; num < CLOCK_MAX; num++) { - if (alarmId[num] == 0) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetAlarmId alarmId[%d] = %d", num, alarmId[num]); + } + for (int num = 0; num < CLOCK_MAX; num++) { + if (alarmId[num] == 0) { //如果某个元素的值为 0,表示这个 ID 尚未被使用 return num; } } return 0; } +//将指定id的闹钟标记为已删除状态 void AlarmClockModel::DeleteAlarmId(uint8_t id) { for (int num = 0; num < CLOCK_MAX; num++) { @@ -341,6 +358,7 @@ void AlarmClockModel::DeleteAlarmId(uint8_t id) return; } +//将指定id的闹钟标记为已设置状态 void AlarmClockModel::SetAlarmId(uint8_t id) { for (int num = 0; num < CLOCK_MAX; num++) { @@ -351,43 +369,53 @@ void AlarmClockModel::SetAlarmId(uint8_t id) return; } -void AlarmClockModel::NewFirstTime(void) -{ - uint32_t timeTem = FIRST_CLOCK_HOUR; - if (currentAlarm[0] == nullptr) { - currentAlarm[0] = new AlarmClockInfo(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewFirstTime new alarm_clock!"); - } - currentAlarm[0]->alarmClockId = GetAlarmId(); - currentAlarm[0]->alarmClockEnable = 0; - currentAlarm[0]->alarmType = 1; - currentAlarm[0]->nameLen = strlen(alarmName[0]); - currentAlarm[0]->index = 0; - currentAlarm[0]->delayNum = 0; - if (strcpy_s(currentAlarm[0]->alarmClockName, CLOCK_NAME_LENGTH, alarmName[0]) != 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewFirstTime copy alarmname error!"); - return; - } - currentAlarm[0]->alarmTime = (timeTem << 16) | 0x0000; // 第一个闹钟的时间初始化为九点 - currentAlarm[0]->repeatPeriod = 0x7F; // 第一个闹钟的日期设置默认为一周七天全选 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, - "AlarmClockModel::JudgeClockModel currentAlarm[0]->alarm_time = %u, currentAlarm[0]->repeat_period =%u", - currentAlarm[0]->alarmTime, currentAlarm[0]->repeatPeriod); - - int ret = AddAlarmClock(currentAlarm[0]); - if (ret != 0) { - if (currentAlarm[0] != nullptr) { - delete currentAlarm[0]; - currentAlarm[0] = nullptr; - } - return; - } - SetAlarmId(currentAlarm[0]->alarmClockId); - return; -} - +void set_alarm_id(uint8_t id) +{ + AlarmClockModel::GetInstance()->SetAlarmId(id); +} + +void delete_alarm_id(uint8_t id) +{ + AlarmClockModel::GetInstance()->DeleteAlarmId(id); +} +// void AlarmClockModel::NewFirstTime(void) +// { +// uint32_t timeTem = FIRST_CLOCK_HOUR; +// if (currentAlarm[0] == nullptr) { +// currentAlarm[0] = new AlarmClockInfo(); +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewFirstTime new alarm_clock!"); +// } +// currentAlarm[0]->alarmClockId = GetAlarmId(); +// currentAlarm[0]->alarmClockEnable = 0; +// currentAlarm[0]->alarmType = 1; +// currentAlarm[0]->nameLen = strlen(alarmName[0]); +// currentAlarm[0]->index = 0; +// currentAlarm[0]->delayNum = 0; +// if (strcpy_s(currentAlarm[0]->alarmClockName, CLOCK_NAME_LENGTH, alarmName[0]) != 0) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewFirstTime copy alarmname error!"); +// return; +// } +// currentAlarm[0]->alarmTime = (timeTem << 16) | 0x0000; // 第一个闹钟的时间初始化为九点 +// currentAlarm[0]->repeatPeriod = 0x7F; // 第一个闹钟的日期设置默认为一周七天全选 +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "AlarmClockModel::JudgeClockModel currentAlarm[0]->alarm_time = %u, currentAlarm[0]->repeat_period =%u", +// currentAlarm[0]->alarmTime, currentAlarm[0]->repeatPeriod); + +// int ret = AddAlarmClock(currentAlarm[0]); +// if (ret != 0) { +// if (currentAlarm[0] != nullptr) { +// delete currentAlarm[0]; +// currentAlarm[0] = nullptr; +// } +// return; +// } +// SetAlarmId(currentAlarm[0]->alarmClockId); +// return; +// } +#if 1 void AlarmClockModel::DeleteClockModel(uint16_t num) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel num=%d", num); if (num >= CLOCK_MAX || currentAlarm[num] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel delete clock error!"); return; @@ -402,28 +430,98 @@ void AlarmClockModel::DeleteClockModel(uint16_t num) "AlarmClockModel::DeleteAlarmClock = %d, currentAlarm[alarmListener] = %p, id = %u!", status, currentAlarm[num], currentAlarm[num]->alarmClockId); DeleteAlarmId(clockId); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel alarmSerial = %u!", alarmSerial); - for (; num < alarmSerial; num++) { - AlarmClockInfo *tempAlarm = currentAlarm[num]; - tempAlarm->index = currentAlarm[num]->index; - currentAlarm[num] = currentAlarm[num + 1]; - currentAlarm[num]->index = num; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::UpdataAlarmClock index = %u!", - currentAlarm[num]->index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel alarmSerial = %u!", alarmSerial); + + for (; num < alarmSerial - 1; num ++) { if (currentAlarm[num + 1] == nullptr || currentAlarm[num + 1]->alarmType == TYPE_INVALID_ALARM_CLOCK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel fail"); - currentAlarm[num] = tempAlarm; - return; + break; } + AlarmClockInfo *tempAlarm = currentAlarm[num]; + currentAlarm[num] = currentAlarm[num + 1]; + currentAlarm[num]->index = num; + int ret = UpdataAlarmClock(currentAlarm[num]); - if (ret != 0) { + if (ret != 0) + { currentAlarm[num] = tempAlarm; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel [%d]", __LINE__); return; } } - currentAlarm[alarmSerial] = nullptr; + currentAlarm[alarmSerial - 1] = nullptr; } +#else + +//删除闹钟信息 +void AlarmClockModel::DeleteClockModel(uint16_t id) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel id=%d", id); + if (id >= CLOCK_MAX || currentAlarm[id] == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel delete clock error!"); + return; + } + uint8_t clockId = currentAlarm[id]->alarmClockId; + int status = DeleteAlarmClock(currentAlarm[id]); + if (status!= 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteAlarmClock delete clock error!"); + return; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"AlarmClockModel::DeleteAlarmClock = %d, currentAlarm[alarmListener] = %p, alarmClockId = %u!", status, currentAlarm[id],currentAlarm[id]->alarmClockId); + DeleteAlarmId(clockId); + int alarmNum = GetAlarmNum(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel alarmNum = %u!", alarmNum); + + bool isFirstAlarm = (alarmNum == 0); + if (isFirstAlarm) { + // 如果是第一个闹钟,直接处理删除,无需检查下一个闹钟状态 + if (alarmNum > 1) { + // 如果有多个闹钟,将第二个闹钟赋给第一个位置,并更新索引 + currentAlarm[0] = currentAlarm[1]; + currentAlarm[0]->index = 0; + int ret = UpdataAlarmClock(currentAlarm[0]); + if (ret!= 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel update first alarm failed!"); + return; + } + } else { + // 如果只有一个闹钟,直接将其置为 nullptr + currentAlarm[0] = nullptr; + } + } else { + // 如果不是第一个闹钟,按照原逻辑处理 + for (; id < alarmNum; id++) + { + AlarmClockInfo *tempAlarm = currentAlarm[id]; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel. current_index = %u!", currentAlarm[id]->index); + // 判断是否到达最后一个闹钟或者下一个闹钟为 nullptr 或无效类型 + if ((id + 1) == alarmNum || currentAlarm[id + 1] == nullptr || currentAlarm[id + 1]->alarmType == TYPE_INVALID_ALARM_CLOCK) + { + // 如果是最后一个闹钟,直接置为 nullptr + if ((id + 1) == alarmNum) { + currentAlarm[id] = nullptr; + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel fail"); + currentAlarm[id] = tempAlarm; + return; + } + break; + } + currentAlarm[id] = currentAlarm[id + 1]; + currentAlarm[id]->index = id; + int ret = UpdataAlarmClock(currentAlarm[id]); + if (ret!= 0) + { + currentAlarm[id] = tempAlarm; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel [%d]", __LINE__); + return; + } + } + } +} +#endif +//切换特定闹钟的启用状态 bool AlarmClockModel::ButtonStatusRing(int16_t num, bool alarmStatus) { if (num >= CLOCK_MAX || currentAlarm[num] == nullptr) { @@ -437,8 +535,7 @@ bool AlarmClockModel::ButtonStatusRing(int16_t num, bool alarmStatus) } else if (!alarmStatus) { currentAlarm[num]->alarmClockEnable = 0; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing alarm[%d] status is %u", num, - currentAlarm[num]->alarmClockEnable); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing alarm[%d] status is %u", num, currentAlarm[num]->alarmClockEnable); int ret = UpdataAlarmClock(currentAlarm[num]); if (ret != 0) { currentAlarm[num]->alarmClockEnable = tempAlarmEnable; @@ -447,6 +544,7 @@ bool AlarmClockModel::ButtonStatusRing(int16_t num, bool alarmStatus) return true; } +//延迟某个闹钟 void AlarmClockModel::SetDelayAlarm(uint8_t alarm) { AlarmClockQueueMsg *clockQueueMsg = new AlarmClockQueueMsg(); @@ -456,13 +554,13 @@ void AlarmClockModel::SetDelayAlarm(uint8_t alarm) } currentAlarm[clockListener]->delayNum++; clockQueueMsg->eventType = EVENT_ALARM_RING_DELAY; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing clockQueueMsg->eventType is %u", - clockQueueMsg->eventType); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing clockQueueMsg->eventType is %u",clockQueueMsg->eventType); (clockQueueMsg->data).value = alarm; AlmmgrAlarmClockEventProcess(clockQueueMsg); return; } +//取消某个闹钟 void AlarmClockModel::SetCancelAlarm(uint8_t alarm) { AlarmClockQueueMsg *clockQueueMsg = new AlarmClockQueueMsg(); @@ -471,13 +569,13 @@ void AlarmClockModel::SetCancelAlarm(uint8_t alarm) return; } clockQueueMsg->eventType = EVENT_ALARM_RING_CANCEL; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing clockQueueMsg->eventType is %u", - clockQueueMsg->eventType); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ButtonStatusRing clockQueueMsg->eventType is %u",clockQueueMsg->eventType); (clockQueueMsg->data).value = alarm; AlmmgrAlarmClockEventProcess(clockQueueMsg); return; } +//设置闹钟时间 void AlarmClockModel::SetAlarmTime(uint32_t time_hour, uint32_t time_min, int16_t num) { if (num >= CLOCK_MAX || currentAlarm[num] == nullptr) { @@ -495,6 +593,7 @@ void AlarmClockModel::SetAlarmTime(uint32_t time_hour, uint32_t time_min, int16_ currentAlarm[num]->alarmTime); } +//设置闹钟星期 void AlarmClockModel::SetAlarmWeek(uint8_t week, int16_t num) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek set week!"); @@ -515,7 +614,7 @@ void AlarmClockModel::SetAlarmWeek(uint8_t week, int16_t num) void AlarmClockModel::DelAlarmDelay(int16_t num) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek set week!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DelAlarmDelay set week!"); if (num >= CLOCK_MAX || currentAlarm[num] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClcokModel::SetAlarmTime new alarm_clock! num = %d", num); return; @@ -527,23 +626,47 @@ void AlarmClockModel::DelAlarmDelay(int16_t num) currentAlarm[num]->delayNum = tempAlarmDelay; return; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek currentAlarm[num]->delayNum = %u", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DelAlarmDelay currentAlarm[num]->delayNum = %u", currentAlarm[num]->delayNum); } -void AlarmClockModel::SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8_t week, uint16_t alarmListener, - uint16_t setListener) +/* + * @brief 设置闹钟信息 + * @param 1 闹钟的小时数 + * @param 2 闹钟的分钟数 + * @param 3 表示闹钟的重复周期,按位表示一周中哪些天重复的数值 + * @param 4 标识特定闹钟的索引 + * @param 5 区分是新建闹钟还是修改闹钟的标志 + */ +void AlarmClockModel::SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8_t week, uint16_t alarmListener,uint16_t setListener) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmInfo!"); + // 检查时间参数是否合法 + if (time_hour < 0 || time_hour > 23 || time_min < 0 || time_min > 59) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Invalid time parameters!"); + return; + } + // 检查 alarmListener 是否在合理范围内 + if (alarmListener >= ALARM_CLOCK_MAX || alarmListener < 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Invalid alarmListener value!"); + return; + } + // 检查 setListener 是否合法 + if (setListener!= NEW_TIME_LISTENER && setListener!= SET_TIME_LISTENER) // NEW_TIME_LISTENER:0 表示新建闹钟,SET_TIME_LISTENER:1 表示修改闹钟 + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Invalid setListener value!"); + return; + } if (currentAlarm[alarmListener] == nullptr || (currentAlarm[alarmListener]->alarmType == TYPE_INVALID_ALARM_CLOCK && currentAlarm[alarmListener] != nullptr)) { currentAlarm[alarmListener] = new AlarmClockInfo(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClcokModel::SetAlarmTime new alarm!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClcokModel::SetAlarmTime new alarm!"); } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "hour = %u, minute = %u", time_hour, time_min); - currentAlarm[alarmListener]->alarmTime = ((time_hour << 16) | time_min); // 闹钟时间数据的小时位右边16位 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewAlarmTime currentAlarm[alarmListener]->alarm_time = %u", - currentAlarm[alarmListener]->alarmTime); + currentAlarm[alarmListener]->alarmTime = ((time_hour << 16) | time_min); // 闹钟时间数据:小时存储在高 16 位,分钟存储在低 16 位 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewAlarmTime currentAlarm[alarmListener]->alarm_time = %u",currentAlarm[alarmListener]->alarmTime); currentAlarm[alarmListener]->alarmClockId = GetAlarmId(); currentAlarm[alarmListener]->alarmClockEnable = 1; currentAlarm[alarmListener]->alarmType = 1; @@ -558,8 +681,8 @@ void AlarmClockModel::SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8_ } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewAlarmTime clock name = %s, id = %u", currentAlarm[alarmListener]->alarmClockName, currentAlarm[alarmListener]->alarmClockId); - if (setListener == 0) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek new time!"); + if (setListener == NEW_TIME_LISTENER) { //表示新建闹钟 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek new time!"); int ret = AddAlarmClock(currentAlarm[alarmListener]); if (ret != 0) { if (currentAlarm[alarmListener] != nullptr) { @@ -569,8 +692,8 @@ void AlarmClockModel::SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8_ return; } SetAlarmId(currentAlarm[alarmListener]->alarmClockId); - } else { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek modify time!"); + } else { //表示修改闹钟 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek modify time!"); UpdataAlarmClock(currentAlarm[alarmListener]); } } @@ -605,7 +728,7 @@ void AlarmClockModel::ResetRingClockStatus() } if (currentAlarm[clockListener]->repeatPeriod == 0) { currentAlarm[clockListener]->alarmClockEnable = 0; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ResetRingClockStatus"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::ResetRingClockStatus clockListener = %d",clockListener); } } @@ -614,7 +737,11 @@ void AlarmClockModel::GetPopTimeData(int16 *hour, int16 *min) *hour = popHour; *min = popMin; } - +void AlarmClockModel::SetPopTimeData(int16 hour, int16 min) +{ + popHour = hour; + popMin = min; +} void AlarmClockModel::AlarmGetClockNum() { struct tm curTime; @@ -639,7 +766,7 @@ void AlarmClockModel::AlarmGetClockNum() currentAlarm[num]->alarmTime >> TWO_BYTES_BITS, currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES); popHour = hour; popMin = min; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum %d:%d!", popHour, popMin); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum %d:%d!", popHour, popMin); clockListener = num; return; } @@ -658,11 +785,11 @@ void AlarmClockModel::GetAlarmCallId(uint8_t *alarm) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmTimerCallback AlarmGetCurrentTimeInfo failed!!"); return; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmGetClockNum, hour:%u, min:%u", curTime.tm_hour, curTime.tm_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetAlarmCallId, hour:%u, min:%u", curTime.tm_hour, curTime.tm_min); for (uint16_t num = 0; num < CLOCK_MAX; num++) { if (currentAlarm[num] == nullptr || currentAlarm[num]->alarmType == TYPE_INVALID_ALARM_CLOCK) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum get num fail!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetAlarmCallId get num fail!"); return; } int32_t hour = currentAlarm[num]->alarmTime >> TWO_BYTES_BITS; @@ -670,7 +797,7 @@ void AlarmClockModel::GetAlarmCallId(uint8_t *alarm) hour = (hour + min / ONE_HOUR_MIN) % TWENTY_FOUR_HOUR; min = min % ONE_HOUR_MIN; if (curTime.tm_hour == hour && curTime.tm_min == min) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum %d:%d!", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetAlarmCallId %d:%d!", currentAlarm[num]->alarmTime >> TWO_BYTES_BITS, currentAlarm[num]->alarmTime & AND_FOR_LOW_TWO_BYTES); *alarm = currentAlarm[num]->alarmClockId; return; @@ -687,7 +814,14 @@ void AlarmClockModel::PopInterCancelMusic() void AlarmClockModel::PopInterPlayMusic() { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::PopInterPlayMusic"); + if(true == ConfigModel::GetInstance()->GetDnotdisturb() || (uapi_sleep_mode_flag_get())) + { + return; + } + ScreenTurnOn(-1); + GraphicService::GetInstance()->PostGraphicEvent( std::bind(&AlarmClockModel::AlarmPlayerStart, AlarmClockModel::GetInstance())); } @@ -705,13 +839,18 @@ uint16 AlarmClockModel::GetSliceId() int AlarmClockModel::AlarmPlayerStat() { int32_t ret; + // if(NotificationManager::GetInstance()->GetWatchCallStatus()) + // { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetWatchCallStatus"); + // return 0; + // } // 设置回调函数 if (playerCtr.get() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmPlayerStat playerCtr nullptr"); return OHOS_FAILURE; } - playerCtr->SetPlayerCallback(playerCallback); + //playerCtr->SetPlayerCallback(playerCallback); // 申请资源 source = std::make_shared(uri, header); if (source.get() == nullptr) { @@ -720,7 +859,7 @@ int AlarmClockModel::AlarmPlayerStat() } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPlayer uri %s.", uri.c_str()); playerCtr->SetSource(*source); - playerCtr->SetAudioStreamType(AUDIO_STREAM_ALARM_CLOCK); + playerCtr->SetAudioStreamType(AUDIO_STREAM_RING); playerCtr->Prepare(); // 申请焦点 @@ -736,15 +875,25 @@ int AlarmClockModel::AlarmPlayerStat() WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerInterruptListener new fail"); return OHOS_FAILURE; } - interrupt = { AUDIO_STREAM_ALARM_CLOCK, sessionId, playerInterruptListener }; + interrupt = { AUDIO_STREAM_RING, sessionId, playerInterruptListener }; // 激活音频中断 5s超时 if (amIntance.ActivateAudioInterrupt(interrupt) == INTERRUPT_FAILED) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivateAudioInterrupt faild"); return OHOS_FAILURE; } playerCtr->SetAudioSessionId(sessionId); + playerCtr->SetVolume(amIntance.GetMaxVolume(AUDIO_STREAM_MUSIC),amIntance.GetMaxVolume(AUDIO_STREAM_MUSIC)); + playerCtr->EnableSingleLooping(true); // 播放 - playerCtr->Play(); + // playerCtr->Play(); + + ret = playerCtr->Play(); + if (ret != 0) { + playerCtr->Stop(); // 暂停 + playerCtr->Reset(); // 初始化 + + AudioManager::GetInstance().DeactivateAudioInterrupt(interrupt); + } return OHOS_SUCCESS; } @@ -757,7 +906,12 @@ int AlarmClockModel::AlarmPlayerInit(void) std::string strSongName = sliceId; std::string pureName = strSongName.substr(0, strSongName.rfind(".")); // 播放音乐的路径需要引用.号 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); - std::string strSrcMusic(APP_MUSIC_PATH); + //std::string strSrcMusic(APP_MUSIC_PATH); + #ifdef SINGLE_USER_PARTITION + std::string strSrcMusic("/user/music/ring"); + #else + std::string strSrcMusic("/music/ring"); + #endif std::string tempStr("/"); std::string strName = sliceId; uri = strSrcMusic + tempStr + strName; @@ -777,6 +931,31 @@ int AlarmClockModel::AlarmPlayerInit(void) return OHOS_SUCCESS; } + +int AlarmClockModel::AlarmPlayerInit_BY_fir_name(char *str) +{ + // 本地播放文件路径和状态 + sliceId = str; // 播放音乐的文件名 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit start!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); + std::string strName = sliceId; + uri =strName; + // 创建 AM + + playerCtr = std::make_shared(); + if (playerCtr.get() == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerCtr new fail"); + return OHOS_FAILURE; + } + playerCallback = std::make_shared(); + if (playerCallback.get() == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerCallback new fail"); + return OHOS_FAILURE; + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit end!"); + return OHOS_SUCCESS; +} + int AlarmClockModel::AlarmPlayerStop(void) { int32_t ret = 0; @@ -785,12 +964,14 @@ int AlarmClockModel::AlarmPlayerStop(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmPlayerStop playerCtr nullptr"); return OHOS_FAILURE; } - - ret = playerCtr->Stop(); - playerCtr->Reset(); - playerCtr->Release(); - if (amIntance.DeactivateAudioInterrupt(interrupt) != 0) { - return OHOS_FAILURE; + if(playerCtr->IsPlaying()) + { + ret = playerCtr->Stop(); + playerCtr->Reset(); + playerCtr->Release(); + if (amIntance.DeactivateAudioInterrupt(interrupt) != 0) { + return OHOS_FAILURE; + } } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Reset, ret:%d", ret); return OHOS_SUCCESS; @@ -803,6 +984,25 @@ int AlarmClockModel::AlarmPlayerStart(void) return OHOS_SUCCESS; } +int testPlayerStart_(char *str) +{ + AlarmClockModel::GetInstance()->testPlayerStart(str); + return OHOS_SUCCESS; +} + +int AlarmPlayerStop_(void) +{ + AlarmClockModel::GetInstance()->AlarmPlayerStop(); + return OHOS_SUCCESS; +} + +int AlarmClockModel::testPlayerStart(char *str) +{ + AlarmPlayerInit_BY_fir_name(str); + AlarmPlayerStat(); + return OHOS_SUCCESS; +} + void AlarmPlayerCallbackImpl::OnPlaybackComplete() { GraphicService::GetInstance()->PostGraphicEvent( @@ -814,7 +1014,7 @@ uint16_t AlarmClockModel::JudgePreSlice(void) uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); if (preSlice == VIEW_ALARM_POP_UP || preSlice < VIEW_SETTING) { preSlice = VIEW_MAIN; - } else if ((preSlice == VIEW_MAEKPHONE_SAMPLE) && + } else if ((preSlice == VIEW_INCOMING_CALL) && (GetCurrCallNum() == 0 || GetScoConnectState() != HFP_SCO_STATE_CONNECTED)) { int num; PhoneCallInfo callList[MULTI_CALL_MAX_NUME]{}; @@ -909,6 +1109,43 @@ uint16 AlarmClockModel::GetSmartAlarmCnt(void) return AlmmgrGetSmartAlarmCnt(); } +void AlarmClockModel::UpdateAlarmInfoByAppSet(void) +{ + if(nullptr != OHOS::AlarmPresenter::GetInstance()) + { + OHOS::AlarmPresenter::GetInstance()->UpdateAlarmInfoByAppSet(); + } +} + +void AlarmClockModel::CancelAlarmRing() +{ + bool alarmStatus; + uint8_t alarm = 0; + alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarm); + if (!alarmStatus) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpPresenter::CancelAlarmRing get alarm Id false!"); + return; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CancelAlarmRing alarm = %d",alarm); + AlarmClockModel::GetInstance()->ResetRingClockStatus(); + AlarmClockModel::GetInstance()->SetCancelAlarm(alarm); + if(AlarmPresenter::GetInstance()) { + AlarmPresenter::GetInstance()->RefreshAlarmStatus(clockListener); + } +} + +void AlarmClockModel::DelayAlarmRing() +{ + uint8_t alarmId = 0; + bool alarmStatus; + alarmStatus = AlarmClockModel::GetInstance()->GetListenClockId(&alarmId); + if (!alarmStatus) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DelayAlarmRing get alarm Id false!"); + return; + } + AlarmClockModel::GetInstance()->SetDelayAlarm(alarmId); +} + bool AlarmPlayerListener::IsPaused() { return isPaused_; @@ -968,10 +1205,10 @@ void AlarmPlayerListener::OnInterrupt(int32_t type, int32_t hint) } } -void PushAlarmClockDataToModel(AlarmClockQueueMsg alarmClockMsg) -{ - OHOS::AlarmClockModel::GetInstance()->PushAlarmClockData(alarmClockMsg); -} +// void PushAlarmClockDataToModel(AlarmClockQueueMsg alarmClockMsg) +// { +// OHOS::AlarmClockModel::GetInstance()->PushAlarmClockData(alarmClockMsg); +// } //////////////////////////////////////////////////////////////////////////// diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp index f6bd43da4..16813e109 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp @@ -15,9 +15,6 @@ #include "AlarmPopUpPresenter.h" -#ifdef FD230_650 -#include "PhoneService.h" -#endif namespace OHOS { #define CLOSE "关闭" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp index 171caef71..320be4745 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp @@ -11,8 +11,11 @@ #include "AlarmPresenter.h" #include #include "color.h" - -namespace OHOS { +#include "ConfigModel.h" +#include "ui_resource_string.h" +#include "languagecode/LanguageInit.h" +namespace OHOS +{ #define SET_ALARM "编辑闹钟" #define TIME "9:00:00" #define SET_THIS_TIME "更改时间" @@ -24,302 +27,395 @@ namespace OHOS { #define EVERY_DAY "每天" #define DO_NOT_REPEAT "不重复" -static AlarmConfigView *g_pAlarmConfigView = nullptr; -constexpr int16_t CONTAINER_X = 0; -constexpr int16_t CONTAINER_Y = 0; -constexpr int16_t SET_ONE = 1; -constexpr int16_t SET_FOUR = 4; -constexpr int16_t TITLE_X_LEN = 100; -constexpr int16_t MAX_TITLE_X_LEN = 160; -constexpr int16_t MAX_TITLE_Y_LEN = 45; -constexpr int16_t MAX_DATA_X = 65; -constexpr int16_t CLOCK_X = 165; -constexpr int16_t LABEL_WID = 250; -constexpr int16_t MAX_LABEL_H_LEN = 80; -constexpr int16_t MAX_DATA_W_LEN = 275; -constexpr int16_t DIGITAL_CLOCK_FONT = 45; -constexpr int16_t MAX_LABEL_TIME_Y_LEN = 195; -constexpr int16_t LABEL_SET_TIME_Y = 245; -constexpr int16_t MAX_LABEL_DAY_Y_LEN = 320; -constexpr int16_t MAX_LABEL_SET_WEEK_Y_LEN = 380; -constexpr int16_t MAX_LABEL_LABEL_CHANGE_NAME_Y_LEN = 460; -constexpr int16_t MAX_LABEL_SET_NAME_Y_LEN = 505; -constexpr int16_t MAX_DEFAULT_FONT_LEN = 34; -constexpr int16_t LITTLE_LABEL_FONT = 30; -constexpr int16_t MAX_DEFAULT_FONT_2_LEN = 35; -constexpr int16_t MAX_DEFAULT_LIT_FONT2_LEN = 40; -constexpr int16_t MAX_BACK_BUTTON_HEIGHT_LEN = 64; -constexpr int16_t MAX_FONT_DEFAULT_SIZE_LEN = 24; -constexpr int16_t MAX_DELETE_BUTTON_W_LEN = 320; -constexpr int16_t LABEL_DAY_WIDTH = 320; -constexpr int16_t MAX_DELETE_BUTTON_H_LEN = 100; -constexpr int16_t MAX_DELETE_BUTTON_X_LEN = 63; -constexpr int16_t MAX_DELETE_BUTTON_Y_LEN = 365; -constexpr int16_t MAX_IMAGE_CHANGE_X_LEN = 370; -constexpr int16_t MAX_IMAGE_CHANGE1_Y_LEN = 210; -constexpr int16_t MAX_IMAGE_CHANGE2_Y_LEN = 350; -constexpr int16_t MAX_IMAGE_CHANGE3_Y_LEN = 470; -constexpr int16_t MAX_IMAGE_CHANGE_WIDTH = 50; -constexpr int16_t MAX_IMAGE_CHANGE_HEIGHT = 60; -constexpr int16_t CONFIG_SCROLL_SIZE = 50; -constexpr int16_t LABEL_SEMITRANSPARENT = 168; - -AlarmConfigView::AlarmConfigView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::AlarmConfigView"); - g_pAlarmConfigView = this; -} - -AlarmConfigView::~AlarmConfigView() -{ - group->RemoveAll(); - configScroll->RemoveAll(); - delete editLabel; - editLabel = nullptr; - delete deleteImage; - deleteImage = nullptr; - delete configScroll; - configScroll = nullptr; - delete labelTime; - labelTime = nullptr; - delete labelSetTime; - labelSetTime = nullptr; - delete labelDay; - labelDay = nullptr; - delete labelSetWeek; - labelSetWeek = nullptr; - delete labelChangeName; - labelChangeName = nullptr; - delete labelSetName; - labelSetName = nullptr; - delete changeIcon1; - changeIcon1 = nullptr; - delete changeIcon2; - changeIcon2 = nullptr; - delete changeIcon3; - changeIcon3 = nullptr; - delete group; - group = nullptr; - g_pAlarmConfigView = nullptr; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::~AlarmConfigView"); -} + static AlarmConfigView *g_pAlarmConfigView = nullptr; + constexpr int16_t CONTAINER_X = 0; + constexpr int16_t CONTAINER_Y = 0; + constexpr int16_t SET_ONE = 1; + constexpr int16_t SET_FOUR = 4; + constexpr int16_t TITLE_X_LEN = 100; + constexpr int16_t MAX_TITLE_X_LEN = 160; + constexpr int16_t MAX_TITLE_Y_LEN = 45; + constexpr int16_t MAX_DATA_X = 65; + constexpr int16_t CLOCK_X = 165; + constexpr int16_t LABEL_WID = 250; + constexpr int16_t MAX_LABEL_H_LEN = 80; + constexpr int16_t MAX_DATA_W_LEN = 275; + constexpr int16_t DIGITAL_CLOCK_FONT = 45; + constexpr int16_t MAX_LABEL_TIME_Y_LEN = 195 - 25; + constexpr int16_t LABEL_SET_TIME_Y = 245 - 25; + constexpr int16_t MAX_LABEL_DAY_Y_LEN = 320 - 30; + constexpr int16_t MAX_LABEL_SET_WEEK_Y_LEN = 380 - 30; + constexpr int16_t MAX_LABEL_LABEL_CHANGE_NAME_Y_LEN = 460; + constexpr int16_t MAX_LABEL_SET_NAME_Y_LEN = 505; + constexpr int16_t MAX_DEFAULT_FONT_LEN = 34; + constexpr int16_t LITTLE_LABEL_FONT = 30; + constexpr int16_t MAX_DEFAULT_FONT_2_LEN = 35; + constexpr int16_t MAX_DEFAULT_LIT_FONT2_LEN = 40; + constexpr int16_t MAX_BACK_BUTTON_HEIGHT_LEN = 64; + constexpr int16_t MAX_FONT_DEFAULT_SIZE_LEN = 24; + constexpr int16_t MAX_DELETE_BUTTON_W_LEN = 320; + constexpr int16_t LABEL_DAY_WIDTH = 320; + constexpr int16_t MAX_DELETE_BUTTON_H_LEN = 100; + constexpr int16_t MAX_DELETE_BUTTON_X_LEN = 63; + constexpr int16_t MAX_DELETE_BUTTON_Y_LEN = 365; + constexpr int16_t MAX_IMAGE_CHANGE_X_LEN = 370; + constexpr int16_t MAX_IMAGE_CHANGE1_Y_LEN = 210 - 25; + constexpr int16_t MAX_IMAGE_CHANGE2_Y_LEN = 350 - 30; + constexpr int16_t MAX_IMAGE_CHANGE3_Y_LEN = 470; + constexpr int16_t MAX_IMAGE_CHANGE_WIDTH = 50; + constexpr int16_t MAX_IMAGE_CHANGE_HEIGHT = 60; + constexpr int16_t CONFIG_SCROLL_SIZE = 50; + constexpr int16_t LABEL_SEMITRANSPARENT = 168; -AlarmConfigView *AlarmConfigView::GetInstance(void) -{ - return g_pAlarmConfigView; -} - -UILabel *AlarmConfigView::CreateConfigLabel(const char *buttonText, int16_t labelFont, int16_t x, int16_t y, int16_t width) -{ - if (buttonText == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: buttonText nullptr!"); - return nullptr; + AlarmConfigView::AlarmConfigView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::AlarmConfigView"); + g_pAlarmConfigView = this; } - UILabel *label = nullptr; - label = new UILabel(); - if (label == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: CreateConfigLabel return nullptr"); - return nullptr; - } - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelFont); - label->SetText(buttonText); - label->SetPosition(x, y, width, MAX_LABEL_H_LEN); - return label; -} -void AlarmConfigView::CreateChangeIcons(void) -{ - changeIcon1 = new UIImageView(); - if (changeIcon1 == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new changeIcon1 fail"); - return; - } - changeIcon1->SetPosition(MAX_IMAGE_CHANGE_X_LEN, MAX_IMAGE_CHANGE1_Y_LEN, MAX_IMAGE_CHANGE_WIDTH, MAX_IMAGE_CHANGE_HEIGHT); - changeIcon1->SetSrc(PNG_SETTTING_BUTTON_IMAGE); - configScroll->Add(changeIcon1); - - changeIcon2 = new UIImageView(); - if (changeIcon2 == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new changeIcon2 fail"); - return; - } - changeIcon2->SetPosition(MAX_IMAGE_CHANGE_X_LEN, MAX_IMAGE_CHANGE2_Y_LEN, MAX_IMAGE_CHANGE_WIDTH, MAX_IMAGE_CHANGE_HEIGHT); - changeIcon2->SetSrc(PNG_SETTTING_BUTTON_IMAGE); - configScroll->Add(changeIcon2); - - changeIcon3 = new UIImageView(); - if (changeIcon3 == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new changeIcon3 fail"); - return; - } - changeIcon3->SetPosition(MAX_IMAGE_CHANGE_X_LEN, MAX_IMAGE_CHANGE3_Y_LEN, MAX_IMAGE_CHANGE_WIDTH, MAX_IMAGE_CHANGE_HEIGHT); - changeIcon3->SetSrc(PNG_SETTTING_BUTTON_IMAGE); - configScroll->Add(changeIcon3); - - UIView::OnDragListener *configDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); - if (configDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new configDragListener fail"); - return; - } - group->SetOnDragListener(configDragListener); -} - -void AlarmConfigView::CreateConfigButton(void) -{ - editLabel = CreateConfigLabel(SET_ALARM, MAX_DEFAULT_FONT_LEN, TITLE_X_LEN, MAX_TITLE_Y_LEN, LABEL_WID); - if (editLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new editLabel fail"); - return; - } - editLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); - configScroll->Add(editLabel); - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - if (clickListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::OnStart clickListener nullptr"); - return; - } - labelTime = new UIDigitalClock(); - if (labelTime == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelTime fail"); - return; + AlarmConfigView::~AlarmConfigView() + { + if (nullptr != group) + { + group->RemoveAll(); + if (nullptr != configScroll) + { + configScroll->RemoveAll(); + if (nullptr != editLabel) + { + delete editLabel; + editLabel = nullptr; + } + if (nullptr != labelTime) + { + delete labelTime; + labelTime = nullptr; + } + if (nullptr != labelSetTime) + { + delete labelSetTime; + labelSetTime = nullptr; + } + if (nullptr != labelDay) + { + delete labelDay; + labelDay = nullptr; + } + if (nullptr != labelSetWeek) + { + delete labelSetWeek; + labelSetWeek = nullptr; + } + if (nullptr != button1) + { + delete button1; + button1 = nullptr; + } + if (nullptr != button2) + { + delete button2; + button2 = nullptr; + } + delete configScroll; + configScroll = nullptr; + } + delete group; + group = nullptr; + } + g_pAlarmConfigView = nullptr; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::~AlarmConfigView"); } - labelTime->SetViewId(SET_TIME); - labelTime->SetPosition(CLOCK_X, MAX_LABEL_TIME_Y_LEN, LABEL_WID, MAX_LABEL_H_LEN); - labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, DIGITAL_CLOCK_FONT); - labelTime->SetTouchable(true); - labelTime->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS); - labelTime->SetOnClickListener(clickListener); - configScroll->Add(labelTime); - labelSetTime = CreateConfigLabel(SET_THIS_TIME, LITTLE_LABEL_FONT, MAX_TITLE_X_LEN, LABEL_SET_TIME_Y, LABEL_WID); - if (labelSetTime == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelSetTime fail"); - return; - } - labelSetTime->SetStyle(STYLE_TEXT_OPA, LABEL_SEMITRANSPARENT); - configScroll->Add(labelSetTime); - labelDay = CreateConfigLabel(WEEK_MON_TUE, MAX_DEFAULT_FONT_LEN, MAX_DATA_X, MAX_LABEL_DAY_Y_LEN, LABEL_DAY_WIDTH); - if (labelDay == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelDay fail"); - return; + AlarmConfigView *AlarmConfigView::GetInstance(void) + { + return g_pAlarmConfigView; } - labelDay->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); - configScroll->Add(labelDay); - labelDay->SetViewId(SET_WEEK); - labelDay->SetTouchable(true); - labelDay->SetOnClickListener(clickListener); - labelSetWeek = CreateConfigLabel(SET_DATA, LITTLE_LABEL_FONT, MAX_TITLE_X_LEN, MAX_LABEL_SET_WEEK_Y_LEN, LABEL_WID); - if (labelSetWeek == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelSetWeek fail"); - return; + void AlarmConfigView::InitLabel() + { + if (editLabel == nullptr) + { + editLabel = new UILabelExt(); + if (editLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new editLabel fail"); + return; + } + } + editLabel->SetPosition(83, 50, 300, 35); + // editLabel->SetText("编辑闹钟"); + editLabel->SetTextId(STR_ALARM); + editLabel->SetStyle(STYLE_TEXT_FONT, 30); + editLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + editLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + editLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + editLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + editLabel->SetRollSpeed(23); + /* -------------------------------------------------------------------------- */ + // if (labelTime == nullptr) + // { + // labelTime = new UIDigitalClock(); + // if (labelTime == nullptr) + // { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelTime fail"); + // return; + // } + // } + // labelTime->SetPosition(93, (120 - 80) / 2, 150, 45); + // labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 45); + // labelTime->SetTouchable(true); + // labelTime->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS); + if (labelTime == nullptr) + { + labelTime = new UILabelExt(); + if (labelTime == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new labelSetTime fail"); + return; + } + } + labelTime->SetPosition(93, 120 + 12, 250, 45); + labelTime->SetStyle(STYLE_TEXT_FONT, 40); + labelTime->SetStyle(STYLE_LINE_HEIGHT, 45); + labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); + labelTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelTime->SetRollSpeed(23); + /* -------------------------------------------------------------------------- */ + if (labelSetTime == nullptr) + { + labelSetTime = new UILabelExt(); + if (labelSetTime == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new labelSetTime fail"); + return; + } + } + labelSetTime->SetPosition(93, labelTime->GetY() + labelTime->GetHeight(), 250, 35); + // labelSetTime->SetText("更改时间"); + labelSetTime->SetTextId(STR_ALARM_TIME_CHANGE); + labelSetTime->SetStyle(STYLE_TEXT_FONT, 30); + labelSetTime->SetStyle(STYLE_LINE_HEIGHT, 35); + labelSetTime->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); + labelSetTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + labelSetTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelSetTime->SetRollSpeed(23); + /* -------------------------------------------------------------------------- */ + if (labelDay == nullptr) + { + labelDay = new UILabelExt(); + if (labelDay == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new labelDay fail"); + return; + } + } + labelDay->SetPosition(93, 240 + 12, 250, 45); + labelDay->SetStyle(STYLE_TEXT_FONT, 40); + labelDay->SetStyle(STYLE_LINE_HEIGHT, 45); + labelDay->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); + labelDay->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelDay->SetRollSpeed(23); + /* -------------------------------------------------------------------------- */ + if (labelSetWeek == nullptr) + { + labelSetWeek = new UILabelExt(); + if (labelSetWeek == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new labelSetWeek fail"); + return; + } + } + labelSetWeek->SetPosition(93, labelDay->GetY() + labelDay->GetHeight(), 250, 35); + // labelSetWeek->SetText("更改星期"); + labelSetWeek->SetTextId(STR_ALARM_WEEK_CHANGE); + labelSetWeek->SetStyle(STYLE_TEXT_FONT, 30); + labelSetWeek->SetStyle(STYLE_LINE_HEIGHT, 35); + labelSetWeek->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); + labelSetWeek->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + labelSetWeek->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelSetWeek->SetRollSpeed(23); } - labelSetWeek->SetStyle(STYLE_TEXT_OPA, LABEL_SEMITRANSPARENT); - configScroll->Add(labelSetWeek); -} -UIScrollView *AlarmConfigView::InitConfigView(void) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::OnStart"); - group = new UIScrollView(); - if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new group fail"); - return nullptr; + void AlarmConfigView::InitButton() + { + UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + if (clickListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::OnStart clickListener nullptr"); + return; + } + if (nullptr == button1) + { + button1 = new UILabelButtonExt(); + if (nullptr == button1) + { + return; + } + } + button1->SetPosition(43, 120, 380, 100); + button1->SetViewId(SET_TIME); // 设置时间 + button1->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + button1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + button1->SetStyle(STYLE_LINE_HEIGHT, 35); + button1->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); + button1->SetAlign(TEXT_ALIGNMENT_LEFT); + button1->SetLabelPosition(115, 0); + button1->SetImagePosition(326, 37); + button1->SetImageSrc(PNG_SETTING_NEXT_IMAGE, PNG_SETTING_NEXT_IMAGE); + button1->SetOnClickListener(clickListener); + /* -------------------------------------------------------------------------- */ + if (nullptr == button2) + { + button2 = new UILabelButtonExt(); + if (nullptr == button2) + { + return; + } + } + button2->SetPosition(43, 240, 380, 100); + button2->SetViewId(SET_WEEK); // 设置星期 + button2->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + button2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + button2->SetStyle(STYLE_LINE_HEIGHT, 35); + button2->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); + button2->SetAlign(TEXT_ALIGNMENT_LEFT); + button2->SetLabelPosition(115, 0); + button2->SetImagePosition(326, 37); + button2->SetImageSrc(PNG_SETTING_NEXT_IMAGE, PNG_SETTING_NEXT_IMAGE); + button2->SetOnClickListener(clickListener); } - group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - configScroll = new UIScrollView(); - if (configScroll == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new configScroll fail"); - return nullptr; - } - configScroll->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION - MAX_BACK_BUTTON_HEIGHT_LEN); - configScroll->SetReboundSize(CONFIG_SCROLL_SIZE); - configScroll->SetHorizontalScrollState(false); - CreateConfigButton(); - labelChangeName = CreateConfigLabel(CHANGE_NAME, MAX_DEFAULT_FONT_LEN, MAX_TITLE_X_LEN, - MAX_LABEL_LABEL_CHANGE_NAME_Y_LEN, LABEL_WID); - if (labelChangeName == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelChangeName fail"); - return nullptr; - } - configScroll->Add(labelChangeName); - labelSetName = CreateConfigLabel(SET_NAME, LITTLE_LABEL_FONT, MAX_TITLE_X_LEN, MAX_LABEL_SET_NAME_Y_LEN, LABEL_WID); - if (labelSetName == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new labelSetName fail"); - return nullptr; - } - labelSetName->SetStyle(STYLE_TEXT_OPA, LABEL_SEMITRANSPARENT); - configScroll->Add(labelSetName); - deleteImage = new UILabelButton(); - if (deleteImage == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new deleteImage fail"); - return nullptr; + UIScrollView *AlarmConfigView::InitConfigView(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::OnStart"); + if (group == nullptr) + { + group = new UIScrollView(); + if (group == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new group fail"); + return nullptr; + } + group->SetPosition(CONTAINER_X, CONTAINER_Y, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + UIView::OnDragListener *configDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); + if (configDragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new configDragListener fail"); + return nullptr; + } + group->SetOnDragListener(configDragListener); + /* -------------------------------------------------------------------------- */ + if (configScroll == nullptr) + { + configScroll = new UIScrollView(); + if (configScroll == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new configScroll fail"); + return nullptr; + } + } + configScroll->SetPosition(CONTAINER_X, CONTAINER_Y, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + configScroll->SetReboundSize(CONFIG_SCROLL_SIZE); + configScroll->SetHorizontalScrollState(false); + InitButton(); + InitLabel(); + /* ----------------------------------- Add ---------------------------------- */ + configScroll->Add(button1); + configScroll->Add(button2); + configScroll->Add(editLabel); + configScroll->Add(labelTime); + configScroll->Add(labelSetTime); + configScroll->Add(labelDay); + configScroll->Add(labelSetWeek); + group->Add(configScroll); + } + return group; } - deleteImage->SetPosition(MAX_DELETE_BUTTON_X_LEN, MAX_DELETE_BUTTON_Y_LEN, MAX_DELETE_BUTTON_W_LEN, MAX_DELETE_BUTTON_H_LEN); - deleteImage->SetText(DELETE_INTERFACES); - deleteImage->SetTouchable(true); - deleteImage->SetViewId(ALARM_CLOCK_DELETE); - deleteImage->SetTextColor(Color::Red()); - deleteImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_DEFAULT_LIT_FONT2_LEN); - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - deleteImage->SetOnClickListener(clickListener); - deleteImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE); - - CreateChangeIcons(); - group->Add(configScroll); - group->Add(deleteImage); - return group; -} -void AlarmConfigView::RefreshConfig(const uint32_t time, uint8_t week, uint16_t alarmNum) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep"); - uint8_t hour = time >> 16; // 闹钟存储小时位需右移16位 - uint8_t min = time & 0x00FF; // 闹钟存储分钟的位数右边16位需要全部置0 - uint16_t ret; - std::string weekStr; - if (hour > 24) { // 小时数最大为24,加入判断若小时的参数超过24则错误 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep hour > 24 error!"); - return; - } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::week = %u!", week); - if ((week & 0x7f) == 0x7f) { // 判断0~6位是否都为1,如若都为1,则一周7天闹钟都响应 - weekStr = EVERY_DAY; - } else if (week == 0) { // 判断0~6位是否都为0,如若都为0,则一周7天都不响应,闹钟为不重复开启 - weekStr = DO_NOT_REPEAT; - } else { - if ((week & 0x02) == 0x02) { // 判断第1位是否为1,如若为1,则星期一响应 - weekStr += MON_DAY; + void AlarmConfigView::RefreshConfig(const uint32_t time, uint8_t week, uint16_t alarmNum) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep"); + uint8_t hour = time >> 16; // 闹钟存储小时位需右移16位 + uint8_t min = time & 0x00FF; // 闹钟存储分钟的位数右边16位需要全部置0 + uint16_t ret; + std::string weekStr; + std::string weekStr_en; + if (hour > 24) + { // 小时数最大为24,加入判断若小时的参数超过24则错误 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep hour > 24 error!"); + return; } - if ((week & 0x04) == 0x04) { // 判断第2位是否为1,如若为1,则星期二响应 - weekStr += TUE_DAY; + // 检查分钟是否在有效范围 + if (min > 59) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep min > 59 error!"); + return; } - if ((week & 0x08) == 0x08) { // 判断第3位是否为1,如若为1,则星期三响应 - weekStr += WED_DAY; + // 检查 week 是否在有效范围 + if (week > 127) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep week out of range!"); + return; } - if ((week & 0x10) == 0x10) { // 判断第4位是否为1,如若为1,则星期四响应 - weekStr += THUR_DAY; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::week = %u!", week); + if ((week & 0x7f) == 0x7f) + { // 判断0~6位是否都为1,如若都为1,则一周7天闹钟都响应 + weekStr = EVERY_DAY; + weekStr_en = EVERY_DAY_EN; } - if ((week & 0x20) == 0x20) { // 判断第5位是否为1,如若为1,则星期五响应 - weekStr += FRI_DAY; + else if (week == 0) + { // 判断0~6位是否都为0,如若都为0,则一周7天都不响应,闹钟为不重复开启 + weekStr = DO_NOT_REPEAT; + weekStr_en = DO_NOT_REPEAT_EN; } - if ((week & 0x40) == 0x40) { // 判断第6位是否为1,如若为1,则星期六响应 - weekStr += SAT_DAY; + else + { + if ((week & 0x02) == 0x02) + { // 判断第1位是否为1,如若为1,则星期一响应 + weekStr += MON_DAY; + weekStr_en += MON_DAY_EN; + } + if ((week & 0x04) == 0x04) + { // 判断第2位是否为1,如若为1,则星期二响应 + weekStr += TUE_DAY; + weekStr_en += TUE_DAY_EN; + } + if ((week & 0x08) == 0x08) + { // 判断第3位是否为1,如若为1,则星期三响应 + weekStr += WED_DAY; + weekStr_en += WED_DAY_EN; + } + if ((week & 0x10) == 0x10) + { // 判断第4位是否为1,如若为1,则星期四响应 + weekStr += THUR_DAY; + weekStr_en += THUR_DAY_EN; + } + if ((week & 0x20) == 0x20) + { // 判断第5位是否为1,如若为1,则星期五响应 + weekStr += FRI_DAY; + weekStr_en += FRI_DAY_EN; + } + if ((week & 0x40) == 0x40) + { // 判断第6位是否为1,如若为1,则星期六响应 + weekStr += SAT_DAY; + weekStr_en += SAT_DAY_EN; + } + if ((week & 0x01) == 0x01) + { // 判断第0位是否为1,如若为1,则星期日响应 + weekStr += SUN_DAY; + weekStr_en += SUN_DAY_EN; + } } - if ((week & 0x01) == 0x01) { // 判断第0位是否为1,如若为1,则星期日响应 - weekStr += SUN_DAY; + if (labelTime == nullptr || labelDay == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep labelTime or labelDay error!"); + return; } + memset(showtime, 0, sizeof(showtime)); + snprintf(showtime, sizeof(showtime), "%02d:%02d", hour, min); // 使用更安全的 snprintf 函数 + labelTime->SetText(showtime); + if (ConfigModel::GetInstance()->GetLanguage() == ZH_CN) + labelDay->SetText(weekStr.c_str()); + else + labelDay->SetText(weekStr_en.c_str()); } - if (labelTime == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView::RefreshStep labelTime error!"); - return; - } - if (alarmNum == 0) { - deleteImage->SetVisible(false); - } else if (alarmNum >= SET_ONE && alarmNum <= SET_FOUR) { - deleteImage->SetVisible(true); - } - labelTime->SetTime24Hour(hour, min, 0); - labelDay->SetText(weekStr.c_str()); -} } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmJudgeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmJudgeView.cpp index 9e6c2ea72..b45d22489 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmJudgeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmJudgeView.cpp @@ -5,29 +5,14 @@ * Create: 2021-09-11 */ -#include "AlarmJudgeView.h" +#include "alarm/include/AlarmJudgeView.h" #include "UiConfig.h" #include -#include "AlarmPresenter.h" +#include "alarm/include/AlarmPresenter.h" +#include "ui_resource_string.h" namespace OHOS { -#define DELETE_INETERFACES "是否删除此闹钟?" - static AlarmJudgeView *g_JudgeView = nullptr; -constexpr int16_t CONTAINER_X = 0; -constexpr int16_t CONTAINER_Y = 0; -constexpr int16_t MAX_LABEL_X_LEN = 120; -constexpr int16_t MAX_LABEL_Y_LEN = 160; -constexpr int16_t MAX_LABEL_LENGTH_LEN = 400; -constexpr int16_t MAX_LABEL_WIDTH_LEN = 50; -constexpr int16_t MAX_LABEL_FONT_LEN = 30; -constexpr int16_t MAX_IMAGE_DELETE_X_LEN = 90; -constexpr int16_t MAX_IMAGE_DELETE_Y_LEN = 300; -constexpr int16_t MAX_IMAGE_TRUE_X_LEN = 270; -constexpr int16_t MAX_IMAGE_TRUE_Y_LEN = 300; -constexpr int16_t MAX_IMAGE_DELETE_WIDTH_LEN = 91; -constexpr int16_t MAX_IMAGE_TRUE_WIDTH_LEN = 91; - AlarmJudgeView::AlarmJudgeView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView::AlarmJudgeView"); @@ -36,73 +21,138 @@ AlarmJudgeView::AlarmJudgeView() AlarmJudgeView::~AlarmJudgeView() { - container->RemoveAll(); - delete labelText; - labelText = nullptr; - delete imageViewDelete; - imageViewDelete = nullptr; - delete container; - container = nullptr; + DeinitDeleteScreen(); g_JudgeView = nullptr; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView::~AlarmJudgeView"); } -void AlarmJudgeView::CreateImage(void) +UIScrollView *AlarmJudgeView::InitJudgeView(void) { - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - if (clickListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new OnClickListener fail"); - return; - } - imageViewDelete = new UIImageView(); - if (imageViewDelete == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new imageViewDelete fail"); - return; - } - imageViewDelete->SetPosition(MAX_IMAGE_DELETE_X_LEN, MAX_IMAGE_DELETE_Y_LEN); - imageViewDelete->SetSrc(ALARM_DELETE_ADD_PATH); - imageViewDelete->SetViewId(JUDGE_DELETE); - imageViewDelete->SetWidth(MAX_IMAGE_DELETE_WIDTH_LEN); - imageViewDelete->SetTouchable(true); - imageViewDelete->SetOnClickListener(clickListener); - container->Add(imageViewDelete); - - imageViewTrue = new UIImageView(); - if (imageViewTrue == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new imageViewTrue fail"); - return; - } - imageViewTrue->SetPosition(MAX_IMAGE_TRUE_X_LEN, MAX_IMAGE_TRUE_Y_LEN); // 50 : size - imageViewTrue->SetSrc(ALARM_TRUE_ADD_PATH); - imageViewTrue->SetViewId(JUDGE_TRUE); - imageViewTrue->SetWidth(MAX_IMAGE_TRUE_WIDTH_LEN); - imageViewTrue->SetTouchable(true); - imageViewTrue->SetOnClickListener(clickListener); - container->Add(imageViewTrue); + return InitDeleteScreen(); } -UIScrollView *AlarmJudgeView::InitJudgeView(void) + +void AlarmJudgeView::DeinitDeleteScreen() { - container = new UIScrollView(); - if (container == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new container fail"); - return nullptr; + if(nullptr != DeleteGroup_) + { + DeleteGroup_->RemoveAll(); + if(nullptr != DeleteTitleLabelExt_) + { + delete DeleteTitleLabelExt_; + DeleteTitleLabelExt_ = nullptr; + } + if(nullptr != DeletePromptLabelExt_) + { + delete DeletePromptLabelExt_; + DeletePromptLabelExt_ = nullptr; + } + if(nullptr != DeleteCancelButton_) + { + delete DeleteCancelButton_; + DeleteCancelButton_ = nullptr; + } + if(nullptr != DeleteOKButton_) + { + delete DeleteOKButton_; + DeleteOKButton_ = nullptr; + } + + delete DeleteGroup_; + DeleteGroup_ = nullptr; } - container->SetPosition(CONTAINER_X, CONTAINER_Y); - container->SetWidth(HORIZONTAL_RESOLUTION); - container->SetHeight(VERTICAL_RESOLUTION); - - labelText = new UILabel(); - if (container == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmJudgeView:: new labelText fail"); - return nullptr; +} + +UIScrollView * AlarmJudgeView::InitDeleteScreen() +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + if(nullptr == DeleteGroup_) + { + DeleteGroup_ = new UIScrollView(); + if(nullptr == DeleteGroup_) + return nullptr; + + DeleteGroup_->SetPosition(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + DeleteGroup_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + DeleteGroup_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + + if(nullptr == DeleteTitleLabelExt_) + { + DeleteTitleLabelExt_ = new UILabelExt(); + if(nullptr == DeleteTitleLabelExt_) + return nullptr; + + DeleteTitleLabelExt_->SetPosition(83, 50, 300, 35); + DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_FONT, 30); + DeleteTitleLabelExt_->SetStyle(STYLE_LINE_HEIGHT, 35); + DeleteTitleLabelExt_->SetTextId(STR_DELETE); + DeleteTitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + DeleteTitleLabelExt_->SetRollSpeed(23); + DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full); + } + + if(nullptr == DeletePromptLabelExt_) + { + DeletePromptLabelExt_ = new UILabelExt(); + if(nullptr == DeletePromptLabelExt_) + return nullptr; + + DeletePromptLabelExt_->SetPosition(83, 187, 300, 35); + DeletePromptLabelExt_->SetStyle(STYLE_TEXT_FONT, 30); + DeletePromptLabelExt_->SetStyle(STYLE_LINE_HEIGHT, 35); + DeletePromptLabelExt_->SetTextId(STR_ALARM_DELETE_NOTE); + DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + DeletePromptLabelExt_->SetRollSpeed(23); + DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999); + } + + UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + if(nullptr == DeleteCancelButton_) + { + DeleteCancelButton_ = new UILabelButtonExt(); + if(nullptr == DeleteCancelButton_) + return nullptr; + + DeleteCancelButton_->SetPosition(111, 299, 100, 100); + DeleteCancelButton_->SetViewId(JUDGE_DELETE); + DeleteCancelButton_->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + DeleteCancelButton_->SetStyle(STYLE_BACKGROUND_OPA, 25); // 10% + DeleteCancelButton_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED); + DeleteCancelButton_->SetStyleForState(STYLE_BACKGROUND_OPA, 25, UIButton::PRESSED); + DeleteCancelButton_->SetStyle(STYLE_BORDER_RADIUS, 100); + DeleteCancelButton_->SetImagePosition(0, 0); + DeleteCancelButton_->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE); + DeleteCancelButton_->SetOnClickListener(clickListener); + } + + if(nullptr == DeleteOKButton_) + { + DeleteOKButton_ = new UILabelButtonExt(); + if(nullptr == DeleteOKButton_) + return nullptr; + + DeleteOKButton_->SetPosition(256, 299, 100, 100); + DeleteOKButton_->SetViewId(JUDGE_TRUE); + DeleteOKButton_->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + DeleteOKButton_->SetStyle(STYLE_BACKGROUND_OPA, 25); // 10% + DeleteOKButton_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED); + DeleteOKButton_->SetStyleForState(STYLE_BACKGROUND_OPA, 25, UIButton::PRESSED); + DeleteOKButton_->SetStyle(STYLE_BORDER_RADIUS, 100); + DeleteOKButton_->SetImagePosition(0, 0); + DeleteOKButton_->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE); + DeleteOKButton_->SetOnClickListener(clickListener); + } + + DeleteGroup_->Add(DeleteTitleLabelExt_); + DeleteGroup_->Add(DeletePromptLabelExt_); + DeleteGroup_->Add(DeleteCancelButton_); + DeleteGroup_->Add(DeleteOKButton_); } - labelText->SetPosition(MAX_LABEL_X_LEN, MAX_LABEL_Y_LEN, MAX_LABEL_LENGTH_LEN, MAX_LABEL_WIDTH_LEN); - labelText->SetText(DELETE_INETERFACES); - labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_LABEL_FONT_LEN); - container->Add(labelText); - CreateImage(); - return container; + return DeleteGroup_; } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp index ed0e5aef6..570da742e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp @@ -13,6 +13,7 @@ #include "AlarmPresenter.h" #include "MainAlarmView.h" +#include "ui_resource_string.h" namespace OHOS { #define MAX_INETERFACES "当前闹钟个数已达上限" @@ -20,7 +21,7 @@ namespace OHOS { GraphicTimer* g_stopAlarmMaxHandle = nullptr; static AlarmMaxClock *g_AlarmMaxClock = nullptr; -static constexpr uint64_t MS_THREE_SECONDS = 3000; +static constexpr uint64_t MS_THREE_SECONDS = 10*1000; //10s钟无操作关闭该视图; void ScanTimerCallback(void* data); void EndScanHandle(void); @@ -47,11 +48,17 @@ AlarmMaxClock::AlarmMaxClock() AlarmMaxClock::~AlarmMaxClock() { - container->RemoveAll(); - delete labelText; - labelText = nullptr; - delete container; - container = nullptr; + if(container) + { + container->RemoveAll(); + if(labelText) + { + delete labelText; + labelText = nullptr; + } + delete container; + container = nullptr; + } g_AlarmMaxClock = nullptr; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::~AlarmMaxClock"); } @@ -63,34 +70,43 @@ AlarmMaxClock *AlarmMaxClock::GetInstance(void) UIScrollView *AlarmMaxClock::InitAlarmMax(void) { - container = new UIScrollView(); if (container == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: new container fail"); - return container; - } - container->SetPosition(CONTAINER_X, CONTAINER_Y); - container->SetWidth(HORIZONTAL_RESOLUTION); - container->SetHeight(VERTICAL_RESOLUTION); - - labelText = new UILabel(); - if (labelText == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: new labelText fail"); - return container; - } - labelText->SetPosition(MAX_LABEL_X_LEN, MAX_LABEL_Y_LEN, MAX_LABEL_LENGTH_LEN, MAX_LABEL_WIDTH_LEN); - labelText->SetText(MAX_INETERFACES); - labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MAX_LABEL_FONT_LEN); - - container->SetTouchable(true); - container->SetDraggable(true); - UIView::OnDragListener *maxClockDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); - if (maxClockDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: maxClockDragListener is nullptr"); - return container; + container = new UIScrollView(); + if (container == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: new container fail"); + return container; + } + container->SetPosition(CONTAINER_X, CONTAINER_Y); + container->SetWidth(HORIZONTAL_RESOLUTION); + container->SetHeight(VERTICAL_RESOLUTION); + container->SetTouchable(true); + container->SetDraggable(true); + UIView::OnDragListener *maxClockDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); + if (maxClockDragListener == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock:: maxClockDragListener is nullptr"); + return container; + } + container->SetOnDragListener(maxClockDragListener); + /* -------------------------------------------------------------------------- */ + if (labelText == nullptr) + { + labelText = new UILabelExt(); + if (labelText == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitAlarmMax labelText is nullptr"); + return nullptr; + } + } + labelText->SetPosition(83, 236, 360, 35); + labelText->SetTextId(STR_ALARM_ADD_LIMIT_NOTE);//当前闹钟个数已达上限 + labelText->SetStyle(STYLE_TEXT_FONT, 30); + labelText->SetStyle(STYLE_LINE_HEIGHT, 35); + labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + labelText->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelText->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + container->Add(labelText); + labelText->LayoutCenterOfParent(); } - container->SetOnDragListener(maxClockDragListener); - container->Add(labelText); - return container; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp index 93a205b55..e514488ea 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp @@ -12,175 +12,195 @@ #include #include #include - +#include "components/ui_label_ext.h" +#include "ui_resource_string.h" namespace OHOS { #ifndef NEW_TIME -#define NEW_TIME "设置时间" +#define NEW_TIME "时间" #endif #define NEXT "下一步" -static AlarmNewTimeView *g_pAlarmNewTimeView = nullptr; -constexpr int16_t CONTAINER_X = 0; -constexpr int16_t CONTAINER_Y = 0; -constexpr int16_t TITLE_X = 153; -constexpr int16_t TITLE_Y = 30; -constexpr int16_t TIME_PICKER_X = 75; -constexpr int16_t TIME_PICKER_WIDTH = 250; -constexpr int16_t TIME_ITEM_HEIGHT = 80; -constexpr int16_t TIME_LABEL_BUTTON_X = 63; -constexpr int16_t TIME_LABEL_BUTTON_Y = 360; -constexpr int16_t LABEL_X = 0; -constexpr int16_t LABEL_Y = 45; -constexpr int16_t LABEL_BLANK = 38; -constexpr int16_t LIST_W = 300; -constexpr int16_t LIST_H = 260; -constexpr int16_t TITLE_LABEL_DEFAULT_HEIGHT = 50; -constexpr int16_t BUTTON_WIDHT3 = 324; -constexpr int16_t BUTTON_HEIGHT3 = 101; -constexpr int16_t PICKER_FONT_SIZE = 25; -constexpr uint8_t BACKGROUND_FONT = 40; -constexpr uint8_t HIGHTLIGHT_FONT = 50; -constexpr uint16_t LABEL_FONT = 40; - -AlarmNewTimeView::AlarmNewTimeView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::AlarmNewTimeView"); - g_pAlarmNewTimeView = this; -} - -AlarmNewTimeView::~AlarmNewTimeView() -{ - group->RemoveAll(); - delete labelButton; - labelButton = nullptr; - delete picker; - picker = nullptr; - delete title; - title = nullptr; - delete group; - group = nullptr; - g_pAlarmNewTimeView = nullptr; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::~AlarmNewTimeView"); -} + static AlarmNewTimeView *g_pAlarmNewTimeView = nullptr; + constexpr int16_t CONTAINER_X = 0; + constexpr int16_t CONTAINER_Y = 0; + constexpr int16_t TITLE_X = 153; + constexpr int16_t TITLE_Y = 30; + constexpr int16_t TIME_PICKER_X = 75; + constexpr int16_t TIME_PICKER_WIDTH = 250; + constexpr int16_t TIME_ITEM_HEIGHT = 80; + constexpr int16_t TIME_LABEL_BUTTON_X = 63; + constexpr int16_t TIME_LABEL_BUTTON_Y = 360; + constexpr int16_t LABEL_X = 0; + constexpr int16_t LABEL_Y = 45; + constexpr int16_t LABEL_BLANK = 38; + constexpr int16_t LIST_W = 300; + constexpr int16_t LIST_H = 260; + constexpr int16_t TITLE_LABEL_DEFAULT_HEIGHT = 50; + constexpr int16_t BUTTON_WIDHT3 = 324; + constexpr int16_t BUTTON_HEIGHT3 = 101; + constexpr int16_t PICKER_FONT_SIZE = 25; + constexpr uint8_t BACKGROUND_FONT = 40; + constexpr uint8_t HIGHTLIGHT_FONT = 50; + constexpr uint16_t LABEL_FONT = 40; -AlarmNewTimeView *AlarmNewTimeView::GetInstance(void) -{ - return g_pAlarmNewTimeView; -} - -UILabel *AlarmNewTimeView::GetTitleLabel(const char *titleName) -{ - if (titleName == nullptr) { - return nullptr; - } - UILabel *label = new UILabel(); - if (label == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new label fail"); - return nullptr; + AlarmNewTimeView::AlarmNewTimeView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::AlarmNewTimeView"); + g_pAlarmNewTimeView = this; } - // 2: half of screen width - label->SetPosition(LABEL_X, LABEL_Y, HORIZONTAL_RESOLUTION / 2, TITLE_LABEL_DEFAULT_HEIGHT); - label->SetText(titleName); - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT); - return label; -} -void AlarmNewTimeView::CreateLabelTime(void) -{ - title = GetTitleLabel(NEW_TIME); - if (title == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime Set title fail"); - return; - } - group->Add(title); - title->SetPosition(TITLE_X, TITLE_Y); // 672: x-coordinate - title->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); - picker = new UITimePicker(); - if (picker == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime:: new picker fail"); - return; + AlarmNewTimeView::~AlarmNewTimeView() + { + if (group) + { + group->RemoveAll(); + if (labelButton) + { + delete labelButton; + labelButton = nullptr; + } + if (picker) + { + delete picker; + picker = nullptr; + } + if (title) + { + delete title; + title = nullptr; + } + delete group; + group = nullptr; + } + g_pAlarmNewTimeView = nullptr; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::~AlarmNewTimeView"); } - UITimePicker::SelectedListener *selectedListener = - (UITimePicker::SelectedListener *)OHOS::AlarmPresenter::GetInstance(); - if (selectedListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime:: selectedListener is nullptr"); - return; + AlarmNewTimeView *AlarmNewTimeView::GetInstance(void) + { + return g_pAlarmNewTimeView; } - picker->EnableSecond(false); - picker->SetPosition(TIME_PICKER_X, LABEL_Y + LABEL_BLANK, LIST_W, LIST_H); // 652: x-coordinate - picker->SetItemHeight(TIME_ITEM_HEIGHT); - picker->SetLoopState(0, true); - picker->SetLoopState(1, true); - picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); - picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT); - picker->RegisterSelectedListener(selectedListener); - group->Add(picker); -} -UIScrollView *AlarmNewTimeView::InitNewTimeView(void) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::OnStart"); - group = new UIScrollView(); - if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new group fail"); - return nullptr; + void AlarmNewTimeView::CreateLabelTime(void) + { + if (title == nullptr) + { + title = new UILabelExt(); + if (title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new title fail"); + return; + } + } + title->SetPosition(83, 50, 300, 35); + title->SetTextId(STR_TIME); + title->SetStyle(STYLE_TEXT_FONT, 30); + title->SetStyle(STYLE_LINE_HEIGHT, 35); + title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + title->SetRollSpeed(23); + group->Add(title); + /* -------------------------------------------------------------------------- */ + if (picker == nullptr) + { + picker = new UITimePicker(); + if (picker == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime:: new picker fail"); + return; + } + } + picker->EnableSecond(false); + picker->SetPosition(TIME_PICKER_X, LABEL_Y + LABEL_Y, LIST_W, LIST_H); + picker->SetItemHeight(TIME_ITEM_HEIGHT); + picker->SetLoopState(0, true); + picker->SetLoopState(1, true); + // picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); + // picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT); + picker->SetHighlightFont(GILROY_BOLD_FONT, 65); // 设置突出显示文本的字体名称和大小。 + picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, 50); + picker->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff), Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); + UITimePicker::SelectedListener *selectedListener = (UITimePicker::SelectedListener *)OHOS::AlarmPresenter::GetInstance(); + if (selectedListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateLabelTime:: selectedListener is nullptr"); + return; + } + picker->RegisterSelectedListener(selectedListener); + group->Add(picker); } - group->SetPosition(CONTAINER_X, CONTAINER_Y); - group->SetWidth(HORIZONTAL_RESOLUTION); - group->SetHeight(VERTICAL_RESOLUTION); - CreateLabelTime(); + UIScrollView *AlarmNewTimeView::InitNewTimeView(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::InitNewTimeView"); + if (group == nullptr) + { + group = new UIScrollView(); + if (group == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new group fail"); + return nullptr; + } + } + group->SetPosition(CONTAINER_X, CONTAINER_Y, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + UIView::OnDragListener *newTimeDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); + if (newTimeDragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new newTimeDragListener fail"); + return group; + } + group->SetOnDragListener(newTimeDragListener); + /* -------------------------------------------------------------------------- */ + CreateLabelTime(); + if (labelButton == nullptr) + { + labelButton = new UILabelButtonExt(); + if (labelButton == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new labelButton fail"); + return group; + } + } + labelButton->SetPosition(0, 366, 466, 100); + labelButton->SetViewId(ALARM_NEXT); + labelButton->SetTextId(STR_NEXT_STEP); // 下一步 + labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + labelButton->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); + labelButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE); + labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED); + labelButton->SetTouchable(true); + UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + if (clickListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new newTimeDragListener fail"); + return group; + } + labelButton->SetOnClickListener(clickListener); + group->Add(labelButton); - labelButton = new UILabelButton(); - if (labelButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new labelButton fail"); return group; } - labelButton->Resize(BUTTON_WIDHT3, BUTTON_HEIGHT3); - labelButton->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y); - labelButton->SetText(NEXT); - labelButton->SetViewId(ALARM_NEXT); - labelButton->SetTouchable(true); - labelButton->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE); - labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT); - if (OHOS::AlarmPresenter::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail"); - return group; - } - labelButton->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue()); - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - labelButton->SetOnClickListener(clickListener); - group->Add(labelButton); - - UIView::OnDragListener *newTimeDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); - if (newTimeDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new newTimeDragListener fail"); - return group; - } - group->SetOnDragListener(newTimeDragListener); - - return group; -} -void AlarmNewTimeView::RefreshNewTime(void) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::RefreshStep"); - struct tm local_time; - time_t seconds = time(nullptr); - if (localtime_r(&seconds, &local_time) == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmGetClockNum get localtime error!"); - return; + void AlarmNewTimeView::RefreshNewTime(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::RefreshNewTime"); + struct tm local_time; + time_t seconds = time(nullptr); + if (localtime_r(&seconds, &local_time) == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::RefreshNewTime get localtime error!"); + return; + } + std::ostringstream ostrHour; + std::ostringstream ostMin; + ostrHour << local_time.tm_hour; + ostMin << local_time.tm_min; + std::string timeStr = ostrHour.str() + ":" + ostMin.str(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "time = %s!", timeStr.c_str()); + picker->SetSelected(timeStr.c_str()); + uint32_t timeHour = stoi(ostrHour.str()); + uint32_t timeMin = stoi(ostMin.str()); + AlarmPresenter::GetInstance()->OnTimePickerInaction(timeHour, timeMin); } - std::ostringstream ostrHour; - std::ostringstream ostMin; - ostrHour << local_time.tm_hour; - ostMin << local_time.tm_min; - std::string weekStr = ostrHour.str() + ":" + ostMin.str(); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "time = %s!", weekStr.c_str()); - picker->SetSelected(weekStr.c_str()); // 添加的时间默认初始时间为0点 - uint32_t timeHour = stoi(ostrHour.str()); - uint32_t timeMin = stoi(ostMin.str()); - AlarmPresenter::GetInstance()->OnTimePickerInaction(timeHour, timeMin); -} } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp index 29b88dd08..b56aebc55 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp @@ -6,13 +6,15 @@ */ -#include "AlarmPresenter.h" -#include "MainAlarmView.h" +// #include "AlarmPresenter.h" +#include "alarm/include/AlarmPresenter.h" +#include "alarm/include/MainAlarmView.h" #include "NativeRegisterManager.h" #include "ChangeSliceListener.h" #include "string" #include "iostream" #include "sstream" +#include namespace OHOS { @@ -23,8 +25,6 @@ static AlarmPresenter *g_pAlarmPresenter = nullptr; constexpr int16_t CLOSE_SWITCHES = 0; constexpr int16_t OPEN_SWITCHES = 1; constexpr int16_t SET_ZERO = 0; -constexpr int16_t NEW_TIME_LISTENER = 0; -constexpr int16_t SET_TIME_LISTENER = 1; constexpr uint16_t THE_FIRST_ALARM = 0; constexpr uint16_t SECOND_ALARM = 1; constexpr uint16_t THIRD_ALARM = 2; @@ -40,8 +40,8 @@ constexpr uint8_t WEEK_BIT3 = 3; constexpr uint8_t WEEK_BIT2 = 2; constexpr uint8_t WEEK_BIT1 = 1; constexpr uint8_t WEEK_BIT0 = 0; -constexpr uint16_t ALARM_MAX_NUM = 4; -constexpr int32_t BUTTON_MAX_NUM = 7; +constexpr uint16_t ALARM_MAX_NUM = 5; // 最大闹钟数 +constexpr int32_t WEEK_BUTTON_MAX_NUM = 7; // 星期按钮的最大个数 constexpr uint16_t CLOCK_NUM = 5; constexpr uint8_t CANCEL_DATA = 0; constexpr uint8_t SELECT_DATA = 1; @@ -50,6 +50,7 @@ constexpr uint8_t SLIDING_LENGTH = 30; AlarmPresenter::AlarmPresenter() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new"); + OHOS::AlarmClockModel::GetInstance()->InitAlarmData(); g_pAlarmPresenter = this; } @@ -168,22 +169,34 @@ void AlarmPresenter::ClickJudgeTrue(uint16_t num) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter JUDGE_DELETE"); UNUSED(num); uint32_t clockTime; + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d,%d", __LINE__, alarmListener, clockQty); AlarmClockModel::GetInstance()->DeleteClockModel(alarmListener); if (MainAlarmView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeTrue new MainAlarmView::GetInstance() error"); return; } - MainAlarmView::GetInstance()->RefreshAlarm(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "clockQty = %d", clockQty); clockQty--; - for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) { - if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime))) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error"); - return; - } - MainAlarmView::GetInstance()->RefreshAlarm(); - } AlarmClockModel::GetInstance()->SetSerialRdc(); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); + MainAlarmView::GetInstance()->RefreshAlarm(); + // MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_ALARM); + + + + // MainAlarmView::GetInstance()->RefreshAlarm(); + // clockQty--; + // for (uint16_t alarmNum = 0; alarmNum < clockQty; alarmNum++) { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, alarmNum); + + // if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmNum, &clockTime))) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickJudgeTrue error"); + // return; + // } + // MainAlarmView::GetInstance()->RefreshAlarm(); + // } + // AlarmClockModel::GetInstance()->SetSerialRdc(); + // MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_JUDGE, MAIN_INTERFACE); } void AlarmPresenter::ClickAlarmTimeOk(uint16_t num) @@ -244,6 +257,7 @@ void AlarmPresenter::ClickAlarmClock(uint16_t num) AlarmConfigView::GetInstance()->RefreshConfig(clockTime, clockWeek, num); } +// 处理闹钟星期设置确认按钮的点击事件 void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_WEEK_OK"); @@ -256,7 +270,7 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) if (setListener == SET_TIME_LISTENER) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk set time!"); if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ClickAlarmWeekOk error"); return; } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk time = %d", clockTime); @@ -269,11 +283,11 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) } AlarmClockModel::GetInstance()->ButtonStatusRing(alarmListener, true); MainAlarmView::GetInstance()->RefreshAlarm(); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, CHANGE_INTERFACE_CONFIG); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, CHANGE_INTERFACE_CONFIG); // 跳转到闹钟配置界面 } else if (setListener == NEW_TIME_LISTENER) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk new time!"); - clockQty++; alarmListener = clockQty; + clockQty++; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "******************ClickAlarmWeekOk alarmListener = %d***************", alarmListener); AlarmClockModel::GetInstance()->SetSerialAdd(); AlarmClockModel::GetInstance()->SetAlarmInfo(timeHour, timeMin, clockWeek, alarmListener, setListener); @@ -288,13 +302,18 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) return; } MainAlarmView::GetInstance()->RefreshAlarm(); - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, MAIN_INTERFACE); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_SET_WEEK, MAIN_INTERFACE); // 跳转到闹钟主界面 } } +// 处理闹钟新建按钮的点击事件 void AlarmPresenter::ClickAlarmNewTime(uint16_t num) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEW_TIME"); + if (MainAlarmView::GetInstance() == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNewTime new MainAlarmView::GetInstance() error"); + return; + } clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty); UNUSED(num); @@ -318,11 +337,13 @@ void AlarmPresenter::ClickAlarmNewTime(uint16_t num) AlarmNewTimeView::GetInstance()->RefreshNewTime(); } +// 新建闹钟时:时间设置页面的下一步按钮点击事件处理函数 + void AlarmPresenter::ClickAlarmNext(uint16_t num) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter ALARM_NEXT"); UNUSED(num); - for (int i = 0; i < BUTTON_MAX_NUM; i++) { + for (int i = 0; i < WEEK_BUTTON_MAX_NUM; i++) { alarmWeek[i] = 0; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[%d] = %u", i, alarmWeek[i]); } @@ -331,7 +352,7 @@ void AlarmPresenter::ClickAlarmNext(uint16_t num) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new MainAlarmView::GetInstance() error"); return; } - MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_NEW_TIME, CHANGE_INTERFACE_SET_WEEK); + MainAlarmView::GetInstance()->ChangeView(CHANGE_INTERFACE_NEW_TIME, CHANGE_INTERFACE_SET_WEEK);// 跳转到星期设置界面 if (AlarmNewTimeView::GetInstance() == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickAlarmNext new AlarmNewTimeView::GetInstance() error"); return; @@ -351,12 +372,24 @@ bool AlarmPresenter::OnDrag(UIView& view, const DragEvent& event) deltaX = event.GetDeltaX(); deltaY = event.GetDeltaY(); if (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH) { - MainAlarmView::GetInstance()->DropView(view); + // MainAlarmView::GetInstance()->DropView(view); + X_DRAG_FLAG = true; } } return true; } +bool AlarmPresenter::OnDragEnd(UIView& view, const DragEvent& event) +{ + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && X_DRAG_FLAG) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnDragEnd %p",&view); + MainAlarmView::GetInstance()->DropView(view); + X_DRAG_FLAG = false; + } + return true; +} + struct AlarmPresentMapper1 { const char *viewId; void (AlarmPresenter::*func)(uint16_t); @@ -401,19 +434,19 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName) bool AlarmPresenter::ClickFuncView(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickFuncView view = %s", view.GetViewId()); - for (int num = 0; num < BUTTON_MAX_NUM; num++) { - if (strcmp(view.GetViewId(), WEEK_CONTAINER[num]) == 0) { + for (int num = 0; num < WEEK_BUTTON_MAX_NUM; num++) { + if (strcmp(view.GetViewId(), WEEK_BUTTON_VIEWID[num]) == 0) { alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA: SELECT_DATA; - if (alarmWeek[num] == CANCEL_DATA) { + if (alarmWeek[num] == CANCEL_DATA) { // 取消选中 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]); - view.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + view.SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x19, 0x19, 0x19).full); dynamic_cast(view).SetStyleForState(STYLE_BACKGROUND_COLOR, - Color::Black().full, UIButton::PRESSED); - } else if (alarmWeek[num] == SELECT_DATA) { + Color::GetColorFromRGB(0x19, 0x19, 0x19).full, UIButton::PRESSED); + } else if (alarmWeek[num] == SELECT_DATA) { // 选中 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmWeek[num] = %u", alarmWeek[num]); - view.SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + view.SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x4f, 0xc3, 0x4c).full); dynamic_cast(view).SetStyleForState(STYLE_BACKGROUND_COLOR, - Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full, UIButton::PRESSED); + Color::GetColorFromRGB(0x4f, 0xc3, 0x4c).full, UIButton::PRESSED); } } } @@ -421,9 +454,57 @@ bool AlarmPresenter::ClickFuncView(UIView &view) return true; } +bool AlarmPresenter::OnKeyAct(UIView &view, const KeyEvent &event) +{ + UNUSED(view); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnKeyAct"); + uint16_t keyID = event.GetKeyId(); + uint16_t keyState = event.GetState(); + // 如果是power键,且是亮屏状态,按键释放就返回上一级 + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) + { + NativeAbility::GetInstance().Back(); + } + return true; +} + +void AlarmPresenter::ClickDeleteButtonAlarmClockDelete(uint16_t num) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, num); + if (MainAlarmView::GetInstance() == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickDeleteButtonAlarmClockDelete error"); + return; + } + UNUSED(num); + alarmListener = num; + MainAlarmView::GetInstance()->ChangeView(MAIN_INTERFACE, CHANGE_INTERFACE_JUDGE); +} + +static const AlarmPresentMapper1 DeleteButtonPresentMapper[] = +{ + {ALARM_ITEM_DELETE[THE_FIRST_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete}, + {ALARM_ITEM_DELETE[SECOND_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete}, + {ALARM_ITEM_DELETE[THIRD_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete}, + {ALARM_ITEM_DELETE[FOURTH_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete}, + {ALARM_ITEM_DELETE[FIVE_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete}, + {ALARM_ITEM_DELETE[SIX_ALARM], &AlarmPresenter::ClickDeleteButtonAlarmClockDelete}, +}; + bool AlarmPresenter::OnClick(UIView &view, const ClickEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnClick "); + + uint16_t num; + for (num = 0; num < CLOCK_NUM; num++) + { + if (0 == strcmp(view.GetViewId(), ALARM_ITEM_DELETE[num])) // 闹钟删除按钮 + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, num); + (this->*(DeleteButtonPresentMapper[num].func))(num); + return true; + } + } + bool jug = ClickFuncId(view.GetViewId()); if (!jug) { ClickFuncView(view); @@ -452,4 +533,30 @@ bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state) return true; } +void AlarmPresenter::OnSwipe(UISwipeView &view) +{ + UNUSED(view); + + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnSwipe "); + view.SetIntercept((0 == view.GetCurrentPage()) ? false : true); +} + +void AlarmPresenter::UpdateAlarmInfoByAppSet(void) +{ + NativeAbility::GetInstance().Back(); +} + +void AlarmPresenter::RefreshAlarmStatus(int i) +{ + uint8_t alarmEnable = 0; + bool alarmStatus; + alarmStatus = AlarmClockModel::GetInstance()->GetClockStatus(i, &alarmEnable); + if (!alarmStatus) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter:: GetClockStatus fail! i = %d", i); + } + if( MainAlarmView::GetInstance()) + { + MainAlarmView::GetInstance()->RefreshAlarmStatus(alarmEnable, i); + } +} } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp index 6d04e328f..90923c173 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp @@ -10,7 +10,8 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include - +#include "components/ui_label_ext.h" +#include "ui_resource_string.h" namespace OHOS { #define SET_THIS_TIME "设置时间" #define SURE "确认" @@ -21,7 +22,7 @@ constexpr int16_t CONTAINER_Y = 0; constexpr int16_t TITLE_X = 153; constexpr int16_t TITLE_Y = 30; constexpr int16_t LABEL_X = 0; -constexpr int16_t LABEL_Y = 30; +constexpr int16_t LABEL_Y = 45; // 30; constexpr int16_t LABEL_FONT = 40; constexpr int16_t TIME_PICKER_X = 75; constexpr int16_t TIME_PICKER_WIDTH = 250; @@ -30,7 +31,7 @@ constexpr int16_t TIME_LABEL_BUTTON_X = 63; constexpr int16_t TIME_LABEL_BUTTON_Y = 360; constexpr int16_t LABEL_BLANK = 38; constexpr int16_t LIST_W = 300; -constexpr int16_t LIST_H = 250; +constexpr int16_t LIST_H = 260; // 250; constexpr int16_t TITLE_LABEL_DEFAULT_HEIGHT = 50; constexpr int16_t BUTTON_WIDHT3 = 320; constexpr int16_t BUTTON_HEIGHT3 = 101; @@ -47,15 +48,28 @@ AlarmSetTimeView::AlarmSetTimeView() AlarmSetTimeView::~AlarmSetTimeView() { - group->RemoveAll(); - delete timeImage; - timeImage = nullptr; - delete picker; - picker = nullptr; - delete title; - title = nullptr; - delete group; - group = nullptr; + if(nullptr != group) + { + group->RemoveAll(); + if(nullptr != labelButton) + { + delete labelButton; + labelButton = nullptr; + } + if(nullptr != picker) + { + delete picker; + picker = nullptr; + } + if(nullptr != title) + { + delete title; + title = nullptr; + } + + delete group; + group = nullptr; + } g_pAlarmSetTimeView = nullptr; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::~AlarmSetTimeView"); } @@ -84,50 +98,92 @@ UILabel *AlarmSetTimeView::GetTitleLabel(const char *titleName) void AlarmSetTimeView::SetLabelButton(void) { - timeImage = new UILabelButton(); - if (timeImage == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new timeImage fail"); - return; - } - timeImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3); - timeImage->SetText(SURE); - timeImage->SetTouchable(true); - timeImage->SetViewId(ALARM_OK); - if (OHOS::AlarmPresenter::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail"); - return; + // timeImage = new UILabelButton(); + // if (timeImage == nullptr) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new timeImage fail"); + // return; + // } + // timeImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3); + // timeImage->SetText(SURE); + // timeImage->SetTouchable(true); + // timeImage->SetViewId(ALARM_OK); + // if (OHOS::AlarmPresenter::GetInstance() == nullptr) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail"); + // return; + // } + // timeImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue()); + // timeImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_TIME_FONT); + // UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + // timeImage->SetOnClickListener(clickListener); + // timeImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE); + // group->Add(timeImage); + + if (labelButton == nullptr) { + labelButton = new UILabelButtonExt(); + if (labelButton == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::SetLabelButton"); + return ; + } } - timeImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue()); - timeImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_TIME_FONT); + labelButton->SetPosition(0, 366, 466, 100); + labelButton->SetViewId(ALARM_OK); + // labelButton->SetText(SURE); + labelButton->SetTextId(STR_OK);//确定 + labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + labelButton->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); + labelButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE); + labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED); + labelButton->SetTouchable(true); UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - timeImage->SetOnClickListener(clickListener); - timeImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE); - group->Add(timeImage); + labelButton->SetOnClickListener(clickListener); + group->Add(labelButton); } UIScrollView *AlarmSetTimeView::InitSetTimeView(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView::OnStart"); - group = new UIScrollView(); if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: new group fail"); - return nullptr; + group = new UIScrollView(); + if (group == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: new group fail"); + return nullptr; + } } - group->SetPosition(CONTAINER_X, CONTAINER_Y); - group->SetWidth(HORIZONTAL_RESOLUTION); - group->SetHeight(VERTICAL_RESOLUTION); - - title = GetTitleLabel(SET_THIS_TIME); - if (title == nullptr) { - return nullptr; + group->SetPosition(CONTAINER_X, CONTAINER_Y,Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + group->SetTouchable(true); + group->SetDraggable(true); + UIView::OnDragListener *setTimeDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); + if (setTimeDragListener == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: setTimeDragListener is nullptr"); + return group; + } + group->SetOnDragListener(setTimeDragListener); + /* -------------------------------------------------------------------------- */ + if (title == nullptr) + { + title = new UILabelExt(); + if (title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new title fail"); + return group; + } } + title->SetPosition(83, 50, 300, 35); + title->SetTextId(STR_TIME); + title->SetStyle(STYLE_TEXT_FONT, 30); + title->SetStyle(STYLE_LINE_HEIGHT, 35); + title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + title->SetRollSpeed(23); group->Add(title); - title->SetPosition(TITLE_X, TITLE_Y); // 672: x-coordinate - title->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); - picker = new UITimePicker(); + /* -------------------------------------------------------------------------- */ if (picker == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: new picker fail"); - return nullptr; + picker = new UITimePicker(); + if (picker == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: new picker fail"); + return nullptr; + } } UITimePicker::SelectedListener *selectedListener = (UITimePicker::SelectedListener *)OHOS::AlarmPresenter::GetInstance(); @@ -136,10 +192,13 @@ UIScrollView *AlarmSetTimeView::InitSetTimeView(void) return nullptr; } picker->EnableSecond(false); - picker->SetPosition(TIME_PICKER_X, LABEL_Y + LABEL_BLANK, LIST_W, LIST_H); // 652: x-coordinate + picker->SetPosition(TIME_PICKER_X, LABEL_Y + LABEL_Y, LIST_W, LIST_H); // 652: x-coordinate picker->SetItemHeight(TIME_ITEM_HEIGHT); - picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); - picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT); + // picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, BACKGROUND_FONT); + // picker->SetHighlightFont(DEFAULT_VECTOR_FONT_FILENAME, HIGHTLIGHT_FONT); + picker->SetHighlightFont(GILROY_BOLD_FONT, 65); // 设置突出显示文本的字体名称和大小。 + picker->SetBackgroundFont(DEFAULT_VECTOR_FONT_FILENAME, 50); + picker->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff), Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); picker->SetLoopState(0, true); picker->SetLoopState(1, true); picker->SetTouchable(true); @@ -148,14 +207,6 @@ UIScrollView *AlarmSetTimeView::InitSetTimeView(void) SetLabelButton(); - group->SetTouchable(true); - group->SetDraggable(true); - UIView::OnDragListener *setTimeDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); - if (setTimeDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetTimeView:: setTimeDragListener is nullptr"); - return group; - } - group->SetOnDragListener(setTimeDragListener); return group; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp index 397430b78..28436580b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp @@ -8,55 +8,21 @@ #include "AlarmSetWeekView.h" #include "common/screen.h" #include "components/ui_digital_clock.h" - +#include "ui_resource_string.h" +#include "ConfigModel.h" namespace OHOS { -#define MON "星期一" -#define TUE "星期二" -#define WED "星期三" -#define THUR "星期四" -#define FRI "星期五" -#define SAT "星期六" -#define SUN "星期天" -#define RESPEAT "重复" -#define SURE "确认" - -#define MONDAY "monday" -#define TUESDAY "tuesday" -#define WEDNESDAY "wednesday" -#define THURSDAY "thursday" -#define FRIDAY "friday" -#define SATURDAY "saturday" -#define SUNDAY "sunday" - static AlarmSetWeekView *g_pAlarmSetWeekView = nullptr; constexpr int16_t CONTAINER_X = 0; constexpr int16_t CONTAINER_Y = 0; -constexpr int16_t DEFAULT_FONT = 40; -constexpr int16_t REBOUND_SIZE = 50; -constexpr int16_t BORDER_WIDTH = 20; -constexpr int16_t SET_ZERO = 0; -constexpr int16_t TITLE_X = 185; -constexpr int16_t TITLE_Y = 30; -constexpr int16_t LABEL_POSITION_SIZE = 150; constexpr int16_t VIEW_BORDER_SIZE = 2; -constexpr int16_t BORDER_RADIUS_SIZE = 200; -constexpr int16_t VIEW_BUTTON_X = 100; -constexpr int16_t VIEW_BUTTON_Y = 70; -constexpr int16_t BUTTON_FONT_SIZE = 18; -constexpr int16_t TIME_LABEL_BUTTON_X = 63; -constexpr int16_t TIME_LABEL_BUTTON_Y = 360; -constexpr int16_t BUTTON_WIDHT3 = 320; -constexpr int16_t BUTTON_HEIGHT3 = 101; -constexpr int16_t LABEL_WEEK_FONT = 40; -constexpr int16_t BUTTON_WIDHT = 100; -constexpr int16_t BUTTON_HEIGHT = 60; -constexpr int16_t BUTTON_FONT = 20; -constexpr int16_t VIEW_POSITION_X = 60; -constexpr int16_t VIEW_POSITION_X2 = 12; -constexpr int16_t WEEK_Y1 = 130; -constexpr int16_t WEEK_Y2 = 210; -constexpr int16_t WEEK_GAP_X = 112; -constexpr int16_t BUTTON_STYLE_BORDER_RADIUS_VALUE = 30; +constexpr int16_t BUTTON_WIDHT = 80; // 80 +constexpr int16_t BUTTON_HEIGHT = 80; // 80 +constexpr int16_t VIEW_POSITION_X = 27; //27 +constexpr int16_t VIEW_POSITION_X2 = 83;// 83 +constexpr int16_t WEEK_Y1 = 135; +constexpr int16_t WEEK_Y2 = 245; +constexpr int16_t WEEK_GAP_X = 110;// 星期按钮间的间隔 +constexpr int16_t BUTTON_STYLE_BORDER_RADIUS_VALUE = 100; constexpr int16_t FONT_DEFAULT_SIZE = 30; constexpr int16_t WEEK_MON = 1; constexpr int16_t WEEK_TUE = 2; @@ -66,6 +32,10 @@ constexpr int16_t WEEK_FRI = 5; constexpr int16_t WEEK_SAT = 6; constexpr int16_t WEEK_SUN = 0; +#define DEFAULT_BG_COLOR (Color::GetColorFromRGB(0x19, 0x19, 0x19)) // 默认背景色 +#define SELECTED_BG_COLOR (Color::GetColorFromRGB(0x4f, 0xc3, 0x4c)) // 选中背景色 + + AlarmSetWeekView::AlarmSetWeekView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::AlarmSetWeekView"); @@ -74,17 +44,29 @@ AlarmSetWeekView::AlarmSetWeekView() AlarmSetWeekView::~AlarmSetWeekView() { - group->RemoveAll(); - delete labelRespeat; - labelRespeat = nullptr; - delete weekImage; - weekImage = nullptr; - for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) { - delete buttonWeek[alarmNum]; - buttonWeek[alarmNum] = nullptr; - } - delete group; - group = nullptr; + if(group) + { + group->RemoveAll(); + if(labelRespeat) + { + delete labelRespeat; + labelRespeat = nullptr; + } + if(weekImage) + { + delete weekImage; + weekImage = nullptr; + } + for (int16_t alarmNum = 0; alarmNum < WEEK_NUM; alarmNum++) { + if(buttonWeek[alarmNum]) + { + delete buttonWeek[alarmNum]; + buttonWeek[alarmNum] = nullptr; + } + } + delete group; + group = nullptr; + } g_pAlarmSetWeekView = nullptr; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::~AlarmSetWeekView"); } @@ -94,37 +76,44 @@ AlarmSetWeekView *AlarmSetWeekView::GetInstance(void) return g_pAlarmSetWeekView; } -UILabelButton *AlarmSetWeekView::CreateUILabelButton(const char *buttonText, int16_t x, int16_t y) +UILabelButtonExt *AlarmSetWeekView::CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y) { - if (buttonText == nullptr) { + if (buttonText1 == nullptr || buttonText2 == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: buttonText1 or buttonText2 is null"); return nullptr; } - UILabelButton *labelButton = new UILabelButton(); + UILabelButtonExt *labelButton = new UILabelButtonExt(); if (labelButton == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelButton fail"); return nullptr; } - + int language = ConfigModel::GetInstance()->GetLanguage(); + if(language == 0) // 中文 + { + labelButton->SetText(buttonText1); + } + else + { + labelButton->SetText(buttonText2); + } labelButton->SetPosition(x, y); - labelButton->SetText(buttonText); - labelButton->SetViewId(buttonText); - labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE); + labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, FONT_DEFAULT_SIZE); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::PRESSED); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::INACTIVE); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::RELEASED); - labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::RELEASED); - labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); - labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::INACTIVE); + labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::RELEASED); + labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); + labelButton->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::INACTIVE); labelButton->SetStyleForState(STYLE_BORDER_WIDTH, VIEW_BORDER_SIZE, UIButton::RELEASED); labelButton->SetStyleForState(STYLE_BORDER_WIDTH, VIEW_BORDER_SIZE, UIButton::PRESSED); labelButton->SetStyleForState(STYLE_BORDER_WIDTH, VIEW_BORDER_SIZE, UIButton::INACTIVE); - labelButton->SetStyleForState(STYLE_BORDER_COLOR, Color::White().full, UIButton::RELEASED); - labelButton->SetStyleForState(STYLE_BORDER_COLOR, Color::White().full, UIButton::PRESSED); - labelButton->SetStyleForState(STYLE_BORDER_COLOR, Color::White().full, UIButton::INACTIVE); - labelButton->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + labelButton->SetStyleForState(STYLE_BORDER_COLOR, Color::Black().full, UIButton::RELEASED); + labelButton->SetStyleForState(STYLE_BORDER_COLOR, Color::Black().full, UIButton::PRESSED); + labelButton->SetStyleForState(STYLE_BORDER_COLOR, Color::Black().full, UIButton::INACTIVE); + labelButton->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); labelButton->SetStyle(STYLE_BORDER_WIDTH, VIEW_BORDER_SIZE); - labelButton->SetStyle(STYLE_BORDER_COLOR, Color::White().full); + labelButton->SetStyle(STYLE_BORDER_COLOR, Color::Black().full); labelButton->Resize(BUTTON_WIDHT, BUTTON_HEIGHT); return labelButton; @@ -132,9 +121,20 @@ UILabelButton *AlarmSetWeekView::CreateUILabelButton(const char *buttonText, int void AlarmSetWeekView::CreateWeekButton1(void) { - int viewPositionX = VIEW_POSITION_X; // 60 150 + int viewPositionX = VIEW_POSITION_X; UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - buttonWeek[WEEK_MON] = CreateUILabelButton(MON, viewPositionX, WEEK_Y1); + + buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN_DAY,SUN_DAY_EN, viewPositionX, WEEK_Y1); + if (buttonWeek[WEEK_SUN] == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSun fail"); + return; + } + group->Add(buttonWeek[WEEK_SUN]); + buttonWeek[WEEK_SUN]->SetOnClickListener(clickListener); + buttonWeek[WEEK_SUN]->SetViewId(SUNDAY); + viewPositionX += WEEK_GAP_X; + + buttonWeek[WEEK_MON] = CreateUILabelButton(MON_DAY,MON_DAY_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_MON] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonMon fail"); return; @@ -144,7 +144,7 @@ void AlarmSetWeekView::CreateWeekButton1(void) buttonWeek[WEEK_MON]->SetViewId(MONDAY); viewPositionX += WEEK_GAP_X; - buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE, viewPositionX, WEEK_Y1); + buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE_DAY,TUE_DAY_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_TUE] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonTue fail"); return; @@ -154,7 +154,7 @@ void AlarmSetWeekView::CreateWeekButton1(void) buttonWeek[WEEK_TUE]->SetViewId(TUESDAY); viewPositionX += WEEK_GAP_X; - buttonWeek[WEEK_WED] = CreateUILabelButton(WED, viewPositionX, WEEK_Y1); + buttonWeek[WEEK_WED] = CreateUILabelButton(WED_DAY,WED_DAY_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_WED] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonWed fail"); return; @@ -166,10 +166,10 @@ void AlarmSetWeekView::CreateWeekButton1(void) void AlarmSetWeekView::CreateWeekButton2(void) { - int viewPositionX2 = VIEW_POSITION_X2; // 12 210 + int viewPositionX2 = VIEW_POSITION_X2; UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR, viewPositionX2, WEEK_Y2); + buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR_DAY,THUR_DAY_EN, viewPositionX2, WEEK_Y2); if (buttonWeek[WEEK_THUR] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonThur fail"); return; @@ -179,7 +179,7 @@ void AlarmSetWeekView::CreateWeekButton2(void) buttonWeek[WEEK_THUR]->SetViewId(THURSDAY); viewPositionX2 += WEEK_GAP_X; - buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI, viewPositionX2, WEEK_Y2); + buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI_DAY,FRI_DAY_EN, viewPositionX2, WEEK_Y2); if (buttonWeek[WEEK_FRI] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonFri fail"); return; @@ -189,7 +189,7 @@ void AlarmSetWeekView::CreateWeekButton2(void) buttonWeek[WEEK_FRI]->SetViewId(FRIDAY); viewPositionX2 += WEEK_GAP_X; - buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT, viewPositionX2, WEEK_Y2); + buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT_DAY,SAT_DAY_EN, viewPositionX2, WEEK_Y2); if (buttonWeek[WEEK_SAT] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSat fail"); return; @@ -199,14 +199,6 @@ void AlarmSetWeekView::CreateWeekButton2(void) buttonWeek[WEEK_SAT]->SetViewId(SATURDAY); viewPositionX2 += WEEK_GAP_X; - buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN, viewPositionX2, WEEK_Y2); - if (buttonWeek[WEEK_SUN] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSun fail"); - return; - } - group->Add(buttonWeek[WEEK_SUN]); - buttonWeek[WEEK_SUN]->SetOnClickListener(clickListener); - buttonWeek[WEEK_SUN]->SetViewId(SUNDAY); } void AlarmSetWeekView::SetLabelButton(void) @@ -216,62 +208,63 @@ void AlarmSetWeekView::SetLabelButton(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new clickListener fail"); return; } - weekImage = new UILabelButton(); + weekImage = new UILabelButtonExt(); if (weekImage == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new weekImage fail"); return; } - weekImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3); - weekImage->SetText(SURE); - weekImage->SetTouchable(true); + weekImage->SetPosition(0, 366, 466, 100); weekImage->SetViewId(ALARM_WEEK_OK); - weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_WEEK_FONT); - if (OHOS::AlarmPresenter::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail"); - return; - } - weekImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue()); + weekImage->SetTextId(STR_OK);//确定 + weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + weekImage->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); + weekImage->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE); + weekImage->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED); + weekImage->SetTouchable(true); weekImage->SetOnClickListener(clickListener); - weekImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE); group->Add(weekImage); } UIScrollView *AlarmSetWeekView::InitSetWeekView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView"); - group = new UIScrollView(); if (group == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new group fail"); return group; } - group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - labelRespeat = new UILabel(); + group->SetTouchable(true); + group->SetDraggable(true); + UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); + if (setWeekDragListener == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail"); + return group; + } + group->SetOnDragListener(setWeekDragListener); + /* -------------------------------------------------------------------------- */ + labelRespeat = new UILabelExt(); if (labelRespeat == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelRespeat fail"); return group; } + labelRespeat->SetTextId(STR_ALARM_REPEAT);//重复 + labelRespeat->SetPosition(83, 50, 300, 35); + labelRespeat->SetStyle(STYLE_TEXT_FONT, 30); + labelRespeat->SetStyle(STYLE_LINE_HEIGHT, 35); + labelRespeat->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); group->Add(labelRespeat); - labelRespeat->SetText(RESPEAT); - labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, DEFAULT_FONT); - labelRespeat->SetPosition(TITLE_X, TITLE_Y, HORIZONTAL_RESOLUTION / 2, LABEL_POSITION_SIZE); CreateWeekButton1(); CreateWeekButton2(); SetLabelButton(); - group->SetTouchable(true); - group->SetDraggable(true); - UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); - if (setWeekDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail"); - return group; - } - group->SetOnDragListener(setWeekDragListener); + return group; } +//该函数用于设置AlarmSetWeekView中周一到周日按钮的背景颜色 void AlarmSetWeekView::RefreshSetWeek1(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1"); @@ -279,81 +272,83 @@ void AlarmSetWeekView::RefreshSetWeek1(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonMon nullptr error!"); return; } - buttonWeek[WEEK_MON]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_MON]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_MON]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_MON]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); if (buttonWeek[WEEK_TUE] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonTue nullptr error!"); return; } - buttonWeek[WEEK_TUE]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_TUE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_TUE]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_TUE]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); if (buttonWeek[WEEK_WED] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonWed nullptr error!"); return; } - buttonWeek[WEEK_WED]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_WED]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_WED]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_WED]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); if (buttonWeek[WEEK_THUR] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonThur nullptr error!"); return; } - buttonWeek[WEEK_THUR]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_THUR]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_THUR]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_THUR]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); if (buttonWeek[WEEK_FRI] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonFri nullptr error!"); return; } - buttonWeek[WEEK_FRI]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_FRI]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_FRI]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_FRI]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); if (buttonWeek[WEEK_SAT] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonSat nullptr error!"); return; } - buttonWeek[WEEK_SAT]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_SAT]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_SAT]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_SAT]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); if (buttonWeek[WEEK_SUN] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonSun nullptr error!"); return; } - buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - buttonWeek[WEEK_SUN]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); + buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full); + buttonWeek[WEEK_SUN]->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BG_COLOR.full, UIButton::PRESSED); } +//该函数用于设置AlarmSetWeekView中周一到周日按钮的背景颜色 void AlarmSetWeekView::RefreshSetWeek2(uint8_t week) { - for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) { + for (int16_t alarmNum = 0; alarmNum < WEEK_NUM; alarmNum++) { if (buttonWeek[alarmNum] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep2 week[%d] nullptr error!", alarmNum); return; } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: week = %u", week); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: week = %u", week); if ((week & 0x01) == 1) { // 判断星期天的位数是否为1 - buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + // buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_SUN] = 1; } if ((week & 0x02) == 0x02) { // 判断星期一的位数是否为1 - buttonWeek[WEEK_MON]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_MON]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_MON] = 1; } if ((week & 0x04) == 0x04) { // 判断星期二的位数是否为1 - buttonWeek[WEEK_TUE]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_TUE]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_TUE] = 1; } if ((week & 0x08) == 0x08) { // 判断星期三的位数是否为1 - buttonWeek[WEEK_WED]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_WED]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_WED] = 1; } if ((week & 0x10) == 0x10) { // 判断星期四的位数是否为1 - buttonWeek[WEEK_THUR]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_THUR]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_THUR] = 1; } if ((week & 0x20) == 0x20) { // 判断星期五的位数是否为1 - buttonWeek[WEEK_FRI]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_FRI]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_FRI] = 1; } if ((week & 0x40) == 0x40) { // 判断星期六的位数是否为1 - buttonWeek[WEEK_SAT]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); + buttonWeek[WEEK_SAT]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); AlarmPresenter::GetInstance()->alarmWeek[WEEK_SAT] = 1; } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp index 430334b14..e836e06f1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp @@ -5,10 +5,13 @@ * Create: 2021-09-11 */ -#include "MainAlarmView.h" +#include "alarm/include/MainAlarmView.h" #include "UiConfig.h" #include "ui_label_button.h" #include "PhoneService.h" +#include "ui_resource_string.h" +#include "ConfigModel.h" +#include "languagecode/LanguageInit.h" namespace OHOS { static MainAlarmView *g_MainAlarmView = nullptr; @@ -43,8 +46,8 @@ constexpr int16_t STATUS_BUTTON_Y = 210; constexpr int16_t STATUS_BUTTON_W = 90; constexpr int16_t STATUS_BUTTON_H = 90; constexpr int16_t D_CLOCK_X = 80; -constexpr int16_t D_CLOCK_FONT_SIZE = 55; -constexpr int16_t D_CLOCK_LABEL_FONT = 25; +constexpr int16_t D_CLOCK_FONT_SIZE = 40; // 55; +constexpr int16_t D_CLOCK_LABEL_FONT = 30; // 25; constexpr int16_t POSITION_ADD_Y = 110; constexpr int16_t POSITION_BUTTON_ADD_Y = 85; constexpr int16_t LABEL_SEMITRANSPARENT = 128; @@ -65,33 +68,100 @@ MainAlarmView::~MainAlarmView() alarmMin = 0; dClockNum = 0; weekStatus = 0; - group->RemoveAll(); - delete addButton; - addButton = nullptr; - delete group; - group = nullptr; - delete configView; - configView = nullptr; - delete setTimeView; - setTimeView = nullptr; - delete setWeekView; - setWeekView = nullptr; - delete judgeView; - judgeView = nullptr; - delete newTimeView; - newTimeView = nullptr; - for (int alarmNum = SET_ZERO; alarmNum <= SET_FIVE; alarmNum++) { - if (dClock[alarmNum] != nullptr) { - delete dClock[alarmNum]; - dClock[alarmNum] = nullptr; - } - if (statusButton[alarmNum] != nullptr) { - delete statusButton[alarmNum]; - statusButton[alarmNum] = nullptr; - } - if (dLabel[alarmNum] != nullptr) { - delete dLabel[alarmNum]; - dLabel[alarmNum] = nullptr; + if(group) + { + group->RemoveAll(); + delete group; + group = nullptr; + } + if(configView) + { + delete configView; + configView = nullptr; + } + if(setTimeView) + { + delete setTimeView; + setTimeView = nullptr; + } + if(setWeekView) + { + delete setWeekView; + setWeekView = nullptr; + } + if(judgeView) + { + delete judgeView; + judgeView = nullptr; + } + if(newTimeView) + { + delete newTimeView; + newTimeView = nullptr; + } + if(maxClockView) + { + delete maxClockView; + maxClockView = nullptr; + } + if(nullptr != TitleLabelExt_) + { + delete TitleLabelExt_; + TitleLabelExt_ = nullptr; + } + if(nullptr != AddButton_) + { + delete AddButton_; + AddButton_ = nullptr; + } + for (int alarmNum = SET_ZERO; alarmNum <= SET_FIVE; alarmNum++) + { + if(nullptr != SwipeView_[alarmNum]) + { + SwipeView_[alarmNum]->RemoveAll(); + + if(nullptr != SwipeViewItem_[alarmNum][0]) + { + SwipeViewItem_[alarmNum][0]->RemoveAll(); + + if (dClock[alarmNum] != nullptr) { + delete dClock[alarmNum]; + dClock[alarmNum] = nullptr; + } + if (statusButton[alarmNum] != nullptr) { + delete statusButton[alarmNum]; + statusButton[alarmNum] = nullptr; + } + if (dLabel[alarmNum] != nullptr) { + delete dLabel[alarmNum]; + dLabel[alarmNum] = nullptr; + } + if(statusListener[alarmNum] != nullptr) + { + delete statusListener[alarmNum]; + statusListener[alarmNum] = nullptr; + } + + delete SwipeViewItem_[alarmNum][0]; + SwipeViewItem_[alarmNum][0] = nullptr; + } + + if(nullptr != SwipeViewItem_[alarmNum][1]) + { + SwipeViewItem_[alarmNum][1]->RemoveAll(); + + if (nullptr != DeleteButton_[alarmNum]) + { + delete DeleteButton_[alarmNum]; + DeleteButton_[alarmNum] = nullptr; + } + + delete SwipeViewItem_[alarmNum][1]; + SwipeViewItem_[alarmNum][1] = nullptr; + } + + delete SwipeView_[alarmNum]; + SwipeView_[alarmNum] = nullptr; } container[alarmNum] = nullptr; } @@ -104,113 +174,261 @@ MainAlarmView *MainAlarmView::GetInstance(void) return g_MainAlarmView; } -void MainAlarmView::CreateImage(void) +void MainAlarmView::AlarmTitleCreate(void) { - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + if(nullptr == TitleLabelExt_) + { + TitleLabelExt_ = new UILabelExt(); + if(nullptr == TitleLabelExt_) + return; - addButton = new UIImageView(); - if (addButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new addButton fail"); - return; + TitleLabelExt_->SetPosition(83, 50, 300, 35); + TitleLabelExt_->SetStyle(STYLE_TEXT_FONT, 30); + TitleLabelExt_->SetStyle(STYLE_LINE_HEIGHT, 35); + TitleLabelExt_->SetTextId(STR_ALARM); + TitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + TitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + TitleLabelExt_->SetRollSpeed(23); + TitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + group->Add(TitleLabelExt_); } - addButton->SetPosition(ADD_BUTTON_X, ADD_BUTTON_Y); - addButton->SetWidth(ADD_BUTTON_W); - addButton->SetHeight(ADD_BUTTON_H); - addButton->SetSrc(ALARM_ADD_BUTTON_PATH); - addButton->SetViewId(ADD_BUTTON); - addButton->SetTouchable(true); - addButton->SetOnClickListener(clickListener); - group->Add(addButton); } -void MainAlarmView::NewClockCtl(int16_t alarmNum) +void MainAlarmView::AlarmAddButtonCreate(void) { - 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"); - return; - } - dClock[alarmNum]->SetViewId(ALARM_CLOCK[alarmNum]); - dClock[alarmNum]->SetTouchable(true); - dClock[alarmNum]->SetOnClickListener(clockListener); - if (alarmNum == 0) { - dClock[0]->SetPosition(D_CLOCK_X, alarmPositionY, ALARM_CLOCK_WIDTH, ALARM_CLOCK_HEIGHT); - } else { - dClock[alarmNum]->SetPosition(D_CLOCK_X, dClock[0]->GetY() + (alarmInterval * alarmNum), ALARM_CLOCK_WIDTH, ALARM_CLOCK_HEIGHT); + if(nullptr == AddButton_) + { + AddButton_ = new UILabelButtonExt(); + if(nullptr == AddButton_) + return; + + AddButton_->SetPosition(43, 0, 380, 100); + AddButton_->SetViewId(ADD_BUTTON); + AddButton_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + AddButton_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + AddButton_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED); + AddButton_->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_OPAQUE, UIButton::PRESSED); + AddButton_->SetStyle(STYLE_BORDER_RADIUS, 100); + AddButton_->SetStyle(STYLE_TEXT_FONT, 30); + AddButton_->SetStyle(STYLE_LINE_HEIGHT, 35); + AddButton_->SetTextId(STR_ADD_A_NEW_ALARM); + // AddButton_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + // AddButton_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + // AddButton_->SetRollSpeed(23); + AddButton_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + AddButton_->SetOnClickListener(clickListener); + + group->Add(AddButton_); } - dClock[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, D_CLOCK_FONT_SIZE); - dClock[alarmNum]->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS); - group->Add(dClock[alarmNum]); +} - dLabel[alarmNum] = new UILabel(); - if (dLabel[alarmNum] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new dLabel fail"); - return; +//更新闹钟添加按钮的位置 +//更新闹钟添加按钮的位置 +void MainAlarmView::AlarmAddButtonUpdate(uint8_t count) +{ + if(nullptr == AddButton_ || TitleLabelExt_ == nullptr) + return; + int bef_y = 0; + int aft_y = 0; + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]: 0_y=%d", __LINE__, Screen::GetInstance().GetHeight() / 2); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]: 0_y=%d", __LINE__, TitleLabelExt_->GetHeight()); + bef_y = AddButton_->GetY(); + if((0 == count)) + { + TitleLabelExt_->SetY(50); + AddButton_->SetY(120); } - if (alarmNum == 0) { - dLabel[0]->SetPosition(D_CLOCK_X, labelPositionY, ALARM_CLOCK_WIDTH, WEEK_LABEL_HEIGHT); - } else { - dLabel[alarmNum]->SetPosition(D_CLOCK_X, dLabel[0]->GetY() + (alarmInterval * alarmNum), ALARM_CLOCK_WIDTH, WEEK_LABEL_HEIGHT); + else + { + if(SwipeView_[0]) { + AddButton_->SetY(SwipeView_[0]->GetY() + (alarmInterval * count)); + } + } + aft_y = AddButton_->GetY(); + bool is_up_drag = bef_y- aft_y > 0 ? false:true; + if(group) { + if(viewInitstatus_) + group->ScrollBy(0, is_up_drag ? - 120 : 120); } - group->Add(dLabel[alarmNum]); + RootView::GetInstance()->Invalidate(); +} - statusButton[alarmNum] = new UIToggleButton(); - if (statusButton[alarmNum] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new statusButton[alarmNum] fail"); - return; +UIViewGroup * MainAlarmView::NewClockCtlExt(int16_t alarmNum, uint8_t index) +{ + UIViewGroup * TempGroup_ = new UIViewGroup(); + if(nullptr == TempGroup_) + return nullptr; + + if(0 == index) + { + TempGroup_->SetPosition(0, 0, 380, 100); + TempGroup_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + TempGroup_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + TempGroup_->SetStyle(STYLE_BORDER_RADIUS, 100); + + dClock[alarmNum] = new UIDigitalClock(); + if (dClock[alarmNum] == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new dClock fail"); + return nullptr; + } + dClock[alarmNum]->SetViewId(ALARM_CLOCK[alarmNum]); + dClock[alarmNum]->SetTouchable(true); + UIView::OnClickListener *clockListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); + dClock[alarmNum]->SetOnClickListener(clockListener); + dClock[alarmNum]->SetPosition(50, 10, 200, 76); + dClock[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, D_CLOCK_FONT_SIZE); + dClock[alarmNum]->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS); + /* -------------------------------------------------------------------------- */ + dLabel[alarmNum] = new UILabelExt(); + if (dLabel[alarmNum] == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new dLabel fail"); + return nullptr; + } + dLabel[alarmNum]->SetPosition(50, 60, 200, 35); + dLabel[alarmNum]->SetStyle(STYLE_TEXT_FONT, 30); + dLabel[alarmNum]->SetStyle(STYLE_LINE_HEIGHT, 35); + dLabel[alarmNum]->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); + dLabel[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, D_CLOCK_LABEL_FONT); + dLabel[alarmNum]->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + dLabel[alarmNum]->SetRollSpeed(23); + /* -------------------------------------------------------------------------- */ + statusButton[alarmNum] = new UIToggleButton(); + if (statusButton[alarmNum] == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new statusButton[alarmNum] fail"); + return nullptr; + } + statusButton[alarmNum]->SetViewId(ALARM_STATUS[alarmNum]); + statusButton[alarmNum]->SetPosition(250, 15, 120, 70); + statusButton[alarmNum]->SetImages(PNG_TOGGLEBUTTON_ON_IMAGE, PNG_TOGGLEBUTTON_OFF_IMAGE); + // statusButton[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, alarmNum); + // statusButton[alarmNum]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff29b862); + // statusButton[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + if(statusListener[alarmNum] == nullptr){ + statusListener[alarmNum] = new AlarmStatusBtnChangeListener(reinterpret_cast(statusButton[alarmNum])); + if (statusListener == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::NewStatusButton statusListener nullptr!"); + return nullptr; + } + } + statusButton[alarmNum]->SetOnChangeListener((UICheckBox::OnChangeListener *)statusListener[alarmNum]); + /* ----------------------------------- Add ---------------------------------- */ + TempGroup_->Add(dClock[alarmNum]); + TempGroup_->Add(dLabel[alarmNum]); + TempGroup_->Add(statusButton[alarmNum]); } - statusButton[alarmNum]->SetViewId(ALARM_STATUS[alarmNum]); - if (alarmNum == 0) { - statusButton[0]->SetPosition(STATUS_BUTTON_X, alarmPositionY, STATUS_BUTTON_W, STATUS_BUTTON_H); - } else { - statusButton[alarmNum]->SetPosition(STATUS_BUTTON_X, statusButton[0]->GetY() + (alarmInterval * alarmNum), STATUS_BUTTON_W, STATUS_BUTTON_H); + else + { + 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); + + DeleteButton_[alarmNum] = new UILabelButtonExt(); + if(nullptr == DeleteButton_[alarmNum]) + return nullptr; + + 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% + DeleteButton_[alarmNum]->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED); + DeleteButton_[alarmNum]->SetStyleForState(STYLE_BACKGROUND_OPA, 25, UIButton::PRESSED); + DeleteButton_[alarmNum]->SetStyle(STYLE_BORDER_RADIUS, 100); + DeleteButton_[alarmNum]->SetImagePosition(0, 0); + DeleteButton_[alarmNum]->SetImageSrc(ALARM_DELETE_IMAGE, ALARM_DELETE_IMAGE); + DeleteButton_[alarmNum]->SetOnClickListener(presenter_); + + TempGroup_->Add(DeleteButton_[alarmNum]); } - statusButton[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, alarmNum); - UICheckBox::OnChangeListener *statusListener{nullptr}; - statusListener = new AlarmStatusBtnChangeListener(reinterpret_cast(statusButton[alarmNum])); - if (statusListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::NewStatusButton statusListener nullptr!"); - return; + + return TempGroup_; +} + +void MainAlarmView::NewClockCtl(int16_t alarmNum) +{ + SwipeView_[alarmNum] = new UISwipeView(UISwipeView::HORIZONTAL); + if (0 == alarmNum) + { + SwipeView_[alarmNum]->SetPosition(43, 120, 380, 100); + } else + { + SwipeView_[alarmNum]->SetPosition(43, SwipeView_[0]->GetY() + (alarmInterval * alarmNum), 380, 100); } - statusButton[alarmNum]->SetOnChangeListener((UICheckBox::OnChangeListener *)statusListener); - group->Add(statusButton[alarmNum]); + // SwipeView_[alarmNum]->SetViewId(ITEM_SWIPE[alarmNum]); + SwipeView_[alarmNum]->SetTouchable(true); + // SwipeView_[alarmNum]->SetThrowDrag(true); + SwipeView_[alarmNum]->SetOnSwipeListener(presenter_); + SwipeView_[alarmNum]->SetAnimatorTime(50); // 200:animator drag time(ms) + // SwipeView_[alarmNum]->SetOnDragListener(presenter_); + 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]->SetBlankSize(0); + // SwipeView_[alarmNum]->SetReboundSize(30); // 200: rebound size + // SwipeView_[alarmNum]->SetElastic(true); + + SwipeViewItem_[alarmNum][0] = NewClockCtlExt(alarmNum, 0); + SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][0]); + + SwipeViewItem_[alarmNum][1] = NewClockCtlExt(alarmNum, 1); + SwipeView_[alarmNum]->Add(SwipeViewItem_[alarmNum][1]); + + SwipeView_[alarmNum]->SetCurrentPage(0); + SwipeView_[alarmNum]->SetIntercept(false); + SwipeView_[alarmNum]->SetLoopState(false); + + group->Add(SwipeView_[alarmNum]); } void MainAlarmView::LabelGetWeek(uint8_t week, int16_t alarmNum) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::week = %u!", week); std::string weekStr; + std::string weekStr_en; if ((week & 0x7f) == 0x7f) { // 判断0~6位是否都为1,如若都为1,则一周7天闹钟都响应 weekStr = EVERY_DAY; + weekStr_en = EVERY_DAY_EN; } else if (week == 0) { // 判断0~6位是否都为0,如若都为0,则一周7天都不响应,闹钟为不重复开启 weekStr = DO_NOT_REPEAT; + weekStr_en = DO_NOT_REPEAT_EN; } else { if ((week & 0x02) == 0x02) { // 判断第1位是否为1,如若为1,则星期一响应 weekStr += MON_DAY; + weekStr_en += MON_DAY_EN; } if ((week & 0x04) == 0x04) { // 判断第2位是否为1,如若为1,则星期二响应 weekStr += TUE_DAY; + weekStr_en += TUE_DAY_EN; } if ((week & 0x08) == 0x08) { // 判断第3位是否为1,如若为1,则星期三响应 weekStr += WED_DAY; + weekStr_en += WED_DAY_EN; } if ((week & 0x10) == 0x10) { // 判断第4位是否为1,如若为1,则星期四响应 weekStr += THUR_DAY; + weekStr_en += THUR_DAY_EN; } if ((week & 0x20) == 0x20) { // 判断第5位是否为1,如若为1,则星期五响应 weekStr += FRI_DAY; + weekStr_en += FRI_DAY_EN; } if ((week & 0x40) == 0x40) { // 判断第6位是否为1,如若为1,则星期六响应 weekStr += SAT_DAY; + weekStr_en += SAT_DAY_EN; } if ((week & 0x01) == 0x01) { // 判断第0位是否为1,如若为1,则星期日响应 weekStr += SUN_DAY; + weekStr_en += SUN_DAY_EN; } } - dLabel[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, D_CLOCK_LABEL_FONT); - dLabel[alarmNum]->SetText(weekStr.c_str()); - dLabel[alarmNum]->SetStyle(STYLE_TEXT_OPA, LABEL_SEMITRANSPARENT); + if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN) + dLabel[alarmNum]->SetText(weekStr.c_str()); + else + dLabel[alarmNum]->SetText(weekStr_en.c_str()); + // dLabel[alarmNum]->ForceResetText(); } bool MainAlarmView::GetRefreshStatus(void) @@ -220,42 +438,55 @@ bool MainAlarmView::GetRefreshStatus(void) void MainAlarmView::RefreshAlarmStatus(uint8_t alarmEnable, int16_t num) { - reflashStatus = true; - if (alarmEnable == 0) { - statusButton[num]->SetState(false); - } else if (alarmEnable == 1) { - statusButton[num]->SetState(true); - } - reflashStatus = false; - dClock[num]->SetVisible(true); - statusButton[num]->SetVisible(true); + if(statusButton[num] && dClock[num] && SwipeView_[num]) + { + reflashStatus = true; + if (alarmEnable == 0) { + statusButton[num]->SetState(false); + } else if (alarmEnable == 1) { + statusButton[num]->SetState(true); + } + reflashStatus = false; + dClock[num]->SetVisible(true); + statusButton[num]->SetVisible(true); + + SwipeView_[num]->SetCurrentPage(0); + } } void MainAlarmView::OnStart() { - - group = new UIScrollView(); if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new group fail"); - return; + group = new UIScrollView(); + if (group == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new group fail"); + return; + } } - group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - CreateImage(); - + group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + group->SetScrollBlankSize(75); group->SetTouchable(true); group->SetDraggable(true); + group->SetDirection(UIScrollView::VERTICAL); + group->RequestFocus(); + group->SetRotateFactor(1.0); UIView::OnDragListener *alarmDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); if (alarmDragListener == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new alarmDragListener fail"); return; } group->SetOnDragListener(alarmDragListener); + + AlarmTitleCreate(); + AlarmAddButtonCreate(); + RefreshAlarm(); if (group != nullptr) { container[0] = group; AddViewToRootContainer(container[0]); } + viewInitstatus_ = true; + RootView::GetInstance()->SetOnKeyActListener(presenter_); } void MainAlarmView::RefreshAlarm(void) @@ -294,21 +525,54 @@ void MainAlarmView::RefreshAlarm(void) RefreshAlarmStatus(alarmEnable, i); dClock[i]->SetTime24Hour(refreshHour, refreshMin, 0); } - group->ScrollBy(0, ADD_BUTTON_Y - addButton->GetY()); - if (dClockNum > (i - 1)) { - group->Remove(dClock[dClockNum]); - delete dClock[dClockNum]; - dClock[dClockNum] = nullptr; - - group->Remove(statusButton[dClockNum]); - delete statusButton[dClockNum]; - statusButton[dClockNum] = nullptr; - - group->Remove(dLabel[dClockNum]); - delete dLabel[dClockNum]; - dLabel[dClockNum] = nullptr; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]: dClockNum = %d", __LINE__, dClockNum); + // group->ScrollBy(0, ADD_BUTTON_Y - addButton->GetY()); + if (dClockNum > (i - 1)) + { + if(group) + { + if(SwipeView_[dClockNum]) + { + group->Remove(SwipeView_[dClockNum]); + SwipeView_[dClockNum]->RemoveAll(); + // 0 + if(SwipeViewItem_[dClockNum][0]) + { + SwipeViewItem_[dClockNum][0]->RemoveAll(); + + delete dClock[dClockNum]; + dClock[dClockNum] = nullptr; + + delete dLabel[dClockNum]; + dLabel[dClockNum] = nullptr; + + delete statusButton[dClockNum]; + statusButton[dClockNum] = nullptr; + + delete SwipeViewItem_[dClockNum][0]; + SwipeViewItem_[dClockNum][0] = nullptr; + } + /* -------------------------------------------------------------------------- */ + // 1 + if(SwipeViewItem_[dClockNum][1]) + { + SwipeViewItem_[dClockNum][1]->RemoveAll(); + + delete DeleteButton_[dClockNum]; + DeleteButton_[dClockNum] = nullptr; + + delete SwipeViewItem_[dClockNum][1]; + SwipeViewItem_[dClockNum][1] = nullptr; + } + delete SwipeView_[dClockNum]; + SwipeView_[dClockNum] = nullptr; + } + } } dClockNum = i - 1; + + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]: dClockNum=%d", __LINE__, dClockNum); + AlarmAddButtonUpdate(i); } bool MainAlarmView::ChangeMainAlarm(int16_t thisView) @@ -373,7 +637,7 @@ bool MainAlarmView::ChangeSetWeek(int16_t thisView) 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); @@ -412,7 +676,7 @@ bool MainAlarmView::ChangeMaxClock(int16_t thisView) container[thisView] = maxClockView->InitAlarmMax(); AddViewToRootContainer(container[thisView]); } - AlarmMaxClock::GetInstance()->AlarmMaxDelayExit(); + // AlarmMaxClock::GetInstance()->AlarmMaxDelayExit();//暂时屏蔽自动销毁界面 return true; } @@ -446,11 +710,10 @@ void MainAlarmView::DropView(UIView& view) } else if (&view == container[CHANGE_INTERFACE_MAXCLOCK]) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[CHANGE_INTERFACE_MAXCLOCK]"); ChangeView(CHANGE_INTERFACE_MAXCLOCK, MAIN_INTERFACE); - CancelScanHandle(); + // CancelScanHandle();暂时屏蔽自动销毁界面 } else if (&view == container[MAIN_INTERFACE]) { - uint16_t preSlice = AlarmClockModel::GetInstance()->JudgePreSlice(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[MAIN_INTERFACE]"); - NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp index 5ce9f8636..6d91ca907 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp @@ -20,7 +20,7 @@ #include "samgr_lite.h" #include "RtcService.h" -#include "AlarmClockTimerConfig.h" +#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h" #include "AlarmClockManage.h" #ifdef __cplusplus @@ -28,8 +28,8 @@ extern "C" { #endif static constexpr uint32 DATETIME_PARA_NUM = 6; -static constexpr const char *ALARM_CLOCK_MANAGE_DATA_PATH = (char *)"/user/data/alarmclock/alarmClockManage.bin"; -static constexpr const char *ALARM_CLOCK_MANAGE_DIRECTORY = (char *)"/user/data/alarmclock"; +static constexpr const char *ALARM_CLOCK_MANAGE_DATA_PATH = (char *)"/user/userdata/alarmclock/alarmClockManage.bin"; +static constexpr const char *ALARM_CLOCK_MANAGE_DIRECTORY = (char *)"/user/userdata/alarmclock"; static int32 SaveManagementToFile(void); static int32 LoadManagementFromFile(void); @@ -334,7 +334,7 @@ static int32 DeleteAndUpdataListAlarmToday(uint8 id) if (node == g_alarmTodayList.end() || id > EVENT_ALARM_CLOCK_MAX) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteAndUpdataListAlarmToday id is invalid, id = %u!!", id); - return STATUS_ALARM_ID_INVALID; + // return STATUS_ALARM_ID_INVALID; } (void)SetFirstAlarmToday(TYPE_CUR_NODE_NO_SKIP); @@ -377,6 +377,8 @@ static int32 SetFirstAlarmToday(FirstAlarmTodaySetType type) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetFirstAlarmToday AlarmGetCurrentTimeInfo failed!!"); return STATUS_TIME_FUN_ERROR; } + + SetAlarm(ALARM_A, 0,255, 255); for (node = g_alarmTodayList.begin(); node != g_alarmTodayList.end();) { tempNode = node; @@ -772,6 +774,7 @@ void UpdataListAndFirstAlarmToday(void) (void)CreateListAlarmToday(); (void)SortListAlarmToday(); (void)SetFirstAlarmToday(TYPE_CUR_NODE_NO_SKIP); + (void)SetZeroAlarm(); return; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/include/AlarmClockTimerConfig.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/include/AlarmClockTimerConfig.h index 4c9e4cd94..a4e1c38b0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/include/AlarmClockTimerConfig.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/include/AlarmClockTimerConfig.h @@ -40,6 +40,7 @@ typedef struct { uint8_t week; uint8_t hour; uint8_t minute; + uint8_t second; uint8_t reserved; } AlarmInfo; @@ -56,6 +57,21 @@ int32_t AlarmTimerInit(void); int32_t SetZeroAlarm(void); int32_t SetAlarm(AlarmType type, uint8_t week, uint8_t hour, uint8_t minute); int32_t AlarmGetCurrentTimeInfo(struct tm *timeInfo); +void set_sleep_and_wake_time(void); +void set_sedentary_data(void); +void get_sleep_time_notify(void); +void clean_sleep_monitoring_flag(void); +void clean_sedentary_flag(void); +void set_drinkreminder_data(void); + +bool HandleIsBind(void); +bool HandleCanShowDialog(void); +void HandleSleepReminder(const struct tm* curTime); +void HandleWakeUp(const struct tm* curTime); +void HandleDrinkReminder(const struct tm* curTime); +void HandleHeartRateDetection(const struct tm *curTime); +void HandleAlarmOnTime(const struct tm *curTime); +void HandleMusicUpdate(void); #ifdef __cplusplus } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index 135ebd78d..8a13ed56d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -18,178 +18,760 @@ #include "AlarmClockTimerConfig.h" -#ifdef __cplusplus -extern "C" { +#include "ConfigModelC.h" +#include "ConfigModel.h" +#include "heartrate/include/HeartModel.h" +#include "sleep/include/SleepModel.h" +#include "sleepmode/include/SleepModeModel.h" +// #include "safemodemanager/include/SafeModeManagerModel.h" +#include "cat1_server_hal.h" +#include "custom_runtime.h" +#include "uiservice/include/ui_service.h" +#include "power_display_service.h" +#include +#include "AppViewIDs.h" +#include "player/include/PlayersView.h" +#include "record/include/RecordingPlayerView.h" +#include "custom_utils.h" +#include "alarm/include/AlarmClockModel.h" +#ifdef CYWEE_SPORT +#include "cywee_service.h" #endif -static AlarmCtrl g_alarmCtrA; -static AlarmCtrl g_alarmCtrB; -namespace OHOS { -GraphicTimer* g_AlarmHandle = nullptr; -} +#ifdef PPG_HX3695 +#include "ppg_service.h" +#endif -void AlarmTimerEventPublish(uint16 topic, AlarmClockEventData data) +#ifdef __cplusplus +extern "C" { - int32 ret; - uint32 size = sizeof(AlarmClockEventData); - BroadcastApi *broadcastApi = nullptr; - IUnknown *api = nullptr; +#endif - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish topic=%u!!", topic); + static AlarmCtrl g_alarmCtrA; + static AlarmCtrl g_alarmCtrB; + static osTimerId_t g_AlarmHandle = nullptr; - void *publishData = malloc(size); - if (publishData == nullptr) { - return; +#define SLEPPNOTIFY 20 + + static int sleep_time = 0; + static int wake_up_time = 0; + static int sleep_notify_time = 0; + static int sleep_time_hour = 0; + static int sleep_time_min = 0; + static int wake_time_hour = 0; + static int wake_time_min = 0; + static int sedentary_switch = 0; + static int sedentary_interval = 1; + static int sedentary_time = 0; + static int sedentary_start_hour = 0; + static int sedentary_start_min = 0; + static int sedentary_stop_hour = 0; + static int sedentary_stop_min = 0; + static int drinkreminder_switch = 0; /*喝水提醒开关:0 关闭 1开始 2间隔提醒*/ + static int drinkreminder_start_time = 0; /*喝水提醒开始时间*/ + static int drinkreminder_start_hour = 0; /*喝水提醒开始小时*/ + static int drinkreminder_start_min = 0; /*喝水提醒开始分钟*/ + static int drinkreminder_end_time = 0; /*喝水提醒结束时间*/ + static int drinkreminder_end_hour = 0; /*喝水提醒结束小时*/ + static int drinkreminder_end_min = 0; /*喝水提醒结束分钟*/ + static int drinkreminder_freq = 0; /*喝水提醒频率*/ + static int drinkreminder_goal = 0; /*喝水提醒目标ml*/ + static int drinkremind_expectedTime = 0; + static int sleep_notify_time_min = 0; + static int sleep_notify_time_hour = 0; + static int time_sync_flag = 0; + + // #define SEDENTARY_TIME_RANGE (((curTime.tm_hour > sedentary_start_hour) || (curTime.tm_hour == sedentary_start_hour && curTime.tm_min >= sedentary_start_min)) && \ +// ((curTime.tm_hour < sedentary_stop_hour) || (curTime.tm_hour == sedentary_stop_hour && curTime.tm_min < sedentary_stop_min))) + + // #define WAKE_TIME_RANGE (((wake_time_hour < sleep_time_hour) && \ +// ((curTime.tm_hour > wake_time_hour) || \ +// (curTime.tm_hour == wake_time_hour && curTime.tm_min >= wake_time_min)) && \ +// ((curTime.tm_hour < sleep_time_hour) || \ +// (curTime.tm_hour == sleep_time_hour && curTime.tm_min < sleep_time_min))) || \ +// ((wake_time_hour >= sleep_time_hour) && \ +// (((curTime.tm_hour > wake_time_hour) || \ +// (curTime.tm_hour == wake_time_hour && curTime.tm_min >= wake_time_min)) || \ +// ((curTime.tm_hour < sleep_time_hour) || \ +// (curTime.tm_hour == sleep_time_hour && curTime.tm_min < sleep_time_min))) || \ +// ((curTime.tm_hour > wake_time_hour) && (curTime.tm_hour < sleep_time_hour)))) + + // 设置目标睡眠时间 + void set_sleep_and_wake_time(void) + { + sleep_time = get_sleep_time_from_config_model(); + wake_up_time = get_wake_up_time_from_config_model(); + // 解析开始时间 + sleep_time_hour = (sleep_time & 0xFFFF0000) >> 16; + sleep_time_min = sleep_time & 0x0000FFFF; + wake_time_hour = (wake_up_time & 0xFFFF0000) >> 16; + wake_time_min = wake_up_time & 0x0000FFFF; + clean_sleep_monitoring_flag(); + // 解析结束时间 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleep_time_hour:%d sleep_time_min:%d wake_time_hour:%d wake_time_min:%d", sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min); } - ret = memcpy_s(publishData, size, (const void *)&data, size); - if (ret != EOK) { - free(publishData); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish memcpy_s fail! ret = %d", ret); - return; + + void set_sedentary_data(void) + { + sedentary_switch = get_sedentary_switch_from_config_model(); + sedentary_time = get_sedentary_time_from_config_model(); + sedentary_interval = get_sedentary_interval_from_config_model(); + #ifdef CYWEE_SPORT + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SET_SEDENTARY_INTERVAL, &sedentary_interval); // 设置久坐提醒间隔 + #endif + + // sedentary_start_hour = (sedentary_time & 0XFF000000) >> 24; + // sedentary_start_min = (sedentary_time & 0X00FF0000) >> 16; + // sedentary_stop_hour = (sedentary_time & 0X0000FF00) >> 8; + // sedentary_stop_min = sedentary_time & 0X000000FF; + sedentary_stop_min = (sedentary_time & 0XFF000000) >> 24; + sedentary_stop_hour = (sedentary_time & 0X00FF0000) >> 16; + sedentary_start_min = (sedentary_time & 0X0000FF00) >> 8; + sedentary_start_hour = sedentary_time & 0X000000FF; + clean_sedentary_flag(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "set_sedentary_data:%d:%d~%d:%d", sedentary_start_hour, sedentary_start_min, sedentary_stop_hour, sedentary_stop_min); } - Request request = { - .msgId = topic, - .len = size, - .msgValue = 0, - .data = publishData, - }; + void set_drinkreminder_data(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "set_drinkreminder_data"); + drinkreminder_switch = OHOS::ConfigModel::GetInstance()->GetDrinkSwitch(); + drinkreminder_freq = OHOS::ConfigModel::GetInstance()->GetDrinkFreq(); + drinkreminder_goal = OHOS::ConfigModel::GetInstance()->GetDrinkGoal(); - /* public request */ - api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); - if (api == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed"); - free(publishData); - return; + // 获取提醒时间段 + drinkreminder_start_time = OHOS::ConfigModel::GetInstance()->GetDrinkStart(); // 获取喝水提醒开始时间,int类型 前16位小时,后16位分钟 + drinkreminder_end_time = OHOS::ConfigModel::GetInstance()->GetDrinkEnd(); // 获取喝水提醒结束时间, int类型 前16位小时,后16位分钟 + + // 解析开始时间 + drinkreminder_start_hour = (drinkreminder_start_time & 0XFFFF0000) >> 16; // 前16位是小时 + drinkreminder_start_min = drinkreminder_start_time & 0X0000FFFF; // 后16位是分钟 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d:%d", drinkreminder_start_hour, drinkreminder_start_min); + + // 解析结束时间 + drinkreminder_end_hour = (drinkreminder_end_time & 0XFFFF0000) >> 16; // 前16位是小时 + drinkreminder_end_min = drinkreminder_end_time & 0x0000FFFF; // 后16位是分钟 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d:%d", drinkreminder_end_hour, drinkreminder_end_min); + + if (drinkreminder_switch == 2) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d:%d~%d:%d", drinkreminder_start_hour, drinkreminder_start_min, drinkreminder_end_hour, drinkreminder_end_min); + } } - ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (ret != 0 || broadcastApi == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed"); - free(publishData); + + static bool is_time_range(const struct tm &curTime, int start_time_hour, int start_time_min, int end_time_hour, int end_time_min) + { + int start_min = start_time_hour * 60 + start_time_min; /* 开始时间的分钟数 */ + int end_min = end_time_hour * 60 + end_time_min; /* 结束时间的分钟数 */ + int cur_time_min = curTime.tm_hour * 60 + curTime.tm_min; /* 当前时间的分钟数 */ + + // 处理非跨天的情况 + if (end_min > start_min) + { + if (cur_time_min >= start_min && cur_time_min < end_min) + { + return true; + } + } + else // 处理跨天的情况 + { + if (cur_time_min >= start_min || cur_time_min < end_min) + { + return true; + } + } + return false; + } + + void clean_sleep_monitoring_flag(void) + { + uapi_dev_runtime_set_sleep_monitoring_status(0); + uapi_dev_runtime_set_nap_monitoring_status(0); + } + + void clean_sedentary_flag(void) + { + uapi_dev_runtime_set_sedentary_status(0); + } + + // 设置睡眠提醒时间 + void get_sleep_time_notify(void) + { + int goal_hour = (sleep_time & 0XFFFF0000) >> 16; + int goal_min = (sleep_time & 0X0000FFFF); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "goal_hour:%d goal_min:%d", goal_hour, goal_min); + + sleep_notify_time_min = (goal_min >= SLEPPNOTIFY) ? goal_min - SLEPPNOTIFY : ((goal_min + 60) - SLEPPNOTIFY); // 避免分钟数为负 + sleep_notify_time_hour = goal_hour; + if (goal_min < SLEPPNOTIFY) + { // 如果需要借位 + sleep_notify_time_hour -= 1; // 小时减1 + } + // 确保小时数正确 + sleep_notify_time_hour = (sleep_notify_time_hour < 0) ? 23 : sleep_notify_time_hour; // 处理从0点前20分钟的情况,变为前一天的23点40分 + + sleep_notify_time = (sleep_notify_time_hour << 16) | sleep_notify_time_min; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleep_notify_time_hour:%d sleep_notify_time_min:%d sleep_notify_time:%d", sleep_notify_time_hour, sleep_notify_time_min, sleep_notify_time); + } + void AlarmEventPublish(uint16_t topic, uint8_t *data, uint32_t size) + { + int32 ret; + + BroadcastApi *broadcastApi = NULL; + IUnknown *api = NULL; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u!!", topic); + + void *publishData = nullptr; + if (size > 0) + { + publishData = malloc(size); + if (publishData == nullptr) + { + return; + } + ret = memcpy_s(publishData, size, (const void *)data, size); + if (ret != EOK) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s rateDataTmp fail! ret = %d", ret); + free(publishData); + return; + } + } + + Request request = {.msgId = topic, .len = size, .msgValue = 0, .data = publishData}; + + /* public request */ + api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); + if (api == NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed"); + free(publishData); + return; + } + ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); + if (ret != 0 || broadcastApi == NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed"); + free(publishData); + return; + } + broadcastApi->PublishTopic((IUnknown *)broadcastApi, &request); + broadcastApi->Release((IUnknown *)broadcastApi); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish end!!"); + return; } - broadcastApi->PublishTopic((IUnknown *)broadcastApi, &request); - broadcastApi->Release((IUnknown *)broadcastApi); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish end!!"); + void AlarmTimerEventPublish(uint16 topic, AlarmClockEventData data) + { + int32 ret; + uint32 size = sizeof(AlarmClockEventData); + BroadcastApi *broadcastApi = nullptr; + IUnknown *api = nullptr; - return; -} + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish topic=%u!!", topic); -static void AlarmCallBackProcA(void) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmCallBackProcA"); - AlarmClockEventData unuse; - AlarmTimerEventPublish(TOPIC_EVENT_ALARM_RING, unuse); -} + void *publishData = malloc(size); + if (publishData == nullptr) + { + return; + } + ret = memcpy_s(publishData, size, (const void *)&data, size); + if (ret != EOK) + { + free(publishData); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish memcpy_s fail! ret = %d", ret); + return; + } -static void AlarmCallBackProcB(void) -{ - AlarmClockEventData unuse; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmCallBackProcB"); - AlarmTimerEventPublish(TOPIC_EVENT_NEXTDAY_UPDATE, unuse); - SetZeroAlarm(); -} + Request request = { + .msgId = topic, + .len = size, + .msgValue = 0, + .data = publishData, + }; + + /* public request */ + api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); + if (api == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed"); + free(publishData); + return; + } + ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); + if (ret != 0 || broadcastApi == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed"); + free(publishData); + return; + } + broadcastApi->PublishTopic((IUnknown *)broadcastApi, &request); + broadcastApi->Release((IUnknown *)broadcastApi); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish end!!"); -void AlarmScan(void *arg) -{ - struct tm curTime; - int32_t ret = AlarmGetCurrentTimeInfo(&curTime); - if (ret != ERRCODE_SUCC) { return; } + /*闹钟*/ + static void AlarmCallBackProcA(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmCallBackProcA"); + AlarmClockEventData unuse; + AlarmTimerEventPublish(TOPIC_EVENT_ALARM_RING, unuse); + } + + /*NextDay*/ + static void AlarmCallBackProcB(void) + { + AlarmClockEventData unuse; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmCallBackProcB"); +#if 0 + // 记录当前时间 + time_t now = time(nullptr); + struct tm *localTime = localtime(&now); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Current time - Hour: %d, Minute: %d", localTime->tm_hour, localTime->tm_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Posting next day update event"); + +#endif + + GraphicService::GetInstance()->PostGraphicEvent(std::bind(AlarmTimerEventPublish, TOPIC_EVENT_NEXTDAY_UPDATE, unuse)); + + // AlarmTimerEventPublish(TOPIC_EVENT_NEXTDAY_UPDATE, unuse); + + // 重置nextday闹钟 + SetZeroAlarm(); + } + + static void on_time_CallBackProc(void) + { + AlarmClockEventData unuse; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked"); + AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse); + // GraphicService::GetInstance()->PostGraphicEvent( + // std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse)); + + // AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse); + } + + void AlarmScan(void *arg) + { + struct tm curTime; + int32_t ret = AlarmGetCurrentTimeInfo(&curTime); + if (ret != ERRCODE_SUCC) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get current time info, error code: %d", ret); + return; + } + + if (curTime.tm_sec % 3 == 0) + { + do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_BLE_ADV_CHECK, nullptr, 0); // 3秒钟检查一次广播 + } + + if (curTime.tm_sec % 60 == 0) + { + #ifdef CYWEE_SPORT + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_CHECK_ACC, NULL); // 一分钟检查一次gsensor是否停止 + #endif + } + + if (curTime.tm_min % 60 == 0 && curTime.tm_sec == 0) + { + do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_SAVE, nullptr, 0); // 十分钟存一次电池信息 + } + + if (g_alarmCtrA.state == ALARM_STATUS_RUNNING) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Checking Alarm A"); + if ((g_alarmCtrA.callback != nullptr) && + (g_alarmCtrA.info.hour == curTime.tm_hour) && + (g_alarmCtrA.info.minute == curTime.tm_min)) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Alarm A triggered"); + OHOS::AlarmClockModel::GetInstance()->SetPopTimeData(g_alarmCtrA.info.hour, g_alarmCtrA.info.minute); + g_alarmCtrA.state = ALARM_STATUS_CREATED; + g_alarmCtrA.callback(); + } + } + + if (g_alarmCtrB.state == ALARM_STATUS_RUNNING) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Checking Alarm B"); + if ((g_alarmCtrB.callback != NULL) && + // (g_alarmCtrB.info.week == curTime.tm_wday) && + (g_alarmCtrB.info.hour == curTime.tm_hour) && + (g_alarmCtrB.info.minute == curTime.tm_min) && + (g_alarmCtrB.info.second == curTime.tm_sec)) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Alarm B triggered"); + g_alarmCtrB.state = ALARM_STATUS_CREATED; + g_alarmCtrB.callback(); + } + } + + // 业务逻辑回调 + do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TIMECALL_BACK, nullptr, 0); + } - if (g_alarmCtrA.state == ALARM_STATUS_RUNNING) { - if ((g_alarmCtrA.callback != nullptr) && - (g_alarmCtrA.info.hour == curTime.tm_hour) && - (g_alarmCtrA.info.minute == curTime.tm_min)) { - g_alarmCtrA.callback(); - g_alarmCtrA.state = ALARM_STATUS_CREATED; + // 每秒回调 + void custom_timer_callback() + { + struct tm curTime; + int32_t ret = AlarmGetCurrentTimeInfo(&curTime); + if (ret != ERRCODE_SUCC) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get current time info, error code: %d", ret); + return; } + + // 绑定判断 + if (HandleIsBind()) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleAlarmOnTime: not binded"); + return; + } + + HandleAlarmOnTime(&curTime); + HandleSleepReminder(&curTime); + HandleMusicUpdate(); + + // 以下弹窗被控制 + if (HandleCanShowDialog()) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleAlarmOnTime: not show dialog"); + return; + } + + HandleDrinkReminder(&curTime); + HandleHeartRateDetection(&curTime); } - if (g_alarmCtrB.state == ALARM_STATUS_RUNNING) { - if ((g_alarmCtrB.callback != nullptr) && - (g_alarmCtrB.info.week == curTime.tm_wday) && - (g_alarmCtrB.info.hour == curTime.tm_hour) && - (g_alarmCtrB.info.minute == curTime.tm_min)) { - g_alarmCtrB.callback(); - g_alarmCtrB.state = ALARM_STATUS_CREATED; + // 判断是否绑定 + bool HandleIsBind(void) + { + // 未绑定状态下,以下操作不进行 + if (OHOS::ConfigModel::GetInstance()->get_configData_bool( + OHOS::ConfigModel::CONFIGMODEL_ITEM_FIRSTTIMESTART)) + { + return true; } + return false; } -} -static int32_t AlarmCreate(AlarmCtrl *alarmCtrl, AlarmCallBack callback) -{ - if (alarmCtrl == nullptr) { - return ERRCODE_FAIL; + // 判断是否可以弹窗 + bool HandleCanShowDialog(void) + { + bool state = false; + + if (uapi_dev_runtime_get_saveele_status()) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "saveele!"); + state = true; + } + + if (uapi_dev_runtime_get_train_status()) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "training!"); + state = true; + } + + return state; } - if (alarmCtrl->state == ALARM_STATUS_UNUSED) { - alarmCtrl->state = ALARM_STATUS_CREATED; - alarmCtrl->callback = callback; + + // 整点回调 + void HandleAlarmOnTime(const struct tm *curTime) + { + if (curTime->tm_min == 0 && curTime->tm_sec == 0) + { + AlarmClockEventData unuse; + time_t timetemp = mktime((struct tm *)curTime); + unuse.value = timetemp - 60 * 60; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse)); + } } - return ERRCODE_SUCC; -} -int32_t AlarmTimerInit(void) -{ - int32_t ret; + // 睡眠提醒 + void HandleSleepReminder(const struct tm *curTime) + { + // 睡眠总开关 + if (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP)) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CONFIGMODEL_ITEM_SLEEP is OK"); + // 睡眠提醒[前提开启睡眠提醒] + if (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_REMIND)) + { + // 提醒一次 + if ((curTime->tm_hour == sleep_notify_time_hour) && (curTime->tm_min == sleep_notify_time_min) && (curTime->tm_sec == 0)) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "It's bedtime in 20 minutes"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "20分钟后要睡觉啦!"); + // 设置状态为睡眠提醒 + OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEEPNOTIFY); + AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, NULL, 0); + } + } + if ((curTime->tm_hour == wake_time_hour && curTime->tm_min == wake_time_min && curTime->tm_sec == 0) || + (curTime->tm_hour == sleep_time_hour && curTime->tm_min == sleep_time_min && curTime->tm_sec == 0) && curTime->tm_min) + { + uapi_cywee_time_sync(); + } + else if (!time_sync_flag && curTime->tm_min) + { + time_sync_flag = 1; + uapi_cywee_time_sync(); + } + // 退出睡眠检测模式并进入小睡检测模式 + if (!is_time_range(*curTime, sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min) && (uapi_dev_runtime_get_nap_monitoring_status() == 0)) + { + if (curTime->tm_hour == wake_time_hour && curTime->tm_min == wake_time_min && curTime->tm_sec == 0) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "闹铃!"); + // 退出睡眠模式 + OHOS::SleepModeModel::GetInstance().SetSleepModeDisabled(); + OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE); + } - g_alarmCtrA.state = ALARM_STATUS_UNUSED; - g_alarmCtrB.state = ALARM_STATUS_UNUSED; - OHOS::g_AlarmHandle = new OHOS::GraphicTimer(ALARM_INTERVAL_MS, AlarmScan, nullptr, true); - bool timerStatus = OHOS::g_AlarmHandle->Start(); - if (!timerStatus) { - return ERRCODE_FAIL; + // 判断是否还在睡眠 + if (uapi_dev_runtime_get_sleep_status() == 0) + { + // 设置状态为小睡 + uapi_dev_runtime_set_nap_status(0); // 清零小睡状态 + uapi_dev_runtime_set_absolute_static_status(0); // 清零绝对静止状态 + #ifdef PPG_HX3695 + set_keep_in_wear_det_mode(1); // 开启小睡佩戴监测 + #endif + #ifdef CYWEE_SPORT + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL); // 算法底层切换小睡监测模式 + #endif + time_sync_flag = 0; + } + } + // 进入睡眠检测模式并退出小睡检测模式 + else if (is_time_range(*curTime, sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min) && (uapi_dev_runtime_get_sleep_monitoring_status() == 0)) + { + int cmd = 1; + uapi_dev_runtime_set_sleep_status(0); // 清零睡眠状态 + uapi_dev_runtime_set_absolute_static_status(0); // 清零绝对静止状态 + // OHOS::clean_sleep_data(); // 清零睡眠文件存储数据 + // if(uapi_dev_runtime_get_nap_monitoring_status() == 1) + // uapi_clean_sleep_flag(); // 清除睡眠标志文件 + // OHOS::create_sleep_folder(); // 创建睡眠文件夹 + #ifdef PPG_HX3695 + set_keep_in_wear_det_mode(0); + #endif + #ifdef CYWEE_SPORT + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, &cmd); // 强制获取小睡数据,结束小睡 + #endif + + // 睡眠弹窗 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!"); + // 设置状态为睡眠 + OHOS::SleepModel::GetInstance().clean_sleep_data(); // 清除历史数据 + OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP); + + if (curTime->tm_hour == sleep_time_hour && curTime->tm_min == sleep_time_min && curTime->tm_sec == 0) + { + // 进入睡眠模式 + OHOS::SleepModeModel::GetInstance().SetSleepModeEnabled(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!!!! 开始"); + AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, NULL, 0); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!!!! 结束"); + } + + #ifdef CYWEE_SPORT + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式 + #endif + time_sync_flag = 0; + } + } } - ret = AlarmCreate(&g_alarmCtrA, AlarmCallBackProcA); - if (ret != ERRCODE_SUCC) { - return ERRCODE_FAIL; + + // 喝水提醒 + void HandleDrinkReminder(const struct tm *curTime) + { + if (drinkreminder_switch == 1) + { // 定时提醒 + if (curTime->tm_hour == drinkreminder_start_hour && + curTime->tm_min == drinkreminder_start_min && + curTime->tm_sec == 0) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); + AlarmEventPublish(TOPIC_EVENT_DRINKREMINDER, NULL, 0); + } + } + else if (drinkreminder_switch == 2) + { // 间隔提醒 + // 判断当前时间是否在提醒时间段内 + if (is_time_range(*curTime, drinkreminder_start_hour, drinkreminder_start_min, drinkreminder_end_hour, drinkreminder_end_min)) + { + double interval_time = (drinkreminder_freq == 0) ? 0.5 : drinkreminder_freq; + int interval_time_seconds = (int)(interval_time * 60) * 60; + int current_seconds = (curTime->tm_hour * 60 + curTime->tm_min) * 60; + int hour_24_seconds = 24 * 60 * 60; + // 进行间隔判断和提醒 + if (uapi_dev_runtime_get_drinkremind_status() == 0) + { + uapi_dev_runtime_set_drinkremind_status(1); + drinkremind_expectedTime = current_seconds + interval_time_seconds; + drinkremind_expectedTime %= hour_24_seconds; // 同时处理24小时循环 + } + else if (current_seconds == drinkremind_expectedTime && curTime->tm_sec == 0) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); + drinkremind_expectedTime += interval_time_seconds; + drinkremind_expectedTime %= hour_24_seconds; // 处理24小时循环 + AlarmEventPublish(TOPIC_EVENT_DRINKREMINDER, NULL, 0); + } + } + else if (!is_time_range(*curTime, drinkreminder_start_hour, drinkreminder_start_min, drinkreminder_end_hour, drinkreminder_end_min) && uapi_dev_runtime_get_drinkremind_status() == 1) + { + uapi_dev_runtime_set_drinkremind_status(0); + } + } } - ret = AlarmCreate(&g_alarmCtrB, AlarmCallBackProcB); - if (ret != ERRCODE_SUCC) { - return ERRCODE_FAIL; + + // 心率周期检测 + void HandleHeartRateDetection(const struct tm *curTime) + { + int heartRateDetectionInterval = 0; + + if (uapi_dev_runtime_get_sleep_monitoring_status()) + heartRateDetectionInterval = 20; // 晚上 20分钟检测一次 + else + heartRateDetectionInterval = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED); + + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d", heartRateDetectionInterval); + if (heartRateDetectionInterval) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d", curTime->tm_min % heartRateDetectionInterval); + if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts"); + // 开启心率检测 + OHOS::HeartModel::GetInstance()->Heart_Control(OHOS::HeartState::Start, OHOS::HeartCheck::PASSIVITY); + } + } } - return ERRCODE_SUCC; -} -int32_t SetAlarm(AlarmType type, uint8_t week, uint8_t hour, uint8_t minute) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetAlarm %d %d %d %d", type, week, hour, minute); - if (type == ALARM_A) { - g_alarmCtrA.state = ALARM_STATUS_RUNNING; - g_alarmCtrA.info.hour = hour; - g_alarmCtrA.info.minute = minute; - } else if (type == ALARM_B) { - g_alarmCtrB.state = ALARM_STATUS_RUNNING; - g_alarmCtrB.info.week = week; - g_alarmCtrB.info.hour = hour; - g_alarmCtrB.info.minute = minute; - } else { - return ERRCODE_FAIL; - } - return ERRCODE_SUCC; -} + // 音乐更新 + void HandleMusicUpdate() + { + int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId(); + if (curviewid != VIEW_MAIN && OHOS::PlayersView::GetInstance()) + { // 当前不在主界面且音乐界面不为空 + OHOS::UICheckBox::UICheckBoxState state = OHOS::PlayersView::GetInstance()->GetPlayerButtonState(); + if (state == OHOS::UICheckBox::UICheckBoxState::SELECTED) + { + SendMsgToUIService(UI_UPDATE_PLAYERPROCESS, 0, nullptr, 0); // 音乐进度条更新 + } + } + else if (OHOS::RecordingPlayerView::GetInstance()) + { + OHOS::UICheckBox::UICheckBoxState state = OHOS::RecordingPlayerView::GetInstance()->GetPlayerButtonState(); + if (state == OHOS::UICheckBox::UICheckBoxState::SELECTED) + { + SendMsgToUIService(UI_UPDATE_RECORDPROCESS, 0, nullptr, 0); // 录音进度条更新 + } + } + } -int32_t SetZeroAlarm(void) -{ - struct tm curTime; - int32_t ret = AlarmGetCurrentTimeInfo(&curTime); - if (ret != ERRCODE_SUCC) { - return ERRCODE_FAIL; + static int32_t AlarmCreate(AlarmCtrl *alarmCtrl, AlarmCallBack callback) + { + if (alarmCtrl == nullptr) + { + return ERRCODE_FAIL; + } + if (alarmCtrl->state == ALARM_STATUS_UNUSED) + { + alarmCtrl->state = ALARM_STATUS_CREATED; + alarmCtrl->callback = callback; + } + return ERRCODE_SUCC; } - int32_t weekday = (++curTime.tm_wday) % 7; - return SetAlarm(ALARM_B, weekday, 0, 0); -} -int32_t AlarmGetCurrentTimeInfo(struct tm *timeInfo) -{ - if (timeInfo == nullptr) { - return ERRCODE_FAIL; + int32_t AlarmTimerInit(void) + { + int32_t timerStatus; + int32_t ret; + + set_sleep_and_wake_time(); + set_sedentary_data(); + set_drinkreminder_data(); + get_sleep_time_notify(); + + g_alarmCtrA.state = ALARM_STATUS_UNUSED; + g_alarmCtrB.state = ALARM_STATUS_UNUSED; + g_AlarmHandle = osTimerNew(AlarmScan, osTimerPeriodic, nullptr, nullptr); + if (g_AlarmHandle == nullptr) + { + return ERRCODE_FAIL; + } + timerStatus = osTimerStart(g_AlarmHandle, ALARM_INTERVAL_MS); + if (timerStatus != osOK) + { + return ERRCODE_FAIL; + } + ret = AlarmCreate(&g_alarmCtrA, AlarmCallBackProcA); + if (ret != ERRCODE_SUCC) + { + return ERRCODE_FAIL; + } + ret = AlarmCreate(&g_alarmCtrB, AlarmCallBackProcB); + if (ret != ERRCODE_SUCC) + { + return ERRCODE_FAIL; + } + + return ERRCODE_SUCC; + } + + int32_t SetAlarm(AlarmType type, uint8_t week, uint8_t hour, uint8_t minute) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetAlarm %d %d %d %d", type, week, hour, minute); + if (type == ALARM_A) + { + g_alarmCtrA.state = ALARM_STATUS_RUNNING; + g_alarmCtrA.info.hour = hour; + g_alarmCtrA.info.minute = minute; + } + else if (type == ALARM_B) + { + g_alarmCtrB.state = ALARM_STATUS_RUNNING; + g_alarmCtrB.info.week = week; + g_alarmCtrB.info.hour = hour; + g_alarmCtrB.info.minute = minute; + g_alarmCtrB.info.second = 5; + } + else + { + return ERRCODE_FAIL; + } + return ERRCODE_SUCC; + } + + int32_t SetZeroAlarm(void) + { + struct tm curTime; + int32_t ret = AlarmGetCurrentTimeInfo(&curTime); + if (ret != ERRCODE_SUCC) + { + return ERRCODE_FAIL; + } + int32_t weekday = (++curTime.tm_wday) % 7; + return SetAlarm(ALARM_B, weekday, 0, 0); + } + + int32_t AlarmGetCurrentTimeInfo(struct tm *timeInfo) + { + if (timeInfo == nullptr) + { + return ERRCODE_FAIL; + } + time_t sec = time(nullptr); + localtime_r(&sec, timeInfo); + return ERRCODE_SUCC; } - time_t sec = time(nullptr); - localtime_r(&sec, timeInfo); - return ERRCODE_SUCC; -} #ifdef __cplusplus } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp index 1d5c29b4c..b514467ad 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp @@ -59,7 +59,7 @@ namespace OHOS } void BloodDetectionPresenter::NavigateBack() { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } bool BloodDetectionPresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp index 523378418..572087ec0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -116,7 +116,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } return false; @@ -130,7 +130,7 @@ namespace OHOS keyState == 1 && uapi_get_screen_state() == 0) { // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp index df24e6883..7dce69ea9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp @@ -73,7 +73,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } @@ -87,7 +87,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp index e2162996b..ec15f74de 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp @@ -155,7 +155,7 @@ bool CalculatorPresenter::OnDragEnd(OHOS::UIView& view, const OHOS::DragEvent& e if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { if(event.GetPreLastPoint().x-event.GetStartPoint().x>150) - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } @@ -169,7 +169,7 @@ bool CalculatorPresenter::OnKeyAct(UIView &view, const KeyEvent &event) if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp index 669004b35..0ba073834 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp @@ -58,7 +58,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { if (event.GetPreLastPoint().x - event.GetStartPoint().x > 100) - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } if (event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP) { @@ -82,7 +82,7 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp index 39be26534..7f8a917e9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp @@ -77,7 +77,7 @@ namespace OHOS { if (strcmp(view.GetViewId(), MAINCOUNTDOWNVIEW) == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } else if (strcmp(view.GetViewId(), COUNTDOWN_TIMECONFIG_VIEW) == 0) { @@ -251,7 +251,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp index c971b7f57..ade20a322 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -216,7 +216,7 @@ namespace OHOS } else if (strcmp(view.GetViewId(), DISPLAY_BRIGHTNESS_VIEW) == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } DisplayBrightnessPresenter::X_DRAG_FLAG = false; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp index d2babeecb..4cc98f7a3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp @@ -71,7 +71,7 @@ namespace OHOS UNUSED(event); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && DnotDisturbPresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); DnotDisturbPresenter::X_DRAG_FLAG = false; } return true; @@ -93,9 +93,9 @@ namespace OHOS } else if (&view == p_DnotDisturbView->GetButtonOff()) { - // NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + // NativeAbility::GetInstance().Back(); } - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } @@ -108,7 +108,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp index 75a850edb..865b8dd70 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp @@ -93,7 +93,7 @@ namespace OHOS UNUSED(event); if (strcmp(view.GetViewId(), FINDPHONE_LABELBUTTON) == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } @@ -115,7 +115,7 @@ namespace OHOS UNUSED(event); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && FindPhonePresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); FindPhonePresenter::X_DRAG_FLAG = false; } return true; @@ -130,7 +130,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp index 3f9c1dc65..bb21fc84f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp @@ -171,7 +171,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp index 67a22a8ae..1980b83b7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp @@ -82,7 +82,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && MaingoalPresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); X_DRAG_FLAG = false; } return true; @@ -106,7 +106,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp index b6346b59d..9a3b0174e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp @@ -58,7 +58,7 @@ namespace OHOS } void HeartChartPresenter::NavigateBack() { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } void HeartChartPresenter::OnStart() { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp index 75033b01c..08c9c0799 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp @@ -48,7 +48,7 @@ namespace OHOS } void HeartDetectionPresenter::NavigateBack() { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } void HeartDetectionPresenter::OnStart() { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp index f64c063df..7b90ec894 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp @@ -119,7 +119,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } return false; @@ -132,7 +132,7 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp index 4da051936..7f2861196 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -92,7 +92,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && LanguageSwitchPresenter::X_DRAG_FLAG) { #ifdef FD230_650 - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); #endif LanguageSwitchPresenter::X_DRAG_FLAG = false; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp index dee2b4868..2d242f2d4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp @@ -87,7 +87,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && (event.GetDeltaX() > 20) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY())))) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } if(event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM) { @@ -111,7 +111,7 @@ namespace OHOS { // 执行全部删除操作 model->ClearAllMessages(); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } @@ -147,7 +147,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp index 33cb8be31..f9c276f67 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp @@ -94,7 +94,7 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp index 7ca585c65..a0bb5ed9d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp @@ -97,7 +97,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerPresenter::OnDragEnd"); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && MusicPlayerPresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); MusicPlayerPresenter::X_DRAG_FLAG = false; } return true; @@ -112,7 +112,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp index 2c62ab38c..c6ee00a76 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp @@ -153,7 +153,7 @@ namespace OHOS else { //if(event.GetPreLastPoint().x-event.GetStartPoint().x>200) - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); //NativeAbility::GetInstance().EnterSlice(VIEW_APPLIST); TelephonyInitInterface::X_DRAG_FLAG = false; } @@ -183,7 +183,7 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp index 0475d24c2..3b9176657 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp @@ -110,7 +110,7 @@ namespace OHOS switch (currentView) { case RECORDINGVIEW: - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); break; case RECORDINGPLAYERVIEW: p_RecordingView->ChangeView(RECORDINGPLAYERVIEW, RECORDINGLISTVIEW); // 录音播放视图(subView)->录音列表视图(subView) @@ -314,7 +314,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp index 2238c303d..21cfbe253 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp @@ -77,7 +77,7 @@ namespace OHOS std::string viewId = view.GetViewId(); if (viewId == RTCLABELBUTTON) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } std::map viewMap = { @@ -126,7 +126,7 @@ namespace OHOS } else { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } RespiratoryTrainingPresenter::X_DRAG_FLAG = false; } @@ -142,7 +142,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp index 15504ed13..a93b13aa3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp @@ -137,7 +137,7 @@ namespace OHOS return true; } - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); SchedulePresenter::X_DRAG_FLAG = false; } return true; @@ -152,7 +152,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp index 1dcecc1f3..4ab9001cc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp @@ -84,7 +84,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && SleepControlPresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } @@ -107,7 +107,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp index 77fed051c..54eddb7ac 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp @@ -51,7 +51,7 @@ namespace OHOS UNUSED(event); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && SleepModePresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); SleepModePresenter::X_DRAG_FLAG = false; } return true; @@ -66,7 +66,7 @@ namespace OHOS SleepModeModel_->SetSleepModeEnabled(); } - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } @@ -79,7 +79,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp index 9e5914e02..6e3dadc19 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp @@ -90,7 +90,7 @@ namespace OHOS } else { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } SoundAndVibrationPresenter::X_DRAG_FLAG = false; } @@ -107,7 +107,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp index 249a639cb..c3a5513ee 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp @@ -127,7 +127,7 @@ namespace OHOS { if (&view == view_->GetScrollView(MAIN_STOPWATCH)) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } else if (&view == view_->GetScrollView(STOPWATCH_RECORD_CYCLE_TO_LIMIT)) { @@ -358,7 +358,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return false; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp index d9e41dca4..685fc9801 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp @@ -135,7 +135,7 @@ extern "C" { // 点亮屏幕 uapi_set_screen_on_api(); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); #ifdef SUPPORT_BLE_SERVICE cameraSend(3); #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp index b99e34f94..e0d584d7b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp @@ -80,7 +80,7 @@ namespace OHOS (event.GetDeltaX() > 20) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY())))) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); /*如果是拍照界面需要发送拍照结束的消息*/ if (TakephotosModel::GetInstance()->GetPopStaust() == PopupPhoto::TakePopup) @@ -100,7 +100,7 @@ namespace OHOS // 返回按键 if (strcmp(view.GetViewId(), BUTTONGO) == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } if (strcmp(view.GetViewId(), BUTTONTAKE) == 0) @@ -121,7 +121,7 @@ namespace OHOS // 如果是power键,且是亮屏状态,按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); /*如果是拍照界面需要发送拍照结束的消息*/ if (TakephotosModel::GetInstance()->GetPopStaust() == PopupPhoto::TakePopup) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp index 43d607135..8817b37ef 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp @@ -73,7 +73,7 @@ namespace OHOS std::string viewId = labelButtonExt->GetViewId(); if (viewId == THEMESTYLEVIEWEXIT) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); return true; } @@ -105,7 +105,7 @@ namespace OHOS uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); if (preSlice == VIEW_APPLIST) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } else { @@ -133,7 +133,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingPresenter::OnDragEnd"); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && ThemeStylePresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); ThemeStylePresenter::X_DRAG_FLAG = false; } return true; @@ -147,7 +147,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp index 7aa92f354..f2d015772 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp @@ -78,7 +78,7 @@ namespace OHOS 3.[更多]->[具体训练项]进入 4.[设置训练目标]进入 {不返回} */ - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } bool TraingNomalPresenter::OnDrag(UIView &view, const DragEvent &event) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp index c2b400aa1..f56ca47c6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp @@ -96,7 +96,7 @@ namespace OHOS } else { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } } bool TraingMorePresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp index f696d60a5..548e5013e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp @@ -105,7 +105,7 @@ namespace OHOS } else { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } } bool TraingRecordPresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp index a8e28d0e3..f4b094184 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp @@ -76,7 +76,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && MainWeatherPresenter::X_DRAG_FLAG) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); X_DRAG_FLAG = false; } return true; @@ -100,7 +100,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + NativeAbility::GetInstance().Back(); } return true; } diff --git a/code/sdk/zhihui/utils/custom_cmd_service.c b/code/sdk/zhihui/utils/custom_cmd_service.c index 0ce5a58a3..46f51a471 100644 --- a/code/sdk/zhihui/utils/custom_cmd_service.c +++ b/code/sdk/zhihui/utils/custom_cmd_service.c @@ -32,17 +32,18 @@ #include "custom_utils.h" #include "ui_serviceC.h" +#include "alarm/include/AlarmClockModelC.h" #ifdef FD230_650 #include "BluetoothModelC.h" #include "PhoneServiceC.h" #include "safemodemanager/include/SafeModeManagerModelC.h" #include "set_dial/include/SetDialModelC.h" -#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h" + #else // void HandleUpdatelcdMode(int f){} // void set_ota_upgrade(void){} -void custom_timer_callback(void){} +// void custom_timer_callback(void){} // void Check_ble_adv_status(void){} // void check_dial_space(void){}