From aa621d9f1488f07e1ab43f22db9065b024ca9377 Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Mon, 17 Nov 2025 14:00:11 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96272=E4=BA=A7=E6=B5=8BUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../UI/producttest/include/testPresenter.h | 4 +++- .../sdk/zhihui/UI/producttest/include/testView.h | 4 ++++ code/sdk/zhihui/UI/producttest/src/testView.cpp | 16 ++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/sdk/zhihui/UI/producttest/include/testPresenter.h b/code/sdk/zhihui/UI/producttest/include/testPresenter.h index 55fc6f4da..ab9aa8a8c 100644 --- a/code/sdk/zhihui/UI/producttest/include/testPresenter.h +++ b/code/sdk/zhihui/UI/producttest/include/testPresenter.h @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-08-23 10:50:37 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-09-01 09:55:12 + * @LastEditTime: 2025-11-17 13:55:35 * @FilePath: /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenter.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -57,7 +57,9 @@ namespace OHOS VISON, LCD, TP, +#ifdef SUPPORT_MAG_SERVICE MAGETIC, +#endif LUMINANCE, CHARG, SPEAK, diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h index 80a3fc4bf..c62f886fa 100644 --- a/code/sdk/zhihui/UI/producttest/include/testView.h +++ b/code/sdk/zhihui/UI/producttest/include/testView.h @@ -88,10 +88,14 @@ namespace OHOS bool ChangspeakTESTView(int16_t thisView); bool ChangmotorTESTView(int16_t thisView); bool ChangKEYTESTView(int16_t thisView); +#ifdef SUPPORT_MAG_SERVICE bool ChangeMGTESTView(int16_t thisView); +#endif bool ChangeMPTESTView(int16_t thisView); bool ChangeHRTESTView(int16_t thisView); +#ifdef SUPPORT_CAT1_SERVICE bool ChangeCAT1TESTView(int16_t thisView); +#endif bool ChangeGTESTView(int16_t thisView); bool ChangeoldTESTView(int16_t thisView); bool ChangeBTTESTView(int16_t thisView); diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp index 8cd25d550..56aff6e48 100644 --- a/code/sdk/zhihui/UI/producttest/src/testView.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp @@ -543,10 +543,10 @@ namespace OHOS } return true; } - +#ifdef SUPPORT_MAG_SERVICE bool testView::ChangeMGTESTView(int16_t thisView) { -#ifdef SUPPORT_MAG_SERVICE + if (SystemScrollView[thisView] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeMGTESTView"); @@ -559,10 +559,10 @@ namespace OHOS SystemScrollView[thisView] = test_MG_view->testmagicInitIView(thisView); group->Add(SystemScrollView[thisView]); } -#endif + return true; } - +#endif bool testView::ChangLUMTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) @@ -630,10 +630,10 @@ namespace OHOS } return true; } - +#ifdef SUPPORT_CAT1_SERVICE bool testView::ChangeCAT1TESTView(int16_t thisView) { -#ifdef SUPPORT_CAT1_SERVICE + if (SystemScrollView[thisView] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeCAT1TESTView"); @@ -646,10 +646,10 @@ namespace OHOS SystemScrollView[thisView] = test_cat1_view->testcat1InitIView(thisView); group->Add(SystemScrollView[thisView]); } -#endif + return true; } - +#endif bool testView::ChangKEYTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) -- 2.17.1