添加开机动画

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 d561124..0db4ec7 100644 (file)
--- 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 */\r
     (void)nv_upg_upgrade_task_process();\r
     thread_init();\r
+\r
+    //尽早显示启动logo ，需要 lcd 驱动，mount file system ， power_display 线程管理 lcd背光\r
+    ohos_show_bootup_logo();  \r
     \r
     button_app_init();\r
     \r

diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
index d3190af..6b2fb68 100644 (file)
--- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
+++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c
@@ -18,7 +18,27 @@
 \r
 #include "soc_lcd_api.h"\r
 \r
-void ohos_startup()\r
+// int32_t user_get_random_bytes(uint32_t size, uint8_t *randnum)\r
+// {\r
+//     return uapi_drv_cipher_trng_get_random_bytes(randnum, size);\r
+// }\r
+\r
+// int32_t user_get_random(uint32_t *randnum)\r
+// {\r
+//     return uapi_drv_cipher_trng_get_random(randnum);\r
+// }\r
+\r
+// int32_t mbedtls_adapt_register(void)\r
+// {\r
+//     mbedtls_harden_cipher_func harden_cipher_func = { 0 };\r
+//     harden_cipher_func.harden_trng_get_random = user_get_random,\r
+//     harden_cipher_func.harden_trng_get_multi_random = user_get_random_bytes,\r
+\r
+//     mbedtls_cipher_adapt_register_func(&harden_cipher_func);\r
+//     return 0;\r
+// }\r
+\r
+void ohos_show_bootup_logo(void)\r
 {\r
     /* 未接lcd时不能调用图形相关类的实例 */\r
     if (!uapi_is_lcd_connect()) {\r
@@ -31,10 +51,59 @@ void ohos_startup()
 #ifdef SUPPORT_POWER_MANAGER\r
     const power_display_svr_api_t *display_api = power_display_svr_get_api();\r
     display_api->turn_on_screen();\r
-    display_api->set_screen_set_keepon_timeout(5000);\r
+#if defined(A5133_DEMO_SERVER) || defined(A5133_DEMO_CLIENT)\r
+    display_api->set_screen_set_keepon_timeout(-1);\r
+#else\r
+    display_api->set_screen_set_keepon_timeout(25000);\r
+#endif\r
 #endif\r
+\r
+\r
+#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT)\r
+ if  (upg_check_upgrade_need_upgrade())\r
+ {    \r
+    ShowGraphicOTALogo();\r
+ }else{\r
+    \r
+    ShowGraphicLogo();\r
+ }\r
+#else\r
+\r
 #ifdef ENABLE_UIKIT\r
     ShowGraphicLogo();\r
 #endif\r
+\r
+#endif\r
+}\r
+\r
+\r
+void ohos_startup()\r
+{\r
+    // mbedtls_adapt_register();\r
+    /* 未接lcd时不能调用图形相关类的实例 */\r
+    if (!uapi_is_lcd_connect()) {\r
+        return;\r
+    }\r
+    \r
+\r
+#ifdef ENABLE_UIKIT\r
+    boot_animation_init();\r
+#endif\r
+wait_animation_stop();\r
+boot_animation_init_deinit();\r
+\r
+#if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT)\r
+    //如果在升级状态，则不进入系统\r
+ if  (upg_check_upgrade_need_upgrade()) return ;\r
+#endif\r
     OHOS_SystemInit();\r
+    \r
+#ifdef SUPPORT_POWER_MANAGER\r
+    const power_display_svr_api_t *display_api = power_display_svr_get_api();\r
+    // display_api->turn_on_screen();\r
+#if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT)\r
+    display_api->set_screen_set_keepon_timeout(0);\r
+#endif\r
+    // display_api->set_screen_set_keepon_timeout(5000);\r
+#endif\r
 }\r