From 1b30ed70e3f414003c1f1a2a65ec2bfc14eefea5 Mon Sep 17 00:00:00 2001 From: Caisking Date: Mon, 28 Apr 2025 18:01:42 +0800 Subject: [PATCH] =?utf8?q?=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?utf8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/BluetoothServiceOptionsPresenter.cpp | 3 +++ .../src/BluetoothServiceOptionsView.cpp | 3 ++- .../nativeui/goal/src/Maingoalview.cpp | 4 ++-- .../heart_blood/CheckAbnormalView.cpp | 2 +- .../nativeui/heart_blood/CheckInvalidView.cpp | 4 +++- .../nativeui/heartrate/src/HeartChartView.cpp | 4 ++-- .../heartrate/src/HeartDetectionView.cpp | 2 +- .../heartrate/src/HeartResultView.cpp | 2 +- .../src/LanguageSwitchPresenter.cpp | 18 +++++------------ .../languagecode/src/LanguageSwitchView.cpp | 6 +++--- .../nativeui/main/src/MainPresenterSample.cpp | 2 +- .../nativeui/main/src/PullUpDownView.cpp | 2 ++ .../main/src/VolumeSettingPresenter.cpp | 2 +- .../nativeui/message/include/MessageModel.h | 6 +++++- .../nativeui/message/src/MessageShowView.cpp | 1 - .../src/MotionRecognitionView.cpp | 2 +- .../networkandcall/src/NetworkAndCallView.cpp | 6 +++--- .../offlinevoice/src/VocassistView.cpp | 4 ++-- .../nativeui/saveele/src/SaveElePresenter.cpp | 8 +++----- .../set_card/src/SetCardPresenter.cpp | 2 +- .../nativeui/set_dial/src/SetDialView.cpp | 2 +- .../nativeui/sleep/src/SleepControlView.cpp | 4 ++-- .../nativeui/sleepmode/src/SleepModeView.cpp | 2 +- .../nativeui/settings/src/SettingItemView.cpp | 1 + .../br/libbt_host_audio_manager_wrapper.a | Bin 219708 -> 219760 bytes .../zhihui/UI/producttest/include/testView.h | 4 +--- .../zhihui/UI/producttest/src/testView.cpp | 19 +----------------- 27 files changed, 49 insertions(+), 66 deletions(-) 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 7efb9ea53120481baa0a75bf49a5656ad13cae52..0cc557d309e80289f12eb3e1aefb81482cf87f6c 100644 GIT binary patch delta 25039 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, 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 -- 2.17.1