From: Caisking <3449750381@qq.com> Date: Thu, 23 Nov 2023 11:01:58 +0000 (+0800) Subject: 增加亮屏时间 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9f92573eba5daf0f0e2fc0e8ef15b9adde78141b;p=mirrors%2FFD230.git 增加亮屏时间 --- diff --git a/.deveco/burntool/historyConfig.ini b/.deveco/burntool/historyConfig.ini index 6ec488df2..6856a696d 100644 --- a/.deveco/burntool/historyConfig.ini +++ b/.deveco/burntool/historyConfig.ini @@ -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 diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp index 5ec8fb319..3292b864f 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp @@ -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; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp index 4422e0f7c..911a78bfe 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp @@ -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(SETTING_ITEM_ZERO, VIEW_BLUETOOTH_EARPHONE)); - // settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_PHONE)); - // settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_REBOOT)); - // settingIdToViewId.insert(std::pair(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(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS)); - settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_BLUETOOTH)); - settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION)); - settingIdToViewId.insert(std::pair(SETTING_ITEM_THREE, VIEW_QUICK_ACCESS)); - settingIdToViewId.insert(std::pair(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(SETTING_ITEM_ZERO, VIEW_BLUETOOTH_EARPHONE)); + settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_PHONE)); + settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_REBOOT)); + settingIdToViewId.insert(std::pair(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(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_BLUETOOTH)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_THREE, VIEW_QUICK_ACCESS)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_FIVE, VIEW_SYSTEM)); } const SettingItem *SettingModel::GetSettinglistItems() const diff --git a/code/sdk/application/wearable/service/power_manager/include/power_display_service.h b/code/sdk/application/wearable/service/power_manager/include/power_display_service.h index af6a4f750..a33cc1c4c 100644 --- a/code/sdk/application/wearable/service/power_manager/include/power_display_service.h +++ b/code/sdk/application/wearable/service/power_manager/include/power_display_service.h @@ -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, /* * 系统默认灭屏定时器超时 */ diff --git a/code/sdk/application/wearable/service/power_manager/src/power_display_service.c b/code/sdk/application/wearable/service/power_manager/src/power_display_service.c index f97ee8eef..6d5819c86 100644 --- a/code/sdk/application/wearable/service/power_manager/src/power_display_service.c +++ b/code/sdk/application/wearable/service/power_manager/src/power_display_service.c @@ -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, diff --git a/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h b/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h index 24f602f1e..0b0d0af04 100644 --- a/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h +++ b/code/sdk/drivers/drivers/driver/audio/source/core/common/include/common_dsp.h @@ -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 diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a index fdafeec09..3da807d30 100644 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 diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a index e2a0637da..b4f168f90 100644 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 diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a index 6b9ad796d..2f6554cce 100644 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 diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a index ce0f93d2d..9a19567a5 100644 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 diff --git a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin index a29056c35..0e4ddefd3 100644 Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