Patedam/Calendink
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed code to use <screen> tags as base for the xml. Confirmed layout works now.

Browse Source
This commit is contained in:
Patedam
2026-03-15 15:08:23 -04:00
parent ebb0ccecf4
commit f64860125c
5 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Provider/main/api/devices/screen_image.cpp
View File

@@ -89,21 +89,32 @@ internal esp_err_t api_devices_screen_image_handler(httpd_req_t *req)
bool render_success = false;
// 1. Wrap the payload in a <component><view> if it's missing (LVGL 9.4
// requirement for register_component_from_data)
char xml_buffer[2500];
const char *xml_to_register = (const char *)dev->xml_layout;
// 1. Prepare the XML payload
const char *xml_to_register = NULL;
static char xml_buffer[DEVICE_XML_MAX + 100]; // static buffer to avoid stack overflow
if (strstr(xml_to_register, "<view") == NULL &&
strstr(xml_to_register, "<screen") == NULL)
if (dev->xml_layout[0] == '\0')
{
ESP_LOGI(kTagDeviceScreenImage, "Device %s has no layout xml.", mac);
return ESP_FAIL;
}
if (strstr(dev->xml_layout, "<screen") != NULL)
{
// The user provided a correct <screen> wrapped XML
xml_to_register = dev->xml_layout;
ESP_LOGI(kTagDeviceScreenImage,
"XML already contains <screen>, passing directly to parser.");
}
else
{
// Backwards compatibility for early setups - wrap it in screen and view
snprintf(xml_buffer, sizeof(xml_buffer),
"<component>\n<view width=\"100%%\" "
"height=\"100%%\">\n%s\n</view>\n</component>",
"<screen>\n<view name=\"current_device\" width=\"100%%\" height=\"100%%\">\n%s\n</view>\n</screen>",
dev->xml_layout);
xml_to_register = xml_buffer;
ESP_LOGI(kTagDeviceScreenImage,
"Wrapped widget XML in component/view for parsing.");
"Legacy XML without <screen> detected. Wrapped automatically.");
}
// 2. Register the XML payload as a component
@@ -115,43 +126,20 @@ internal esp_err_t api_devices_screen_image_handler(httpd_req_t *req)
ESP_LOGI(kTagDeviceScreenImage, "Successfully registered XML for device %s",
mac);
// 3. Determine if this XML describes a full <screen> or just a <component>
// layout Simple heuristic: check if the string contains "<screen"
if (strstr(xml_to_register, "<screen") != NULL)
{
ESP_LOGI(kTagDeviceScreenImage,
"XML contains <screen>, creating screen instance");
lv_obj_t *new_scr = lv_xml_create_screen("current_device");
// 3. Since we enforce <screen> now, we always create a screen instance
lv_obj_t *new_scr = lv_xml_create_screen("current_device");
if (new_scr)
{
// We must load this newly created screen to make it active before
// rendering
lv_screen_load(new_scr);
scr = new_scr; // Update local pointer since active screen changed
render_success = true;
}
else
{
ESP_LOGE(kTagDeviceScreenImage,
"lv_xml_create_screen failed for device %s", mac);
}
if (new_scr)
{
// We must load this newly created screen to make it active before rendering
lv_screen_load(new_scr);
scr = new_scr; // Update local pointer since active screen changed
render_success = true;
}
else
{
ESP_LOGI(kTagDeviceScreenImage,
"XML is a component/widget, creating on active screen");
// Create the component directly on the currently active cleaned screen
lv_obj_t *comp = (lv_obj_t *)lv_xml_create(scr, "current_device", NULL);
if (comp)
{
render_success = true;
}
else
{
ESP_LOGE(kTagDeviceScreenImage, "lv_xml_create failed for device %s",
mac);
}
ESP_LOGE(kTagDeviceScreenImage,
"lv_xml_create_screen failed for device %s", mac);
}
}
else