From: luozheng <1732036298@qq.com> Date: Thu, 29 Feb 2024 11:32:09 +0000 (+0800) Subject: 录音界面实现录音和停止录音功能，添加录音图片 X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~46^2 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=d6450d7d3633dfda1d39b1e9abbcf13d4b1b1d6d;p=mirrors%2FFD230.git 录音界面实现录音和停止录音功能，添加录音图片 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordView.h index 91a26b00d..08cb90be9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordView.h @@ -34,7 +34,6 @@ namespace OHOS void InitView(void); void DeInitView(void); - UIViewGroup *container_ = nullptr; UIScrollView *scrollView = nullptr; UILabel *label1 = nullptr; UIImageView *RECORD1_Image = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp index b92f769fd..3620773b9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp @@ -57,12 +57,26 @@ namespace OHOS UNUSED(event); } +#ifdef __cplusplus + extern "C" + { +#endif + int32_t AudioCaptureSample(int32_t argc, const char *argv[]); + +#ifdef __cplusplus + }; +#endif + bool RecordGoingPresenter::OnClick(UIView &view, const ClickEvent &event) { // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), RECORD_GOING_BUTTON_VIEWID) == 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "End of recording...."); + int32_t argc = 1; + uint8_t *argv = (uint8_t *)"stop"; + AudioCaptureSample(argc, (const char **)&argv); NativeAbility::GetInstance().ChangeSlice(VIEW_RECORD); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordPresenter.cpp index 5fbe79221..f84710183 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordPresenter.cpp @@ -82,16 +82,15 @@ namespace OHOS { // 将参数保存到数组中 - const char *args[] = {"01", "mp3", "16000", "1", "16", "/user/test/2024_2_27_record_test.mp3"}; + const char *args[] = {"01", "mp3", "16000", "1", "16", "/user/res/record/recording/record_test.mp3"}; int argc = sizeof(args) / sizeof(args[0]); // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), RECORD_BUTTON) == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_RECORD_GOING); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Recording...."); - // 调用AudioCaptureSample函数 AudioCaptureSample(argc, args); + NativeAbility::GetInstance().ChangeSlice(VIEW_RECORD_GOING); return true; } return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordView.cpp index 01c2b9c43..1835459aa 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordView.cpp @@ -29,20 +29,6 @@ namespace OHOS } void RecordView::InitView(void) { - if (container_ == nullptr) - { - container_ = new UIViewGroup(); - container_->SetPosition(0, 0, 466, 466); - container_->SetStyle(STYLE_BACKGROUND_OPA, 0); - draglistener = static_cast(RecordPresenter::GetInstance()); - if (draglistener == nullptr) - { - return; - } - container_->SetOnDragListener(draglistener); - container_->SetTouchable(true); - container_->SetDraggable(true); - } // Add ScrollView to App if (scrollView == nullptr) { @@ -53,7 +39,6 @@ namespace OHOS scrollView->SetViewId("ScrollView"); scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); // Add to rootView - container_->Add(scrollView); scrollView->SetVisible(true); // Add Label to App @@ -159,14 +144,9 @@ namespace OHOS } void RecordView::DeInitView(void) { - if (container_ != nullptr) - { - container_->RemoveAll(); - } if (scrollView != nullptr) { - delete scrollView; - scrollView = nullptr; + scrollView->RemoveAll(); } if (label1 != nullptr) { @@ -193,20 +173,20 @@ namespace OHOS delete imageAnimator1_; imageAnimator1_ = nullptr; } - delete container_; - container_ = nullptr; + + delete scrollView; + scrollView = nullptr; } void RecordView::OnStart() { View::OnStart(); InitView(); - RootView::GetInstance()->Add(container_); } void RecordView::OnSetUpView() { - View::OnSetUpView(); + RootView::GetInstance()->Add(scrollView); Draw(); } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD1.bin new file mode 100644 index 000000000..d1322a55e Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD1.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD2.bin new file mode 100644 index 000000000..387fa4073 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD2.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD3.bin new file mode 100644 index 000000000..f1c2f15d6 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD3.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_DELETE_BACKGROUND.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_DELETE_BACKGROUND.bin new file mode 100644 index 000000000..694867488 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_DELETE_BACKGROUND.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_BACKGROUND.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_BACKGROUND.bin new file mode 100644 index 000000000..57a72780b Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_BACKGROUND.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_DELETE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_DELETE.bin new file mode 100644 index 000000000..3734ac8ef Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_DELETE.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_NEXT.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_NEXT.bin new file mode 100644 index 000000000..72567d16e Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_NEXT.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_PROVE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_PROVE.bin new file mode 100644 index 000000000..893d42d9a Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_PROVE.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_VOLUME.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_VOLUME.bin new file mode 100644 index 000000000..7af937be9 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/RECORD_PLAY_VOLUME.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/UNIVERSAL_PAUSE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/UNIVERSAL_PAUSE.bin new file mode 100644 index 000000000..93008102a Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/UNIVERSAL_PAUSE.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/UNIVERSAL_PLAY.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/UNIVERSAL_PLAY.bin new file mode 100644 index 000000000..65be736c3 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/UNIVERSAL_PLAY.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/animator1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/animator1.bin new file mode 100644 index 000000000..96f896968 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/animator1.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/animator2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/animator2.bin new file mode 100644 index 000000000..aa9e47652 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/animator2.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/recording/animator1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/recording/animator1.bin new file mode 100644 index 000000000..96f896968 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/record/recording/animator1.bin differ