Skip to content

Feature/update UI logic #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature/update UI logic #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
753ba3a
Add files via upload
liaochuan110 Aug 14, 2025
a857182
feat: Update UI to use SquareLine Studio project
google-labs-jules[bot] Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@ set(SOURCES "audio/audio_codec.cc"
"main.cc"
)

set(INCLUDE_DIRS "." "display" "audio" "protocols")
set(INCLUDE_DIRS "." "display" "audio" "protocols" "ui/ui")

# 添加UI文件
file(GLOB UI_SOURCES
"ui/ui/*.c"
"ui/ui/screens/*.c"
"ui/ui/components/*.c"
"ui/ui/images/*.c"
"ui/ui/fonts/*.c"
"ui/ui/themes/*.c"
)
list(APPEND SOURCES ${UI_SOURCES})

# 添加板级公共文件
file(GLOB BOARD_COMMON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/common/*.cc)
Expand Down
5 changes: 5 additions & 0 deletions main/application.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "application.h"
#include "board.h"
#include "display.h"
#include "ui/ui.h"
#include "system_info.h"
#include "audio_codec.h"
#include "mqtt_protocol.h"
Expand Down Expand Up @@ -645,6 +646,9 @@ void Application::SetDeviceState(DeviceState state) {
auto display = board.GetDisplay();
auto led = board.GetLed();
led->OnStateChanged();
if (previous_state == kDeviceStateSpeaking && state != kDeviceStateSpeaking) {
lv_disp_load_scr(ui_defaultStandBy);
}
switch (state) {
case kDeviceStateUnknown:
case kDeviceStateIdle:
Expand Down Expand Up @@ -672,6 +676,7 @@ void Application::SetDeviceState(DeviceState state) {
break;
case kDeviceStateSpeaking:
display->SetStatus(Lang::Strings::SPEAKING);
lv_disp_load_scr(ui_talking);

if (listening_mode_ != kListeningModeRealtime) {
audio_service_.EnableVoiceProcessing(false);
Expand Down
Loading