Compare commits

...

26 Commits
0.2.0 ... 0.2.3

Author SHA1 Message Date
7f2611b410 Version 0.2.3 2018-10-03 00:55:50 +03:00
648750655c Resolves #109 No static width for inputs 2018-10-02 23:21:50 +03:00
8a0d5581d9 Resolves #111: Assumed state 2018-10-02 23:10:40 +03:00
98d716109b Resolves #21: Handling socket disconnect by sink done Future 2018-10-02 22:48:47 +03:00
ebb2f2b4e5 Decline all timeouts as variables 2018-10-02 18:05:50 +03:00
d910e4dd43 Add socket ping interval 2018-10-02 17:42:06 +03:00
95d80fbbfc Resolves #58: Message queue 2018-10-02 17:23:19 +03:00
41297150c2 Implement fetch timer with 30 timeout along with connection timer 2018-10-02 16:00:55 +03:00
b14b248f2f Resolves #72 reconnect on message sending 2018-10-02 15:46:24 +03:00
13fc1bff27 Resolves #61: Prevent second connection opening 2018-10-02 14:50:42 +03:00
eee8f21e76 Version 0.2.2 2018-10-02 00:48:25 +03:00
8ce3560d8d Merge pull request #108 from estevez-dev/feature/entity_widget
Refactoring: Stateful entity widgets
2018-10-01 21:44:31 +00:00
9e97bac85b Refactoring: Stateful entity widgets 2018-10-02 00:41:40 +03:00
4a0b447f00 Separate entity classes on different files 2018-10-01 21:57:54 +03:00
bc4969dae8 Resolves #104: wrong value is set for input_text 2018-10-01 10:24:38 +03:00
5025b3d384 Merge pull request #101 from estevez-dev/release/0.2.1
Release/0.2.1
2018-09-30 20:29:12 +00:00
0d7e7eb6f7 Version 0.2.3 2018-09-30 23:14:40 +03:00
062392b38c Resolves #100 input_datetime 2018-09-30 23:12:27 +03:00
acd468ae75 Resolves #53 input_select support 2018-09-30 20:57:07 +03:00
60f216df13 Resolves #99 Slider with mutliplier 2018-09-30 20:24:13 +03:00
9de8a659d3 Resolves #95: Input value validation 2018-09-30 12:51:55 +03:00
7dd8f65af7 Last updated time in duration 2018-09-30 10:15:32 +03:00
9e83a3e447 Refactoring: Input text and focus 2018-09-30 10:00:19 +03:00
2f135169a9 Fix slider step issue 2018-09-30 01:37:33 +03:00
76d2750ad6 Fix slider issues. Siplify Entity view 2018-09-30 01:07:02 +03:00
571778fbd4 Resolves #80: Card without title 2018-09-29 23:13:02 +03:00
17 changed files with 737 additions and 426 deletions

View File

