From: penglei <1624952103@qq.com> Date: Fri, 10 Jan 2025 06:09:35 +0000 (+0800) Subject: U8产测UI增加功能键2测试 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=ad97ebbf6c0f7ce4afd91294e2f1783cfe82ca0b;p=mirrors%2FFD230.git U8产测UI增加功能键2测试 --- diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/include/common/key_code.h b/code/sdk/middleware/services/gui/uikit/proprietary/include/common/key_code.h index 8d8d0b06f..9dd86ca90 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/include/common/key_code.h +++ b/code/sdk/middleware/services/gui/uikit/proprietary/include/common/key_code.h @@ -1,3 +1,11 @@ +/* + * @Author: penglei 1624952103@qq.com + * @Date: 2024-12-03 19:06:16 + * @LastEditors: penglei 1624952103@qq.com + * @LastEditTime: 2025-01-10 11:41:29 + * @FilePath: /sdk615/code/sdk/middleware/services/gui/uikit/proprietary/include/common/key_code.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ /* * Copyright (c) 2022 CompanyNameMagicTag. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -53,6 +61,7 @@ enum class ZliteKeyCode { ZLITE_KEY_AUDIO = ZLITE_KEY_CAT(FUNCTION, 0x2A), ZLITE_KEY_HOME = ZLITE_KEY_CAT(FUNCTION, 0x3F), ZLITE_KEY_FUNC = ZLITE_KEY_CAT(FUNCTION, 0x100), + ZLITE_KEY_FUNC2 = ZLITE_KEY_CAT(FUNCTION, 0x101), }; } #endif \ No newline at end of file diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/utils/frameworks/hals/lite_input_hal.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/utils/frameworks/hals/lite_input_hal.cpp index 08ef0caf5..da6bda187 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/utils/frameworks/hals/lite_input_hal.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/utils/frameworks/hals/lite_input_hal.cpp @@ -30,6 +30,8 @@ static bool ConvertKeyId(uint16_t indevKey, uint16_t* key) *key = static_cast(ZliteKeyCode::ZLITE_KEY_POWER); } else if (indevKey == INDEV_KEY_FUNC) { *key = static_cast(ZliteKeyCode::ZLITE_KEY_FUNC); + } else if (indevKey == INDEV_KEY_FUNC2) { + *key = static_cast(ZliteKeyCode::ZLITE_KEY_FUNC2); } else { GRAPHIC_LOGW("Unsupported KeyId."); return false; diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp index b5abaf2fb..46a833cb6 100644 --- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp @@ -396,13 +396,14 @@ namespace OHOS } #ifdef BOARD_U8 - if (keyID == 2) + if (keyID == 1) { - if(keystate) - testbuttonView::GetInstance()-> Changbutton(2,true); + + if(keystate) + testbuttonView::GetInstance()-> Changbutton(2,true); else - testbuttonView::GetInstance()-> Changbutton(2,false); - + testbuttonView::GetInstance()-> Changbutton(2,false); + // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); } diff --git a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp index a84ca8ee4..5b26dcee4 100644 --- a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp @@ -127,12 +127,12 @@ namespace OHOS if(falg==true) { button[0]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); - button[0]->SetText("UP_KEY::\npress"); + button[0]->SetText("POWER_KEY::\npress"); } else { button[0]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); - button[0]->SetText("UP_KEY::\nraise"); + button[0]->SetText("POWER_KEY::\nraise"); } @@ -143,28 +143,27 @@ namespace OHOS if(falg==true) { button[1]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); - button[1]->SetText("DOWN_KEY::\npress"); + button[1]->SetText("FUNC_KEY::\npress"); } else { button[1]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); - button[1]->SetText("DOWN_KEY::\nraise"); + button[1]->SetText("FUNC_KEY::\nraise"); } } #ifdef BOARD_U8 if(i==2) { - if(falg==true) { - button[3]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); - button[3]->SetText("DOWN_KEY::\npress"); + button[2]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); + button[2]->SetText("FUNC_KEY2::\npress"); } else { - button[3]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); - button[3]->SetText("DOWN_KEY::\nraise"); + button[2]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); + button[2]->SetText("FUNC_KEY2::\nraise"); } } #endif @@ -178,16 +177,22 @@ namespace OHOS void testbuttonView::Changbutton(bool falg) { + int index = 0; +#ifdef BOARD_U8 + index = 3; +#else + index = 2; +#endif if(falg) { - button[2]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); - button[2]->SetText("crown::spin"); + button[index]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full); + button[index]->SetText("crown::spin"); } else { - button[2]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); - button[2]->SetText("crown::raise"); + button[index]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); + button[index]->SetText("crown::raise"); } RootView::GetInstance()->Invalidate(); @@ -280,8 +285,8 @@ namespace OHOS buttonconfig.ViewId="FUNC_KEY2:"; buttonconfig.str="FUNC_KEY2:"; buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT; - button[3]=SetTheButton_ext(buttonconfig); - testBUTTONScrollView->Add(button[3]); + button[2]=SetTheButton_ext(buttonconfig); + testBUTTONScrollView->Add(button[2]); buttonconfig.x = 80; buttonconfig.y = 600; @@ -293,8 +298,8 @@ namespace OHOS buttonconfig.ViewId="crown::"; buttonconfig.str="crown::"; buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT; - button[2]=SetTheButton_ext(buttonconfig); - testBUTTONScrollView->Add(button[2]); + button[3]=SetTheButton_ext(buttonconfig); + testBUTTONScrollView->Add(button[3]); #else @@ -312,10 +317,14 @@ namespace OHOS testBUTTONScrollView->Add(button[2]); #endif + int index = 0; +#ifdef BOARD_U8 + index = 3; +#else + index = 2; +#endif - - - for(int i=3;i<10;i++) + for(int i=index+1;i<10;i++) { buttonconfig.x = 80; buttonconfig.y +=250; diff --git a/code/sdk/zhihui/drivers/rotary_encoder/crown/crown.c b/code/sdk/zhihui/drivers/rotary_encoder/crown/crown.c index a087b32d6..0b3aeb6ed 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/crown/crown.c +++ b/code/sdk/zhihui/drivers/rotary_encoder/crown/crown.c @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-12-31 10:20:16 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-01-09 15:39:10 + * @LastEditTime: 2025-01-10 11:48:37 * @FilePath: /sdk615/code/sdk/zhihui/drivers/rotary_encoder/crown/crown.c * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ void crown_int_callback(pin_t pin, uintptr_t param) crown_diff++; } } - PRINT("pin : %d , direction : %d , crown_diff : %d \n",pin,direction,crown_diff); + // PRINT("pin : %d , direction : %d , crown_diff : %d \n",pin,direction,crown_diff); }