增加亮屏时间
authorCaisking <3449750381@qq.com>
Thu, 23 Nov 2023 11:01:58 +0000 (19:01 +0800)
committerCaisking <3449750381@qq.com>
Thu, 23 Nov 2023 11:01:58 +0000 (19:01 +0800)
.deveco/burntool/historyConfig.ini
code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp
code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp
code/sdk/application/wearable/service/power_manager/include/power_display_service.h
code/sdk/application/wearable/service/power_manager/src/power_display_service.c
code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a
code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin

index 6ec488d..6856a69 100644 (file)
@@ -1 +1 @@
-{"serialPortValue":"COM7","baudRateValue":"500000","stopBitValue":"0","verifyTypeValue":"0"}
\ No newline at end of file
+{"serialPortValue":"COM8","baudRateValue":"500000","stopBitValue":"0","verifyTypeValue":"0"}
\ No newline at end of file
index 5ec8fb3..3292b86 100644 (file)
@@ -7,7 +7,7 @@
 
 #include "wearable_log.h"
 #include "SettingItemView.h"
-
+#include "UiConfig.h"
 namespace OHOS {
     static constexpr int16 SETTING_ICON_X = 19;
     static constexpr int16_t SETTING_SICON_Y = 19;
index 4422e0f..911a78b 100644 (file)
@@ -21,24 +21,24 @@ namespace OHOS {
 
     void SettingModel::InitSettingItem()
     {
-        // settings[0] = {SETTING_ITEM_ZERO, PNG_BLUETOOTH_STITLE, "蓝牙耳机", true};
-        // settings[1] = {SETTING_ITEM_ONE, PNG_CONNECT_PHONE_IMAGE, "连接手机", true};
-        // settings[2] = {SETTING_ITEM_TWO, PNG_SETTTING_REBOOT_IMAGE, "重启", true};
-        // settings[3] = {SETTING_ITEM_THREE, PNG_SETTTING_SHUTDOWN_IMAGE, "关机", true};
-        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ZERO, VIEW_BLUETOOTH_EARPHONE));
-        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ONE, VIEW_CONNECT_PHONE));
-        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_TWO, VIEW_REBOOT));
-        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_THREE, VIEW_REBOOT));
-        settings[0] = {SETTING_ITEM_ZERO, PNG_DISPLAY_BRIGHTNESS, "屏幕与亮度", true};
-        settings[1] = {SETTING_ITEM_ONE, PNG_BLUETOOTH, "蓝牙", true};
-        settings[2] = {SETTING_ITEM_TWO, PNG_SOUND_VIBRATION, "声音与震动", true};
-        settings[3] = {SETTING_ITEM_THREE, PNG_QUICK_ACCESS, "快速访问", true};
-        settings[4] = {SETTING_ITEM_FIVE, PNG_SYSTEM, "系统", true};
-        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS));
-        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ONE, VIEW_CONNECT_BLUETOOTH));
-        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION));
-        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_THREE, VIEW_QUICK_ACCESS));
-        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_FIVE, VIEW_SYSTEM));
+        settings[0] = {SETTING_ITEM_ZERO, PNG_BLUETOOTH_STITLE, "蓝牙耳机", true};
+        settings[1] = {SETTING_ITEM_ONE, PNG_CONNECT_PHONE_IMAGE, "连接手机", true};
+        settings[2] = {SETTING_ITEM_TWO, PNG_SETTTING_REBOOT_IMAGE, "重启", true};
+        settings[3] = {SETTING_ITEM_THREE, PNG_SETTTING_SHUTDOWN_IMAGE, "关机", true};
+        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ZERO, VIEW_BLUETOOTH_EARPHONE));
+        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ONE, VIEW_CONNECT_PHONE));
+        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_TWO, VIEW_REBOOT));
+        settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_THREE, VIEW_REBOOT));
+        // settings[0] = {SETTING_ITEM_ZERO, PNG_DISPLAY_BRIGHTNESS, "屏幕与亮度", true};
+        // settings[1] = {SETTING_ITEM_ONE, PNG_BLUETOOTH, "蓝牙", true};
+        // settings[2] = {SETTING_ITEM_TWO, PNG_SOUND_VIBRATION, "声音与震动", true};
+        // settings[3] = {SETTING_ITEM_THREE, PNG_QUICK_ACCESS, "快速访问", true};
+        // settings[4] = {SETTING_ITEM_FIVE, PNG_SYSTEM, "系统", true};
+        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS));
+        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ONE, VIEW_CONNECT_BLUETOOTH));
+        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION));
+        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_THREE, VIEW_QUICK_ACCESS));
+        // settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_FIVE, VIEW_SYSTEM));
     }
 
     const SettingItem *SettingModel::GetSettinglistItems() const
index af6a4f7..a33cc1c 100644 (file)
@@ -185,7 +185,7 @@ typedef enum message_type {
  */
 typedef enum timer_event_type {
     /* * 常亮灭屏定时器超时 */
-    KEEP_ON_TIMER_TIME_OUT = 0,
+    KEEP_ON_TIMER_TIME_OUT = 60,
     /* * 应用灭屏定时器超时 */
     SLICE_TIMER_TIME_OUT,
     /* * 系统默认灭屏定时器超时 */
index f97ee8e..6d5819c 100644 (file)
@@ -20,7 +20,7 @@
 #include "touch_screen_def.h"
 #include "display_state_machine.h"
 
-#define DISPLAY_AUTO_POWER_OFF_PERIOD_MS 5000
+#define DISPLAY_AUTO_POWER_OFF_PERIOD_MS 50000
 #define DISPLAY_DEFAULT_BRIGHTNESS 50
 #define POWER_DISPLAY_QUEUE_MAX_SIZE 64
 #define POWER_DISPLAY_MAX_SIZE 0x10
@@ -32,7 +32,7 @@ typedef errcode_t (*message_handle)(uint32_t message_type, uint32_t message_valu
 
 static screen_context_t g_screen_context = {
     .screen_off_timeout = DISPLAY_AUTO_POWER_OFF_PERIOD_MS,
-    .keep_on_timeout = 0,
+    .keep_on_timeout = 60,// 将常亮屏超时时间修改为60秒
     .current_state = SCREEN_OFF,
     .brightness_mode = DISPLAY_DEFAULT_BRIGHTNESS,
     .brightness_value = 50,
index 24f602f..0b0d0af 100644 (file)
@@ -31,7 +31,8 @@ extern "C" {
 #define SIZE_8M 0x00800000
 #define SIZE_512M 0x20000000
 
-#define DELAY_100US 100
+//测试更改时间
+#define DELAY_100US 1000
 #define CNT_100US_PS 10000
 #define WAIT_10S (10 * CNT_100US_PS)
 #define DELAY_1MS 1
index fdafeec..3da807d 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a differ
index e2a0637..b4f168f 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a differ
index 6b9ad79..2f6554c 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a differ
index ce0f93d..9a19567 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a differ
index a29056c..0e4ddef 100644 (file)
Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