@ -1,314 +0,0 @@
part of 'main.dart';
class Entity {
static const STATE_ICONS_COLORS = {
"on": Colors.amber,
"off": Color.fromRGBO(68, 115, 158, 1.0),
"unavailable": Colors.black12,
"unknown": Colors.black12,
"playing": Colors.amber
};
static const RIGTH_WIDGET_PADDING = 14.0;
static const LEFT_WIDGET_PADDING = 8.0;
static const EXTENDED_WIDGET_HEIGHT = 50.0;
static const WIDGET_HEIGHT = 34.0;
Map _attributes;
String _domain;
String _entityId;
String _state;
String _entityPicture;
DateTime _lastUpdated;
String get displayName => _attributes["friendly_name"] ?? (_attributes["name"] ?? "_");
String get domain => _domain;
String get entityId => _entityId;
String get state => _state;
set state(value) => _state = value;
double get minValue => _attributes["min"] ?? 0.0;
double get maxValue => _attributes["max"] ?? 100.0;
double get valueStep => _attributes["step"] ?? 1.0;
double get doubleState => double.tryParse(_state) ?? 0.0;
bool get isSliderField => _attributes["mode"] == "slider";
bool get isTextField => _attributes["mode"] == "text";
bool get isPasswordField => _attributes["mode"] == "password";
String get deviceClass => _attributes["device_class"] ?? null;
bool get isView => (_domain == "group") && (_attributes != null ? _attributes["view"] ?? false : false);
bool get isGroup => _domain == "group";
String get icon => _attributes["icon"] ?? "";
bool get isOn => state == "on";
String get entityPicture => _attributes["entity_picture"];
String get unitOfMeasurement => _attributes["unit_of_measurement"] ?? "";
List get childEntities => _attributes["entity_id"] ?? [];
String get lastUpdated => _getLastUpdatedFormatted();
Entity(Map rawData) {
update(rawData);
}
int getValueDivisions() {
return ((maxValue - minValue)/valueStep).round().round();
}
void update(Map rawData) {
_attributes = rawData["attributes"] ?? {};
_domain = rawData["entity_id"].split(".")[0];
_entityId = rawData["entity_id"];
_state = rawData["state"];
_lastUpdated = DateTime.tryParse(rawData["last_updated"]);
}
String _getLastUpdatedFormatted() {
if (_lastUpdated == null) {
return "-";
} else {
return formatDate(_lastUpdated, [yy, '-', M, '-', d, ' ', HH, ':', nn, ':', ss]);
}
}
void openEntityPage() {
eventBus.fire(new ShowEntityPageEvent(this));
}
Widget buildWidget(BuildContext context) {
return SizedBox(
height: Entity.WIDGET_HEIGHT,
child: Row(
children: <Widget>[
GestureDetector(
child: _buildIconWidget(),
onTap: openEntityPage,
),
Expanded(
child: GestureDetector(
child: _buildNameWidget(),
onTap: openEntityPage,
),
),
_buildActionWidget(context)
],
),
);
}
Widget buildExtendedWidget(BuildContext context, String staticState) {
return Row(
children: <Widget>[
_buildIconWidget(),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: _buildNameWidget(),
),
_buildExtendedActionWidget(context, staticState)
],
),
_buildLastUpdatedWidget()
],
),
)
],
);
}
Widget _buildIconWidget() {
return Padding(
padding: EdgeInsets.fromLTRB(Entity.LEFT_WIDGET_PADDING, 0.0, 12.0, 0.0),
child: MaterialDesignIcons.createIconWidgetFromEntityData(this, 28.0, Entity.STATE_ICONS_COLORS[_state] ?? Colors.blueGrey),
);
}
Widget _buildLastUpdatedWidget() {
return Text(
'${this.lastUpdated}',
textAlign: TextAlign.left,
style: TextStyle(
fontSize: 12.0,
color: Colors.black26
),
);
}
Widget _buildNameWidget() {
return Padding(
padding: EdgeInsets.only(right: 10.0),
child: Text(
"${this.displayName}",
overflow: TextOverflow.ellipsis,
softWrap: false,
style: TextStyle(
fontSize: 16.0
),
),
);
}
Widget _buildActionWidget(BuildContext context) {
return Padding(
padding: EdgeInsets.fromLTRB(0.0, 0.0, Entity.RIGTH_WIDGET_PADDING, 0.0),
child: GestureDetector(
child: Text(
this.isPasswordField ? "******" :
"$_state${this.unitOfMeasurement}",
textAlign: TextAlign.right,
style: new TextStyle(
fontSize: 16.0,
)
),
onTap: openEntityPage,
)
);
}
Widget _buildExtendedActionWidget(BuildContext context, String staticState) {
return _buildActionWidget(context);
}
}
class SwitchEntity extends Entity {
SwitchEntity(Map rawData) : super(rawData);
@override
Widget _buildActionWidget(BuildContext context) {
return Switch(
value: this.isOn,
onChanged: ((switchState) {
eventBus.fire(new ServiceCallEvent(_domain, switchState ? "turn_on" : "turn_off", entityId, null));
}),
);
}
}
class ButtonEntity extends Entity {
ButtonEntity(Map rawData) : super(rawData);
@override
Widget _buildActionWidget(BuildContext context) {
return FlatButton(
onPressed: (() {
eventBus.fire(new ServiceCallEvent(_domain, "turn_on", _entityId, null));
}),
child: Text(
"EXECUTE",
textAlign: TextAlign.right,
style: new TextStyle(fontSize: 16.0, color: Colors.blue),
),
);
}
}
class InputEntity extends Entity {
InputEntity(Map rawData) : super(rawData);
@override
Widget buildExtendedWidget(BuildContext context, String staticState) {
return Column(
children: <Widget>[
SizedBox(
height: Entity.EXTENDED_WIDGET_HEIGHT,
child: Row(
children: <Widget>[
_buildIconWidget(),
Expanded(
child: _buildNameWidget(),
),
_buildLastUpdatedWidget()
],
),
),
SizedBox(
height: Entity.EXTENDED_WIDGET_HEIGHT,
child: _buildExtendedActionWidget(context, staticState),
)
],
);
}
@override
Widget _buildActionWidget(BuildContext context) {
if (this.isSliderField) {
return Container(
width: 200.0,
child: Row(
children: <Widget>[
Expanded(
child: Slider(
min: this.minValue*10,
max: this.maxValue*10,
value: (this.doubleState <= this.maxValue) && (this.doubleState >= this.minValue) ? this.doubleState*10 : this.minValue*10,
divisions: this.getValueDivisions(),
onChanged: (value) {
eventBus.fire(new StateChangedEvent(_entityId, (value.roundToDouble() / 10).toString(), true));
},
onChangeEnd: (value) {
eventBus.fire(new ServiceCallEvent(_domain, "set_value", _entityId,{"value": "$_state"}));
},
),
),
Padding(
padding: EdgeInsets.only(right: 16.0),
child: Text(
"$_state${this.unitOfMeasurement}",
textAlign: TextAlign.right,
style: new TextStyle(
fontSize: 16.0,
)
),
)
],
),
);
} else {
return super._buildActionWidget(context);
}
}
@override
Widget _buildExtendedActionWidget(BuildContext context, String staticState) {
return Padding(
padding: EdgeInsets.fromLTRB(Entity.LEFT_WIDGET_PADDING, 0.0, Entity.RIGTH_WIDGET_PADDING, 0.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Expanded(
child: TextField(
obscureText: this.isPasswordField,
controller: TextEditingController(
text: staticState,
),
onChanged: (value) {
staticState = value;
},
),
),
SizedBox(
width: 63.0,
child: FlatButton(
onPressed: () {
eventBus.fire(new ServiceCallEvent(_domain, "set_value", _entityId,{"value": "$staticState"}));
Navigator.pop(context);
},
child: Text(
"SET",
textAlign: TextAlign.right,
style: new TextStyle(fontSize: 16.0, color: Colors.blue),
),
),
)
],
)
);
}
}

