remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-06-15 19:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 2 bugs in issue 221 (#222)

Browse Source 
Template rendering and Webhook ID on initial start.

Please review and (hopefully) approve, but don't merge as I need to
deploy to the beta app.
This commit is contained in:
Philip Abbey
2025-03-27 06:32:27 +00:00
committed by GitHub
parent 1ae4085113 155649f162
commit a77870c2eb
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/HomeAssistantApp.mc
View File

@ -266,7 +266,6 @@ class HomeAssistantApp extends Application.AppBase {
private function buildMenu(menu as Lang.Dictionary) { private function buildMenu(menu as Lang.Dictionary) {
mHaMenu = new HomeAssistantView(menu, null); mHaMenu = new HomeAssistantView(menu, null);
mQuitTimer.begin(); mQuitTimer.begin();
startUpdates();
} }
function startUpdates() { function startUpdates() {

8
source/HomeAssistantGroupMenuItem.mc
View File

@ -56,6 +56,12 @@ class HomeAssistantGroupMenuItem extends WatchUi.IconMenuItem {
setSubLabel(null); setSubLabel(null);
} else if(data instanceof Lang.String) { } else if(data instanceof Lang.String) {
setSubLabel(data); setSubLabel(data);
} else if(data instanceof Lang.Number) {
var d = data as Lang.Number;
setSubLabel(d.format("%d"));
} else if(data instanceof Lang.Float) {
var f = data as Lang.Float;
setSubLabel(f.format("%f"));
} else if(data instanceof Lang.Dictionary) { } else if(data instanceof Lang.Dictionary) {
// System.println("HomeAsistantGroupMenuItem updateState() data = " + data); // System.println("HomeAsistantGroupMenuItem updateState() data = " + data);
if (data.get("error") != null) { if (data.get("error") != null) {
@ -64,7 +70,7 @@ class HomeAssistantGroupMenuItem extends WatchUi.IconMenuItem {
setSubLabel($.Rez.Strings.PotentialError); setSubLabel($.Rez.Strings.PotentialError);
} }
} else { } else {
// The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error. // The template must return a Lang.String, Number or Float, or the item cannot be formatted locally without error.
setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String); setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
} }
WatchUi.requestUpdate(); WatchUi.requestUpdate();

8
source/HomeAssistantTapMenuItem.mc
View File

@ -72,6 +72,12 @@ class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
setSubLabel($.Rez.Strings.Empty); setSubLabel($.Rez.Strings.Empty);
} else if(data instanceof Lang.String) { } else if(data instanceof Lang.String) {
setSubLabel(data); setSubLabel(data);
} else if(data instanceof Lang.Number) {
var d = data as Lang.Number;
setSubLabel(d.format("%d"));
} else if(data instanceof Lang.Float) {
var f = data as Lang.Float;
setSubLabel(f.format("%f"));
} else if(data instanceof Lang.Dictionary) { } else if(data instanceof Lang.Dictionary) {
// System.println("HomeAsistantTemplateMenuItem updateState() data = " + data); // System.println("HomeAsistantTemplateMenuItem updateState() data = " + data);
if (data.get("error") != null) { if (data.get("error") != null) {
@ -80,7 +86,7 @@ class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
setSubLabel($.Rez.Strings.PotentialError); setSubLabel($.Rez.Strings.PotentialError);
} }
} else { } else {
// The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error. // The template must return a Lang.String, Number or Float, or the item cannot be formatted locally without error.
setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String); setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
} }
WatchUi.requestUpdate(); WatchUi.requestUpdate();

8
source/HomeAssistantToggleMenuItem.mc
View File

@ -74,6 +74,12 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
setSubLabel(null); setSubLabel(null);
} else if(data instanceof Lang.String) { } else if(data instanceof Lang.String) {
setSubLabel(data); setSubLabel(data);
} else if(data instanceof Lang.Number) {
var d = data as Lang.Number;
setSubLabel(d.format("%d"));
} else if(data instanceof Lang.Float) {
var f = data as Lang.Float;
setSubLabel(f.format("%f"));
} else if(data instanceof Lang.Dictionary) { } else if(data instanceof Lang.Dictionary) {
// System.println("HomeAsistantToggleMenuItem updateState() data = " + data); // System.println("HomeAsistantToggleMenuItem updateState() data = " + data);
if (data.get("error") != null) { if (data.get("error") != null) {
@ -82,7 +88,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
setSubLabel($.Rez.Strings.PotentialError); setSubLabel($.Rez.Strings.PotentialError);
} }
} else { } else {
// The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error. // The template must return a Lang.String, Number or Float, or the item cannot be formatted locally without error.
setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String); setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
} }
WatchUi.requestUpdate(); WatchUi.requestUpdate();