Merge #632 into sdk602patch0626 from refs/changes/632/head 635/target/1
author罗正 <1732036298@qq.com>
Fri, 2 Aug 2024 10:43:19 +0000 (10:43 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 2 Aug 2024 10:43:19 +0000 (10:43 +0000)
commitba11ca7016984334d09a8bff8dce7ec90b25bdfc
tree66c3c38707f388ee965748371d4fdf203d841ac3
parentc19c4e0409908273d0d596f7b4609b6fab8bb9b5
Merge #632 into sdk602patch0626 from refs/changes/632/head

解决狂按电源键或function键死机问题

* refs/changes/632/head: (7 commits squashed)

  - 解决狂按电源键或function键死机问题

  - 修改AI语音等待录音录完时间为1s,目前还未测试

  - AI语音界面title的top位置修改由52修改为50

  - 搭建音乐播放器基本框架,并提供存放音乐路径接口

  - 添加后退多级Slice函数,优化EnterSlice

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Ability 文件中BackCountSlice函数最后一个参数默认跳转1级

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/632
25 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp
code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
code/sdk/application/wearable/fd230app/nativeui/musicplayer/include/MusicPlayerControlView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/include/MusicPlayerModel.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/include/MusicPlayerPresenter.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/include/MusicPlayerView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerControlView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerModel.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerPresenter.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/music.txt [new file with mode: 0644]