View File

@ -3,7 +3,7 @@ part of 'main.dart';
class EntityViewPage extends StatefulWidget {
EntityViewPage({Key key, this.entity}) : super(key: key);
Entity entity;
final Entity entity;
@override
_EntityViewPageState createState() => new _EntityViewPageState();
@ -12,21 +12,17 @@ class EntityViewPage extends StatefulWidget {
class _EntityViewPageState extends State<EntityViewPage> {
String _title;
Entity _entity;
String _lastState;
StreamSubscription _stateSubscription;
@override
void initState() {
super.initState();
_entity = widget.entity;
_lastState = _entity.state;
if (_stateSubscription != null) _stateSubscription.cancel();
_stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
setState(() {
if (event.entityId == _entity.entityId) {
_lastState = event.newState ?? _entity.state;
}
});
if (event.entityId == _entity.entityId) {
setState(() {});
}
});
_prepareData();
}
@ -48,11 +44,7 @@ class _EntityViewPageState extends State<EntityViewPage> {
),
body: Padding(
padding: EdgeInsets.all(10.0),
child: ListView(
children: <Widget>[
_entity.buildExtendedWidget(context, _lastState)
],
),
child: _entity.buildWidget(context, false)
),
);
}

View File

@ -0,0 +1,24 @@
part of '../main.dart';
class _ButtonEntityWidgetState extends _EntityWidgetState {
@override
void setNewState(newValue) {
eventBus.fire(new ServiceCallEvent(widget.entity.domain, "turn_on", widget.entity.entityId, null));
}
@override
Widget _buildActionWidget(bool inCard, BuildContext context) {
return FlatButton(
onPressed: (() {
setNewState(null);
}),
child: Text(
"EXECUTE",
textAlign: TextAlign.right,
style:
new TextStyle(fontSize: Entity.STATE_FONT_SIZE, color: Colors.blue),
),
);
}
}

View File

@ -0,0 +1,92 @@
part of '../main.dart';
class _DateTimeEntityWidgetState extends _EntityWidgetState {
bool get hasDate => widget.entity._attributes["has_date"] ?? false;
bool get hasTime => widget.entity._attributes["has_time"] ?? false;
int get year => widget.entity._attributes["year"] ?? 1970;
int get month => widget.entity._attributes["month"] ?? 1;
int get day => widget.entity._attributes["day"] ?? 1;
int get hour => widget.entity._attributes["hour"] ?? 0;
int get minute => widget.entity._attributes["minute"] ?? 0;
int get second => widget.entity._attributes["second"] ?? 0;
String get formattedState => _getFormattedState();
DateTime get dateTimeState => _getDateTimeState();
DateTime _getDateTimeState() {
return DateTime(this.year, this.month, this.day, this.hour, this.minute, this.second);
}
String _getFormattedState() {
String formattedState = "";
if (this.hasDate) {
formattedState += formatDate(dateTimeState, [M, ' ', d, ', ', yyyy]);
}
if (this.hasTime) {
formattedState += " "+formatDate(dateTimeState, [HH, ':', nn]);
}
return formattedState;
}
@override
void setNewState(newValue) {
eventBus.fire(new ServiceCallEvent(widget.entity.domain, "set_datetime", widget.entity.entityId,
newValue));
}
@override
Widget _buildActionWidget(bool inCard, BuildContext context) {
return Padding(
padding:
EdgeInsets.fromLTRB(0.0, 0.0, Entity.RIGHT_WIDGET_PADDING, 0.0),
child: GestureDetector(
child: Text(
"$formattedState",
textAlign: TextAlign.right,
style: new TextStyle(
fontSize: Entity.STATE_FONT_SIZE,
)),
onTap: () => _handleStateTap(context),
)
);
}
void _handleStateTap(BuildContext context) {
if (hasDate) {
_showDatePicker(context).then((date) {
if (date != null) {
if (hasTime) {
_showTimePicker(context).then((time){
setNewState({"date": "${formatDate(date, [yyyy, '-', mm, '-', dd])}", "time": "${formatDate(DateTime(1970, 1, 1, time.hour, time.minute), [HH, ':', nn])}"});
});
} else {
setNewState({"date": "${formatDate(date, [yyyy, '-', mm, '-', dd])}"});
}
}
});
} else if (hasTime) {
_showTimePicker(context).then((time){
if (time != null) {
setNewState({"time": "${formatDate(DateTime(1970, 1, 1, time.hour, time.minute), [HH, ':', nn])}"});
}
});
} else {
TheLogger.log("Warning", "${widget.entity.entityId} has no date and no time");
}
}
Future _showDatePicker(BuildContext context) {
return showDatePicker(
context: context,
initialDate: dateTimeState,
firstDate: DateTime(1970),
lastDate: DateTime(2037) //Unix timestamp will finish at Jan 19, 2038
);
}
Future _showTimePicker(BuildContext context) {
return showTimePicker(
context: context,
initialTime: TimeOfDay.fromDateTime(dateTimeState)
);
}
}

View File

