log improve and v.0.3.6

This commit is contained in:
Yegor Vialov 2018-11-04 19:30:10 +02:00
parent 71c4ac7fed
commit 04d8681656
4 changed files with 7 additions and 12 deletions

View File

@ -214,6 +214,7 @@ class HomeAssistant {
} else if (data["type"] == "auth_invalid") { } else if (data["type"] == "auth_invalid") {
_completeConnecting({"errorCode": 6, "errorMessage": "${data["message"]}"}); _completeConnecting({"errorCode": 6, "errorMessage": "${data["message"]}"});
} else if (data["type"] == "result") { } else if (data["type"] == "result") {
TheLogger.debug("[Received] => id:${data["id"]}, ${data['success'] ? 'success' : 'error'}");
if (data["id"] == _configMessageId) { if (data["id"] == _configMessageId) {
_parseConfig(data); _parseConfig(data);
} else if (data["id"] == _statesMessageId) { } else if (data["id"] == _statesMessageId) {
@ -224,8 +225,6 @@ class HomeAssistant {
_parseServices(data); _parseServices(data);
} else if (data["id"] == _userInfoMessageId) { } else if (data["id"] == _userInfoMessageId) {
_parseUserInfo(data); _parseUserInfo(data);
} else if (data["id"] == _currentMessageId) {
TheLogger.debug("[Received] => Request id:$_currentMessageId was successful");
} }
} else if (data["type"] == "event") { } else if (data["type"] == "event") {
if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) { if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
@ -357,6 +356,7 @@ class HomeAssistant {
_userName = data["result"]["name"]; _userName = data["result"]["name"];
} else { } else {
_userName = null; _userName = null;
TheLogger.warning("There was an error getting current user: $data");
} }
_userInfoCompleter.complete(); _userInfoCompleter.complete();
} }
@ -369,6 +369,7 @@ class HomeAssistant {
if (response["success"] == true) { if (response["success"] == true) {
_rawLovelaceData = response["result"]; _rawLovelaceData = response["result"];
} else { } else {
TheLogger.error("There was an error getting Lovelace config: $response");
_rawLovelaceData = null; _rawLovelaceData = null;
} }
_lovelaceCompleter.complete(); _lovelaceCompleter.complete();
@ -376,7 +377,6 @@ class HomeAssistant {
void _parseLovelace() { void _parseLovelace() {
ui = HomeAssistantUI(); ui = HomeAssistantUI();
TheLogger.debug("Parsing lovelace config");
TheLogger.debug("--Title: ${_rawLovelaceData["title"]}"); TheLogger.debug("--Title: ${_rawLovelaceData["title"]}");
int viewCounter = 0; int viewCounter = 0;
TheLogger.debug("--Views count: ${_rawLovelaceData['views'].length}"); TheLogger.debug("--Views count: ${_rawLovelaceData['views'].length}");
@ -400,10 +400,8 @@ class HomeAssistant {
List<HACard> result = []; List<HACard> result = [];
rawCards.forEach((rawCard){ rawCards.forEach((rawCard){
if (rawCard["cards"] != null) { if (rawCard["cards"] != null) {
TheLogger.debug("------card: ${rawCard['type']} has child cards");
result.addAll(_createLovelaceCards(rawCard["cards"])); result.addAll(_createLovelaceCards(rawCard["cards"]));
} else { } else {
TheLogger.debug("------card: ${rawCard['type']}");
HACard card = HACard( HACard card = HACard(
id: "card", id: "card",
name: rawCard["title"], name: rawCard["title"],
@ -440,12 +438,13 @@ class HomeAssistant {
void _createUI() { void _createUI() {
if ((_useLovelace) && (_rawLovelaceData != null)) { if ((_useLovelace) && (_rawLovelaceData != null)) {
TheLogger.debug("Creating Lovelace UI");
_parseLovelace(); _parseLovelace();
} else { } else {
TheLogger.debug("Creating group-based UI");
ui = HomeAssistantUI(); ui = HomeAssistantUI();
int viewCounter = 0; int viewCounter = 0;
if (!entities.hasDefaultView) { if (!entities.hasDefaultView) {
TheLogger.debug( "--Default view");
HAView view = HAView( HAView view = HAView(
count: viewCounter, count: viewCounter,
id: "group.default_view", id: "group.default_view",
@ -458,7 +457,6 @@ class HomeAssistant {
viewCounter += 1; viewCounter += 1;
} }
entities.viewEntities.forEach((viewEntity) { entities.viewEntities.forEach((viewEntity) {
TheLogger.debug( "--View: ${viewEntity.entityId}");
HAView view = HAView( HAView view = HAView(
count: viewCounter, count: viewCounter,
id: viewEntity.entityId, id: viewEntity.entityId,

View File

@ -75,7 +75,7 @@ part 'ui_widgets/card_header_widget.dart';
EventBus eventBus = new EventBus(); EventBus eventBus = new EventBus();
const String appName = "HA Client"; const String appName = "HA Client";
const appVersion = "0.3.5"; const appVersion = "0.3.6";
String homeAssistantWebHost; String homeAssistantWebHost;

View File

@ -26,7 +26,6 @@ class HAView {
childEntities.forEach((entity) { childEntities.forEach((entity) {
if (entity.isBadge) { if (entity.isBadge) {
badges.add(entity); badges.add(entity);
TheLogger.debug("----Badge: ${entity.entityId}");
} else { } else {
if (!entity.isGroup) { if (!entity.isGroup) {
String groupIdToAdd = "${entity.domain}.${entity.domain}$count"; String groupIdToAdd = "${entity.domain}.${entity.domain}$count";
@ -36,14 +35,12 @@ class HAView {
name: entity.domain, name: entity.domain,
type: "entities" type: "entities"
); );
TheLogger.debug("----Creating card: $groupIdToAdd");
card.entities.add(entity); card.entities.add(entity);
autoGeneratedCards.add(card); autoGeneratedCards.add(card);
} else { } else {
autoGeneratedCards.firstWhere((card) => card.id == groupIdToAdd).entities.add(entity); autoGeneratedCards.firstWhere((card) => card.id == groupIdToAdd).entities.add(entity);
} }
} else { } else {
TheLogger.debug("----Card: ${entity.entityId}");
HACard card = HACard( HACard card = HACard(
name: entity.displayName, name: entity.displayName,
id: entity.entityId, id: entity.entityId,

View File

@ -1,7 +1,7 @@
name: hass_client name: hass_client
description: Home Assistant Android Client description: Home Assistant Android Client
version: 0.3.5+55 version: 0.3.6+56
environment: environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0" sdk: ">=2.0.0-dev.68.0 <3.0.0"