From a06a3c0e0cf52ed164340726d2e63ccbcb3166dd Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 10 Jun 2025 18:59:08 +0800
Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E6=9C=BA=E5=8A=A8?=
 =?utf8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../brandy/brandy_standard/thread_pri_init.c  |  3 +
 .../wearable/ohos_startup/ohosfwk_startup.c   | 73 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 2 deletions(-)

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 d56112415..0db4ec7fe 100644
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -482,6 +482,9 @@ static void thread_main(const void *unused)
     /* nv init and file system init must be before nv_upg_upgrade_task_process */
     (void)nv_upg_upgrade_task_process();
     thread_init();
+
+    //尽早显示启动logo ，需要 lcd 驱动，mount file system ， power_display 线程管理 lcd背光
+    ohos_show_bootup_logo();  
     
     button_app_init();
     
diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
index d3190af23..6b2fb6821 100644
--- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
+++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
@@ -18,7 +18,27 @@
 
 #include "soc_lcd_api.h"
 
-void ohos_startup()
+// 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()) {
@@ -31,10 +51,59 @@ void ohos_startup()
 #ifdef SUPPORT_POWER_MANAGER
     const power_display_svr_api_t *display_api = power_display_svr_get_api();
     display_api->turn_on_screen();
-    display_api->set_screen_set_keepon_timeout(5000);
+#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 ENABLE_UIKIT
+    boot_animation_init();
+#endif
+wait_animation_stop();
+boot_animation_init_deinit();
+
+#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT)
+    //如果在升级状态，则不进入系统
+ if  (upg_check_upgrade_need_upgrade()) return ;
+#endif
     OHOS_SystemInit();
+    
+#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
 }
-- 
2.17.1