Various improvements (#547)
- Fixed crash when returning to Setup app (from any of the steps) - Fixed crash when returning to TimeDateSettings app (after locale selection) - Fixed GuiService inconsistent behaviour: now always perform operations async (e.g. to show/hide apps). This fixes crashes in some onHide() calls where onHide() might be called before onShow() was called. - Fix for incorrect WebServService path - Remove CYD-4848S040C SD card functionality, but added a GPIO fix for releasing 3-wire SPI pin sharing. - Fix for saving/loading settings for various apps
This commit is contained in:
committed by
GitHub
parent
a323f8e148
commit
ecad2248d9
@@ -53,6 +53,7 @@ class SetupApp final : public App {
|
||||
Phase phase = Phase::Welcome;
|
||||
size_t stepIndex = 0;
|
||||
std::vector<StepConfiguration> steps;
|
||||
bool isShown = false;
|
||||
|
||||
lv_obj_t* titleLabel = nullptr;
|
||||
lv_obj_t* descriptionLabel = nullptr;
|
||||
@@ -105,7 +106,12 @@ class SetupApp final : public App {
|
||||
phase = Phase::Done;
|
||||
}
|
||||
|
||||
renderCurrent();
|
||||
// Widgets may not exist yet: onShow() runs asynchronously on the GUI task and
|
||||
// may not have (re)created them by the time onResult() advances the state.
|
||||
// onShow() calls renderCurrent() itself once the widgets are ready.
|
||||
if (isShown) {
|
||||
renderCurrent();
|
||||
}
|
||||
}
|
||||
|
||||
void onSkipClicked() {
|
||||
@@ -180,9 +186,14 @@ public:
|
||||
lv_obj_align(continueButton, LV_ALIGN_BOTTOM_RIGHT, -12, -12);
|
||||
lv_obj_add_event_cb(continueButton, onContinueClickedCallback, LV_EVENT_SHORT_CLICKED, this);
|
||||
|
||||
isShown = true;
|
||||
renderCurrent();
|
||||
}
|
||||
|
||||
void onHide(AppContext& app) override {
|
||||
isShown = false;
|
||||
}
|
||||
|
||||
void onResult(AppContext& app, LaunchId launchId, Result result, std::unique_ptr<Bundle> bundle) override {
|
||||
lvgl_lock();
|
||||
advanceTo(stepIndex + 1);
|
||||
|
||||
Reference in New Issue
Block a user