From af71edb1b6e22d8261c9bde9fbff0fbd1cfe3d1c Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Tue, 19 Aug 2025 10:11:02 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E4=BA=A7=E6=B5=8B=E7=BB=93?= =?utf8?q?=E6=9E=9C=E6=8E=A5=E5=8F=A3(bu)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../UI/producttest/include/testPresenter.h | 40 +++++++-------- .../UI/producttest/src/testPresenter.cpp | 9 +++- .../zhihui/UI/producttest/src/testgsenson.cpp | 20 ++++---- .../UI/producttest/src/testmagnetic.cpp | 50 +++++++++---------- 4 files changed, 63 insertions(+), 56 deletions(-) diff --git a/code/sdk/zhihui/UI/producttest/include/testPresenter.h b/code/sdk/zhihui/UI/producttest/include/testPresenter.h index 34a39a136..5befff5a6 100644 --- a/code/sdk/zhihui/UI/producttest/include/testPresenter.h +++ b/code/sdk/zhihui/UI/producttest/include/testPresenter.h @@ -27,26 +27,26 @@ -typedef struct { - uint8_t lcd; // LCD测试结果 - uint8_t tp; // 触摸屏测试结果 - uint8_t mag; // 磁力计测试结果 - uint8_t brightness; // 亮度测试结果 - uint8_t bat; // 亮度测试结果 - uint8_t spk; // 喇叭测试结果 - uint8_t mic; // 麦克风测试结果 - uint8_t motor; // 马达测试结果 - uint8_t hr; // 心率漏光测试结果 - uint8_t gsensor; // 重力加速度传感器 - uint8_t cat1; // 4g测试结果 - uint8_t button; // 按键测试结果 - uint8_t bt; // 蓝牙扫描测试结果 - uint8_t aplipay; // 支付宝加密芯片测试结果 - uint8_t gps; // gps测试结果 - uint8_t lowpower; // 低功耗测试结果 -} FactoryTestResult; +// typedef struct { +// uint8_t lcd; // LCD测试结果 +// uint8_t tp; // 触摸屏测试结果 +// uint8_t mag; // 磁力计测试结果 +// uint8_t brightness; // 亮度测试结果 +// uint8_t bat; // 亮度测试结果 +// uint8_t spk; // 喇叭测试结果 +// uint8_t mic; // 麦克风测试结果 +// uint8_t motor; // 马达测试结果 +// uint8_t hr; // 心率漏光测试结果 +// uint8_t gsensor; // 重力加速度传感器 +// uint8_t cat1; // 4g测试结果 +// uint8_t button; // 按键测试结果 +// uint8_t bt; // 蓝牙扫描测试结果 +// uint8_t aplipay; // 支付宝加密芯片测试结果 +// uint8_t gps; // gps测试结果 +// uint8_t lowpower; // 低功耗测试结果 +// } FactoryTestResult; -static FactoryTestResult g_factoryTestResult = {0}; +// static FactoryTestResult g_factoryTestResult = {0}; namespace OHOS { @@ -106,7 +106,7 @@ namespace OHOS static testPresenter *GetInstance(); - FactoryTestResult* GetFactoryTestResult() {return &g_factoryTestResult;} + // FactoryTestResult* GetFactoryTestResult() {return &g_factoryTestResult;} private: diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp index f7ea6ffac..7c713bc7a 100644 --- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp @@ -211,7 +211,14 @@ namespace OHOS } - mcu_pm_lcd_off(NULL,NULL); + // mcu_pm_lcd_off(NULL,NULL); + + const power_display_svr_api_t * display_api = power_display_svr_get_api(); + if (display_api) + { + display_api->turn_off_screen(); + } + return true; } diff --git a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp index fb7b92a19..34bc4f6a1 100644 --- a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp @@ -20,10 +20,10 @@ extern "C" #endif #endif -#ifdef SUPPORT_CYWEE_SERVICE -static gsenson_t last_value = {0}; -static bool isInit = false; -#endif +// #ifdef SUPPORT_CYWEE_SERVICE +// static gsenson_t last_value = {0}; +// static bool isInit = false; +// #endif //#include "acc_service.h" namespace OHOS @@ -72,12 +72,12 @@ namespace OHOS static osTimerId_t Gsenson_TEST_timer=NULL; void testgsensonView::ClearAll() { -#ifdef SUPPORT_CYWEE_SERVICE - last_value.x = 0; - last_value.y = 0; - last_value.z = 0; - isInit = false; -#endif +// #ifdef SUPPORT_CYWEE_SERVICE +// last_value.x = 0; +// last_value.y = 0; +// last_value.z = 0; +// isInit = false; +// #endif if(testGsonsonScrollView) { testGsonsonScrollView->RemoveAll(); diff --git a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp index 395082239..7e6f5566d 100644 --- a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp @@ -28,7 +28,7 @@ extern "C" #endif #endif -static float last_value = 0; +// static float last_value = 0; namespace OHOS { @@ -56,7 +56,7 @@ namespace OHOS osTimerId_t magneyic_TEST_timer=NULL; void testMagicView::ClearAll() { - last_value = 0; + // last_value = 0; if(testmagicScrollView) { @@ -133,30 +133,30 @@ namespace OHOS #ifdef SUPPORT_MAG_SERVICE mag_get_fAzimuth(&angle_value); #endif - if(angle_value && !last_value) - { - last_value = angle_value; - } - else if(last_value && angle_value && last_value != angle_value) - { - FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult(); - if(g_ret) - { - g_ret->mag = 1; - } - } - else if(!angle_value) - { - FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult(); - if(g_ret) - { - g_ret->mag = 2; - } - } + // if(angle_value && !last_value) + // { + // last_value = angle_value; + // } + // else if(last_value && angle_value && last_value != angle_value) + // { + // FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult(); + // if(g_ret) + // { + // g_ret->mag = 1; + // } + // } + // else if(!angle_value) + // { + // FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult(); + // if(g_ret) + // { + // g_ret->mag = 2; + // } + // } - FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult(); - if(g_ret) - printf("mag test result:%d\n",g_ret->mag); + // FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult(); + // if(g_ret) + // printf("mag test result:%d\n",g_ret->mag); char buf[16]={0}; sprintf(buf,"angle:%.2f",angle_value); -- 2.17.1