From b6cc131bb19f68fd3602ccc5e4d1f784942c0bb4 Mon Sep 17 00:00:00 2001
From: SnickerSun <snickersun@163.com>
Date: Mon, 2 Dec 2024 10:42:26 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E6=9C=BAlogo?=
 =?utf8?q?=E6=98=BE=E7=A4=BA=E9=80=9F=E5=BA=A6=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?utf8?q?=E5=BC=80=E6=9C=BAlogo=E6=98=BE=E7=A4=BA=E5=BB=B6=E5=90=8E?=
 =?utf8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../brandy/brandy_standard/thread_pri_init.c    | 16 +++++++---------
 .../wearable/ohos_startup/ohosfwk_startup.c     | 17 +++++++++++++----
 .../wearable/ohos_startup/ohosfwk_startup.h     |  1 +
 3 files changed, 21 insertions(+), 13 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 52f463281..aa4391fdc 100755
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -425,7 +425,7 @@ static void thread_main(const void *unused)
      * 
     */
     ConfigModelInit();
-    
+
 
 #if DSP_EXIST == YES
     audio_init();
@@ -438,7 +438,12 @@ static void thread_main(const void *unused)
 #endif
     /* 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();
     uapi_calendar_init();
     uapi_calendar_recover_date();
@@ -455,18 +460,10 @@ static void thread_main(const void *unused)
 #endif
 uapi_pm_remove_sleep_veto(PM_ID_DEBUG);
 
-// #ifdef SUPPORT_AT_VIBRATOR
-//     uapi_vibrator_service_init();
-// #endif
 #ifdef SUPPORT_BATTERY_SERVICE
     uapi_battery_init();
 #endif
 
-#ifdef ACC_LIS2DOC
-    // uapi_acc_service_init();
-#endif
-
-
 #ifdef ENABLE_SLIP
     slip_uart_init();
 #endif
@@ -523,6 +520,7 @@ uapi_pm_remove_sleep_veto(PM_ID_DEBUG);
     uapi_a5133_service_init();
 #endif
 #ifdef SUPPORT_AT_OHOSFWK
+    //开始播放开机动画，并启动ohos系统
     ohos_startup();
 #endif
     
diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
index e459ddc5c..1955c849a 100755
--- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
+++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
@@ -39,15 +39,14 @@ int32_t mbedtls_adapt_register(void)
     mbedtls_cipher_adapt_register_func(&harden_cipher_func);
     return 0;
 }
-void ohos_startup()
+
+void ohos_show_bootup_logo(void)
 {
-    mbedtls_adapt_register();
 
     /* 未接lcd时不能调用图形相关类的实例 */
     if (!uapi_is_lcd_connect()) {
         return;
     }
-    
 #ifdef ENABLE_UIKIT
     InitGraphicService();
 #endif
@@ -77,6 +76,16 @@ void ohos_startup()
 #endif
 
 #endif
+}
+void ohos_startup(void)
+{
+    
+    mbedtls_adapt_register();
+    /* 未接lcd时不能调用图形相关类的实例 */
+    if (!uapi_is_lcd_connect()) {
+        return;
+    }
+    
 
 #ifdef ENABLE_UIKIT
     boot_animation_init();
@@ -100,7 +109,7 @@ boot_animation_init_deinit();
     OHOS_SystemInit();
     
 #ifdef SUPPORT_POWER_MANAGER
-    // const power_display_svr_api_t *display_api = power_display_svr_get_api();
+    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);
diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.h b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.h
index fb5224687..07c11b4d2 100755
--- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.h
+++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.h
@@ -11,6 +11,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+void ohos_show_bootup_logo(void);
 void ohos_startup(void);
 #ifdef __cplusplus
 }
-- 
2.17.1