优化LCD测试，增加常亮屏操作，修改背光亮度默认值，优化开机播放音频时长

diff --git a/code/sdk/application/wearable/ln/service/power_manager/src/actions/display_action.c b/code/sdk/application/wearable/ln/service/power_manager/src/actions/display_action.c
index 399376d..db48adb 100644 (file)
--- a/code/sdk/application/wearable/ln/service/power_manager/src/actions/display_action.c
+++ b/code/sdk/application/wearable/ln/service/power_manager/src/actions/display_action.c
@@ -154,7 +154,7 @@ static uint32_t action_display_lcd_on()
             return ERRCODE_FAIL;\r
         }\r
 #if defined(CUSTOM_UTILS) && defined(BOARD_LEINIAO)\r
-        uapi_lcd_backlight_on(1);\r
+        uapi_lcd_backlight_on();\r
 #endif\r
         ret = uapi_lcd_init();\r
         if (ret != 0 && ret != EXT_ERR_MIPI_ALREADY_INIT) {\r

diff --git a/code/sdk/application/wearable/ln/service/power_manager/src/power_display_service.c b/code/sdk/application/wearable/ln/service/power_manager/src/power_display_service.c
index f9f4cbd..19b9d2b 100644 (file)
--- a/code/sdk/application/wearable/ln/service/power_manager/src/power_display_service.c
+++ b/code/sdk/application/wearable/ln/service/power_manager/src/power_display_service.c
@@ -95,7 +95,7 @@ static errcode_t power_display_msg_write(uint32_t msg_id, uint8_t *msg, uint16_t
 static errcode_t power_display_turn_on_screen(void)\r
 {\r
 #if defined(CUSTOM_UTILS) && defined(BOARD_LEINIAO)\r
-    uapi_lcd_backlight_on(50);\r
+    uapi_lcd_backlight_on();\r
 #endif\r
 #ifndef SUPPORT_OHOSFWK\r
     message_type_t mt = TURN_ON_SCREEN_CMD;\r

diff --git a/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds b/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds
index 4d419a0..e4ee194 100644 (file)
--- a/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds
+++ b/code/sdk/drivers/boards/brandy_evb/linker/standard/acore.prelds
@@ -106,6 +106,9 @@ SECTIONS
         SORT(*libvibrator*.a:*.o*) (.data .data* .sdata .sdata*)
 #ifdef SUPPORT_GYRO_SERVICE
         SORT(*libgyro*.a:*.o*) (.data .data* .sdata .sdata*)
+#endif
+#ifdef BOARD_LEINIAO
+        SORT(*libthunderbird_toys*.a:*.o*) (.data .data* .sdata .sdata*)
 #endif
         SORT(*libace_adapt.a:*.o*) (.data .data* .sdata .sdata*)
         SORT(*libace_http*.a:*.o*) (.data .data* .sdata .sdata*)
@@ -149,6 +152,9 @@ SECTIONS
         SORT(*libvibrator*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON)
 #ifdef SUPPORT_GYRO_SERVICE
         SORT(*libgyro*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON)
+#endif
+#ifdef BOARD_LEINIAO
+        SORT(*libthunderbird_toys*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON)
 #endif
         SORT(*libace_adapt.a:*.o*) (.bss .bss* .sbss .sbss* COMMON)
         SORT(*libace_http*.a:*.o*) (.bss .bss* .sbss .sbss* COMMON)

diff --git a/code/sdk/zhihui/config/src/ConfigModel.cpp b/code/sdk/zhihui/config/src/ConfigModel.cpp
index fc1b73b..e459c1b 100644 (file)
--- a/code/sdk/zhihui/config/src/ConfigModel.cpp
+++ b/code/sdk/zhihui/config/src/ConfigModel.cpp
@@ -1355,9 +1355,7 @@ void cm_initScreenBrightness(void)
    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cm_initScreenBrightness");
    int brightness = OHOS::ConfigModel::GetInstance()->GetBrightness();
    #ifdef BOARD_LEINIAO
-   uapi_setScreenBrightness(5);
-   #else
-   uapi_setScreenBrightness(brightness);
+   OHOS::ConfigModel::GetInstance()->SetBrightness(5);
    #endif
 }
 

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index aedaf56..d6803c3 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -663,18 +663,19 @@ void startup_post_init_task(void)
     uapi_get_file_data(FACTORY_TEST_MODE_PATH,&factory_test_flag,1);
 
     char path[40] = {0};
-
+    uint16_t delay_time = 1500;
     if(factory_test_flag)
     {
         factory_set_recoder_streamType();
         snprintf(path, 40, "/user/music/FactoryMode.mp3");
+        delay_time = 2000;
     }
 
     else
         snprintf(path, 40, "/user/music/PowerOn.mp3");
 
     custom_play_audio(path,100);
-    LOS_Msleep(1500);
+    LOS_Msleep(delay_time);
     custom_stop_play_audio();
 #endif
 #ifdef SUPPORT_CYWEE_SERVICE
@@ -684,8 +685,9 @@ void startup_post_init_task(void)
     {
         stop_custom_ble_service();
     }
-
-    // cm_initScreenBrightness();
+#ifdef BOARD_LEINIAO
+    cm_initScreenBrightness();
+#endif
     // cm_initializeScreenDuration();
     cm_initializeRaiseToWake();
     // cm_initializeVibrationModel();
@@ -1616,7 +1618,8 @@ void uapi_set_screen_on_api(void) {
     PRINT("屏幕状态为亮屏，不进行亮屏！\n");
 #endif
   const power_display_svr_api_t *display_api = power_display_svr_get_api();
-  display_api->turn_on_screen();
+  if(display_api)
+    display_api->turn_on_screen();
     // 设置屏幕亮5000
     // display_api->set_screen_set_keepon_timeout(5000);
 }
@@ -4473,11 +4476,13 @@ void uapi_lcd_backlight_off(void)
     PRINT("uapi_lcd_backlight_off\r\n");
 }
 
-void uapi_lcd_backlight_on(uint8_t brightness)
+void uapi_lcd_backlight_on(void)
 {
-#ifdef CUSTOM_ZHIHUI
+    uint8_t brightness = 100;
+
     brightness = cm_getScreenBrightness();
-#endif
+    printf("brightness:%d\n",brightness);
+
     uint8_t fall_edge_cnt = 0;
     if (brightness <= 11)      fall_edge_cnt = 7;
     else if (brightness <= 24) fall_edge_cnt = 6;

diff --git a/code/sdk/zhihui/utils/custom_utils.h b/code/sdk/zhihui/utils/custom_utils.h
index 3672dff..08d6558 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.h
+++ b/code/sdk/zhihui/utils/custom_utils.h
@@ -468,7 +468,7 @@ void uapi_cat1_add_cat1_vote(void);
 
 void uapi_get_lcd_id(uint32_t *id);
 
-void uapi_lcd_backlight_on(uint8_t brightness);
+void uapi_lcd_backlight_on(void);
 void uapi_lcd_backlight_off(void);
 
 

diff --git a/code/sdk/zhihui/utils/custom_utils_at_cmd.c b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
index edfbc3e..439f2b5 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c
+++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
@@ -153,6 +153,8 @@ static uint32_t lcd_test_control(uint8_t *para, uint32_t paraLen, char *strCommo
     
     if(cmd == 1)
     {
+        uapi_set_screen_on_api();
+        ScreenAlwaysOnCtr(1);
         // 进入LCD测试界面
 #ifdef BOARD_LEINIAO
         start_lcd_test_view();
@@ -172,6 +174,7 @@ static uint32_t lcd_test_control(uint8_t *para, uint32_t paraLen, char *strCommo
     }
     else if(cmd == 2)
     {
+        ScreenAlwaysOnCtr(0);
         // 退出LCD测试界面
 #ifdef BOARD_LEINIAO
         stop_lcd_test_view();
@@ -249,6 +252,8 @@ static uint32_t ppp_test_control(uint8_t *para, uint32_t paraLen, char *strCommo
     
     if(cmd == 1)
     {
+        uapi_set_screen_on_api();
+        ScreenAlwaysOnCtr(1);
         // 进入PPP测试界面
 #ifdef BOARD_LEINIAO
         // 雷鸟板：使用 PPPTestView 进行PPP测试
@@ -477,7 +482,8 @@ static uint32_t custom_battery_getpower(uint8_t *para, uint32_t paraLen, char *s
     #ifdef SUPPORT_BATTERY_SERVICE
     float vol = 0;
     uint8_t percent = battery_get_voltage(&vol);
-    printf("fac:voltage : %.3f , percent %d\r\n",vol,percent);
+    uint8_t charge = get_charge_stat();
+    printf("fac:voltage : %.3f , percent %d , charge : %d\r\n",vol,percent,charge);
     #endif
 
     return ERRCODE_SUCC;
@@ -1803,8 +1809,10 @@ static uint32_t custom_enter_factory_test_mode(uint8_t *para, uint32_t paraLen,
     
     custom_set_factory_test_flag(cmd);
 
+    printf("fac:enter or exit facotry mode :%d\n",cmd);
+
     uapi_reboot_device();
-    
+
     return ERRCODE_SUCC;
 }
 

diff --git a/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp b/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
index 48020d9..1ca63ea 100644 (file)
--- a/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
+++ b/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
@@ -456,8 +456,8 @@ void custom_factory_bt_scan_stop(void)
  */
 int custom_play_audio(const char* filePath, float volume)
 {
-    if (!filePath) {
-        filePath = "/user/userdata/1.mp3";
+    if (filePath == NULL) {
+        return -1;
     }
     
     printf("=== Starting AudioPlayer playback ===\n");