yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Habdle mistakes in card config

Browse Source
This commit is contained in:
Yegor Vialov 2020-05-04 14:47:47 +00:00
parent b5fbe7b86f
commit 814e0a8b00
2 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/cards/card.class.dart
View File

@ -11,7 +11,7 @@ class CardData {
EntityWrapper get entity => entities.isNotEmpty ? entities[0] : null; EntityWrapper get entity => entities.isNotEmpty ? entities[0] : null;
factory CardData.parse(Map<String, dynamic> rawData) { factory CardData.parse(rawData) {
try { try {
switch (rawData['type']) { switch (rawData['type']) {
case CardType.ENTITIES: case CardType.ENTITIES:
@ -30,7 +30,7 @@ class CardData {
return CardData.parse(rawData['card']); return CardData.parse(rawData['card']);
break; break;
case CardType.ENTITY_FILTER: case CardType.ENTITY_FILTER:
Map<String, dynamic> cardData = Map.from(rawData); Map cardData = Map.from(rawData);
cardData.remove('type'); cardData.remove('type');
if (rawData.containsKey('card')) { if (rawData.containsKey('card')) {
cardData.addAll(rawData['card']); cardData.addAll(rawData['card']);
@ -66,13 +66,13 @@ class CardData {
return CardData(rawData); return CardData(rawData);
} }
} catch (error, stacktrace) { } catch (error, stacktrace) {
Logger.e('Parsing ${rawData['type']} card: $error', stacktrace: stacktrace); Logger.e('Error parsing card $rawData: $error', stacktrace: stacktrace);
return ErrorCardData(rawData); return ErrorCardData(rawData);
} }
} }
CardData(Map<String, dynamic> rawData) { CardData(rawData) {
if (rawData != null) { if (rawData != null && rawData is Map) {
type = rawData['type'] ?? CardType.ENTITIES; type = rawData['type'] ?? CardType.ENTITIES;
conditions = rawData['conditions'] ?? []; conditions = rawData['conditions'] ?? [];
showEmpty = rawData['show_empty'] ?? true; showEmpty = rawData['show_empty'] ?? true;
@ -170,7 +170,7 @@ class EntitiesCardData extends CardData {
return EntitiesCard(card: this); return EntitiesCard(card: this);
} }
EntitiesCardData(Map<String, dynamic> rawData) : super(rawData) { EntitiesCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
title = rawData["title"]; title = rawData["title"];
icon = rawData['icon']; icon = rawData['icon'];
@ -260,7 +260,7 @@ class AlarmPanelCardData extends CardData {
return AlarmPanelCard(card: this); return AlarmPanelCard(card: this);
} }
AlarmPanelCardData(Map<String, dynamic> rawData) : super(rawData) { AlarmPanelCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name'];
states = rawData['states']; states = rawData['states'];
@ -296,7 +296,7 @@ class ButtonCardData extends CardData {
return EntityButtonCard(card: this); return EntityButtonCard(card: this);
} }
ButtonCardData(Map<String, dynamic> rawData) : super(rawData) { ButtonCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name'];
icon = rawData['icon']; icon = rawData['icon'];
@ -359,7 +359,7 @@ class GaugeCardData extends CardData {
return GaugeCard(card: this); return GaugeCard(card: this);
} }
GaugeCardData(Map<String, dynamic> rawData) : super(rawData) { GaugeCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name'];
unit = rawData['unit']; unit = rawData['unit'];
@ -411,7 +411,7 @@ class GlanceCardData extends CardData {
return GlanceCard(card: this); return GlanceCard(card: this);
} }
GlanceCardData(Map<String, dynamic> rawData) : super(rawData) { GlanceCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
title = rawData["title"]; title = rawData["title"];
showName = rawData['show_name'] ?? true; showName = rawData['show_name'] ?? true;
@ -459,7 +459,7 @@ class HorizontalStackCardData extends CardData {
return HorizontalStackCard(card: this); return HorizontalStackCard(card: this);
} }
HorizontalStackCardData(Map<String, dynamic> rawData) : super(rawData) { HorizontalStackCardData(rawData) : super(rawData) {
if (rawData.containsKey('cards')) { if (rawData.containsKey('cards')) {
childCards = rawData['cards'].map<CardData>((childCard) { childCards = rawData['cards'].map<CardData>((childCard) {
return CardData.parse(childCard); return CardData.parse(childCard);
@ -480,7 +480,7 @@ class VerticalStackCardData extends CardData {
return VerticalStackCard(card: this); return VerticalStackCard(card: this);
} }
VerticalStackCardData(Map<String, dynamic> rawData) : super(rawData) { VerticalStackCardData(rawData) : super(rawData) {
if (rawData.containsKey('cards')) { if (rawData.containsKey('cards')) {
childCards = rawData['cards'].map<CardData>((childCard) { childCards = rawData['cards'].map<CardData>((childCard) {
return CardData.parse(childCard); return CardData.parse(childCard);
@ -502,7 +502,7 @@ class MarkdownCardData extends CardData {
return MarkdownCard(card: this); return MarkdownCard(card: this);
} }
MarkdownCardData(Map<String, dynamic> rawData) : super(rawData) { MarkdownCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
title = rawData['title']; title = rawData['title'];
content = rawData['content']; content = rawData['content'];
@ -517,7 +517,7 @@ class MediaControlCardData extends CardData {
return MediaControlsCard(card: this); return MediaControlsCard(card: this);
} }
MediaControlCardData(Map<String, dynamic> rawData) : super(rawData) { MediaControlCardData(rawData) : super(rawData) {
var entitiId = rawData["entity"]; var entitiId = rawData["entity"];
if (entitiId != null && entitiId is String) { if (entitiId != null && entitiId is String) {
if (HomeAssistant().entities.isExist(entitiId)) { if (HomeAssistant().entities.isExist(entitiId)) {
@ -541,7 +541,7 @@ class ErrorCardData extends CardData {
return ErrorCard(card: this); return ErrorCard(card: this);
} }
ErrorCardData(Map<String, dynamic> rawData) : super(rawData) { ErrorCardData(rawData) : super(rawData) {
cardConfig = '$rawData'; cardConfig = '$rawData';
} }

3
lib/utils/logger.dart
View File

@ -33,6 +33,9 @@ class Logger {
static void _writeToLog(ErrorLevel level, String message, dynamic stacktrace, bool skipCrashlytics) { static void _writeToLog(ErrorLevel level, String message, dynamic stacktrace, bool skipCrashlytics) {
if (isInDebugMode) { if (isInDebugMode) {
debugPrint('$message'); debugPrint('$message');
if (stacktrace != null) {
debugPrint('$stacktrace');
}
} else if (!skipCrashlytics) { } else if (!skipCrashlytics) {
Crashlytics.instance.recordError('$message', stacktrace); Crashlytics.instance.recordError('$message', stacktrace);
} }