增加N9硬件版本雷鸟configpy配置 2373/1 2373/head 2374/target/1
authorpenglei <1624952103@qq.com>
Tue, 23 Sep 2025 07:52:59 +0000 (15:52 +0800)
committerpenglei <1624952103@qq.com>
Tue, 23 Sep 2025 07:52:59 +0000 (15:52 +0800)
code/sdk/application/wearable/CMakeLists.txt
code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/fd272/nativeapp/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/n9/nativeapp/nativelauncher/src/NativeLauncher.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/middleware/services/gui/uikit/proprietary/include/common/key_code.h
code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
code/sdk/middleware/services/gui/uikit/proprietary/src/utils/frameworks/hals/lite_input_hal.cpp

index 953b94f..28718e3 100644 (file)
@@ -4,11 +4,11 @@
 #===============================================================================
 if("BOARD_FD230" IN_LIST DEFINES)
 add_subdirectory_if_exist(fd230)
-elseif("BOARD_N9" IN_LIST DEFINES)
+elseif("BOARD_N9" IN_LIST DEFINES AND NOT "LEINIAO" IN_LIST DEFINES)
 add_subdirectory_if_exist(n9)
 elseif("BOARD_FD272" IN_LIST DEFINES)
 add_subdirectory_if_exist(fd272)    
-elseif("BOARD_LEINIAO" IN_LIST DEFINES)
+elseif("LEINIAO" IN_LIST DEFINES)
 add_subdirectory_if_exist(ln)
 else()
 add_subdirectory_if_exist(evb)
index 56776b4..b2cb985 100644 (file)
@@ -175,7 +175,7 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode)
         // custom_VibratorFunc_int(0);
 
         // 如果是雷鸟项目
-        #ifdef BOARD_LEINIAO
+        #ifdef LEINIAO
             NativeAbility::GetInstance().SetDefaultSliceId(VIEW_THUNDER_BIRD);
             return;
         #endif
index 56776b4..b2cb985 100644 (file)
@@ -175,7 +175,7 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode)
         // custom_VibratorFunc_int(0);
 
         // 如果是雷鸟项目
-        #ifdef BOARD_LEINIAO
+        #ifdef LEINIAO
             NativeAbility::GetInstance().SetDefaultSliceId(VIEW_THUNDER_BIRD);
             return;
         #endif
index d2f1414..3a99441 100644 (file)
@@ -175,7 +175,7 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode)
         // custom_VibratorFunc_int(0);
 
         // 如果是雷鸟项目 或者是测试雷鸟项目
-        #if defined(BOARD_LEINIAO) || defined(TEST_LEINIAO)
+        #if defined(LEINIAO) || defined(TEST_LEINIAO)
             NativeAbility::GetInstance().SetDefaultSliceId(VIEW_THUNDER_BIRD);
             return;
         #endif
index 5fed25b..b5b73d8 100644 (file)
@@ -1384,6 +1384,167 @@ target = {
             'GPIO_POWERON_FLASH',
         ]
     },
