From: Caisking <3449750381@qq.com> Date: Mon, 27 Nov 2023 09:40:46 +0000 (+0800) Subject: 优化省电模式交互逻辑 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=85eda57904802412e3a5a61c76464731a0b09a4d;p=mirrors%2FFD230.git 优化省电模式交互逻辑 --- diff --git a/.deveco/burntool/historyConfig.ini b/.deveco/burntool/historyConfig.ini index 010d5a3df..b27f42a6d 100644 --- a/.deveco/burntool/historyConfig.ini +++ b/.deveco/burntool/historyConfig.ini @@ -1 +1 @@ -{"serialPortValue":"COM8","baudRateValue":"1000000","stopBitValue":"0","verifyTypeValue":"0"} \ No newline at end of file +{"serialPortValue":"COM6","baudRateValue":"1000000","stopBitValue":"0","verifyTypeValue":"0"} \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp index f6a241c3b..4837a03f7 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp @@ -75,7 +75,7 @@ namespace OHOS // 3.返回 true 以消耗点击事件 if (strcmp(view.GetViewId(), "button1") == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_SAVEELE); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); } return true; } diff --git a/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp index 0d3e24f8f..a8237b11c 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp @@ -68,7 +68,7 @@ namespace OHOS // if (strcmp(view.GetViewId(), 控件ID) == 0) if (strcmp(view.GetViewId(), "button1") == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); } if (strcmp(view.GetViewId(), "button2") == 0) { 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 416d4b510..c4394567d 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 669a0ce20..e1e0d4a05 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 ab26d0f63..ba45a18f1 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 021f35a0d..1c6f9fda9 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/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a index bfbd65a99..de0cdc313 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a index c372a31d4..39ed92808 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a index 82fb8131b..3b90cd448 100644 Binary files a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a and b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a index f14dafe3e..a152c48ab 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a index f8f7b3a14..48ce9b55f 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.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 96471036b..a8fda45cc 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