From: luozheng <1732036298@qq.com> Date: Thu, 13 Jun 2024 06:57:24 +0000 (+0800) Subject: 录音视图优化 X-Git-Tag: release_V1.2.70_20241020_135402~1009 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4daf04d04122e21254c194aa0412f906f81db8e8;p=mirrors%2FFD230.git 录音视图优化 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h index 92fc21842..9bbbf2665 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h @@ -1,3 +1,11 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-13 10:44:21 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef RECORD_DELETE_VIEW_H #define RECORD_DELETE_VIEW_H @@ -8,7 +16,7 @@ #include "components/ui_image_view.h" #include "components/ui_button.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -25,6 +33,7 @@ namespace OHOS int16_t fontSize; // 字体大小 int16_t lineHeigh; // 行高 const char *text; // 文本 + int16_t textId; // 文本Id uint8_t lineBreakMode; // 断行模式。 }; RecordDeleteView(); @@ -34,16 +43,17 @@ namespace OHOS void ClearAll(void); private: - bool SetUpScrollView(void); - UILabelExt *SetUpLabel(LabelConfig &labelconfig); // 设置标签 - bool SetRecordDeleteViewLabel(void); - bool SetUpButton(void); + UILabelExt *CreateRecordDeleteLabel(LabelConfig &labelconfig); // 设置标签 + bool RecordDeleteScrollViewInit(void); + bool RecordDeleteLabelViewInit(void); + bool RecordDeleteButtonViewInit(void); + UIScrollView *RecordDeleteViewScrollView{nullptr}; UILabelExt *TitleLabel{nullptr}; - UILabelExt *AttentionLabel[2]{nullptr}; + UILabelExt *AttentionLabel{nullptr}; + UILabelExt *DeleteNameLabel{nullptr}; UIButton *RECORD_DELETE_ON_BUTTON{nullptr}; // 是否删除录音:是 UIButton *RECORD_DELETE_OFF_BUTTON{nullptr}; // 是否删除录音:否 - bool initViewStatus{false}; }; } // namespace OHOS #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h index f8dfc48a5..362811a2c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-13 14:32:55 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordGoingView.h + */ #ifndef RECORD_GOING_VIEW_H #define RECORD_GOING_VIEW_H @@ -12,7 +19,6 @@ namespace OHOS { - class RecordGoingView { public: @@ -25,6 +31,7 @@ namespace OHOS int16_t fontSize; // 字体大小 int16_t lineHeigh; // 行高 const char *text; // 文本 + int16_t textId; // 文本Id uint8_t lineBreakMode; // 断行模式。 }; RecordGoingView(); @@ -33,21 +40,22 @@ namespace OHOS UIScrollView *RecordGoingViewInit(void); void ClearAll(void); UILabel *GetRecordingDurationLabel(void); + private: - bool SetUpScrollView(void); - UILabel *SetUpLabel(LabelConfig &labelconfig); // 设置标签 - bool SetRecordGoingViewLabel(void); - bool SetUpImageView(void); - bool SetUpButton(void); + UILabel *CreateRecordGoingLabel(LabelConfig &labelconfig); // 设置标签 + UILabelExt *CreateRecordGoingLabelExt(LabelConfig &labelconfig); // 设置标签 + bool RecordGoingScrollViewInit(void); + bool RecordGoingLabelViewInit(void); + bool RecordGoingImageViewInit(void); + bool RecordGoingButtonViewInit(void); + void AddViewsToScrollView(UIScrollView *scrollView, UIView *views[], int numViews); + void AddViewsToRecordGoingViewScrollView(); UIScrollView *RecordGoingViewScrollView{nullptr}; - UILabel *TitleLabel{nullptr}; // 标题 - UILabel *RecordGoingLabel{nullptr}; // “录音中” - UILabel *Timer{nullptr}; // 显示录音时长 + UILabelExt *TitleLabel{nullptr}; // 标题 + UILabelExt *RecordGoingLabel{nullptr}; // “录音中” + UILabel *Timer{nullptr}; // 显示录音时长 UIImageView *RECORD_GOING_IMAGE{nullptr}; UIButton *RECORD_GOING_BUTTON{nullptr}; - - - bool initViewStatus{false}; }; } // namespace OHOS #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h index 2e5e856e2..76a195314 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-12 17:54:46 + * @LastEditTime: 2024-06-13 10:00:02 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h */ #ifndef RECORD_LIST_VIEW_H @@ -42,17 +42,19 @@ namespace OHOS virtual ~RecordListView(); static RecordListView *GetInstance(void); UIScrollView *RecordListViewInit(void); - void ClearAll(void); - void IsVisibleLabel(bool value); void RefreshRecordingListData(void); private: - bool SetUpScrollView(void); - UILabelExt *SetUpLabel(LabelConfig &labelconfig); // 设置标签 - bool SetUpRecordListViewLabel(void); - bool SetUpRecordingList(void); + UILabelExt *CreateRecordListLabel(LabelConfig &labelconfig); // 设置标签 + bool RecordListScrollViewInit(void); + bool RecordListLabelViewInit(void); + bool RecordListListViewInit(void); void AddRecordingToList(const RecordingListItem &item); void InitRecordingInfo(void); + void UpdateVisibilityBasedOnRecordingList(); + void ClearAll(void); + void IsVisibleLabel(bool value); + UIScrollView *RecordListScrollView{nullptr}; UILabelExt *RecordListViewTitleLabel{nullptr}; // "录音列表" UILabelExt *RecordListViewAttentionLabel{nullptr}; //"当前录音列表为空" diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h index f934f4a4d..67437aadd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h @@ -2,13 +2,14 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-02-27 09:16:51 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-12 16:19:16 + * @LastEditTime: 2024-06-13 11:23:15 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h */ #ifndef RECORD_PRESENTER_H #define RECORD_PRESENTER_H +#include "BaseView.h" #include "Presenter.h" #include "RecordingView.h" #include "KeyInputListener.h" @@ -17,17 +18,6 @@ #include namespace OHOS { - typedef enum - { - RECORDINGVIEW = 0, // 录音视图(slice) - RECORDINGLISTVIEW, // 录音列表视图(subView) - RECORDGOINGVIEW, // 正在录音视图(subView) - RECORDINGPLAYERVIEW, // 录音播放视图(subView) - RECORDINGDELETEVIEW, // 录音删除视图(subView) - RECORDINGVOLUMESETTINGVIEW, // 声音设置视图(subView) - MAX_RECORDINGVIEWID, - } RECORDINGVIEWID; - /*正在录音视图*/ static const char *RECORD_GOING_BUTTON_VIEWID = "RECORD_GOING_BUTTON"; // 停止录音按钮id @@ -120,15 +110,6 @@ namespace OHOS bool X_DRAG_FLAG{false}; }; - class RecordingVolumeSettingViewDragLister : public UIView::OnDragListener - { - public: - RecordingVolumeSettingViewDragLister() {} - ~RecordingVolumeSettingViewDragLister(){} - bool OnDrag(UIView &view, const DragEvent &event) override; - bool OnDragEnd(UIView &view, const DragEvent &event) override; - }; - class RecordingModel; class RecordingView; class RecordingPresenter : public Presenter, diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h index bddefe952..4fed53c41 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-13 11:06:56 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h + */ #ifndef RECORD_VIEW_H #define RECORD_VIEW_H @@ -18,9 +25,19 @@ #include "record/include/RecordDeleteView.h" #include "record/include/RecordingVolumeSettingView.h" -#define NUM_MAX_RECORDINGVIEWSCROLLVIEW 10 namespace OHOS { + typedef enum + { + RECORDINGVIEW = 0, // 录音视图(slice) + RECORDINGLISTVIEW, // 录音列表视图(subView) + RECORDGOINGVIEW, // 正在录音视图(subView) + RECORDINGPLAYERVIEW, // 录音播放视图(subView) + RECORDINGDELETEVIEW, // 录音删除视图(subView) + RECORDINGVOLUMESETTINGVIEW, // 声音设置视图(subView) + MAX_RECORDINGVIEWID, + } RECORDINGVIEWID; + class RecordingPresenter; class RecordingView : public View { @@ -47,7 +64,7 @@ namespace OHOS bool ChangeRecordVolumeSettingView(int16_t thisView); // 切换到“声音设置”视图 bool ClickFunc(int16_t interface); void ChangeView(int16_t hideView, int16_t showView); - UIScrollView *GetRecordingViewScrollView(int i); + int GetCurrentViewType(UIScrollView * view); public: void OnStart() override; @@ -63,12 +80,16 @@ namespace OHOS RecordingVolumeSettingView *p_RecordingVolumeSettingView{nullptr}; private: + bool RecordingScrollViewInit(void); + bool RecordingLabelViewInit(void); + bool RecordingButtonViewInit(void); + bool RecordingImageViewInit(void); + bool RecordingImageAnimatorViewInit(void); + void RecordingViewInit(void); void ClearAll(void); - bool SetUpScrollView(void); - bool SetTheTitle(void); UIButton *SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener); - UIScrollView *RecordingViewScrollView[NUM_MAX_RECORDINGVIEWSCROLLVIEW]{nullptr}; + UIScrollView *RecordingViewScrollView[MAX_RECORDINGVIEWID]{nullptr}; UILabelExt *RecordingViewTitleLabel{nullptr}; UIButton *RecordingViewButton{nullptr}; UILabelExt *AttentionLabel{nullptr}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingVolumeSettingView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingVolumeSettingView.h index e35bd1626..a4aaf684a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingVolumeSettingView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingVolumeSettingView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-13 17:34:03 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-13 11:21:14 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingVolumeSettingView.h + */ #ifndef RECORDING_VOLUME_SETTING_VIEW_H #define RECORDING_VOLUME_SETTING_VIEW_H @@ -16,7 +23,6 @@ namespace OHOS private: SoundAndVibrationVolumeSettingView *p_SoundAndVibrationVolumeSettingView{nullptr}; UIScrollView *RecordingVolumeSettingViewScrollView{nullptr}; - UIView::OnDragListener *volumeDragListener{nullptr}; bool initViewStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp index ba4bacfc9..e5f276c31 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp @@ -1,7 +1,7 @@ #include "record/include/RecordDeleteView.h" #include "record/include/RecordingPresenter.h" #include "wearable_log.h" - +#include "language/font/ui_resource_string.h" namespace OHOS { static RecordDeleteView *g_pRecordDeleteView{nullptr}; @@ -26,18 +26,19 @@ namespace OHOS void RecordDeleteView::ClearAll() { - if (initViewStatus == true) + if (RecordDeleteViewScrollView != nullptr) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::ClearAll"); RecordDeleteViewScrollView->RemoveAll(); delete TitleLabel; TitleLabel = nullptr; - for (int i = 0; i < 2; i++) - { - delete AttentionLabel[i]; - AttentionLabel[i] = nullptr; - } + delete AttentionLabel; + AttentionLabel = nullptr; + + delete DeleteNameLabel; + DeleteNameLabel = nullptr; delete RECORD_DELETE_ON_BUTTON; RECORD_DELETE_ON_BUTTON = nullptr; @@ -50,21 +51,7 @@ namespace OHOS } } - bool RecordDeleteView::SetUpScrollView(void) - { - RecordDeleteViewScrollView = new UIScrollView(); - if (RecordDeleteViewScrollView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteViewScrollView new fail!"); - return false; - } - RecordDeleteViewScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - RecordDeleteViewScrollView->SetTouchable(true); - RecordDeleteViewScrollView->SetDraggable(true); - return true; - } - - UILabelExt *RecordDeleteView::SetUpLabel(LabelConfig &labelconfig) // 设置标签 + UILabelExt *RecordDeleteView::CreateRecordDeleteLabel(LabelConfig &labelconfig) // 设置标签 { UILabelExt *label = new UILabelExt(); if (label == nullptr) @@ -74,74 +61,101 @@ namespace OHOS label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小 label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); // 字体大小 label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 - label->SetText(labelconfig.text); // 内容 - label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 + // label->SetText(labelconfig.text); // 内容 + label->SetTextId(labelconfig.textId); // 内容 + label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); + return label; } - bool RecordDeleteView::SetRecordDeleteViewLabel(void) + bool RecordDeleteView::RecordDeleteScrollViewInit(void) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteScrollViewInit"); + RecordDeleteViewScrollView = new UIScrollView(); + if (RecordDeleteViewScrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteViewScrollView new fail!"); + return false; + } + RecordDeleteViewScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + UIView::OnDragListener *dragListener = static_cast(RecordingPresenter::GetInstance()); + if (dragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dragListener is nullptr!!"); + return false; + } + RecordDeleteViewScrollView->SetOnDragListener(dragListener); + RecordDeleteViewScrollView->SetTouchable(true); + RecordDeleteViewScrollView->SetDraggable(true); + return true; + } + + bool RecordDeleteView::RecordDeleteLabelViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteLabelViewInit"); LabelConfig labelconfig = { - .left = 173, + .left = 83, .top = 52, - .width = 200, - .height = 40, + .width = 300, + .height = 35, .fontSize = 30, .lineHeigh = 35, - .text = "删除录音", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + //.text = "删除录音", + .textId = STR_DELETE_RECORDING, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - TitleLabel = SetUpLabel(labelconfig); + TitleLabel = CreateRecordDeleteLabel(labelconfig); if (nullptr == TitleLabel) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::TitleLabel is nullptr!"); return false; } - + RecordDeleteViewScrollView->Add(TitleLabel); + /* -------------------------------------------------------------------------- */ labelconfig = { - .left = 33, - .top = 145, - .width = 400, - .height = 124, + .left = 53, + .top = 160, + .width = 360, + .height = 35, .fontSize = 30, .lineHeigh = 35, - .text = "此操作将 该录音\n\n是否确认?", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + //.text = "是否永久删除", + .textId = STR_DELETE_PERMANENTLY, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - - AttentionLabel[0] = SetUpLabel(labelconfig); - if (nullptr == AttentionLabel[0]) + AttentionLabel = CreateRecordDeleteLabel(labelconfig); + if (nullptr == AttentionLabel) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::AttentionLabel[0] is nullptr!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::AttentionLabel is nullptr!"); return false; } - - labelconfig = { - .left = 188, - .top = 154, - .width = 200, - .height = 40, - .fontSize = 30, - .lineHeigh = 35, - .text = "永久删除", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, - }; - AttentionLabel[1] = SetUpLabel(labelconfig); - AttentionLabel[1]->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); - if (nullptr == AttentionLabel[1]) + AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); + RecordDeleteViewScrollView->Add(AttentionLabel); + /* -------------------------------------------------------------------------- */ + labelconfig.top = 215; + labelconfig.textId = STR_AUDIO_XX; + DeleteNameLabel = CreateRecordDeleteLabel(labelconfig); + if (nullptr == DeleteNameLabel) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::AttentionLabel[1] is nullptr!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::DeleteNameLabel is nullptr!"); return false; } + RecordDeleteViewScrollView->Add(DeleteNameLabel); return true; } - bool RecordDeleteView::SetUpButton(void) + bool RecordDeleteView::RecordDeleteButtonViewInit(void) { - UIView::OnClickListener *clickLister = static_cast(RecordingPresenter::GetInstance()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteButtonViewInit"); + UIView::OnClickListener *clickListener = static_cast(RecordingPresenter::GetInstance()); + if (clickListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clickListener is nullptr!!"); + return false; + } RECORD_DELETE_OFF_BUTTON = new UIButton(); if (RECORD_DELETE_OFF_BUTTON == nullptr) { @@ -151,9 +165,11 @@ namespace OHOS RECORD_DELETE_OFF_BUTTON->SetPosition(111, 299, 100, 100); RECORD_DELETE_OFF_BUTTON->SetViewId(RECORD_DELETE_OFF_BUTTON_VIEWID); RECORD_DELETE_OFF_BUTTON->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + RECORD_DELETE_OFF_BUTTON->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); RECORD_DELETE_OFF_BUTTON->SetImageSrc("/user/res/SYSTEM_CheckOff.bin", "/user/res/SYSTEM_CheckOff.bin"); - RECORD_DELETE_OFF_BUTTON->SetOnClickListener(clickLister); - + RECORD_DELETE_OFF_BUTTON->SetOnClickListener(clickListener); + RecordDeleteViewScrollView->Add(RECORD_DELETE_OFF_BUTTON); + /* -------------------------------------------------------------------------- */ RECORD_DELETE_ON_BUTTON = new UIButton(); if (RECORD_DELETE_ON_BUTTON == nullptr) { @@ -163,35 +179,22 @@ namespace OHOS RECORD_DELETE_ON_BUTTON->SetPosition(256, 299, 100, 100); RECORD_DELETE_ON_BUTTON->SetViewId(RECORD_DELETE_ON_BUTTON_VIEWID); RECORD_DELETE_ON_BUTTON->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + RECORD_DELETE_ON_BUTTON->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); RECORD_DELETE_ON_BUTTON->SetImageSrc("/user/res/SYSTEM_CheckOn.bin", "/user/res/SYSTEM_CheckOn.bin"); - RECORD_DELETE_ON_BUTTON->SetOnClickListener(clickLister); - + RECORD_DELETE_ON_BUTTON->SetOnClickListener(clickListener); + RecordDeleteViewScrollView->Add(RECORD_DELETE_ON_BUTTON); return true; } UIScrollView *RecordDeleteView::RecordDeleteViewInit(void) { - if (!SetUpScrollView()) - { - return nullptr; - } - - if (!SetRecordDeleteViewLabel()) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteViewInit"); + if (!RecordDeleteScrollViewInit() || !RecordDeleteLabelViewInit() || !RecordDeleteButtonViewInit()) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteViewInit fail!!"); return nullptr; } - if (!SetUpButton()) - { - return nullptr; - } - /* ----------------------------------- Add ---------------------------------- */ - RecordDeleteViewScrollView->Add(TitleLabel); - RecordDeleteViewScrollView->Add(AttentionLabel[0]); - RecordDeleteViewScrollView->Add(AttentionLabel[1]); - RecordDeleteViewScrollView->Add(RECORD_DELETE_ON_BUTTON); - RecordDeleteViewScrollView->Add(RECORD_DELETE_OFF_BUTTON); - initViewStatus = true; return RecordDeleteViewScrollView; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp index 23de4b75c..739b81161 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp @@ -9,13 +9,13 @@ namespace OHOS RecordGoingView::RecordGoingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingView"); g_pRecordGoingView = this; } RecordGoingView::~RecordGoingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::~RecordGoingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::~RecordGoingView"); ClearAll(); g_pRecordGoingView = nullptr; } @@ -27,7 +27,7 @@ namespace OHOS void RecordGoingView::ClearAll() { - if (initViewStatus == true) + if (RecordGoingViewScrollView != nullptr) { RecordGoingViewScrollView->RemoveAll(); @@ -51,27 +51,39 @@ namespace OHOS } } - bool RecordGoingView::SetUpScrollView(void) + UILabel *RecordGoingView::GetRecordingDurationLabel(void) { - RecordGoingViewScrollView = new UIScrollView(); - if (RecordGoingViewScrollView == nullptr) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::GetRecordingDurationLabel"); + if (Timer == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingViewScrollView new fail!"); - return false; + return nullptr; } - UIView::OnDragListener *draglistener = static_cast(RecordingPresenter::GetInstance()); - if (draglistener == nullptr) + return Timer; + } + + void RecordGoingView::AddViewsToScrollView(UIScrollView *scrollView, UIView *views[], int numViews) + { + for (int i = 0; i < numViews; ++i) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::draglistener can not be nullptr!"); - return false; + scrollView->Add(views[i]); } - RecordGoingViewScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - RecordGoingViewScrollView->SetTouchable(true); - RecordGoingViewScrollView->SetDraggable(true); - return true; } - UILabel *RecordGoingView::SetUpLabel(LabelConfig &labelconfig) // 设置标签 + void RecordGoingView::AddViewsToRecordGoingViewScrollView() + { + UIView *viewsToAdd[] = { + TitleLabel, + RECORD_GOING_IMAGE, + RECORD_GOING_BUTTON, + Timer, + RecordGoingLabel, + }; + + int numViews = sizeof(viewsToAdd) / sizeof(viewsToAdd[0]); + AddViewsToScrollView(RecordGoingViewScrollView, viewsToAdd, numViews); + } + + UILabel *RecordGoingView::CreateRecordGoingLabel(LabelConfig &labelconfig) { UILabel *label = new UILabel(); if (label == nullptr) @@ -88,28 +100,78 @@ namespace OHOS return label; } - bool RecordGoingView::SetRecordGoingViewLabel(void) + UILabelExt *RecordGoingView::CreateRecordGoingLabelExt(LabelConfig &labelconfig) + { + UILabelExt *label = new UILabelExt(); + if (label == nullptr) + { + return nullptr; + } + label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小 + label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); // 字体大小 + label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 + label->SetTextId(labelconfig.textId); // 内容 + label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 + label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); + return label; + } + + bool RecordGoingView::RecordGoingScrollViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingScrollViewInit"); + RecordGoingViewScrollView = new UIScrollView(); + if (RecordGoingViewScrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingViewScrollView new fail!"); + return false; + } + UIView::OnDragListener *draglistener = static_cast(RecordingPresenter::GetInstance()); + if (draglistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::draglistener can not be nullptr!"); + return false; + } + RecordGoingViewScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + RecordGoingViewScrollView->SetTouchable(true); + RecordGoingViewScrollView->SetDraggable(true); + return true; + } + + bool RecordGoingView::RecordGoingLabelViewInit(void) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingLabelViewInit"); LabelConfig labelconfig = { - .left = 188, + .left = 83, .top = 52, - .width = 90, + .width = 300, .height = 35, .fontSize = 30, .lineHeigh = 35, - .text = "录音机", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + //.text = "录音机", + .textId = STR_RECORDER, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - TitleLabel = SetUpLabel(labelconfig); + TitleLabel = CreateRecordGoingLabelExt(labelconfig); if (nullptr == TitleLabel) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::TitleLabel is nullptr!"); return false; } - labelconfig.top = 370; - labelconfig.text = "录音中"; - RecordGoingLabel = SetUpLabel(labelconfig); + /* -------------------------------------------------------------------------- */ + labelconfig = { + .left = 83, + .top = 380, + .width = 300, + .height = 35, + .fontSize = 30, + .lineHeigh = 35, + //.text = "录音机", + .textId = STR_RECORDING, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + }; + RecordGoingLabel = CreateRecordGoingLabelExt(labelconfig); if (nullptr == RecordGoingLabel) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingLabel is nullptr!"); @@ -118,15 +180,15 @@ namespace OHOS labelconfig = { .left = 83, - .top = 290, + .top = 300, .width = 300, .height = 77, .fontSize = 65, .lineHeigh = 76, .text = "00:00:00", - .lineBreakMode = UILabel::LINE_BREAK_WRAP, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - Timer = SetUpLabel(labelconfig); + Timer = CreateRecordGoingLabel(labelconfig); if (nullptr == Timer) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::Timer is nullptr!"); @@ -136,11 +198,14 @@ namespace OHOS return true; } - bool RecordGoingView::SetUpImageView(void) + bool RecordGoingView::RecordGoingImageViewInit(void) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingImageViewInit"); RECORD_GOING_IMAGE = new UIImageView(); if (RECORD_GOING_IMAGE == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RECORD_GOING_IMAGE is nullptr!"); + return false; } RECORD_GOING_IMAGE->SetPosition(158, 129, 150, 150); RECORD_GOING_IMAGE->SetStyle(STYLE_BACKGROUND_OPA, 0xff); @@ -150,65 +215,44 @@ namespace OHOS return true; } - bool RecordGoingView::SetUpButton(void) + bool RecordGoingView::RecordGoingButtonViewInit(void) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RecordGoingButtonViewInit"); RECORD_GOING_BUTTON = new UIButton(); if (RECORD_GOING_BUTTON == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordGoingView::RECORD_GOING_BUTTON new fail!"); + return false; } RECORD_GOING_BUTTON->SetPosition(210, 180, 60, 60); RECORD_GOING_BUTTON->SetViewId(RECORD_GOING_BUTTON_VIEWID); RECORD_GOING_BUTTON->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); RECORD_GOING_BUTTON->SetStyle(STYLE_BORDER_RADIUS, 20); - RECORD_GOING_BUTTON->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); RECORD_GOING_BUTTON->SetStyleForState(STYLE_BORDER_RADIUS, 20, UIButton::PRESSED); - UIView::OnClickListener *clickListener = static_cast(RecordingPresenter::GetInstance()); RECORD_GOING_BUTTON->SetOnClickListener(clickListener); - return true; - } - UILabel *RecordGoingView::GetRecordingDurationLabel(void) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordGoingView::GetRecordingDurationLabel"); - if(Timer == nullptr) - { - return nullptr; - } - return Timer; + return true; } UIScrollView *RecordGoingView::RecordGoingViewInit() { - if (!SetUpScrollView()) - { - return nullptr; - } - - if (!SetRecordGoingViewLabel()) - { - return nullptr; - } - - if (!SetUpImageView()) - { - return nullptr; - } - - if (!SetUpButton()) + if (!RecordGoingScrollViewInit() || !RecordGoingLabelViewInit() || + !RecordGoingImageViewInit() || !RecordGoingButtonViewInit()) { return nullptr; } - /* ----------------------------------- Add ---------------------------------- */ +#if 1 + AddViewsToRecordGoingViewScrollView(); +#else RecordGoingViewScrollView->Add(TitleLabel); RecordGoingViewScrollView->Add(RECORD_GOING_IMAGE); RecordGoingViewScrollView->Add(RECORD_GOING_BUTTON); RecordGoingViewScrollView->Add(Timer); RecordGoingViewScrollView->Add(RecordGoingLabel); - initViewStatus = true; +#endif return RecordGoingViewScrollView; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp index e94cf3ec9..440e98a10 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-02-27 09:16:52 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-12 18:10:55 + * @LastEditTime: 2024-06-13 09:42:18 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp */ @@ -80,32 +80,72 @@ namespace OHOS } } - bool RecordListView::SetUpScrollView(void) + // 添加录音到list + void RecordListView::AddRecordingToList(const RecordingListItem &item) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::SetUpScrollView"); - RecordListScrollView = new UIScrollView(); - if (RecordListScrollView == nullptr) + p_RecordingListAdapter->AddListItem(item); + } + + // 把录音信息数据拿到存储到list中 + void RecordListView::InitRecordingInfo(void) + { + std::vector &item = RecordingModel::GetInstance()->GetRecordinglistItems(); + for (int i = 0; i < RecordingModel::GetInstance()->GetRecordingListNum(); i++) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListScrollView new fail!"); - return false; + AddRecordingToList(item[i]); } - RecordListScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - UIView::OnDragListener *draglistener = static_cast(new RecordListViewListener()); - if (draglistener == nullptr) + } + + // 每次录音完将数据刷新显示到list + void RecordListView::RefreshRecordingListData(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData"); + RecordingModel::GetInstance()->InitRecordingListItem(); + p_RecordingListAdapter->ClearData(); + InitRecordingInfo(); + recordList->RefreshList(); + if (RecordingModel::GetInstance()->GetRecordingListNum() == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "draglistener can not be nullptr!"); - return false; + IsVisibleLabel(true); } - RecordListScrollView->SetViewId(RECORDLISTSCROLLVIEW); - RecordListScrollView->SetOnDragListener(draglistener); - RecordListScrollView->SetTouchable(true); - RecordListScrollView->SetDraggable(true); + else + { + IsVisibleLabel(false); + } + return; + } - return true; + // 设置提醒标签是否可见 + void RecordListView::IsVisibleLabel(bool value) + { + if (value == true) + { + RecordListViewAttentionLabel->SetVisible(true); + recordList->SetVisible(false); // 列表设置不可见 + RecordListScrollView->SetVerticalScrollState(false); + } + else + { + RecordListViewAttentionLabel->SetVisible(false); + recordList->SetVisible(true); // 列表设置可见 + RecordListScrollView->SetVerticalScrollState(true); + } + } + + //根据录音列表中录音的数量来更新某个标签或视图的可见性。 + void RecordListView::UpdateVisibilityBasedOnRecordingList() + { + if (RecordingModel::GetInstance()->GetRecordingListNum() == 0) + { + IsVisibleLabel(true); + } + else + { + IsVisibleLabel(false); + } } - // 设置标签 - UILabelExt *RecordListView::SetUpLabel(LabelConfig &labelconfig) + UILabelExt *RecordListView::CreateRecordListLabel(LabelConfig &labelconfig) { UILabelExt *label = new UILabelExt(); if (label == nullptr) @@ -123,8 +163,31 @@ namespace OHOS return label; } - // 设置录音视图的标签 - bool RecordListView::SetUpRecordListViewLabel(void) + bool RecordListView::RecordListScrollViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RecordListScrollViewInit"); + RecordListScrollView = new UIScrollView(); + if (RecordListScrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListScrollView new fail!"); + return false; + } + RecordListScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + UIView::OnDragListener *draglistener = static_cast(new RecordListViewListener()); + if (draglistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "draglistener can not be nullptr!"); + return false; + } + RecordListScrollView->SetViewId(RECORDLISTSCROLLVIEW); + RecordListScrollView->SetOnDragListener(draglistener); + RecordListScrollView->SetTouchable(true); + RecordListScrollView->SetDraggable(true); + + return true; + } + + bool RecordListView::RecordListLabelViewInit(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::SetUpRecordListViewLabel"); LabelConfig labelconfig = { @@ -139,7 +202,7 @@ namespace OHOS .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - RecordListViewTitleLabel = SetUpLabel(labelconfig); + RecordListViewTitleLabel = CreateRecordListLabel(labelconfig); if (nullptr == RecordListViewTitleLabel) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewTitleLabel is nullptr!"); @@ -157,7 +220,7 @@ namespace OHOS .textId = STR_CRLEMPTY, .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - RecordListViewAttentionLabel = SetUpLabel(labelconfig); + RecordListViewAttentionLabel = CreateRecordListLabel(labelconfig); if (nullptr == RecordListViewAttentionLabel) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewAttentionLabel is nullptr!"); @@ -171,10 +234,9 @@ namespace OHOS return true; } - bool RecordListView::SetUpRecordingList(void) + bool RecordListView::RecordListListViewInit(void) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::SetUpRecordingList"); - // UIList 的适配器 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RecordListViewInit"); p_RecordingListAdapter = new RecordingListAdapter(); clickListener = static_cast(new RecordListViewListener()); p_RecordingListAdapter->SetItemClickListener(clickListener); @@ -200,77 +262,16 @@ namespace OHOS return true; } - /// @brief 添加录音到list - /// @param item - void RecordListView::AddRecordingToList(const RecordingListItem &item) - { - p_RecordingListAdapter->AddListItem(item); - } - - // 把录音信息数据拿到存储到list中 - void RecordListView::InitRecordingInfo(void) - { - std::vector &item = RecordingModel::GetInstance()->GetRecordinglistItems(); - for (int i = 0; i < RecordingModel::GetInstance()->GetRecordingListNum(); i++) - { - AddRecordingToList(item[i]); - } - } - - /* - * @brief 每次录音完将数据刷新显示到list - */ - void RecordListView::RefreshRecordingListData(void) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData"); - RecordingModel::GetInstance()->InitRecordingListItem(); - p_RecordingListAdapter->ClearData(); - InitRecordingInfo(); - recordList->RefreshList(); - if (RecordingModel::GetInstance()->GetRecordingListNum() == 0) - { - IsVisibleLabel(true); - } - else - { - IsVisibleLabel(false); - } - return; - } - - // 设置提醒标签是否可见 - void RecordListView::IsVisibleLabel(bool value) - { - if (value == true) - { - RecordListViewAttentionLabel->SetVisible(true); - recordList->SetVisible(false); // 列表设置不可见 - RecordListScrollView->SetVerticalScrollState(false); - } - else - { - RecordListViewAttentionLabel->SetVisible(false); - recordList->SetVisible(true); // 列表设置可见 - RecordListScrollView->SetVerticalScrollState(true); - } - } - UIScrollView *RecordListView::RecordListViewInit() { - if (!SetUpScrollView()) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordListViewInit"); + // 如果其中任何一个初始化函数返回 false(即初始化失败),则会打印错误日志并返回空指针。 + if (!RecordListScrollViewInit() || !RecordListLabelViewInit() || !RecordListListViewInit()) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewInit fail!!"); return nullptr; } - if (!SetUpRecordingList()) - { - return nullptr; - } - - if (!SetUpRecordListViewLabel()) - { - return nullptr; - } if (RecordingModel::GetInstance()->GetRecordingListNum() == 0) { IsVisibleLabel(true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp index 2f2888caf..bbe437339 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-02 20:10:18 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-13 11:41:18 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp + */ #include "record/include/RecordingListitemView.h" #include "wearable_log.h" @@ -43,7 +50,7 @@ namespace OHOS m_button.SetPosition(0, 0, 380, 100); m_button.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); - m_button.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff4FC34C, UIButton::PRESSED); + m_button.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff383838, UIButton::PRESSED); SetLabelStyle(m_recordId, 35, 33, 96, 35, textColor, 25); SetLabelStyle(m_recordTotalTime, 268, 19, 73, 35, textColor, 25); diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp index 06d87ff7d..964f1ee86 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp @@ -11,13 +11,13 @@ namespace OHOS RecordingPlayerView::RecordingPlayerView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerView::RecordingPlayerView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerView::RecordingPlayerView"); g_pRecordPlayView = this; } RecordingPlayerView::~RecordingPlayerView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerView::~RecordingPlayerView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerView::~RecordingPlayerView"); ClearAll(); g_pRecordPlayView = nullptr; } @@ -68,28 +68,6 @@ namespace OHOS } } - // 亮屏时长视图“scrollView”初始化 - bool RecordingPlayerView::SetUpScrollView(void) - { - RecordingPlayerViewScrollView = new UIScrollView(); - if (RecordingPlayerViewScrollView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::RecordingPlayerViewScrollView new fail!"); - return false; - } - RecordingPlayerViewScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - UIView::OnDragListener *draglistener = static_cast(RecordingPresenter::GetInstance()); - if (draglistener == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::draglistener can not be nullptr!"); - return false; - } - RecordingPlayerViewScrollView->SetOnDragListener(draglistener); - RecordingPlayerViewScrollView->SetTouchable(true); - RecordingPlayerViewScrollView->SetDraggable(true); - return true; - } - // 设置标签 UILabelExt *RecordingPlayerView::SetUpLabel(LabelConfig &labelconfig) { @@ -128,17 +106,39 @@ namespace OHOS return button; } + // 亮屏时长视图“scrollView”初始化 + bool RecordingPlayerView::SetUpScrollView(void) + { + RecordingPlayerViewScrollView = new UIScrollView(); + if (RecordingPlayerViewScrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::RecordingPlayerViewScrollView new fail!"); + return false; + } + RecordingPlayerViewScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + UIView::OnDragListener *draglistener = static_cast(RecordingPresenter::GetInstance()); + if (draglistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::draglistener can not be nullptr!"); + return false; + } + RecordingPlayerViewScrollView->SetOnDragListener(draglistener); + RecordingPlayerViewScrollView->SetTouchable(true); + RecordingPlayerViewScrollView->SetDraggable(true); + return true; + } + bool RecordingPlayerView::SetUpRecordingPlayerViewLabel(void) { LabelConfig labelconfig = { .left = 83, .top = 52, .width = 300, - .height = 40, + .height = 35, .fontSize = 30, .lineHeigh = 35, .text = "录音3", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; RecordingFileName = SetUpLabel(labelconfig); diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp index 5421f9c30..dc6954c02 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-12 19:03:16 + * @LastEditTime: 2024-06-13 11:46:34 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp */ @@ -18,6 +18,7 @@ #include "record/include/RecordingListitemView.h" #include #include +#include "record/include/RecordingModel.h" namespace OHOS { @@ -48,7 +49,7 @@ namespace OHOS p_RecordingModel->InitRecordingListItem(); p_RecordingModel->AudioInit(); Presenter::OnStart(); - ScreenAlwaysOnCtr(1); + //ScreenAlwaysOnCtr(1); } void RecordingPresenter::OnPause(void) @@ -66,59 +67,68 @@ namespace OHOS { Presenter::OnStop(); p_RecordingModel->ClearRecordingPlayer(); - ScreenAlwaysOnCtr(0); + //ScreenAlwaysOnCtr(0); } bool RecordingPresenter::OnDrag(UIView &view, const DragEvent &event) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnDrag"); + UNUSED(view); + UNUSED(event); return true; } bool RecordingPresenter::OnDragEnd(UIView &view, const DragEvent &event) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnDragEnd"); + RecordingView *p_RecordingView = RecordingView::GetInstance(); if (p_RecordingView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView GetInstance fail"); return false; } - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + + UIScrollView *scrollView = static_cast(&view); + if (scrollView == nullptr) { - for (int i = 0; i < MAX_RECORDINGVIEWID; i++) - { - if (p_RecordingView->GetRecordingViewScrollView(i) != nullptr && - p_RecordingView->GetRecordingViewScrollView(i)->IsVisible() == true) - { - if (i == RECORDINGVIEW) - { - //NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); - return true; - } - else if (i == RECORDINGPLAYERVIEW) - { - p_RecordingView->ChangeView(i, RECORDINGLISTVIEW); - return true; - } - else - { - p_RecordingView->ChangeView(i, RECORDINGVIEW); - return true; - } - break; - } - } - return true; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "scrollView is nullptr"); + return false; } - else if (event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP) + + auto currentView = p_RecordingView->GetCurrentViewType(scrollView); + + switch (event.GetDragDirection()) { - if (p_RecordingView->GetRecordingViewScrollView(RECORDINGVIEW) != nullptr && - p_RecordingView->GetRecordingViewScrollView(RECORDINGVIEW)->IsVisible() == true) + case DragEvent::DIRECTION_LEFT_TO_RIGHT: + switch (currentView) + { + case RECORDINGVIEW: + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + break; + case RECORDINGPLAYERVIEW: + p_RecordingView->ChangeView(RECORDINGPLAYERVIEW, RECORDINGLISTVIEW); + break; + case RECORDINGDELETEVIEW: + p_RecordingView->ChangeView(RECORDINGDELETEVIEW, RECORDINGPLAYERVIEW); + break; + case RECORDINGVOLUMESETTINGVIEW: + p_RecordingView->ChangeView(RECORDINGVOLUMESETTINGVIEW, RECORDINGPLAYERVIEW); + break; + default: + break; + } + break; + case DragEvent::DIRECTION_BOTTOM_TO_TOP: + if (currentView == RECORDINGVIEW) { p_RecordingView->ChangeView(RECORDINGVIEW, RECORDINGLISTVIEW); } - return true; + break; + default: + break; } + return true; } @@ -255,8 +265,7 @@ namespace OHOS // 如果是power键就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; } @@ -328,27 +337,6 @@ namespace OHOS return true; } - bool RecordingVolumeSettingViewDragLister::OnDrag(UIView &view, const DragEvent &event) - { - return true; - } - - bool RecordingVolumeSettingViewDragLister::OnDragEnd(UIView &view, const DragEvent &event) - { - UNUSED(view); - RecordingView *p_RecordingView = RecordingView::GetInstance(); - if (p_RecordingView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView GetInstance fail"); - return false; - } - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) - { - p_RecordingView->ChangeView(RECORDINGVOLUMESETTINGVIEW, RECORDINGPLAYERVIEW); - } - return true; - } - /* * @brief 播放按钮被点击 */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp index 457a9922b..6781eefce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp @@ -29,197 +29,24 @@ namespace OHOS return g_pRecordView; } - void RecordingView::ClearAll(void) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::~RecordingView"); - if (container_ != nullptr) - { - container_->RemoveAll(); - delete container_; - container_ = nullptr; - } - - if (RecordingViewScrollView[RECORDINGVIEW] != nullptr) - { - RecordingViewScrollView[RECORDINGVIEW]->RemoveAll(); - delete RecordingViewScrollView[RECORDINGVIEW]; - RecordingViewScrollView[RECORDINGVIEW] = nullptr; - } - - RecordingViewImageAnimator->Stop(); - delete RecordingViewImageAnimator; - RecordingViewImageAnimator = nullptr; - - delete RecordingViewTitleLabel; - RecordingViewTitleLabel = nullptr; - - delete RecordingViewButton; - RecordingViewButton = nullptr; - - delete AttentionLabel; - AttentionLabel = nullptr; - - delete RECORD1_Image; - RECORD1_Image = nullptr; - - if (p_RecordListView != nullptr) - { - delete p_RecordListView; - p_RecordListView = nullptr; - } - if (p_RecordGoingView != nullptr) - { - delete p_RecordGoingView; - p_RecordGoingView = nullptr; - } - if (p_RecordingPlayerView != nullptr) - { - delete p_RecordingPlayerView; - p_RecordingPlayerView = nullptr; - } - - if (p_RecordDeleteView != nullptr) - { - delete p_RecordDeleteView; - p_RecordDeleteView = nullptr; - } - - if (p_RecordingVolumeSettingView != nullptr) - { - delete p_RecordingVolumeSettingView; - p_RecordingVolumeSettingView = nullptr; - } - } - - // 录音视图scrollView初始化 - bool RecordingView::SetUpScrollView(void) - { - RecordingViewScrollView[RECORDINGVIEW] = new UIScrollView(); - if (RecordingViewScrollView[RECORDINGVIEW] == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingViewScrollView[RECORDINGVIEW] new fail!"); - return false; - } - RecordingViewScrollView[RECORDINGVIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - RecordingViewScrollView[RECORDINGVIEW]->SetScrollBlankSize(35); - RecordingViewScrollView[RECORDINGVIEW]->SetReboundSize(50); - RecordingViewScrollView[RECORDINGVIEW]->SetDirection(1); - UIView::OnDragListener *draglistener = static_cast(RecordingPresenter::GetInstance()); - if (draglistener == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::draglistener can not be nullptr!"); - return false; - } - RecordingViewScrollView[RECORDINGVIEW]->SetOnDragListener(draglistener); - RecordingViewScrollView[RECORDINGVIEW]->SetTouchable(true); - RecordingViewScrollView[RECORDINGVIEW]->SetDraggable(true); - return true; - } - - bool RecordingView::SetTheTitle(void) + int RecordingView::GetCurrentViewType(UIScrollView *view) { - RecordingViewTitleLabel = new UILabelExt(); - if (RecordingViewTitleLabel == nullptr) + for (int i = 0; i < MAX_RECORDINGVIEWID; ++i) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingViewTitleLabel new fail!"); - return false; - } - RecordingViewTitleLabel->SetPosition(83, 52,300,35); - RecordingViewTitleLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff); - RecordingViewTitleLabel->SetStyle(STYLE_TEXT_FONT, 30); - RecordingViewTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - //RecordingViewTitleLabel->SetText("录音机"); - RecordingViewTitleLabel->SetTextId(STR_RECORDER); - RecordingViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - RecordingViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - RecordingViewTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - return true; - } - - UIButton *RecordingView::SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener) - { - UIButton *button = new UIButton(); - if (button == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " RecordingView::SetTheButton: button new fail!"); - return nullptr; - } - button->SetPosition(buttonconfig.x, buttonconfig.y, buttonconfig.w, buttonconfig.h); - button->SetViewId(buttonconfig.ViewId); - button->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); - button->SetStyle(STYLE_BORDER_RADIUS, 100); - button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffff5a36, UIButton::PRESSED); - button->SetOnClickListener(clickListener); - return button; - } - - //录音视图初始化 - void RecordingView::RecordingViewInit(void) - { - if (!SetUpScrollView() || !SetTheTitle()) - { - return; - } - - UIView::OnClickListener *buttonClick = static_cast(RecordingPresenter::GetInstance()); - ButtonConfig buttonconfig; - buttonconfig.x = 178; - buttonconfig.y = 150; - buttonconfig.w = 120; - buttonconfig.h = 120; - buttonconfig.ViewId = RECORD_BUTTON; - RecordingViewButton = SetTheButton(buttonconfig, buttonClick); - - AttentionLabel = new UILabelExt(); - if (AttentionLabel == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::AttentionLabel new fail!"); - return; - } - AttentionLabel->SetPosition(53, 330,360,35); - AttentionLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff); - AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30); - AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - //AttentionLabel->SetText("点击开始录音"); - AttentionLabel->SetTextId(STR_CLICK_TO_RECORD); - AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (RECORD1_Image == nullptr) - { - RECORD1_Image = new UIImageView(); - } - RECORD1_Image->SetPosition(158, 129, 150, 150); - RECORD1_Image->SetStyle(STYLE_BORDER_RADIUS, 10); - RECORD1_Image->SetSrc(PNG_RECORD1_IMAGE); - - RecordingViewImageAnimator = new UIImageAnimatorView(); - if (RecordingViewImageAnimator == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingViewImageAnimator new fail!"); - return; + if (view == RecordingViewScrollView[i]) + { + return i; + } } - RecordingViewImageAnimator->SetPosition(213, 400, 40, 40); - RecordingViewImageAnimator->SetStyle(STYLE_BACKGROUND_OPA, 0xff); - - RecordingViewImageAnimator->SetImageAnimatorSrc(RecordingViewImageAnimatorInfo, 2, 200); - RecordingViewImageAnimator->SetTimeOfPause(200); - RecordingViewImageAnimator->SetRepeatTimes(1); - RecordingViewImageAnimator->SetReverse(true); - RecordingViewImageAnimator->Start(); - - RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewTitleLabel); - RecordingViewScrollView[RECORDINGVIEW]->Add(RECORD1_Image); - RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewButton); - RecordingViewScrollView[RECORDINGVIEW]->Add(AttentionLabel); - RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewImageAnimator); - container_->Add(RecordingViewScrollView[RECORDINGVIEW]); + return MAX_RECORDINGVIEWID; } - UIScrollView *RecordingView::GetRecordingViewScrollView(int i) + // 设置按键监听 + static void SetKeyActListener() { - return RecordingViewScrollView[i]; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener"); + RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::RecordingPresenter::GetInstance(); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); } /* @@ -340,6 +167,7 @@ namespace OHOS } return true; } + // 1.RecordingViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。 struct RecordingViewMapper { @@ -389,38 +217,250 @@ namespace OHOS RecordingViewScrollView[showView]->SetVisible(true); Draw(); } - /* -------------------------------------------------------------------------- */ + + void RecordingView::ClearAll(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::~RecordingView"); + if (container_ != nullptr) + { + container_->RemoveAll(); + delete container_; + container_ = nullptr; + } + + if (RecordingViewScrollView[RECORDINGVIEW] != nullptr) + { + RecordingViewScrollView[RECORDINGVIEW]->RemoveAll(); + delete RecordingViewScrollView[RECORDINGVIEW]; + RecordingViewScrollView[RECORDINGVIEW] = nullptr; + } + + RecordingViewImageAnimator->Stop(); + delete RecordingViewImageAnimator; + RecordingViewImageAnimator = nullptr; + + delete RecordingViewTitleLabel; + RecordingViewTitleLabel = nullptr; + + delete RecordingViewButton; + RecordingViewButton = nullptr; + + delete AttentionLabel; + AttentionLabel = nullptr; + + delete RECORD1_Image; + RECORD1_Image = nullptr; + + if (p_RecordListView != nullptr) + { + delete p_RecordListView; + p_RecordListView = nullptr; + } + if (p_RecordGoingView != nullptr) + { + delete p_RecordGoingView; + p_RecordGoingView = nullptr; + } + if (p_RecordingPlayerView != nullptr) + { + delete p_RecordingPlayerView; + p_RecordingPlayerView = nullptr; + } + + if (p_RecordDeleteView != nullptr) + { + delete p_RecordDeleteView; + p_RecordDeleteView = nullptr; + } + + if (p_RecordingVolumeSettingView != nullptr) + { + delete p_RecordingVolumeSettingView; + p_RecordingVolumeSettingView = nullptr; + } + } + + UIButton *RecordingView::SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener) + { + UIButton *button = new UIButton(); + if (button == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " SetTheButton: button new fail!"); + return nullptr; + } + button->SetPosition(buttonconfig.x, buttonconfig.y, buttonconfig.w, buttonconfig.h); + button->SetViewId(buttonconfig.ViewId); + button->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); + button->SetStyle(STYLE_BORDER_RADIUS, 100); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffff5a36, UIButton::PRESSED); + button->SetOnClickListener(clickListener); + return button; + } + + bool RecordingView::RecordingScrollViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingScrollViewInit"); + RecordingViewScrollView[RECORDINGVIEW] = new UIScrollView(); + if (RecordingViewScrollView[RECORDINGVIEW] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingViewScrollView[RECORDINGVIEW] new fail!"); + return false; + } + RecordingViewScrollView[RECORDINGVIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + RecordingViewScrollView[RECORDINGVIEW]->SetScrollBlankSize(35); + RecordingViewScrollView[RECORDINGVIEW]->SetReboundSize(50); + RecordingViewScrollView[RECORDINGVIEW]->SetDirection(1); + RecordingViewScrollView[RECORDINGVIEW]->SetOnDragListener(presenter_); + RecordingViewScrollView[RECORDINGVIEW]->SetTouchable(true); + RecordingViewScrollView[RECORDINGVIEW]->SetDraggable(true); + return true; + } + + bool RecordingView::RecordingLabelViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingLabelViewInit"); + RecordingViewTitleLabel = new UILabelExt(); + if (RecordingViewTitleLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingViewTitleLabel new fail!"); + return false; + } + RecordingViewTitleLabel->SetPosition(83, 52, 300, 35); + RecordingViewTitleLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + RecordingViewTitleLabel->SetStyle(STYLE_TEXT_FONT, 30); + RecordingViewTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + // RecordingViewTitleLabel->SetText("录音机"); + RecordingViewTitleLabel->SetTextId(STR_RECORDER); + RecordingViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + RecordingViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + RecordingViewTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------------------------------------------------------- */ + AttentionLabel = new UILabelExt(); + if (AttentionLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AttentionLabel new fail!"); + return false; + } + AttentionLabel->SetPosition(53, 330, 360, 35); + AttentionLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30); + AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + // AttentionLabel->SetText("点击开始录音"); + AttentionLabel->SetTextId(STR_CLICK_TO_RECORD); + AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + return true; + } + + bool RecordingView::RecordingButtonViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingButtonViewInit"); + ButtonConfig buttonconfig; + buttonconfig.x = 178; + buttonconfig.y = 150; + buttonconfig.w = 120; + buttonconfig.h = 120; + buttonconfig.ViewId = RECORD_BUTTON; + RecordingViewButton = SetTheButton(buttonconfig, presenter_); + if (RecordingViewButton == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingViewButton new fail!"); + return false; + } + + return true; + } + + bool RecordingView::RecordingImageViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingImageViewInit"); + RECORD1_Image = new UIImageView(); + if (RECORD1_Image == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RECORD1_Image new fail!"); + return false; + } + RECORD1_Image->SetPosition(158, 129, 150, 150); + RECORD1_Image->SetStyle(STYLE_BORDER_RADIUS, 10); + RECORD1_Image->SetSrc(PNG_RECORD1_IMAGE); + + return true; + } + + bool RecordingView::RecordingImageAnimatorViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingImageAnimatorViewInit"); + RecordingViewImageAnimator = new UIImageAnimatorView(); + if (RecordingViewImageAnimator == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingViewImageAnimator new fail!"); + return false; + } + RecordingViewImageAnimator->SetPosition(213, 400, 40, 40); + RecordingViewImageAnimator->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + RecordingViewImageAnimator->SetImageAnimatorSrc(RecordingViewImageAnimatorInfo, 2, 200); + RecordingViewImageAnimator->SetTimeOfPause(200); + RecordingViewImageAnimator->SetRepeatTimes(1); + RecordingViewImageAnimator->SetReverse(true); + RecordingViewImageAnimator->Start(); + + return true; + } + + // 录音视图初始化 + void RecordingView::RecordingViewInit(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingViewInit"); + // 如果其中任何一个初始化函数返回 false(即初始化失败),则会打印错误日志并返回空指针。 + if (!RecordingScrollViewInit() || !RecordingLabelViewInit() || + !RecordingButtonViewInit() || !RecordingImageViewInit() || !RecordingImageAnimatorViewInit()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingViewInit fail!!"); + return; + } + RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewTitleLabel); + RecordingViewScrollView[RECORDINGVIEW]->Add(RECORD1_Image); + RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewButton); + RecordingViewScrollView[RECORDINGVIEW]->Add(AttentionLabel); + RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewImageAnimator); + container_->Add(RecordingViewScrollView[RECORDINGVIEW]); + } void RecordingView::OnStart() { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::OnStart"); View::OnStart(); SetContainerView(new UIViewGroup()); container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - container_->SetOnDragListener(presenter_); + // container_->SetOnDragListener(presenter_); container_->SetTouchable(true); container_->SetDraggable(true); RecordingViewInit(); - - // 增加按键监听 - RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::RecordingPresenter::GetInstance(); - RootView::GetInstance()->SetOnKeyActListener(keyactListener); + SetKeyActListener(); + return; } void RecordingView::OnSetUpView() { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::OnSetUpView"); View::OnSetUpView(); Draw(); + return; } void RecordingView::OnTearDownView() { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::OnTearDownView"); View::OnTearDownView(); return; } void RecordingView::OnStop() { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::OnStop"); View::OnStop(); RootView::GetInstance()->ClearOnKeyActListener(); ClearAll(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingVolumeSettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingVolumeSettingView.cpp index 83c9b4bf2..28c8f5448 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingVolumeSettingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingVolumeSettingView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-13 17:38:18 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-19 15:02:48 + * @LastEditTime: 2024-06-13 11:21:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingVolumeSettingView.cpp */ #include "record/include/RecordingVolumeSettingView.h" @@ -14,14 +14,14 @@ namespace OHOS static RecordingVolumeSettingView *g_pRecordingVolumeSettingView{nullptr}; RecordingVolumeSettingView::RecordingVolumeSettingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingVolumeSettingView::RecordingVolumeSettingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingVolumeSettingView::RecordingVolumeSettingView"); g_pRecordingVolumeSettingView = this; } RecordingVolumeSettingView::~RecordingVolumeSettingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingVolumeSettingView::~RecordingVolumeSettingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingVolumeSettingView::~RecordingVolumeSettingView"); ClearAll(); g_pRecordingVolumeSettingView = nullptr; } @@ -35,9 +35,6 @@ namespace OHOS { if (initViewStatus == true) { - delete volumeDragListener; - volumeDragListener = nullptr; - delete p_SoundAndVibrationVolumeSettingView; p_SoundAndVibrationVolumeSettingView = nullptr; } @@ -45,7 +42,7 @@ namespace OHOS UIScrollView *RecordingVolumeSettingView::RecordingVolumeSettingViewInit(void) { - + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingVolumeSettingView::RecordingVolumeSettingViewInit"); p_SoundAndVibrationVolumeSettingView = new SoundAndVibrationVolumeSettingView(SYSTEM_VOLUME); if (p_SoundAndVibrationVolumeSettingView == nullptr) { @@ -53,7 +50,7 @@ namespace OHOS return nullptr; } RecordingVolumeSettingViewScrollView = p_SoundAndVibrationVolumeSettingView->SetUpVolumeProcess(); - volumeDragListener = static_cast(new RecordingVolumeSettingViewDragLister()); + UIView::OnDragListener * volumeDragListener = static_cast(RecordingPresenter::GetInstance()); if (volumeDragListener == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPresenter GetInstance fail");