+
+######leiniao n9 ##################
+
+    # 'brandy-native-js-ln': {
+    #     'base_target_name': 'brandy-native-js',
+    #     #自定义配置项,选择硬件及功能参数
+    #     'defines': [
+    #         'BOARD_N9',
+    #         # cat1 相关配置
+    #         'FT_SINGLE_UART',
+            
+    #         'CONFIG_EFUSE_READ_TO_RAM',
+    #          'CUSTOM_UTILS',
+    #         # 'CUSTOM_HID_SERVICE',
+    #         # 'WEARABLE_LOG_DEBUG',
+    #         'SUPPORT_RC_CALIBRATION',
+    #         # 'PPG_HX3695',
+    #         # 'VIB_USE_PWM',
+    #         'CONFIG_PWM_SUPPORT',
+    #         # 'ACC_LIS2DOC',
+    #         # 'ENABLE_CUSTOM_I2C',
+    #         #'ENABLE_VIBRATOR',
+    #         # 'ENCODER_SUPPORT',
+    #         # 'SUPPORT_SPO2_NOTIFICATION',
+    #         # 'SUPPORT_SPO2_NOTIFICATION_TEST',
+    #         'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
+    #         # 'ENABLE_FONT_VECTOR_GLOBAL', 
+    #         # 'ENABLE_SHAPING',
+    #         'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
+    #         # 'SUPPORT_AT_CUSTOMUTILS',
+    #         # 'SUPPORT_BLE_SERVICE',
+    #         # 'SUPPORT_MAG_SERVICE',
+    #         # 'SUPPORT_PPG_SERVICE',
+    #         # 'SUPPORT_CYWEE_SERVICE',
+    #         'SUPPORT_BATTERY_SERVICE',
+    #         'LEINIAO',
+    #         # 'SUPPORT_AUTO_OTA_SERVER',
+    #         # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
+    #         #"MEM_CHECK",
+    #         #'ENABLE_WEBSOCKET',
+    #         # 'CYWEE_MAC_ACTIVE',                    
+    #         #'SUPPORT_HID_SERVICE',
+    #         # 'SUPPORT_BAIDU_MAP',
+    #         'CFG_FLASH_SIZE=16',
+    #         'SINGLE_USER_PARTITION',
+    #         # 'TPTYPE_FT6X46',
+    #         # 'ROTARYENCODER_HX3507',
+    #         'NANDFLASH_F35UQA',
+    #         # 'NANDFLASH_GD5F2G',
+    #         # 'NANDFLASH_XT26Q02D',
+    #         'BLE_INSTRUCT',
+    #         '-:SUPPORT_ALIPAY_SEC',
+    #         # 'AILPAY_SUPPORT',
+    #         # 'SUPPORT_FACTORY_SERVICE',
+    #         # 'MEMORY_CORRUPTION',
+    #         'SUPPORT_AI_SERVICE',
+    #         # 'SAP_EFFECT_SWS_SUPPORT',
+    #         # 'AUDIO_SMARTPA_AW88082',
+    #         # 'LCD_JD9885',
+    #         'SUPPORT_LEINIAO',
+    #     ],
+    #     #添加自定义应用
+    #    'ram_component': [
+    #                       'audio_at_service', 
+    #                       'media_at_service', 
+    #                       'bt_manager_at_service',
+    #                     #    "ppg_sensor_hx3695",
+    #                     #   "ppgBleService",
+    #                     #    "mag_sensor_mmc5603",
+    #                       "vibrator",
+    #                       "vibrator_service",
+    #                     #   "-:lwip",
+    #                       "thunderbird_toys",#雷鸟
+    #                       "leiniaoMediaService",
+    #                      #cat1 相关配置
+    #                      #有方需要开启  PPP
+    #                     #   "ppp",
+
+    #                     #EG810 需要开启 cat1Service 和 cat1Test
+    #                     "cat1Service",
+    #                     "cat1Test",
+
+    #                     #tcp 测试相关配置
+    #                     "tcp_test",
+    #                     #websocket 相关配置
+    #                     "zhihui_websocket",
+    #                     #ai 相关配置
+    #                     "aiMediaService",       
+    #                     "aiService",
+    #                     #ai_old相关配置
+    #                     "zhihui_ai_old",
+    #                     #ai_stub 专门解决ai_old和ai_service的依赖问题
+    #                     "ai_stub",
+    #                     #音频相关配置
+    #                     "audio_manager",
+    #                     #   "CustomUIcomponentTool",
+    #                       "nativeabilityfwk",
+    #                       "custom_utils",
+    #                       "custom_utilscpp",
+    #                       "custom_config",
+    #                     #   "rotary_encoder",
+    #                        "nativelauncher",
+    #                         # "ppg_service",
+    #                         # "cywee_service",
+    #                        "batterry_service",
+    #                     #    "bleservice",
+    #                     #    "blemoder",
+    #                        "transspecard",
+    #                     #    "factorytest_service",
+    #                     #    "hid_service",
+    #                     #    "producttest",
+    #                         # "ppg_hal",
+    #                         # "mag_service",
+    #                         # "cywee_dml",
+    #                         #"cyweeBleService",
+    #                         'AT_factory_test',
+    #                         "-:alipay_soc", 
+    #                         "-:alipay_soc_adapt", 
+    #                         "-:alipay_service", 
+    #                         "-:alipay_hal", 
+    #                         "-:alipay_antchain",
+    #                         "-:alipay_msg",
+    #                        ],
+       #       'image_analysis': False,
+       #       'fs_image_path':'leiniao',
+    #     'ssb_version': 'brandy-native-js-ln-ssb',
+       #       # 'fs_image_path':'evb',
+       #       'fs_image': True
+    # },
+    # 'brandy-native-js-ln-r': {
+    #     'base_target_name': 'brandy-native-js-r',
+    #     #自定义配置项,选择硬件及功能参数
+    #     'defines': [
+    #                 'BOARD_N9',
+    #                 'FT_SINGLE_UART',
+    #                 'NANDFLASH_F35UQA',
+    #                 # 'NANDFLASH_GD5F2G',
+    #                 # 'NANDFLASH_XT26Q02D',
+    #                 # 'TPTYPE_FT6X46',
+    #                 'CFG_FLASH_SIZE=16',
+    #                 'LEINIAO',
+       #                               'SINGLE_USER_PARTITION'
+       #       ],
+       #       'ram_component': ["at_cmd"]
+    # },
+    # 'brandy-native-js-ln-ssb': {
+    #     'base_target_name': 'brandy-ssb',
+    #     #自定义配置项,选择硬件及功能参数
+    #     'defines': [
+    #         'BOARD_N9',
+    #         'FT_SINGLE_UART',
+    #         'ENABLE_ECC',
+    #         'CFG_DRIVERS_NANDFLASH',
+    #         'CFG_FLASH_SIZE=16',
+    #         'LEINIAO',
+    #         'NANDFLASH_F35UQA',
+    #         # 'NANDFLASH_GD5F2G',
+    #         # 'NANDFLASH_XT26Q02D',
+    #         'GPIO_POWERON_FLASH',
+    #     ]
+    # },
 }
 
 target_group = {
index cdd5104..c5a293c 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * @Author: penglei 1624952103@qq.com
+ * @Date: 2025-09-18 20:55:35
+ * @LastEditors: penglei 1624952103@qq.com
+ * @LastEditTime: 2025-09-23 12:02:40
+ * @FilePath: /FD230/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,7 +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),
-#ifdef BOARD_LEINIAO
+#ifdef LEINIAO
     /* leiniao */
     ZLITE_KEY_VENDOR_UP = ZLITE_KEY_CAT(FUNCTION, 0x110),
     ZLITE_KEY_VENDOR_DOWN = ZLITE_KEY_CAT(FUNCTION, 0x111),
