projects / mirrors / FD230.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e168603) | patch
Merge #378 into sdk602patch0521 from refs/changes/378/head 380/target/2 381/target/1
author罗正 <1732036298@qq.com>
Wed, 26 Jun 2024 08:50:54 +0000 (08:50 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 26 Jun 2024 08:50:54 +0000 (08:50 +0000)
commit9fadce332d1482c783d23a1eabae533384eb864a
tree4e4895f1faf85964aaa695316edef3236ebe6eebtree | snapshot
parente1686031794a2f6ffc82b7f430e3b9eb939c1db5commit | diff
Merge #378 into sdk602patch0521 from refs/changes/378/head

Code review from 罗正

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

  - 添加app设置手表震动强度，手表能感受设置的强度

  - AiVoice视图添加与修改

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

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

  - Ai语音UI基本上完成，更细节的部分待优化

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

  - 闹钟界面添加按键监听

Signed-off-by: 罗正 <1732036298@qq.com>
Commented-by: 罗正 <1732036298@qq.com>
Commented-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/378
77 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt diff | blob | history
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceBluetoothFailedStartView.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoicePresenter.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceConnectTimeoutView.h [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceListeningView.h [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceMobileDataFailedStartView.h [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceReturnResultTextView.h [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceThinkingView.h [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp diff | blob | history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIRecBlack.bin [deleted file] blob | history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIRecGreen.bin [deleted file] blob | history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIUnion.bin [deleted file] blob | history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_1.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_10.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_11.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_12.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_13.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_14.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_15.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_16.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_17.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_18.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_19.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_2.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_20.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_3.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_4.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_5.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_6.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_7.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_8.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceListening/Ai_Listening_9.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_1.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_10.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_11.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_12.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_13.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_14.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_15.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_16.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_17.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_18.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_19.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_2.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_20.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_21.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_22.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_23.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_24.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_25.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_26.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_27.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_28.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_29.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_3.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_4.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_5.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_6.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_7.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_8.bin [new file with mode: 0644] blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/AIVoice/AIVoiceThinking/Ai_Thinking_9.bin [new file with mode: 0644] blob
code/sdk/drivers/peripheral/config/src/ConfigModel.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.