From: luozheng <1732036298@qq.com>
Date: Wed, 12 Jun 2024 11:11:58 +0000 (+0800)
Subject: 录音视图修改
X-Git-Tag: release_V1.2.70_20241020_135402~1011
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=bf199a3a346723e0637a23bf05f224b8e22364d6;p=mirrors%2FFD230.git
录音视图修改
---
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
index 01932187c..4a4619843 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
@@ -456,4 +456,6 @@ STR_SYSTEM_UPGRADING$ç³»ç»å级ä¸
STR_NEWDEVICE_BIND_REMIND_NOTE$å½å设å¤å·²ç»ä¸ XX ç»å®ç»§ç»è¿æ¥æä½ä¼è§£é¤ä¸ XX çç»å®å¹¶å°æè¡¨æ¢å¤åºå设置ï¼ä¼æ¸
空æè¡¨æ°æ®ï¼æ¯å¦ç»§ç»æ¤æä½
STR_TABULAR_DISPLAY$å表æ¾ç¤º
STR_GRID_DISPLAY$ç½æ ¼æ¾ç¤º
-STR_CELLULAR_DISPLAY$èçªæ¾ç¤º
\ No newline at end of file
+STR_CELLULAR_DISPLAY$èçªæ¾ç¤º
+STR_RECORDING_LIST$å½é³å表
+STR_CRLEMPTY$å½åå½é³å表为空
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
index 8d461f294..d30f5155d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
@@ -458,4 +458,6 @@
+
+
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index b93a9ce1f..7dc97fa77 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
index 436b3d501..29e8216b3 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index 28707bb44..0769074ff 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@ -480,7 +480,9 @@ enum UIResourceTextId : uint16_t {
STR_FRI = 467,
STR_SATUR = 468,
STR_SUN = 469,
- STR_MAX_ID = 470,
+ STR_RECORDING_LIST = 470,
+ STR_CRLEMPTY = 471,
+ STR_MAX_ID = 472,
}; // UIResourceTextId
enum FontLanguageId : uint8_t {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 81c0ab917..22553ae6f 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ
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 38576f1c9..2e5e856e2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.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-12 17:54:46
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordListView.h
+ */
#ifndef RECORD_LIST_VIEW_H
#define RECORD_LIST_VIEW_H
@@ -14,7 +21,7 @@
#include "record/include/RecordingListAdapter.h"
namespace OHOS
{
-
+ static constexpr char *RECORDLISTSCROLLVIEW = "RecordListScrollView";
class RecordListView
{
@@ -28,6 +35,7 @@ namespace OHOS
int16_t fontSize; // åä½å¤§å°
int16_t lineHeigh; // è¡é«
const char *text; // ææ¬
+ int16_t textId; // ææ¬id
uint8_t lineBreakMode; // æè¡æ¨¡å¼ã
};
RecordListView();
@@ -37,19 +45,20 @@ namespace OHOS
void ClearAll(void);
void IsVisibleLabel(bool value);
void RefreshRecordingListData(void);
+
private:
bool SetUpScrollView(void);
- UILabel *SetUpLabel(LabelConfig &labelconfig); // 设置æ ç¾
+ UILabelExt *SetUpLabel(LabelConfig &labelconfig); // 设置æ ç¾
bool SetUpRecordListViewLabel(void);
bool SetUpRecordingList(void);
void AddRecordingToList(const RecordingListItem &item);
void InitRecordingInfo(void);
UIScrollView *RecordListScrollView{nullptr};
- UILabel *RecordListViewTitleLabel{nullptr}; // "å½é³å表"
- UILabel *RecordListViewAttentionLabel{nullptr}; //"å½åå½é³å表为空"
+ UILabelExt *RecordListViewTitleLabel{nullptr}; // "å½é³å表"
+ UILabelExt *RecordListViewAttentionLabel{nullptr}; //"å½åå½é³å表为空"
UIList *recordList{nullptr}; // å½é³å表
RecordingListAdapter *p_RecordingListAdapter{nullptr}; // å½é³å表éé
å¨
- bool initViewStatus{false};
+ UIView::OnClickListener *clickListener{nullptr};
};
} // namespace OHOS
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 6b4a047a2..f934f4a4d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h
@@ -1,3 +1,11 @@
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-02-27 09:16:51
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-06-12 16:19:16
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h
+ */
+
#ifndef RECORD_PRESENTER_H
#define RECORD_PRESENTER_H
@@ -104,11 +112,12 @@ namespace OHOS
{
public:
RecordListViewListener() {}
-
~RecordListViewListener() {}
bool OnClick(UIView &view, const ClickEvent &event) override;
bool OnDrag(UIView &view, const DragEvent &event) override;
+ bool OnDragEnd(UIView &view, const DragEvent &event) override;
+ bool X_DRAG_FLAG{false};
};
class RecordingVolumeSettingViewDragLister : public UIView::OnDragListener
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 7592a6b09..bddefe952 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h
@@ -69,12 +69,11 @@ namespace OHOS
bool SetTheTitle(void);
UIButton *SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener);
UIScrollView *RecordingViewScrollView[NUM_MAX_RECORDINGVIEWSCROLLVIEW]{nullptr};
- UILabel *RecordingViewTitleLabel{nullptr};
+ UILabelExt *RecordingViewTitleLabel{nullptr};
UIButton *RecordingViewButton{nullptr};
- UILabel *AttentionLabel{nullptr};
+ UILabelExt *AttentionLabel{nullptr};
UIImageAnimatorView *RecordingViewImageAnimator{nullptr};
UIImageView *RECORD1_Image = nullptr;
- bool initViewStatus{false};
};
} // namespace OHOS
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 3fd5f308f..e94cf3ec9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp
@@ -1,3 +1,11 @@
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-02-27 09:16:52
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-06-12 18:10:55
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp
+ */
+
#include "record/include/RecordListView.h"
#include "record/include/RecordingPresenter.h"
#include "wearable_log.h"
@@ -9,29 +17,31 @@ namespace OHOS
RecordListView::RecordListView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::RecordListView");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RecordListView");
g_pRecordListView = this;
}
RecordListView::~RecordListView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::~RecordListView");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::~RecordListView");
ClearAll();
g_pRecordListView = nullptr;
}
RecordListView *RecordListView::GetInstance()
{
-
return g_pRecordListView;
}
void RecordListView::ClearAll()
{
- if (initViewStatus == true)
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClearAll");
+ if (RecordListScrollView != nullptr)
{
+ // é¦å
ç§»é¤ææåè§å¾
RecordListScrollView->RemoveAll();
+ // éæ¾åä¸ªèµæº
delete RecordListViewAttentionLabel;
RecordListViewAttentionLabel = nullptr;
@@ -41,20 +51,27 @@ namespace OHOS
delete p_RecordingListAdapter;
p_RecordingListAdapter = nullptr;
- UIView::OnClickListener *clicklister = recordList->GetOnClickListener();
- if (clicklister != nullptr)
+ // éæ¾ç¹å»çå¬å¨
+ if (UIView::OnClickListener *clicklister = recordList->GetOnClickListener())
{
delete clicklister;
clicklister = nullptr;
}
-
- UIView::OnDragListener *dragLister = RecordListScrollView->GetOnDragListener();
- if (dragLister != nullptr)
+
+ // éæ¾æå¨çå¬å¨
+ if (UIView::OnDragListener *dragLister = RecordListScrollView->GetOnDragListener())
{
delete dragLister;
dragLister = nullptr;
}
+ if (clickListener != nullptr)
+ {
+ delete clickListener;
+ clickListener = nullptr;
+ }
+
+ // æåéæ¾ RecordListScrollView åå
¶åè§å¾
delete recordList;
recordList = nullptr;
@@ -63,32 +80,34 @@ namespace OHOS
}
}
- // äº®å±æ¶é¿è§å¾âscrollViewâåå§å
bool RecordListView::SetUpScrollView(void)
{
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::SetUpScrollView");
RecordListScrollView = new UIScrollView();
if (RecordListScrollView == nullptr)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::RecordListScrollView new fail!");
+ 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, "ScreenDurationView::draglistener can not be 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;
}
// 设置æ ç¾
- UILabel *RecordListView::SetUpLabel(LabelConfig &labelconfig)
+ UILabelExt *RecordListView::SetUpLabel(LabelConfig &labelconfig)
{
- UILabel *label = new UILabel();
+ UILabelExt *label = new UILabelExt();
if (label == nullptr)
{
return nullptr;
@@ -96,31 +115,34 @@ 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 RecordListView::SetUpRecordListViewLabel(void)
{
- // å建ScreenDurationTitleLabel
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::SetUpRecordListViewLabel");
LabelConfig labelconfig = {
- .left = 173,
+ .left = 83,
.top = 52,
- .width = 120,
+ .width = 300,
.height = 35,
.fontSize = 30,
.lineHeigh = 35,
- .text = "å½é³å表",
- .lineBreakMode = UILabel::LINE_BREAK_ADAPT,
+ //.text = "å½é³å表",
+ .textId = STR_RECORDING_LIST,
+ .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,
};
RecordListViewTitleLabel = SetUpLabel(labelconfig);
if (nullptr == RecordListViewTitleLabel)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::RecordListViewTitleLabel is nullptr!");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewTitleLabel is nullptr!");
return false;
}
@@ -128,16 +150,17 @@ namespace OHOS
.left = 33,
.top = 273,
.width = 400,
- .height = 124,
+ .height = 30,
.fontSize = 26,
.lineHeigh = 30,
- .text = "å½åå½é³å表为空",
- .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,
+ //.text = "å½åå½é³å表为空",
+ .textId = STR_CRLEMPTY,
+ .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,
};
RecordListViewAttentionLabel = SetUpLabel(labelconfig);
if (nullptr == RecordListViewAttentionLabel)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::RecordListViewAttentionLabel is nullptr!");
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewAttentionLabel is nullptr!");
return false;
}
RecordListViewAttentionLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
@@ -150,9 +173,11 @@ namespace OHOS
bool RecordListView::SetUpRecordingList(void)
{
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::SetUpRecordingList");
// UIList çéé
å¨
p_RecordingListAdapter = new RecordingListAdapter();
- p_RecordingListAdapter->SetItemClickListener(new RecordListViewListener());
+ clickListener = static_cast(new RecordListViewListener());
+ p_RecordingListAdapter->SetItemClickListener(clickListener);
recordList = new UIList();
if (recordList == nullptr)
{
@@ -161,19 +186,13 @@ namespace OHOS
}
recordList->SetPosition(43, 120, 380, 300);
recordList->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);
- // recordList->SetScrollBlankSize(50); // è®¾ç½®æ¤æ»å¨è§å¾ç空ç½å¤§å°ã
- /**
- *è®¾ç½®å¨æ¤å表æ»å¨æ¶éæ©åè§å¾çä½ç½®,å½åè§å¾å¨æå®ä½ç½®è¢«é䏿¶ï¼åè°{@link ListScrollListener}å°è¢«è°ç¨ã*ä½ å¯ä»¥å¨åè°ä¸å®ç°æ¾å¤§ååè²ææã
- */
recordList->SetSelectPosition(233);
- // recordList->EnableAutoAlign(true); // 设置æ¤å表çèªå¨å¯¹é½ç¶æã彿»å¨åæ¢æ¶ï¼åè§å¾è¢«éä¸ï¼å
¶ä½ç½®èªå¨ä¸é¢è®¾ä½ç½®å¯¹é½
recordList->SetThrowDrag(true); // è®¾ç½®æææ¬èµ·å±å¹åæ¯å¦ç»§ç»æ»å¨ã
recordList->SetTouchable(true);
recordList->SetDraggable(true);
recordList->SetMaxScrollDistance(1000); // è®¾ç½®æææ¬èµ·å±å¹åçæå¤§æ»å¨è·ç¦»ã
recordList->SetReboundSize(50);
- //recordList->SetYScrollBarVisible(true); // 设置 Y è½´æ»å¨æ¡æ¯å¦å¯è§ã
- recordList->SetIntercept(true); // 设置æ¯å¦æ¦æªè¾å
¥äºä»¶ãå¦æè¢«æªè·ï¼è§å¾å¨æ¬å°å¤çåä¸ä¼å°è¾å
¥äºä»¶ä¼ éç»ç¶è§å¾ã
+ recordList->SetIntercept(true); // 设置æ¯å¦æ¦æªè¾å
¥äºä»¶ãå¦æè¢«æªè·ï¼è§å¾å¨æ¬å°å¤çåä¸ä¼å°è¾å
¥äºä»¶ä¼ éç»ç¶è§å¾ã
InitRecordingInfo();
recordList->SetAdapter(p_RecordingListAdapter);
recordList->RefreshList();
@@ -203,7 +222,7 @@ namespace OHOS
*/
void RecordListView::RefreshRecordingListData(void)
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData");
RecordingModel::GetInstance()->InitRecordingListItem();
p_RecordingListAdapter->ClearData();
InitRecordingInfo();
@@ -261,8 +280,6 @@ namespace OHOS
IsVisibleLabel(false);
}
- initViewStatus = true;
return RecordListScrollView;
}
-
}
\ No newline at end of file
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 a2fb28277..5421f9c30 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
@@ -1,6 +1,14 @@
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-03-30 09:14:38
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-06-12 19:03:16
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+ */
+
#include "AppViewIDs.h"
#include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
#include "NativeAbility.h"
#include "graphic_math.h"
#include "string.h"
@@ -83,7 +91,8 @@ namespace OHOS
{
if (i == RECORDINGVIEW)
{
- NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
+ //NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
+ NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
return true;
}
else if (i == RECORDINGPLAYERVIEW)
@@ -106,7 +115,7 @@ namespace OHOS
if (p_RecordingView->GetRecordingViewScrollView(RECORDINGVIEW) != nullptr &&
p_RecordingView->GetRecordingViewScrollView(RECORDINGVIEW)->IsVisible() == true)
{
- p_RecordingView->ChangeView(RECORDINGVIEW, RECORDINGLISTVIEW);
+ p_RecordingView->ChangeView(RECORDINGVIEW, RECORDINGLISTVIEW);
}
return true;
}
@@ -188,7 +197,7 @@ namespace OHOS
if (convertNumericDateTime(numericDateTime, formattedDateTime))
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Formatted DateTime: %s\n", formattedDateTime);
- sprintf(args[5], "%s%s.mp3", RecordingModel::GetInstance()->GetRecordDirectory(),formattedDateTime);
+ sprintf(args[5], "%s%s.mp3", RecordingModel::GetInstance()->GetRecordDirectory(), formattedDateTime);
}
else
{
@@ -252,8 +261,10 @@ namespace OHOS
return true;
}
+ // å½é³å表ç¹å»çå¬
bool RecordListViewListener::OnClick(UIView &view, const ClickEvent &event)
{
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListViewListener::OnClick");
UNUSED(event);
RecordingListitemView *p_RecordingListitemView = static_cast(&view);
int index = p_RecordingListitemView->GetRecordingListIndex();
@@ -289,18 +300,30 @@ namespace OHOS
return true;
}
+ // å½é³åè¡¨ææ½ä¸çå¬
bool RecordListViewListener::OnDrag(UIView &view, const DragEvent &event)
{
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListViewListener::OnDrag");
UNUSED(view);
- RecordingView *p_RecordingView = RecordingView::GetInstance();
- if (p_RecordingView == nullptr)
+ if ((event.GetDeltaY() > X_DRAG_OFFSET) && (event.GetDeltaY() > (DOUBLES * MATH_ABS(event.GetDeltaX())))) // 妿æ»å¨ç为ç´çº¿
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView GetInstance fail");
- return false;
+ RecordListViewListener::X_DRAG_FLAG = true;
}
- if (event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM)
+ return true;
+ }
+
+ // å½é³åè¡¨ææ½ç»æçå¬
+ bool RecordListViewListener::OnDragEnd(UIView &view, const DragEvent &event)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListViewListener::OnDragEnd");
+ std::string viewId = view.GetViewId();
+ if (event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM && RecordListViewListener::X_DRAG_FLAG)
{
- p_RecordingView->ChangeView(RECORDINGLISTVIEW, RECORDINGVIEW);
+ if (RecordingView::GetInstance() != nullptr && viewId == RECORDLISTSCROLLVIEW)
+ {
+ RecordingView::GetInstance()->ChangeView(RECORDINGLISTVIEW, RECORDINGVIEW);
+ RecordListViewListener::X_DRAG_FLAG = false;
+ }
}
return true;
}
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 7893cc7b5..457a9922b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp
@@ -14,14 +14,13 @@ namespace OHOS
RecordingView::RecordingView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingView");
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingView");
g_pRecordView = this;
}
RecordingView::~RecordingView()
{
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::~RecordingView");
- RecordingViewInit();
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::~RecordingView");
g_pRecordView = nullptr;
}
@@ -32,56 +31,63 @@ namespace OHOS
void RecordingView::ClearAll(void)
{
- if (initViewStatus == true)
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::~RecordingView");
+ if (container_ != nullptr)
{
- RecordingViewScrollView[RECORDINGVIEW]->RemoveAll();
+ container_->RemoveAll();
+ delete container_;
+ container_ = nullptr;
+ }
- RecordingViewImageAnimator->Stop();
- delete RecordingViewImageAnimator;
- RecordingViewImageAnimator = 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 RecordingViewTitleLabel;
+ RecordingViewTitleLabel = nullptr;
- delete RecordingViewButton;
- RecordingViewButton = nullptr;
+ delete RecordingViewButton;
+ RecordingViewButton = nullptr;
- delete AttentionLabel;
- AttentionLabel = nullptr;
+ delete AttentionLabel;
+ AttentionLabel = nullptr;
- delete RECORD1_Image;
- RECORD1_Image = 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_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_RecordingVolumeSettingView != nullptr)
- {
- delete p_RecordingVolumeSettingView;
- p_RecordingVolumeSettingView = nullptr;
- }
+ if (p_RecordDeleteView != nullptr)
+ {
+ delete p_RecordDeleteView;
+ p_RecordDeleteView = nullptr;
+ }
- delete RecordingViewScrollView[RECORDINGVIEW];
- RecordingViewScrollView[RECORDINGVIEW] = nullptr;
+ if (p_RecordingVolumeSettingView != nullptr)
+ {
+ delete p_RecordingVolumeSettingView;
+ p_RecordingVolumeSettingView = nullptr;
}
}
@@ -112,18 +118,19 @@ namespace OHOS
bool RecordingView::SetTheTitle(void)
{
- RecordingViewTitleLabel = new UILabel();
+ RecordingViewTitleLabel = new UILabelExt();
if (RecordingViewTitleLabel == nullptr)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::RecordingViewTitleLabel new fail!");
return false;
}
- RecordingViewTitleLabel->SetPosition(188, 52);
+ 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->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
+ //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;
@@ -146,14 +153,10 @@ namespace OHOS
return button;
}
+ //å½é³è§å¾åå§å
void RecordingView::RecordingViewInit(void)
{
- if (!SetUpScrollView())
- {
- return;
- }
-
- if (!SetTheTitle())
+ if (!SetUpScrollView() || !SetTheTitle())
{
return;
}
@@ -167,18 +170,19 @@ namespace OHOS
buttonconfig.ViewId = RECORD_BUTTON;
RecordingViewButton = SetTheButton(buttonconfig, buttonClick);
- AttentionLabel = new UILabel();
+ AttentionLabel = new UILabelExt();
if (AttentionLabel == nullptr)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::AttentionLabel new fail!");
return;
}
- AttentionLabel->SetPosition(143, 330);
+ 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->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
+ //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);
@@ -205,11 +209,12 @@ namespace OHOS
RecordingViewImageAnimator->SetReverse(true);
RecordingViewImageAnimator->Start();
- // å¢å æé®çå¬
- RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::RecordingPresenter::GetInstance();
- //(RootView::OnKeyActListener *)OHOS::RecordingPresenter::GetInstance();
- RootView::GetInstance()->SetOnKeyActListener(keyactListener);
- initViewStatus = true;
+ 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]);
}
UIScrollView *RecordingView::GetRecordingViewScrollView(int i)
@@ -225,7 +230,7 @@ namespace OHOS
if (RecordingViewScrollView[thisView] == nullptr)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordingView");
- RootView::GetInstance()->Add(RecordingViewScrollView[thisView]);
+ container_->Add(RecordingViewScrollView[thisView]);
}
return true;
}
@@ -245,7 +250,7 @@ namespace OHOS
return false;
}
RecordingViewScrollView[thisView] = p_RecordListView->RecordListViewInit();
- RootView::GetInstance()->Add(RecordingViewScrollView[thisView]);
+ container_->Add(RecordingViewScrollView[thisView]);
}
else
{
@@ -269,7 +274,7 @@ namespace OHOS
return false;
}
RecordingViewScrollView[thisView] = p_RecordGoingView->RecordGoingViewInit();
- RootView::GetInstance()->Add(RecordingViewScrollView[thisView]);
+ container_->Add(RecordingViewScrollView[thisView]);
}
return true;
}
@@ -289,7 +294,7 @@ namespace OHOS
return false;
}
RecordingViewScrollView[thisView] = p_RecordingPlayerView->RecordingPlayerViewInit();
- RootView::GetInstance()->Add(RecordingViewScrollView[thisView]);
+ container_->Add(RecordingViewScrollView[thisView]);
}
// 设置âå½é³ææ¾å¨âãå½é³æä»¶åæ ç¾ãç"ææ¬å
容"为被ç¹å»ç"å½é³"çå½é³å
p_RecordingPlayerView->ResetComponentStatus();
@@ -311,7 +316,7 @@ namespace OHOS
return false;
}
RecordingViewScrollView[thisView] = p_RecordDeleteView->RecordDeleteViewInit();
- RootView::GetInstance()->Add(RecordingViewScrollView[thisView]);
+ container_->Add(RecordingViewScrollView[thisView]);
}
return true;
}
@@ -331,11 +336,10 @@ namespace OHOS
return false;
}
RecordingViewScrollView[thisView] = p_RecordingVolumeSettingView->RecordingVolumeSettingViewInit();
- RootView::GetInstance()->Add(RecordingViewScrollView[thisView]);
+ container_->Add(RecordingViewScrollView[thisView]);
}
return true;
}
- /* -------------------------------------------------------------------------- */
// 1.RecordingViewMapper:ç»æä½å®ä¹äºä¸ä¸ªå°è§å¾IDæ å°å°ç¹å®æå彿°æéçæ å°è¡¨ã
struct RecordingViewMapper
{
@@ -390,18 +394,22 @@ namespace OHOS
void RecordingView::OnStart()
{
View::OnStart();
+ SetContainerView(new UIViewGroup());
+ container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
+ container_->SetOnDragListener(presenter_);
+ container_->SetTouchable(true);
+ container_->SetDraggable(true);
+
RecordingViewInit();
+
+ // å¢å æé®çå¬
+ RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::RecordingPresenter::GetInstance();
+ RootView::GetInstance()->SetOnKeyActListener(keyactListener);
}
void RecordingView::OnSetUpView()
{
View::OnSetUpView();
- RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewTitleLabel);
- RecordingViewScrollView[RECORDINGVIEW]->Add(RECORD1_Image);
- RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewButton);
- RecordingViewScrollView[RECORDINGVIEW]->Add(AttentionLabel);
- RecordingViewScrollView[RECORDINGVIEW]->Add(RecordingViewImageAnimator);
- RootView::GetInstance()->Add(RecordingViewScrollView[RECORDINGVIEW]);
Draw();
}
@@ -414,8 +422,8 @@ namespace OHOS
void RecordingView::OnStop()
{
View::OnStop();
- RootView::GetInstance()->RemoveAll();
RootView::GetInstance()->ClearOnKeyActListener();
+ ClearAll();
return;
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
index d0bd5b7b7..bc6f1e0a2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
@@ -2,8 +2,12 @@
#include "soundandvibration/include/SoundAndVibrationVolumeSettingPresenter.h"
#include "wearable_log.h"
#include "ConfigModel.h"
+#include "common/image_cache_manager.h"
+
namespace OHOS
{
+
+ static constexpr const char *VOLUMECONTROLVECTORIMAGEPATH = "/user/res/VolumeControlVector.bin";
static SoundAndVibrationVolumeSettingView *g_pSoundAndVibrationVolumeSettingView{nullptr};
SoundAndVibrationVolumeSettingView::SoundAndVibrationVolumeSettingView(uint8_t VolumeType)
@@ -31,19 +35,10 @@ namespace OHOS
{
ScrollView->RemoveAll();
- // int volume = VolumeProcess->GetValue();
- // if (m_VolumeType == SYSTEM_VOLUME)
- // {
- // ConfigModel::GetInstance()->SetSystemVolume(volume);
- // }
- // else if (m_VolumeType == CALL_VOLUME)
- // {
- // ConfigModel::GetInstance()->SetCallVolume(volume);
- // }
-
delete VolumeProcess;
VolumeProcess = nullptr;
+ ImageCacheManager::GetInstance().UnloadSingleRes(VOLUMECONTROLVECTORIMAGEPATH);
delete VolumeVetor;
VolumeVetor = nullptr;
@@ -110,8 +105,13 @@ namespace OHOS
return nullptr;
}
VolumeVetor->SetPosition(213, 213, 40, 40);
- const char *image = "/user/res/VolumeControlVector.bin";
- VolumeVetor->SetSrc(image);
+ ImageInfo *imgInfo = ImageCacheManager::GetInstance().LoadSingleRes(VOLUMECONTROLVECTORIMAGEPATH);
+ if (imgInfo == nullptr)
+ {
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Load image failed!");
+ return nullptr;
+ }
+ VolumeVetor->SetSrc(imgInfo);
if (listener == nullptr)
{
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index b93a9ce1f..7dc97fa77 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
index 436b3d501..29e8216b3 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 28707bb44..0769074ff 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -480,7 +480,9 @@ enum UIResourceTextId : uint16_t {
STR_FRI = 467,
STR_SATUR = 468,
STR_SUN = 469,
- STR_MAX_ID = 470,
+ STR_RECORDING_LIST = 470,
+ STR_CRLEMPTY = 471,
+ STR_MAX_ID = 472,
}; // UIResourceTextId
enum FontLanguageId : uint8_t {
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 81c0ab917..22553ae6f 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