diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart index e1fbf47..9d28090 100644 --- a/lib/home_assistant.class.dart +++ b/lib/home_assistant.class.dart @@ -214,6 +214,7 @@ class HomeAssistant { } else if (data["type"] == "auth_invalid") { _completeConnecting({"errorCode": 6, "errorMessage": "${data["message"]}"}); } else if (data["type"] == "result") { + TheLogger.debug("[Received] => id:${data["id"]}, ${data['success'] ? 'success' : 'error'}"); if (data["id"] == _configMessageId) { _parseConfig(data); } else if (data["id"] == _statesMessageId) { @@ -224,8 +225,6 @@ class HomeAssistant { _parseServices(data); } else if (data["id"] == _userInfoMessageId) { _parseUserInfo(data); - } else if (data["id"] == _currentMessageId) { - TheLogger.debug("[Received] => Request id:$_currentMessageId was successful"); } } else if (data["type"] == "event") { if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) { @@ -357,6 +356,7 @@ class HomeAssistant { _userName = data["result"]["name"]; } else { _userName = null; + TheLogger.warning("There was an error getting current user: $data"); } _userInfoCompleter.complete(); } @@ -369,6 +369,7 @@ class HomeAssistant { if (response["success"] == true) { _rawLovelaceData = response["result"]; } else { + TheLogger.error("There was an error getting Lovelace config: $response"); _rawLovelaceData = null; } _lovelaceCompleter.complete(); @@ -376,7 +377,6 @@ class HomeAssistant { void _parseLovelace() { ui = HomeAssistantUI(); - TheLogger.debug("Parsing lovelace config"); TheLogger.debug("--Title: ${_rawLovelaceData["title"]}"); int viewCounter = 0; TheLogger.debug("--Views count: ${_rawLovelaceData['views'].length}"); @@ -400,10 +400,8 @@ class HomeAssistant { List result = []; rawCards.forEach((rawCard){ if (rawCard["cards"] != null) { - TheLogger.debug("------card: ${rawCard['type']} has child cards"); result.addAll(_createLovelaceCards(rawCard["cards"])); } else { - TheLogger.debug("------card: ${rawCard['type']}"); HACard card = HACard( id: "card", name: rawCard["title"], @@ -440,12 +438,13 @@ class HomeAssistant { void _createUI() { if ((_useLovelace) && (_rawLovelaceData != null)) { + TheLogger.debug("Creating Lovelace UI"); _parseLovelace(); } else { + TheLogger.debug("Creating group-based UI"); ui = HomeAssistantUI(); int viewCounter = 0; if (!entities.hasDefaultView) { - TheLogger.debug( "--Default view"); HAView view = HAView( count: viewCounter, id: "group.default_view", @@ -458,7 +457,6 @@ class HomeAssistant { viewCounter += 1; } entities.viewEntities.forEach((viewEntity) { - TheLogger.debug( "--View: ${viewEntity.entityId}"); HAView view = HAView( count: viewCounter, id: viewEntity.entityId, diff --git a/lib/main.dart b/lib/main.dart index 502fd85..8d415b2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -75,7 +75,7 @@ part 'ui_widgets/card_header_widget.dart'; EventBus eventBus = new EventBus(); const String appName = "HA Client"; -const appVersion = "0.3.5"; +const appVersion = "0.3.6"; String homeAssistantWebHost; diff --git a/lib/ui_class/view.class.dart b/lib/ui_class/view.class.dart index 872a4d8..c0cb40d 100644 --- a/lib/ui_class/view.class.dart +++ b/lib/ui_class/view.class.dart @@ -26,7 +26,6 @@ class HAView { childEntities.forEach((entity) { if (entity.isBadge) { badges.add(entity); - TheLogger.debug("----Badge: ${entity.entityId}"); } else { if (!entity.isGroup) { String groupIdToAdd = "${entity.domain}.${entity.domain}$count"; @@ -36,14 +35,12 @@ class HAView { name: entity.domain, type: "entities" ); - TheLogger.debug("----Creating card: $groupIdToAdd"); card.entities.add(entity); autoGeneratedCards.add(card); } else { autoGeneratedCards.firstWhere((card) => card.id == groupIdToAdd).entities.add(entity); } } else { - TheLogger.debug("----Card: ${entity.entityId}"); HACard card = HACard( name: entity.displayName, id: entity.entityId, diff --git a/pubspec.yaml b/pubspec.yaml index 03e5a6c..b3a3fde 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hass_client description: Home Assistant Android Client -version: 0.3.5+55 +version: 0.3.6+56 environment: sdk: ">=2.0.0-dev.68.0 <3.0.0"