From: 孙春阳 Date: Thu, 27 Nov 2025 09:19:54 +0000 (+0800) Subject: 开机屏蔽不需要的服务,做极简启动UI,蓝色填充图。 X-Git-Tag: V1.0.9_20251128_194606_LN~3 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8b6a5d58f168b5b5cb806a776f649aa1f1d7c536;p=mirrors%2FFD230.git 开机屏蔽不需要的服务,做极简启动UI,蓝色填充图。 --- diff --git a/code/sdk/application/brandy/brandy_standard/thread_init.c b/code/sdk/application/brandy/brandy_standard/thread_init.c index d51d6120e..5f514aa78 100644 --- a/code/sdk/application/brandy/brandy_standard/thread_init.c +++ b/code/sdk/application/brandy/brandy_standard/thread_init.c @@ -377,6 +377,6 @@ static void app_main(const void *unused) static void lwip_main(void) { PRINT("lwip_main run start."NEWLINE); - tcpip_init(NULL, NULL); + // tcpip_init(NULL, NULL); } #endif diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c index e4ecda8d6..5782dfbe0 100644 --- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c +++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c @@ -513,7 +513,6 @@ static void thread_main(const void *unused) * */ // #ifdef CUSTOM_UTILS - ConfigModelInit(); // uapi_runtime_log_service_init(); init_btaddr_btname(); uapi_calendar_init(); @@ -537,7 +536,7 @@ static void thread_main(const void *unused) button_app_init(); #ifdef SUPPORT_AT_VIBRATOR - uapi_vibrator_service_init(); + // uapi_vibrator_service_init(); #endif #ifdef CONFIG_SYSTEM_VIEW @@ -557,7 +556,7 @@ static void thread_main(const void *unused) #ifdef SUPPORT_CAT1_SERVICE - cat1_server_init(); + // cat1_server_init(); #endif #ifdef SUPPORT_BLE_SERVICE @@ -570,26 +569,26 @@ static void thread_main(const void *unused) custom_i2c_init(I2C_BUS_2); #ifdef SUPPORT_CYWEE_SERVICE - uapi_cywee_service_init(); + // uapi_cywee_service_init(); #endif #ifdef ROTARYENCODER_MIXO - uapi_mixo_service_init(); + // uapi_mixo_service_init(); #endif #ifdef SUPORT_MAG_SERVICE - uapi_mag_service_init(); + // uapi_mag_service_init(); #endif #ifdef ENABLE_LQBP002TA - uapi_lqbp_service_init(); + // uapi_lqbp_service_init(); #endif #ifdef ENABLE_BN02 - uapi_bp_service_init(); + // uapi_bp_service_init(); #endif #ifdef SUPPORT_GYRO_SERVICE - uapi_gyro_service_init(); + // uapi_gyro_service_init(); #endif #endif @@ -617,7 +616,7 @@ static void thread_main(const void *unused) #endif #ifdef SUPPORT_GNSS - gnss_uart_init(); + // gnss_uart_init(); // uapi_gnss_http_server_init(); #endif @@ -627,11 +626,11 @@ static void thread_main(const void *unused) #endif #ifdef SUPPORT_PPG_SERVICE - uapi_ppg_service_init(); + // uapi_ppg_service_init(); #endif #ifdef CUSTOM_UTILS - startup_post_init(); + // startup_post_init(); #endif set_startup_finish_flag(); diff --git a/code/sdk/application/wearable/ln/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/ln/nativeapp/nativelauncher/src/NativeLauncher.cpp index 1f01e4a29..944c68d25 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -36,6 +36,10 @@ #include "RecentManager.h" #include "PageTransitionMgr.h" #include +#include "components/root_view.h" +#include "components/ui_view_group.h" +#include "gfx_utils/color.h" +#include "common/screen.h" namespace OHOS { @@ -48,22 +52,53 @@ NativeLauncher &NativeLauncher::GetInstance(void) return instance; } +// 静态变量:保存蓝色窗口的指针 +static OHOS::UIViewGroup *g_simple_blue_window = nullptr; + void NativeLauncher::InitNativeLauncher() { - //设置字体 - GraphicStartUp::InitFontEngine(MEM_POOL_UI_FONT, MEM_POOL_UI_FONT_SIZE, - OHOS::VECTOR_FONT_DIR, DEFAULT_VECTOR_FONT_FILENAME); - - WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "NativeLauncher::InitNativeLauncher"); - - //初始化slice - NativeRegisterManager::GetInstance().InitAllNativesSlices(); - - //初始化屏幕亮度 - cm_initScreenBrightness(); - - //设置默认首页 - NativeAbility::GetInstance().SetDefaultSliceId(VIEW_THUNDER_BIRD); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "InitNativeLauncher: Minimal startup - Blue window only"); + + // 获取根视图并清除所有现有视图 + OHOS::RootView* rootView = OHOS::RootView::GetInstance(); + if (rootView != nullptr) { + rootView->RemoveAll(); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "Cleared all existing views from RootView"); + } + + // 如果蓝色窗口已存在,先删除 + if (g_simple_blue_window != nullptr) { + if (rootView != nullptr) { + rootView->Remove(g_simple_blue_window); + } + delete g_simple_blue_window; + g_simple_blue_window = nullptr; + } + + // 获取屏幕尺寸 + int16_t width = OHOS::Screen::GetInstance().GetWidth(); + int16_t height = OHOS::Screen::GetInstance().GetHeight(); + + // 创建简单的蓝色窗口 + g_simple_blue_window = new OHOS::UIViewGroup(); + if (g_simple_blue_window == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to create blue window"); + return; + } + + // 设置窗口位置和大小(全屏) + g_simple_blue_window->SetPosition(0, 0, width, height); + + // 设置蓝色背景 (ARGB格式: 0xFF0000FF = 蓝色,完全不透明) + g_simple_blue_window->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, OHOS::Color::Blue().full); + g_simple_blue_window->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xFF); + + // 添加到根视图并刷新显示 + if (rootView != nullptr) { + rootView->Add(g_simple_blue_window); + rootView->Invalidate(); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "Blue window created and displayed: %dx%d", width, height); + } } } diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c index 5a70c16d6..0c9cc9994 100644 --- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c +++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c @@ -1,123 +1,123 @@ -/* - * Copyright (c) CompanyNameMagicTag Technologies Co., Ltd. 2023-2023. All rights reserved. - * Description: The application core startup logo display. - * Author: CompanyName - * Create: 2022-02-19 - */ - -#include "common_def.h" -#include "debug_print.h" -#include "system_init.h" -#include "ohosfwk_startup.h" -#ifdef ENABLE_UIKIT -#include "graphic_service_wrapper.h" -#endif -#ifdef SUPPORT_POWER_MANAGER -#include "power_display_service.h" -#endif - -#if defined(CUSTOM_UTILS) && defined(BOARD_LEINIAO) -#include "custom_utils.h" -#endif - -#include "soc_lcd_api.h" - -// int32_t user_get_random_bytes(uint32_t size, uint8_t *randnum) -// { -// return uapi_drv_cipher_trng_get_random_bytes(randnum, size); -// } - -// int32_t user_get_random(uint32_t *randnum) -// { -// return uapi_drv_cipher_trng_get_random(randnum); -// } - -// int32_t mbedtls_adapt_register(void) -// { -// mbedtls_harden_cipher_func harden_cipher_func = { 0 }; -// harden_cipher_func.harden_trng_get_random = user_get_random, -// harden_cipher_func.harden_trng_get_multi_random = user_get_random_bytes, - -// mbedtls_cipher_adapt_register_func(&harden_cipher_func); -// return 0; -// } - -void ohos_show_bootup_logo(void) -{ - /* 未接lcd时不能调用图形相关类的实例 */ - if (!uapi_is_lcd_connect()) { - return; - } - -#if defined(CUSTOM_UTILS) && defined(BOARD_LEINIAO) - PRINT("Turning on LCD backlight...\n"); - uapi_lcd_backlight_on(); - PRINT("LCD backlight turned on (CUSTOM_UTILS + BOARD_LEINIAO)\n"); -#endif - -#ifdef ENABLE_UIKIT - InitGraphicService(); -#endif -#ifdef SUPPORT_POWER_MANAGER - const power_display_svr_api_t *display_api = power_display_svr_get_api(); - display_api->turn_on_screen(); -#if defined(A5133_DEMO_SERVER) || defined(A5133_DEMO_CLIENT) - display_api->set_screen_set_keepon_timeout(-1); -#else - display_api->set_screen_set_keepon_timeout(25000); -#endif -#endif - - -#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT) - if (upg_check_upgrade_need_upgrade()) - { - ShowGraphicOTALogo(); - }else{ - - ShowGraphicLogo(); - } -#else - -#ifdef ENABLE_UIKIT - ShowGraphicLogo(); -#endif - -#endif -} - - -void ohos_startup() -{ - // mbedtls_adapt_register(); - /* 未接lcd时不能调用图形相关类的实例 */ - if (!uapi_is_lcd_connect()) { - return; - } - -//#ifdef BOARD_LEINIAO -#ifdef ENABLE_UIKIT - boot_animation_init(); -#endif -wait_animation_stop(); -boot_animation_init_deinit(); -//#endif -#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT) - //如果在升级状态,则不进入系统 - if (upg_check_upgrade_need_upgrade()) return ; -#endif - OHOS_SystemInit(); - -#ifdef PUBLISH_TEST_DATA - PublishTestData(); -#endif - -#ifdef SUPPORT_POWER_MANAGER - const power_display_svr_api_t *display_api = power_display_svr_get_api(); - // display_api->turn_on_screen(); -#if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT) - display_api->set_screen_set_keepon_timeout(0); -#endif - // display_api->set_screen_set_keepon_timeout(5000); -#endif -} +/* + * Copyright (c) CompanyNameMagicTag Technologies Co., Ltd. 2023-2023. All rights reserved. + * Description: The application core startup logo display. + * Author: CompanyName + * Create: 2022-02-19 + */ + +#include "common_def.h" +#include "debug_print.h" +#include "system_init.h" +#include "ohosfwk_startup.h" +#ifdef ENABLE_UIKIT +#include "graphic_service_wrapper.h" +#endif +#ifdef SUPPORT_POWER_MANAGER +#include "power_display_service.h" +#endif + +#if defined(CUSTOM_UTILS) && defined(BOARD_LEINIAO) +#include "custom_utils.h" +#endif + +#include "soc_lcd_api.h" + +// int32_t user_get_random_bytes(uint32_t size, uint8_t *randnum) +// { +// return uapi_drv_cipher_trng_get_random_bytes(randnum, size); +// } + +// int32_t user_get_random(uint32_t *randnum) +// { +// return uapi_drv_cipher_trng_get_random(randnum); +// } + +// int32_t mbedtls_adapt_register(void) +// { +// mbedtls_harden_cipher_func harden_cipher_func = { 0 }; +// harden_cipher_func.harden_trng_get_random = user_get_random, +// harden_cipher_func.harden_trng_get_multi_random = user_get_random_bytes, + +// mbedtls_cipher_adapt_register_func(&harden_cipher_func); +// return 0; +// } + +void ohos_show_bootup_logo(void) +{ + /* 未接lcd时不能调用图形相关类的实例 */ + if (!uapi_is_lcd_connect()) { + return; + } + +#if defined(CUSTOM_UTILS) && defined(BOARD_LEINIAO) + PRINT("Turning on LCD backlight...\n"); + uapi_lcd_backlight_on(); + PRINT("LCD backlight turned on (CUSTOM_UTILS + BOARD_LEINIAO)\n"); +#endif + +#ifdef ENABLE_UIKIT + InitGraphicService(); +#endif +#ifdef SUPPORT_POWER_MANAGER + const power_display_svr_api_t *display_api = power_display_svr_get_api(); + display_api->turn_on_screen(); +#if defined(A5133_DEMO_SERVER) || defined(A5133_DEMO_CLIENT) + display_api->set_screen_set_keepon_timeout(-1); +#else + display_api->set_screen_set_keepon_timeout(25000); +#endif +#endif + + +#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT) + if (upg_check_upgrade_need_upgrade()) + { + ShowGraphicOTALogo(); + }else{ + + ShowGraphicLogoRed(); + } +#else + +#ifdef ENABLE_UIKIT + ShowGraphicLogoRed(); +#endif + +#endif +} + + +void ohos_startup() +{ + // mbedtls_adapt_register(); + /* 未接lcd时不能调用图形相关类的实例 */ + if (!uapi_is_lcd_connect()) { + return; + } + +//#ifdef BOARD_LEINIAO +// #ifdef ENABLE_UIKIT +// boot_animation_init(); +// #endif +// wait_animation_stop(); +// boot_animation_init_deinit(); +//#endif +#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT) + //如果在升级状态,则不进入系统 + if (upg_check_upgrade_need_upgrade()) return ; +#endif + OHOS_SystemInit(); + +#ifdef PUBLISH_TEST_DATA + PublishTestData(); +#endif + +#ifdef SUPPORT_POWER_MANAGER + const power_display_svr_api_t *display_api = power_display_svr_get_api(); + // display_api->turn_on_screen(); +#if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT) + display_api->set_screen_set_keepon_timeout(0); +#endif + // display_api->set_screen_set_keepon_timeout(5000); +#endif +} diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c index 25295755a..173f72299 100644 --- a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c +++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c @@ -166,7 +166,21 @@ static int formate_filesystem(uint32_t total_block_num) } return ret; } - +static void nandflash_yaffs_mount(void) +{ + if (has_nandflash_init != 1) { + PRINT("\r\nnandflash not init skip mount.\r\n"); + return ; + } + struct nand_driver_struct *freertos_nandflash_driver = get_nand_flash(); + + PRINT("yaffs filesystem init start!\n"); + int ret = formate_filesystem(freertos_nandflash_driver->total_block); + PRINT("yaffs filesystem init end!\n"); +#ifdef CUSTOM_ZHIHUI + ConfigModelInit(); +#endif +} /* 使用约束:中断和异常中,禁止sync操作 */ void nandflash_yaffs_sync(void) { @@ -298,11 +312,11 @@ int nandflash_filesystem_init(void) if (get_mtd_info("nand") != 0) { PRINT("get_mtd_info faild!\n"); } - PRINT("yaffs filesystem init start!\n"); - int ret = formate_filesystem(freertos_nandflash_driver->total_block); - PRINT("yaffs filesystem init end!\n"); + // INSERT_YOUR_CODE + pthread_t yaffs_mount_thread; + pthread_create(&yaffs_mount_thread, NULL, nandflash_yaffs_mount, NULL); has_nandflash_init = 1; - return ret; + return 0; } void nandflash_qspi_resume(void) diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h b/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h index 002cc4bfd..e9a0fe1b1 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h +++ b/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h @@ -71,6 +71,11 @@ void InitGraphicService(void); */ void ShowGraphicLogo(void); +/** + * @brief show red graphic logo (created directly in memory), for c language. + */ +void ShowGraphicLogoRed(void); + /** * @brief hide graphic logo, for c language. */ diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp index 8951ab841..5a3ebe87c 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp @@ -29,6 +29,9 @@ #include "components/ui_image_animator.h" #include "wearable_log.h" #include "UiConfig.h" +#include "gfx_utils/mem_api.h" +#include "gfx_utils/graphic_types.h" +#include #ifdef SUPPORT_CUSTOM_UI_COMPONENT #include "uicomponents/UIComponents.h" #endif @@ -475,8 +478,17 @@ extern "C" OHOS::RootView::GetInstance()->Remove(g_logo); delete g_logo; g_logo = nullptr; - OHOS::ImageCacheManager::GetInstance().UnloadSingleRes(IMAGE_OPEN_LOGO_PATH); - g_imgInfo = nullptr; + // 如果是直接创建的 ImageInfo(红色图片),需要释放内存 + if (g_imgInfo != nullptr) { + if (g_imgInfo->data != nullptr) { + OHOS::UIFree(const_cast(g_imgInfo->data)); + } + OHOS::UIFree(g_imgInfo); + g_imgInfo = nullptr; + } else { + // 如果是从文件加载的,使用原来的方式释放 + OHOS::ImageCacheManager::GetInstance().UnloadSingleRes(IMAGE_OPEN_LOGO_PATH); + } } }); } @@ -553,6 +565,81 @@ extern "C" LOS_Msleep(500); } + void ShowGraphicLogoRed(void) + { + if (g_showLogo) + { + return; + } + g_showLogo = true; + + // 获取屏幕尺寸 + int16_t width = OHOS::Screen::GetInstance().GetWidth(); + int16_t height = OHOS::Screen::GetInstance().GetHeight(); + + // ARGB8888 格式,每个像素4字节 + const uint16_t pixelByteSize = 4; + uint32_t dataSize = width * height * pixelByteSize; + + // 分配像素数据内存 + uint8_t *srcData = static_cast(OHOS::UIMalloc(dataSize)); + if (srcData == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGraphicLogoRed: failed to allocate pixel data"); + g_showLogo = false; + return; + } + + // 填充红色像素数据 (ARGB格式: A-R-G-B) + // 红色: R=255, G=0, B=0, A=255 + for (uint32_t i = 0; i < dataSize; i += pixelByteSize) { + srcData[i] = 0; // B (Blue) + srcData[i + 1] = 0; // G (Green) + srcData[i + 2] = 255; // R (Red) + srcData[i + 3] = 255; // A (Alpha) + } + + // 分配 ImageInfo 结构体内存 + g_imgInfo = static_cast(OHOS::UIMalloc(sizeof(OHOS::ImageInfo))); + if (g_imgInfo == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGraphicLogoRed: failed to allocate ImageInfo"); + OHOS::UIFree(srcData); + g_showLogo = false; + return; + } + + // 初始化 ImageInfo 结构体 + memset(g_imgInfo, 0, sizeof(OHOS::ImageInfo)); + g_imgInfo->header.width = width; + g_imgInfo->header.height = height; + g_imgInfo->header.colorMode = OHOS::ColorMode::ARGB8888; + g_imgInfo->dataSize = dataSize; + g_imgInfo->data = srcData; + + // 创建 UIImageView 并设置 + g_logo = new OHOS::UIImageView(); + if (g_logo == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGraphicLogoRed: failed to create UIImageView"); + OHOS::UIFree(g_imgInfo); + OHOS::UIFree(srcData); + g_imgInfo = nullptr; + g_showLogo = false; + return; + } + + g_logo->SetPosition(0, 0, width, height); + g_logo->SetAutoEnable(false); + g_logo->SetResizeMode(OHOS::UIImageView::CENTER); + g_logo->SetSrc(g_imgInfo); + + GraphicService::GetInstance()->PostGraphicEvent( + [] + { + OHOS::RootView::GetInstance()->Add(g_logo); + OHOS::RootView::GetInstance()->Invalidate(); + }); + LOS_Msleep(500); + } + void ShowGraphicOTALogo(void) {