@ -0,0 +1,242 @@
part of '../main.dart';
class Entity {
static const STATE_ICONS_COLORS = {
"on": Colors.amber,
"off": Color.fromRGBO(68, 115, 158, 1.0),
"unavailable": Colors.black12,
"unknown": Colors.black12,
"playing": Colors.amber
};
static const RIGHT_WIDGET_PADDING = 14.0;
static const LEFT_WIDGET_PADDING = 8.0;
static const EXTENDED_WIDGET_HEIGHT = 50.0;
static const WIDGET_HEIGHT = 34.0;
static const ICON_SIZE = 28.0;
static const STATE_FONT_SIZE = 16.0;
static const NAME_FONT_SIZE = 16.0;
static const SMALL_FONT_SIZE = 14.0;
static const INPUT_WIDTH = 160.0;
Map _attributes;
String _domain;
String _entityId;
String _state;
String assumedState;
DateTime _lastUpdated;
String get displayName =>
_attributes["friendly_name"] ?? (_attributes["name"] ?? "_");
String get domain => _domain;
String get entityId => _entityId;
String get state => _state;
set state(value) => _state = value;
String get deviceClass => _attributes["device_class"] ?? null;
bool get isView =>
(_domain == "group") &&
(_attributes != null ? _attributes["view"] ?? false : false);
bool get isGroup => _domain == "group";
String get icon => _attributes["icon"] ?? "";
bool get isOn => state == "on";
String get entityPicture => _attributes["entity_picture"];
String get unitOfMeasurement => _attributes["unit_of_measurement"] ?? "";
List get childEntities => _attributes["entity_id"] ?? [];
String get lastUpdated => _getLastUpdatedFormatted();
Entity(Map rawData) {
update(rawData);
}
void update(Map rawData) {
_attributes = rawData["attributes"] ?? {};
_domain = rawData["entity_id"].split(".")[0];
_entityId = rawData["entity_id"];
_state = rawData["state"];
assumedState = _state;
_lastUpdated = DateTime.tryParse(rawData["last_updated"]);
}
EntityWidget buildWidget(BuildContext context, bool inCard) {
return EntityWidget(
entity: this,
inCard: inCard,
);
}
String _getLastUpdatedFormatted() {
if (_lastUpdated == null) {
return "-";
} else {
DateTime now = DateTime.now();
Duration d = now.difference(_lastUpdated);
String text;
int v;
if (d.inDays == 0) {
if (d.inHours == 0) {
if (d.inMinutes == 0) {
text = "seconds ago";
v = d.inSeconds;
} else {
text = "minutes ago";
v = d.inMinutes;
}
} else {
text = "hours ago";
v = d.inHours;
}
} else {
text = "days ago";
v = d.inDays;
}
return "$v $text";
}
}
}
class EntityWidget extends StatefulWidget {
EntityWidget({Key key, this.entity, this.inCard}) : super(key: key);
final Entity entity;
final bool inCard;
@override
_EntityWidgetState createState() {
switch (entity.domain) {
case "automation":
case "input_boolean ":
case "switch":
case "light": {
return _SwitchEntityWidgetState();
}
case "script":
case "scene": {
return _ButtonEntityWidgetState();
}
case "input_datetime": {
return _DateTimeEntityWidgetState();
}
case "input_select": {
return _SelectEntityWidgetState();
}
case "input_number": {
return _SliderEntityWidgetState();
}
case "input_text": {
return _TextEntityWidgetState();
}
default: {
return _EntityWidgetState();
}
}
}
}
class _EntityWidgetState extends State<EntityWidget> {
@override
Widget build(BuildContext context) {
if (widget.inCard) {
return _buildMainWidget(context);
} else {
return ListView(
children: <Widget>[
_buildMainWidget(context),
_buildLastUpdatedWidget()
],
);
}
}
Widget _buildMainWidget(BuildContext context) {
return SizedBox(
height: Entity.WIDGET_HEIGHT,
child: Row(
children: <Widget>[
GestureDetector(
child: _buildIconWidget(),
onTap: widget.inCard ? openEntityPage : null,
),
Expanded(
child: GestureDetector(
child: _buildNameWidget(),
onTap: widget.inCard ? openEntityPage : null,
),
),
_buildActionWidget(widget.inCard, context)
],
),
);
}
void openEntityPage() {
eventBus.fire(new ShowEntityPageEvent(widget.entity));
}
void setNewState(newState) {
return;
}
Widget buildAdditionalWidget() {
return _buildLastUpdatedWidget();
}
Widget _buildIconWidget() {
return Padding(
padding: EdgeInsets.fromLTRB(Entity.LEFT_WIDGET_PADDING, 0.0, 12.0, 0.0),
child: MaterialDesignIcons.createIconWidgetFromEntityData(
widget.entity,
Entity.ICON_SIZE,
Entity.STATE_ICONS_COLORS[widget.entity.state] ?? Colors.blueGrey),
);
}
Widget _buildLastUpdatedWidget() {
return Padding(
padding: EdgeInsets.fromLTRB(
Entity.LEFT_WIDGET_PADDING, Entity.SMALL_FONT_SIZE, 0.0, 0.0),
child: Text(
'${widget.entity.lastUpdated}',
textAlign: TextAlign.left,
style:
TextStyle(fontSize: Entity.SMALL_FONT_SIZE, color: Colors.black26),
),
);
}
Widget _buildNameWidget() {
return Padding(
padding: EdgeInsets.only(right: 10.0),
child: Text(
"${widget.entity.displayName}",
overflow: TextOverflow.ellipsis,
softWrap: false,
style: TextStyle(fontSize: Entity.NAME_FONT_SIZE),
),
);
}
Widget _buildActionWidget(bool inCard, BuildContext context) {
return Padding(
padding:
EdgeInsets.fromLTRB(0.0, 0.0, Entity.RIGHT_WIDGET_PADDING, 0.0),
child: GestureDetector(
child: Text(
"${widget.entity.state}${widget.entity.unitOfMeasurement}",
textAlign: TextAlign.right,
style: new TextStyle(
fontSize: Entity.STATE_FONT_SIZE,
)),
onTap: openEntityPage,
)
);
}
}

