From 660592129c3fbb51dd048459e4bd48455642cf69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com> Date: Thu, 22 Aug 2024 09:34:56 +0000 Subject: [PATCH] Merge #761 into sdk602patch0626 from refs/changes/761/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 彭磊 * refs/changes/761/head: (2 commits squashed) - 优化蓝牙产测lcd tp button 测试 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/761 --- .../nativeui/producttest/src/testModel.cpp | 53 +++++++++++++------ .../peripheral/utils/custom_cmd_service.c | 9 ++-- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testModel.cpp index 66cb47673..b85dd3305 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testModel.cpp @@ -1,6 +1,17 @@ +/* + * @Author: penglei 1624952103@qq.com + * @Date: 2024-08-22 16:59:44 + * @LastEditors: penglei 1624952103@qq.com + * @LastEditTime: 2024-08-22 17:22:33 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testModel.cpp +* @Description: + * + * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. + */ #include "producttest/include/testModel.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testLCDC.h" +#include "producttest/include/testTPC.h" namespace OHOS { @@ -15,26 +26,34 @@ namespace OHOS { switch (type) { - case 1: - /* code */ - break; - - default: - break; - } - if( testView::GetInstance()) - { - testView::GetInstance()->ChangeView(TESTVIEW,LCD); - - factorytest_hide_test_lcd_button(); + case 1: + if( testView::GetInstance()) + { + testView::GetInstance()->ChangeView(TESTVIEW,LCD); + factorytest_hide_test_lcd_button(); + } + break; + + case 2: + if( testView::GetInstance()) + { + testView::GetInstance()->ChangeView(TESTVIEW,TP); + factorytest_hide_test_tp_button(); + } + break; + case 3: + if( testView::GetInstance()) + { + testView::GetInstance()->ChangeView(TESTVIEW,BUTTON); + factorytest_hide_test_lcd_button(); + } + break; + + default: + break; } - else - printf("xxxxxxxxxxxxxxxxxxxxx\r\n"); - - - return ; } diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c index f5c8a487d..8e57eef1d 100644 --- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c +++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c @@ -142,7 +142,6 @@ static void custom_cmd_service_check_task(void const *arg) { uapi_set_screen_on_api(); uapi_setScreenBrightness(255); - printf("111\n"); uapi_factorytest_enter_test_view(1); HandleUpdatelcdMode(1); // printf("222\n"); @@ -184,8 +183,9 @@ static void custom_cmd_service_check_task(void const *arg) { //uapi_set_screen_on_api(); //uapi_factorytest_enter_test_view(1); - uapi_factorytest_enter_test_tp_view(); - uapi_factorytest_hide_test_tp_button(); + //uapi_factorytest_enter_test_tp_view(); + HandleUpdatelcdMode(2); + //uapi_factorytest_hide_test_tp_button(); } else { @@ -197,7 +197,8 @@ static void custom_cmd_service_check_task(void const *arg) { //uapi_set_screen_on_api(); //uapi_factorytest_enter_test_view(1); - uapi_factorytest_enter_test_button_view(); + //uapi_factorytest_enter_test_button_view(); + HandleUpdatelcdMode(3); } else { -- 2.17.1