index 76ada5c..07a9a43 100644 (file)
@@ -62,10 +62,10 @@ extern "C"
 #ifdef CUSTOM_Z1
     static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;              // 图片帧数
-#elif defined(BOARD_W9) || defined(BOARD_N9)
+#elif (defined(BOARD_W9) || defined(BOARD_N9)) && !defined(LEINIAO)
 static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30;              // 图片帧数
-#elif defined(BOARD_LEINIAO)
+#elif defined(LEINIAO)
 static constexpr const char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; // 开机图片路径
 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 57;              // 图片帧数
 static const char *TB_REBOOT_PATHS[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES] = {
@@ -91,7 +91,7 @@ static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;
     static OHOS::ImageAnimatorInfo ReBootImageInfo[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES]; // 开机图像的信息
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_X = 0;
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_Y = 0;
-#ifdef BOARD_LEINIAO
+#ifdef LEINIAO
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_W = 360;
     static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_H = 360;
 #else
@@ -215,7 +215,7 @@ static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;
     bool ShowReBootAnimatorView()
     {
 // 优先使用静态路径表(BOARD_LEINIAO),将路径转换为 ImageInfo;否则回退目录生成
-#if defined(BOARD_LEINIAO)
+#if defined(LEINIAO)
         const OHOS::ImageInfo **tmpArray = new const OHOS::ImageInfo *[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES];
         if (tmpArray == nullptr)
         {
@@ -270,7 +270,7 @@ static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36;
             ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xffffffff);
             ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xff);
             ReBootImageAnimatorView->SetImageAnimatorSrc(ReBootImageInfo, REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100);
-#if defined(BOARD_LEINIAO)
+#if defined(LEINIAO)
             ReBootImageAnimatorView->SetAutoEnable(false);
             ReBootImageAnimatorView->SetResizeMode(OHOS::UIImageView::COVER);
 #endif
index 40baf3c..a6e3053 100644 (file)
@@ -31,7 +31,7 @@ static bool ConvertKeyId(uint16_t indevKey, uint16_t* key)
     } else if (indevKey == INDEV_KEY_FUNC) {
         *key = static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_FUNC);
     }
-    #ifdef BOARD_LEINIAO
+    #ifdef LEINIAO
     else if (indevKey == 2u) { 
         *key = static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_VENDOR_UP);
     } else if (indevKey == 3u) {