Merge develop into main (#348)
## App state Improved app state management in `LoaderService` and `GuiService`: - Re-ordered some of the state transitions - Hardened `GuiService` for repeated events (that might trigger a re-render of an app that's already rendered) - Validate state transitions in `LoaderService` and crash if an app transitions from the wrong state to the next one. ## LoaderService - Removed `tt::loader::` functions and expose `LoaderService` interface publicly. - Implement `stopAll()` and `stopAll(id)` which stops all instances of an app, including any apps that were launched by it. - Rename `stop()` functions to `stopTop()` - Created `stopTop(id)` which only stops the top-most app when the app id matches. - Moved `loader::LoaderEvent` to `loader::LoaderService::Event` - Changed app instance `std::stack` to `std::vector` ## Improvements - `ElfApp`: error 22 now shows a hint that `main()` might be missing - Starting, installing and uninstalling apps now stops any running app (and its children) on the stack ## Bugfixes - `HttpdReq` out of memory issue now shows an error message and doesn't crash anymore (this would happen on devices without PSRAM with WiFi active, when an app was installed) - `GuiService::hideApp()` lock should not wait for timeout and now waits indefinitely - `Buildscript/release-sdk-current.sh` deletes the previous local release before building a new one ## Code correctness - App classes were made `final` - Apps that had a `void start()` now have a `LaunchId start()` - `tt::app::State`: renamed `Started` to `Created` and `Stopped` to `Destroyed` to properly reflect earlier name changes
This commit is contained in:
committed by
GitHub
parent
dcf28d0868
commit
f6cdabf3c0
@@ -1,25 +1,25 @@
|
||||
#include "Tactility/service/gui/GuiService.h"
|
||||
#include "Tactility/lvgl/LvglSync.h"
|
||||
#include "Tactility/lvgl/Statusbar.h"
|
||||
#include "Tactility/service/loader/Loader.h"
|
||||
#include <Tactility/service/gui/GuiService.h>
|
||||
|
||||
#include <Tactility/Tactility.h>
|
||||
#include <Tactility/app/AppInstance.h>
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
#include <Tactility/lvgl/Statusbar.h>
|
||||
#include <Tactility/service/loader/Loader.h>
|
||||
#include <Tactility/service/ServiceRegistration.h>
|
||||
#include <Tactility/Tactility.h>
|
||||
|
||||
namespace tt::service::gui {
|
||||
|
||||
extern const ServiceManifest manifest;
|
||||
|
||||
constexpr auto* TAG = "GuiService";
|
||||
using namespace loader;
|
||||
|
||||
// region AppManifest
|
||||
|
||||
void GuiService::onLoaderEvent(loader::LoaderEvent event) {
|
||||
if (event == loader::LoaderEvent::ApplicationShowing) {
|
||||
auto app_instance = app::getCurrentAppContext();
|
||||
void GuiService::onLoaderEvent(LoaderService::Event event) {
|
||||
if (event == LoaderService::Event::ApplicationShowing) {
|
||||
auto app_instance = std::static_pointer_cast<app::AppInstance>(app::getCurrentAppContext());
|
||||
showApp(app_instance);
|
||||
} else if (event == loader::LoaderEvent::ApplicationHiding) {
|
||||
} else if (event == LoaderService::Event::ApplicationHiding) {
|
||||
hideApp();
|
||||
}
|
||||
}
|
||||
@@ -125,7 +125,9 @@ bool GuiService::onStart(TT_UNUSED ServiceContext& service) {
|
||||
[]() { return guiMain(); }
|
||||
);
|
||||
|
||||
loader_pubsub_subscription = loader::getPubsub()->subscribe([this](auto event) {
|
||||
const auto loader = findLoaderService();
|
||||
assert(loader != nullptr);
|
||||
loader_pubsub_subscription = loader->getPubsub()->subscribe([this](auto event) {
|
||||
onLoaderEvent(event);
|
||||
});
|
||||
|
||||
@@ -168,7 +170,9 @@ bool GuiService::onStart(TT_UNUSED ServiceContext& service) {
|
||||
void GuiService::onStop(TT_UNUSED ServiceContext& service) {
|
||||
lock();
|
||||
|
||||
loader::getPubsub()->unsubscribe(loader_pubsub_subscription);
|
||||
const auto loader = findLoaderService();
|
||||
assert(loader != nullptr);
|
||||
loader->getPubsub()->unsubscribe(loader_pubsub_subscription);
|
||||
|
||||
appToRender = nullptr;
|
||||
isStarted = false;
|
||||
@@ -190,36 +194,50 @@ void GuiService::requestDraw() {
|
||||
Thread::setFlags(thread_id, GUI_THREAD_FLAG_DRAW);
|
||||
}
|
||||
|
||||
void GuiService::showApp(std::shared_ptr<app::AppContext> app) {
|
||||
lock();
|
||||
void GuiService::showApp(std::shared_ptr<app::AppInstance> app) {
|
||||
auto lock = mutex.asScopedLock();
|
||||
lock.lock();
|
||||
|
||||
if (!isStarted) {
|
||||
TT_LOG_W(TAG, "Failed to show app %s: GUI not started", app->getManifest().appId.c_str());
|
||||
} else {
|
||||
// Ensure previous app triggers onHide() logic
|
||||
if (appToRender != nullptr) {
|
||||
hideApp();
|
||||
}
|
||||
appToRender = std::move(app);
|
||||
TT_LOG_E(TAG, "Failed to show app %s: GUI not started", app->getManifest().appId.c_str());
|
||||
return;
|
||||
}
|
||||
unlock();
|
||||
|
||||
if (appToRender != nullptr && appToRender->getLaunchId() == app->getLaunchId()) {
|
||||
TT_LOG_W(TAG, "Already showing %s", app->getManifest().appId.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
TT_LOG_I(TAG, "Showing %s", app->getManifest().appId.c_str());
|
||||
// Ensure previous app triggers onHide() logic
|
||||
if (appToRender != nullptr) {
|
||||
hideApp();
|
||||
}
|
||||
|
||||
appToRender = std::move(app);
|
||||
requestDraw();
|
||||
}
|
||||
|
||||
void GuiService::hideApp() {
|
||||
lock();
|
||||
auto lock = mutex.asScopedLock();
|
||||
lock.lock();
|
||||
|
||||
if (!isStarted) {
|
||||
TT_LOG_W(TAG, "Failed to hide app: GUI not started");
|
||||
} else if (appToRender == nullptr) {
|
||||
TT_LOG_W(TAG, "hideApp() called but no app is currently shown");
|
||||
} else {
|
||||
// We must lock the LVGL port, because the viewport hide callbacks
|
||||
// might call LVGL APIs (e.g. to remove the keyboard from the screen root)
|
||||
tt_check(lvgl::lock(configTICK_RATE_HZ));
|
||||
appToRender->getApp()->onHide(*appToRender);
|
||||
lvgl::unlock();
|
||||
appToRender = nullptr;
|
||||
TT_LOG_E(TAG, "Failed to hide app: GUI not started");
|
||||
return;
|
||||
}
|
||||
unlock();
|
||||
|
||||
if (appToRender == nullptr) {
|
||||
TT_LOG_W(TAG, "hideApp() called but no app is currently shown");
|
||||
return;
|
||||
}
|
||||
|
||||
// We must lock the LVGL port, because the viewport hide callbacks
|
||||
// might call LVGL APIs (e.g. to remove the keyboard from the screen root)
|
||||
lvgl::lock(portMAX_DELAY);
|
||||
appToRender->getApp()->onHide(*appToRender);
|
||||
lvgl::unlock();
|
||||
appToRender = nullptr;
|
||||
}
|
||||
|
||||
std::shared_ptr<GuiService> findService() {
|
||||
|
||||
Reference in New Issue
Block a user