View File

@ -0,0 +1,36 @@
part of '../main.dart';
class _SelectEntityWidgetState extends _EntityWidgetState {
List<String> _listOptions = [];
@override
void setNewState(newValue) {
eventBus.fire(new ServiceCallEvent(widget.entity.domain, "select_option", widget.entity.entityId,
{"option": "$newValue"}));
}
@override
Widget _buildActionWidget(bool inCard, BuildContext context) {
_listOptions.clear();
if (widget.entity._attributes["options"] != null) {
widget.entity._attributes["options"].forEach((value){
_listOptions.add(value.toString());
});
}
return Expanded(
//width: Entity.INPUT_WIDTH,
child: DropdownButton<String>(
value: widget.entity.state,
items: this._listOptions.map((String value) {
return new DropdownMenuItem<String>(
value: value,
child: new Text(value),
);
}).toList(),
onChanged: (_) {
setNewState(_);
},
),
);
}
}

View File

@ -0,0 +1,65 @@
part of '../main.dart';
class _SliderEntityWidgetState extends _EntityWidgetState {
int _multiplier = 1;
double get minValue => widget.entity._attributes["min"] ?? 0.0;
double get maxValue => widget.entity._attributes["max"] ?? 100.0;
double get valueStep => widget.entity._attributes["step"] ?? 1.0;
double get doubleState => double.tryParse(widget.entity.state) ?? 0.0;
@override
void initState() {
super.initState();
}
@override
void setNewState(newValue) {
eventBus.fire(new ServiceCallEvent(widget.entity.domain, "set_value", widget.entity.entityId,
{"value": "${newValue.toString()}"}));
}
@override
Widget _buildActionWidget(bool inCard, BuildContext context) {
if (valueStep < 1) {
_multiplier = 10;
} else if (valueStep < 0.1) {
_multiplier = 100;
}
return Expanded(
//width: 200.0,
child: Row(
children: <Widget>[
Expanded(
child: Slider(
min: this.minValue * _multiplier,
max: this.maxValue * _multiplier,
value: (doubleState <= this.maxValue) &&
(doubleState >= this.minValue)
? doubleState * _multiplier
: this.minValue * _multiplier,
onChanged: (value) {
setState(() {
widget.entity.state = (value.roundToDouble() / _multiplier).toString();
});
/*eventBus.fire(new StateChangedEvent(widget.entity.entityId,
(value.roundToDouble() / _multiplier).toString(), true));*/
},
onChangeEnd: (value) {
setNewState(value.roundToDouble() / _multiplier);
},
),
),
Padding(
padding: EdgeInsets.only(right: Entity.RIGHT_WIDGET_PADDING),
child: Text("${widget.entity.state}${widget.entity.unitOfMeasurement}",
textAlign: TextAlign.right,
style: new TextStyle(
fontSize: Entity.STATE_FONT_SIZE,
)),
)
],
),
);
}
}

View File

@ -0,0 +1,33 @@
part of '../main.dart';
class _SwitchEntityWidgetState extends _EntityWidgetState {
@override
void initState() {
super.initState();
}
@override
void setNewState(newValue) {
setState(() {
widget.entity.assumedState = newValue ? 'on' : 'off';
});
Timer(Duration(seconds: 2), (){
setState(() {
widget.entity.assumedState = widget.entity.state;
});
});
eventBus.fire(new ServiceCallEvent(
widget.entity.domain, (newValue as bool) ? "turn_on" : "turn_off", widget.entity.entityId, null));
}
@override
Widget _buildActionWidget(bool inCard, BuildContext context) {
return Switch(
value: widget.entity.assumedState == 'on',
onChanged: ((switchState) {
setNewState(switchState);
}),
);
}
}

View File

