From: Caisking Date: Mon, 28 Apr 2025 10:01:42 +0000 (+0800) Subject: 部分配置修改 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~328 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1b30ed70e3f414003c1f1a2a65ec2bfc14eefea5;p=mirrors%2FFD230.git 部分配置修改 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp index 84f0d949b..c10398b62 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp @@ -12,8 +12,11 @@ #include "BluetoothModel.h" #include "PhoneService.h" #include "bts_le_gap.h" +#include "NativeRegisterManager.h" + namespace OHOS { + REGIST_SLICE(VIEW_BLUETOOTH_SERVICE_OPTIONS, BluetoothServiceOptionsView, BluetoothServiceOptionsPresenter); // 当前Presenter属性实例化的内存指针 static BluetoothServiceOptionsPresenter *g_pBluetoothServiceOptionsPresenter = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp index 38c639cec..6522078c6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp @@ -3,8 +3,9 @@ #include "ConfigModel.h" #include "UiConfig.h" #include "wearable_log.h" -#include "PhoneService.h" + #include "phoneservice/include/PhoneService.h" + #include "BluetoothModel.h" #include "ui_resource_string.h" #include "cmsis_os2.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp index 34c34de05..9e52ac710 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp @@ -103,7 +103,7 @@ namespace OHOS { AddViewToRootContainer(GetGoalPageView()); - // RootView::GetInstance()->Add(GetGoalPageView()); + // GetRootContainer()->Add(GetGoalPageView()); if (goalSwipeViewList != nullptr) { @@ -134,7 +134,7 @@ namespace OHOS /* --------------------------------- 添加按键监听 --------------------------------- */ // RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::MaingoalPresenter::GetInstance(); - // RootView::GetInstance()->SetOnKeyActListener(keyactListener); + //RootView::GetInstance()->SetOnKeyActListener(keyactListener); /* -------------------------------------------------------------------------- */ } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp index 0a59025ba..3dd0294cb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp @@ -171,6 +171,6 @@ namespace OHOS GetRootContainer()->SetDraggable(true); GetRootContainer()->SetTouchable(true); GetRootContainer()->SetOnDragListener(presenter_); - // GetRootContainer()->SetOnKeyActListener(presenter_); + //RootView::GetInstance()->SetOnKeyActListener(presenter_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp index a0a99d23c..37bfee7e5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp @@ -33,6 +33,8 @@ #include "vibrator_service.h" #include "custom_runtime.h" +#include "KeyInputListener.h" + namespace OHOS { static CheckInvalidView *g_pCheckInvalidView{nullptr}; @@ -221,7 +223,7 @@ namespace OHOS // 增加按键监听 RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::CheckInvalidPresenter::GetInstance(); - RootView::GetInstance()->SetOnKeyActListener(keyactListener); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp index b56dc73bf..94015313a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp @@ -294,7 +294,7 @@ void HeartChartView::Update_data_Chart(int serialIndex) { // heartchart->RefreshChart(); - RootView::GetInstance()->Invalidate(); + RootView::GetInstance()->Invalidate(); //更新为刚刚检测 SetLastHeart(); @@ -647,7 +647,7 @@ void HeartChartView::OnStart() { // 增加按键监听 RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::HeartChartPresenter::GetInstance(); - RootView::GetInstance()->SetOnKeyActListener(keyactListener); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); AddViewToRootContainer(scrollView); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp index 073da09d6..c6aa90ddd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp @@ -141,7 +141,7 @@ namespace OHOS GetRootContainer()->SetDraggable(true); GetRootContainer()->SetTouchable(true); GetRootContainer()->SetOnDragListener(presenter_); - // GetRootContainer()->SetOnKeyActListener(presenter_); + //RootView::GetInstance()->SetOnKeyActListener(presenter_); if (imageAnimator != nullptr) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp index c008893d5..0f8523811 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp @@ -197,7 +197,7 @@ namespace OHOS GetRootContainer()->SetDraggable(true); GetRootContainer()->SetTouchable(true); GetRootContainer()->SetOnDragListener(presenter_); - // GetRootContainer()->SetOnKeyActListener(presenter_); + //RootView::GetInstance()->SetOnKeyActListener(presenter_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp index 8501d8994..4da051936 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -49,27 +49,19 @@ namespace OHOS void LanguageSwitchPresenter::OnStart() { Presenter::OnStart(); - } - - void LanguageSwitchPresenter::OnResume(void) - { - Presenter::OnResume(); if (view_ == nullptr) { return; } - -#if 0 - for (uint8_t i = 0; i < MAX_LANGUAGE; i++) - { - view_->AddLanguageItemToList(languages[i]); - } -#else for (uint8_t i = 0; i < 2; i++) { view_->AddLanguageItemToList(languages[i]); } -#endif + } + + void LanguageSwitchPresenter::OnResume(void) + { + Presenter::OnResume(); } void LanguageSwitchPresenter::OnPause(void) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp index 7010058d3..90214050c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp @@ -193,7 +193,7 @@ namespace OHOS void LanguageSwitchView::show_hint_group(std::string code, bool data) { group->SetVisible(data); - RootView::GetInstance()->Invalidate(); + RootView::GetInstance()->Invalidate(); if (data) { hint_id_code = code; @@ -264,9 +264,9 @@ namespace OHOS button_cancel->SetImagePosition(15, 15); button_cancel->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED); button_cancel->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); -#ifdef FD230_650 + button_cancel->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE); -#endif + button_cancel->SetViewId("BUTTON_CHECK_NO"); group->Add(button_cancel); /* ------------------------ button_ensure ----------------------- */ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp index f5f408c24..9289ede00 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -34,7 +34,7 @@ #include "sleep/include/SleepCardView.h" #include "sleep/include/SleepModel.h" #include "MainModel.h" -// #include "../../../../../../../drivers/peripheral/utils/custom_runtime.h" +// #include "custom_runtime.h" // #include "rebootandshutdown/include/RebootAndShutdownModelC.h" #if USE_OFFLINE_DIAL diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp index d0e751ae9..c6c4099e5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp @@ -18,7 +18,9 @@ #include "custom_utils.h" #include "custom_runtime.h" #include "bluetooth/include/BluetoothModel.h" + #include "phoneservice/include/PhoneService.h" + #include "ConfigModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp index 7ca2d4c07..7981beb21 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp @@ -185,7 +185,7 @@ bool VolumeSliderEventListener::OnDrag(UIView& view, const DragEvent& event) volumeSettingView->SetVisible(false); NotificationManager::GetInstance()->SetVolumeScreenStatus(false); } - RootView::GetInstance()->Invalidate(); + RootView::GetInstance()->Invalidate(); } } return true; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h index 7f736a818..14178597c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h @@ -3,7 +3,11 @@ #define MESSAGE_MODEL_H -// #include "bletest.h" +#ifdef SUPPORT_BLE_SERVICE +#include +#include "bleService.h" +#include "bletest.h" +#endif #include "message/include/MessagePresenter.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowView.cpp index 49e8c5680..f103b59cb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowView.cpp @@ -276,7 +276,6 @@ namespace OHOS AddViewToRootContainer(scrollView_); - // scrollView_->SetOnKeyActListener(presenter_); } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp index d51a68010..cd6134a68 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp @@ -178,7 +178,7 @@ namespace OHOS } // 增加按键监听 - RootView::GetInstance()->SetOnKeyActListener(presenter_); + // GetRootContainer()->SetOnKeyActListener(presenter_); scrollView->Add(Title); scrollView->Add(MotionRecognitionImage); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp index a601ad317..476904188 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -231,7 +231,7 @@ namespace OHOS NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(MobileData_toggleButton); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(note); AddViewToRootContainer(NetworkAndCallScrollView[NETWORKANDCALLVIEW]); - RootView::GetInstance()->SetOnKeyActListener(presenter_); + //RootView::GetInstance()->SetOnKeyActListener(presenter_); } @@ -266,7 +266,7 @@ namespace OHOS if (NetworkAndCallScrollView[thisView] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NetworkAndCallView::ChangeNetworkAndCallView"); - RootView::GetInstance()->Add(NetworkAndCallScrollView[thisView]); + GetRootContainer()->Add(NetworkAndCallScrollView[thisView]); } return true; } @@ -284,7 +284,7 @@ namespace OHOS return false; } NetworkAndCallScrollView[thisView] = mobileDataOptionsView->MobileDataOptionsViewInit(); - RootView::GetInstance()->Add(NetworkAndCallScrollView[thisView]); + GetRootContainer()->Add(NetworkAndCallScrollView[thisView]); } return true; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp index 6bbfe2f54..14ace5594 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp @@ -524,7 +524,7 @@ void VoiceAssistance::CreateWordLabel(std::string Word, int isclearFlag) // 识 return; } MainVocassistView::GetInstance()->GetVocassist()->Invalidate(); - RootView::GetInstance()->Invalidate(); + RootView::GetInstance()->Invalidate(); return; } @@ -565,7 +565,7 @@ void VoiceAssistance::CloseVocassist() } // 刷新界面 MainVocassistView::GetInstance()->GetVocassist()->Invalidate(); - RootView::GetInstance()->Invalidate(); + RootView::GetInstance()->Invalidate(); } else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Somethings wrongs cause in CloseVocassist!!"); return; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp index daa5f680c..bc9ac10da 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp @@ -12,11 +12,9 @@ #include "vibrator_service.h" #include "NativeRegisterManager.h" - -namespace OHOS { - - REGIST_MENU_PRO(VIEW_SAVEELE, SaveEleView, SaveElePresenter, - PNG_APPLIST_SAVEELE_IMAGE_BIG, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, "省电模式", STR_POWER_SAVE_MODE); +namespace OHOS +{ + REGIST_SLICE(VIEW_SAVEELE, SaveEleView, SaveElePresenter); // 当前Presenter属性实例化的内存指针 static SaveElePresenter *g_pSaveElePresenter = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp index 01dd8b3cd..278895807 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp @@ -35,7 +35,7 @@ namespace OHOS void SetCardPresenter::OnStop(void) { - RootView::GetInstance()->ClearOnKeyActListener(); + } bool SetCardPresenter::OnClick(UIView &view, const ClickEvent &event) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp index 9a9ec2921..45421f72b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp @@ -37,7 +37,7 @@ namespace OHOS SetUpRollerView(); } - RootView::GetInstance()->SetOnKeyActListener(presenter_); + RootView::GetInstance()->SetOnKeyActListener(presenter_); } void SetDialView::SetUpCoverflowView(void) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp index dd1492e04..b91c737d1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp @@ -106,7 +106,7 @@ namespace OHOS GetRootContainer()->SetTouchable(true); GetRootContainer()->SetDraggable(true); AddViewToRootContainer(GetSleepControlPageView()); - // RootView::GetInstance()->Add(GetSleepControlPageView()); + // GetRootContainer()->Add(GetSleepControlPageView()); if (SleepSwipeViewList == nullptr) { @@ -132,7 +132,7 @@ namespace OHOS return; } - RootView::GetInstance()->SetOnKeyActListener(keyactListener); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp index 26d714de6..fd53606e2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp @@ -41,7 +41,7 @@ namespace OHOS AddViewToRootContainer(ScrollView_); - RootView::GetInstance()->SetOnKeyActListener(presenter_); + RootView::GetInstance()->SetOnKeyActListener(presenter_); } diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp index fed442ced..19129a3ea 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp @@ -43,6 +43,7 @@ namespace OHOS { void SettingItemView::SetItemInfo(const SettingItem itemInfo) { sItemInfo = itemInfo; + WEARABLE_LOGE("SettingItemView::SetItemInfo: %s", sItemInfo.label); sIcon.SetSrc(itemInfo.icon); sLabel.SetText(itemInfo.label); sNextImage.SetVisible(itemInfo.hasSecondMenu); diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a index 7efb9ea53..0cc557d30 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a differ diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h index 9c0d29c98..c0e420a2b 100644 --- a/code/sdk/zhihui/UI/producttest/include/testView.h +++ b/code/sdk/zhihui/UI/producttest/include/testView.h @@ -51,9 +51,7 @@ namespace OHOS static testView *GetInstance(void); void OnStart() override; - void OnSetUpView() override; - void OnTearDownView() override; - void OnStop() override; + struct ButtonConfig { int x; diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp index bbb64bdab..10e318dad 100644 --- a/code/sdk/zhihui/UI/producttest/src/testView.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp @@ -889,10 +889,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); uapi_set4GCapability(true); start_custom_ble_service(); - } - void testView::OnSetUpView() - { View::OnSetUpView(); if (SystemScrollView[TESTVIEW] == nullptr) { @@ -915,21 +912,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); // SystemScrollView[SYSTEMVIEW]->Add(SystemUpgradeButtonExt); RootView::GetInstance()->Add(SystemScrollView[TESTVIEW]); - Draw(); } - void testView::OnTearDownView() - { - - View::OnTearDownView(); - return; - } - - void testView::OnStop() - { - - View::OnStop(); - RootView::GetInstance()->RemoveAll(); - return; - } + } \ No newline at end of file