@ -0,0 +1,83 @@
part of '../main.dart';
class _TextEntityWidgetState extends _EntityWidgetState {
String _tmpValue;
FocusNode _focusNode = FocusNode();
bool validValue = false;
int get valueMinLength => widget.entity._attributes["min"] ?? -1;
int get valueMaxLength => widget.entity._attributes["max"] ?? -1;
String get valuePattern => widget.entity._attributes["pattern"] ?? null;
bool get isTextField => widget.entity._attributes["mode"] == "text";
bool get isPasswordField => widget.entity._attributes["mode"] == "password";
@override
void initState() {
super.initState();
_focusNode.addListener(_focusListener);
_tmpValue = widget.entity.state;
}
@override
void setNewState(newValue) {
if (validate(newValue)) {
eventBus.fire(new ServiceCallEvent(widget.entity.domain, "set_value", widget.entity.entityId,
{"value": "$newValue"}));
} else {
setState(() {
_tmpValue = widget.entity.state;
});
}
}
bool validate(newValue) {
if (newValue is String) {
validValue = (newValue.length >= this.valueMinLength) &&
(this.valueMaxLength == -1 ||
(newValue.length <= this.valueMaxLength));
} else {
validValue = true;
}
return validValue;
}
void _focusListener() {
if (!_focusNode.hasFocus && (_tmpValue != widget.entity.state)) {
setNewState(_tmpValue);
}
}
@override
Widget _buildActionWidget(bool inCard, BuildContext context) {
if (!_focusNode.hasFocus && (_tmpValue != widget.entity.state)) {
_tmpValue = widget.entity.state;
}
if (this.isTextField || this.isPasswordField) {
return Expanded(
//width: Entity.INPUT_WIDTH,
child: TextField(
focusNode: _focusNode,
obscureText: this.isPasswordField,
controller: new TextEditingController.fromValue(
new TextEditingValue(
text: _tmpValue,
selection:
new TextSelection.collapsed(offset: _tmpValue.length))),
onChanged: (value) {
_tmpValue = value;
}),
);
} else {
TheLogger.log("Warning", "Unsupported input mode for ${widget.entity.entityId}");
return super._buildActionWidget(inCard, context);
}
}
@override
void dispose() {
_focusNode.removeListener(_focusListener);
_focusNode.dispose();
super.dispose();
}
}

View File

@ -27,28 +27,7 @@ class EntityCollection {
}
Entity _createEntityInstance(rawEntityData) {
switch (rawEntityData["entity_id"].split(".")[0]) {
case "automation":
case "input_boolean ":
case "switch":
case "light": {
return SwitchEntity(rawEntityData);
}
case "script":
case "scene": {
return ButtonEntity(rawEntityData);
}
case "input_text":
case "input_number": {
return InputEntity(rawEntityData);
}
default: {
return Entity(rawEntityData);
}
}
return Entity(rawEntityData);
}
void updateState(Map rawStateData) {

View File

@ -6,6 +6,7 @@ class HomeAssistant {
String _hassioAuthType;
IOWebSocketChannel _hassioChannel;
SendMessageQueue _messageQueue;
int _currentMessageId = 0;
int _statesMessageId = 0;
@ -20,7 +21,13 @@ class HomeAssistant {
Completer _statesCompleter;
Completer _servicesCompleter;
Completer _configCompleter;
Timer _fetchingTimer;
Completer _connectionCompleter;
Timer _connectionTimer;
Timer _fetchTimer;
int messageExpirationTime = 50; //seconds
Duration fetchTimeout = Duration(seconds: 30);
Duration connectTimeout = Duration(seconds: 10);
String get locationName => _instanceConfig["location_name"] ?? "";
int get viewsCount => _entities.viewList.length ?? 0;
@ -34,19 +41,19 @@ class HomeAssistant {
_hassioAuthType = authType;
_entities = EntityCollection();
_uiBuilder = UIBuilder();
_messageQueue = SendMessageQueue(messageExpirationTime);
}
Future fetch() {
if ((_fetchCompleter != null) && (!_fetchCompleter.isCompleted)) {
TheLogger.log("Warning","Previous fetch is not complited");
} else {
//TODO: Fetch timeout timer. Should be removed after #21 fix
_fetchingTimer = Timer(Duration(seconds: 15), () {
closeConnection();
_fetchCompleter.completeError({"errorCode" : 1,"errorMessage": "Connection timeout"});
});
_fetchCompleter = new Completer();
_reConnectSocket().then((r) {
_fetchTimer = Timer(fetchTimeout, () {
closeConnection();
_finishFetching({"errorCode" : 9,"errorMessage": "Couldn't get data from server"});
});
_connection().then((r) {
_getData();
}).catchError((e) {
_finishFetching(e);
@ -62,18 +69,32 @@ class HomeAssistant {
_hassioChannel = null;
}
Future _reConnectSocket() {
var _connectionCompleter = new Completer();
if ((_hassioChannel == null) || (_hassioChannel.closeCode != null)) {
TheLogger.log("Debug","Socket connecting...");
_hassioChannel = IOWebSocketChannel.connect(_hassioAPIEndpoint);
_hassioChannel.stream.handleError((e) {
TheLogger.log("Error","Unhandled socket error: ${e.toString()}");
});
_hassioChannel.stream.listen((message) =>
_handleMessage(_connectionCompleter, message));
Future _connection() {
if ((_connectionCompleter != null) && (!_connectionCompleter.isCompleted)) {
TheLogger.log("Debug","Previous connection is not complited");
} else {
_connectionCompleter.complete();
if ((_hassioChannel == null) || (_hassioChannel.sink == null) || (_hassioChannel.closeCode != null)) {
TheLogger.log("Debug", "Socket connecting...");
_connectionCompleter = new Completer();
_connectionTimer = Timer(connectTimeout, () {
closeConnection();
_finishConnecting({"errorCode" : 1,"errorMessage": "Couldn't connect to Home Assistant. Looks like a network issues"});
});
_hassioChannel = IOWebSocketChannel.connect(
_hassioAPIEndpoint, pingInterval: Duration(seconds: 30));
_hassioChannel.stream.handleError((e) {
TheLogger.log("Error", "Unhandled socket error: ${e.toString()}");
});
_hassioChannel.stream.listen((message) =>
_handleMessage(_connectionCompleter, message));
_hassioChannel.sink.done.whenComplete(() {
TheLogger.log("Debug","Socket sink finished. Assuming it is closed.");
closeConnection();
});
} else {
//TheLogger.log("Debug","Socket looks connected...${_hassioChannel.protocol}, ${_hassioChannel.closeCode}, ${_hassioChannel.closeReason}");
_finishConnecting(null);
}
}
return _connectionCompleter.future;
}
@ -94,12 +115,26 @@ class HomeAssistant {
});
}
_finishFetching(error) {
_fetchingTimer.cancel();
void _finishFetching(error) {
_fetchTimer.cancel();
_finishConnecting(error);
if (error != null) {
_fetchCompleter.completeError(error);
if (!_fetchCompleter.isCompleted)
_fetchCompleter.completeError(error);
} else {
_fetchCompleter.complete();
if (!_fetchCompleter.isCompleted)
_fetchCompleter.complete();
}
}
void _finishConnecting(error) {
_connectionTimer.cancel();
if (error != null) {
if (!_connectionCompleter.isCompleted)
_connectionCompleter.completeError(error);
} else {
if (!_connectionCompleter.isCompleted)
_connectionCompleter.complete();
}
}
@ -107,12 +142,12 @@ class HomeAssistant {
var data = json.decode(message);
//TheLogger.log("Debug","[Received] => Message type: ${data['type']}");
if (data["type"] == "auth_required") {
_sendMessageRaw('{"type": "auth","$_hassioAuthType": "$_hassioPassword"}');
_sendAuthMessageRaw('{"type": "auth","$_hassioAuthType": "$_hassioPassword"}');
} else if (data["type"] == "auth_ok") {
_finishConnecting(null);
_sendSubscribe();
connectionCompleter.complete();
} else if (data["type"] == "auth_invalid") {
connectionCompleter.completeError({"errorCode": 6, "errorMessage": "${data["message"]}"});
_finishFetching({"errorCode": 6, "errorMessage": "${data["message"]}"});
} else if (data["type"] == "result") {
if (data["id"] == _configMessageId) {
_parseConfig(data);
@ -139,14 +174,14 @@ class HomeAssistant {
void _sendSubscribe() {
_incrementMessageId();
_subscriptionMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}');
_sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}', false);
}
Future _getConfig() {
_configCompleter = new Completer();
_incrementMessageId();
_configMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}');
_sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}', false);
return _configCompleter.future;
}
@ -155,7 +190,7 @@ class HomeAssistant {
_statesCompleter = new Completer();
_incrementMessageId();
_statesMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}');
_sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}', false);
return _statesCompleter.future;
}
@ -164,7 +199,7 @@ class HomeAssistant {
_servicesCompleter = new Completer();
_incrementMessageId();
_servicesMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}');
_sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}', false);
return _servicesCompleter.future;
}
@ -173,17 +208,44 @@ class HomeAssistant {
_currentMessageId += 1;
}
_sendMessageRaw(String message) {
if (message.indexOf('"type": "auth"') > 0) {
TheLogger.log("Debug", "[Sending] ==> auth request");
} else {
TheLogger.log("Debug", "[Sending] ==> $message");
}
void _sendAuthMessageRaw(String message) {
TheLogger.log("Debug", "[Sending] ==> auth request");
_hassioChannel.sink.add(message);
}
_sendMessageRaw(String message, bool queued) {
var sendCompleter = Completer();
if (queued) _messageQueue.add(message);
_connection().then((r) {
_messageQueue.getActualMessages().forEach((message){
TheLogger.log("Debug", "[Sending queued] ==> $message");
_hassioChannel.sink.add(message);
});
if (!queued) {
TheLogger.log("Debug", "[Sending] ==> $message");
_hassioChannel.sink.add(message);
}
sendCompleter.complete();
}).catchError((e){
sendCompleter.completeError(e);
});
return sendCompleter.future;
}
Future callService(String domain, String service, String entityId, Map<String, String> additionalParams) {
_incrementMessageId();
String message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entityId"';
if (additionalParams != null) {
additionalParams.forEach((name, value){
message += ', "$name" : "$value"';
});
}
message += '}}';
return _sendMessageRaw(message, true);
}
void _handleEntityStateChange(Map eventData) {
TheLogger.log("Debug", "Parsing new state for ${eventData['entity_id']}");
//TheLogger.log("Debug", "New state for ${eventData['entity_id']}");
_entities.updateState(eventData);
eventBus.fire(new StateChangedEvent(eventData["entity_id"], null, false));
}
@ -232,29 +294,44 @@ class HomeAssistant {
_uiBuilder.build(_entities);
_statesCompleter.complete();
}
}
Future callService(String domain, String service, String entityId, Map<String, String> additionalParams) {
var sendCompleter = Completer();
//TODO: Send service call timeout timer. Should be removed after #21 fix
Timer _sendTimer = Timer(Duration(seconds: 7), () {
sendCompleter.completeError({"errorCode" : 8,"errorMessage": "Connection timeout"});
class SendMessageQueue {
int _messageTimeout;
List<HAMessage> _queue = [];
SendMessageQueue(this._messageTimeout);
void add(String message) {
_queue.add(HAMessage(_messageTimeout, message));
}
List<String> getActualMessages() {
_queue.removeWhere((item) => item.isExpired());
List<String> result = [];
_queue.forEach((haMessage){
result.add(haMessage.message);
});
_reConnectSocket().then((r) {
_incrementMessageId();
String message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entityId"';
if (additionalParams != null) {
additionalParams.forEach((name, value){
message += ', "$name" : "$value"';
});
}
message += '}}';
_sendMessageRaw(message);
_sendTimer.cancel();
sendCompleter.complete();
}).catchError((e){
_sendTimer.cancel();
sendCompleter.completeError(e);
});
return sendCompleter.future;
this.clear();
return result;
}
void clear() {
_queue.clear();
}
}
class HAMessage {
DateTime _timeStamp;
int _messageTimeout;
String message;
HAMessage(this._messageTimeout, this.message) {
_timeStamp = DateTime.now();
}
bool isExpired() {
return _timeStamp.difference(DateTime.now()).inSeconds > _messageTimeout;
}
}

View File

@ -44,7 +44,7 @@ class _LogViewPageState extends State<LogViewPage> {
onPressed: () {
String body = "```\n$_logData```";
String encodedBody = "${Uri.encodeFull(body)}";
haUtils.launchURL("https://github.com/estevez-dev/ha_client_pub/issues/new?body=$encodedBody");
HAUtils.launchURL("https://github.com/estevez-dev/ha_client_pub/issues/new?body=$encodedBody");
},
),
],

View File

@ -12,13 +12,20 @@ import 'package:url_launcher/url_launcher.dart';
import 'package:flutter/services.dart';
import 'package:date_format/date_format.dart';
part 'entity_class/entity.class.dart';
part 'entity_class/button_entity.class.dart';
part 'entity_class/datetime_entity.class.dart';
part 'entity_class/select_entity.class.dart';
part 'entity_class/slider_entity.class.dart';
part 'entity_class/switch_entity.class.dart';
part 'entity_class/text_entity.class.dart';
part 'settings.page.dart';
part 'home_assistant.class.dart';
part 'log.page.dart';
part 'entity.page.dart';
part 'utils.class.dart';
part 'mdi.class.dart';
part 'entity.class.dart';
part 'entity_collection.class.dart';
part 'ui_builder_class.dart';
part 'view_class.dart';
@ -27,7 +34,7 @@ part 'badge_class.dart';
EventBus eventBus = new EventBus();
const String appName = "HA Client";
const appVersion = "0.2.0";
const appVersion = "0.2.3";
String homeAssistantWebHost;
@ -60,7 +67,7 @@ class HAClientApp extends StatelessWidget {
),
initialRoute: "/",
routes: {
"/": (context) => MainPage(title: 'Hass Client'),
"/": (context) => MainPage(title: 'HA Client'),
"/connection-settings": (context) => ConnectionSettingsPage(title: "Connection Settings"),
"/log-view": (context) => LogViewPage(title: "Log")
},
@ -190,14 +197,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
}
void _callService(String domain, String service, String entityId, Map<String, String> additionalParams) {
setState(() {
_isLoading = true;
});
_homeAssistant.callService(domain, service, entityId, additionalParams).then((r) {
setState(() {
_isLoading = false;
});
}).catchError((e) => _setErrorState(e));
_homeAssistant.callService(domain, service, entityId, additionalParams).catchError((e) => _setErrorState(e));
}
void _showEntityPage(Entity entity) {
@ -385,7 +385,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
Widget _buildCardHeader(String name) {
var result;
if (name.length > 0) {
if (name.trim().length > 0) {
result = new ListTile(
//leading: const Icon(Icons.device_hub),
//subtitle: Text(".."),
@ -409,7 +409,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
entities.add(
Padding(
padding: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
child: entity.buildWidget(context),
child: entity.buildWidget(context, true),
));
}
});
@ -480,7 +480,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
title: Text("Report an issue"),
onTap: () {
Navigator.of(context).pop();
haUtils.launchURL("https://github.com/estevez-dev/ha_client_pub/issues/new");
HAUtils.launchURL("https://github.com/estevez-dev/ha_client_pub/issues/new");
},
),
new AboutListTile(
@ -498,6 +498,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
String message = _lastErrorMessage;
SnackBarAction action;
switch (_errorCodeToBeShown) {
case 9:
case 1: {
action = SnackBarAction(
label: "Retry",

View File

@ -2875,6 +2875,7 @@ class MaterialDesignIcons {
if (data.entityPicture != null) {
if (homeAssistantWebHost != null) {
return CircleAvatar(
radius: size/2,
backgroundColor: Colors.white,
backgroundImage: CachedNetworkImageProvider(
"$homeAssistantWebHost${data.entityPicture}",

View File

@ -32,7 +32,7 @@ class TheLogger {
}
class haUtils {
class HAUtils {
static void launchURL(String url) async {
if (await canLaunch(url)) {
await launch(url);

View File

@ -285,7 +285,7 @@ packages:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.2"
plugin:
dependency: transitive
description:
@ -486,7 +486,7 @@ packages:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.1"
version: "3.2.3"
yaml:
dependency: transitive
description:

View File

@ -1,7 +1,7 @@
name: hass_client
description: Home Assistant Android Client
version: 0.2.0+22
version: 0.2.3+25
environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0"