diff options
author | 2023-09-20 12:26:45 -0400 | |
---|---|---|
committer | 2023-09-20 12:48:19 -0400 | |
commit | 6a853805d2479bf7b111511b1f94907e425c607a (patch) | |
tree | 343a651a5e4a944de525f585eceb752d9ed3840a /lib/Buttons/ac_on_face.dart | |
parent | 20d76f947ef9d4a9093df0e5ad04476963655173 (diff) |
Rework to use KUKSA.val databroker gRPC API
Rework to move from the WebSocket API with the older KUKSA.val
server to the gRPC "VAL" API of the databroker.
Changes include:
- All VISS WebSocket API code has been removed, and the signal
providers replumbed to be driven by a new VssClient class with
a hvac-specific child class to hold all the gRPC API
handling.
- The generated code for the VAL API and its dependencies has
been checked in under lib/generated, as there still does not
seem to be a good way to generate it during the Flutter build.
- The configuration file is now expected to be "hvac.yaml" instead
of "hvac_config.yaml". The authorization token field name has
been renamed to "authorization", and there are new "use-tls" and
"ca-certificate" configuration fields. TLS is disabled by default
for now, and the default CA certificate is /etc/kuksa.val/CA.pem.
- Bumped minimum SDK version to 2.18 in pubspec.yaml to enable
"super" keyword support. This matches what the version was set
to in flutter-homescreen.
- The Vehicle and VehicleSignals classes have been reworked into
a VehicleAcStatus class + provider, and users have been updated
to use the Riverpod provider select functionality to attempt to
reduce naive over-updating.
- VSS paths have been rationalized to use the definitions in the
VSSPath class so only one location will need to be updated on any
signal name changes.
- Added .gitignore file from flutter-homescreen to keep things
clean in the future.
Bug-AGL: SPEC-4762
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Idbabb54ead52bf38796f264a3c8a270aa170e2cd
Diffstat (limited to 'lib/Buttons/ac_on_face.dart')
-rw-r--r-- | lib/Buttons/ac_on_face.dart | 60 |
1 files changed, 26 insertions, 34 deletions
diff --git a/lib/Buttons/ac_on_face.dart b/lib/Buttons/ac_on_face.dart index f0c0f41..9d8ded3 100644 --- a/lib/Buttons/ac_on_face.dart +++ b/lib/Buttons/ac_on_face.dart @@ -5,19 +5,18 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg_provider/flutter_svg_provider.dart'; -import 'package:flutter_hvac/kuksa-server/vehicle-provider.dart'; +import 'package:flutter_hvac/vehicle-signals/vehicle_ac_status_provider.dart'; +import 'package:flutter_hvac/vehicle-signals/vss_provider.dart'; +import 'package:flutter_hvac/vehicle-signals/vss_path.dart'; -import '../kuksa-server/vehicle-class.dart'; -import '../kuksa-server/vehicle_methods.dart'; import '../size.dart'; class AcOnFace extends ConsumerStatefulWidget { final String img; - WebSocket socket; + AcOnFace({ Key? key, required this.img, - required this.socket, }) : super(key: key); @override @@ -45,26 +44,20 @@ class _AcOnFaceState extends ConsumerState<AcOnFace> _controller.addListener(() {}); _controller.addStatusListener((status) { + String direction = ""; if (status == AnimationStatus.completed) { - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row1.Left.AirDistribution", 'up'); - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row1.Right.AirDistribution", 'up'); - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row2.Left.AirDistribution", 'up'); - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row2.Right.AirDistribution", 'up'); + direction = "MIDDLE"; + } else if (status == AnimationStatus.dismissed) { + direction = "DOWN"; } - - if (status == AnimationStatus.dismissed) { - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row1.Left.AirDistribution", 'middle'); - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row1.Right.AirDistribution", 'middle'); - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row2.Left.AirDistribution", 'middle'); - VISS.set(widget.socket,ref, - "Vehicle.Cabin.HVAC.Station.Row2.Right.AirDistribution", 'middle'); + if (direction.isNotEmpty) { + var vss = ref.read(vssClientProvider); + if (vss != null) { + vss.setString(VSSPath.vehicleFrontLeftAirDistribution, direction, true); + vss.setString(VSSPath.vehicleFrontRightAirDistribution, direction, true); + vss.setString(VSSPath.vehicleRearLeftAirDistribution, direction, true); + vss.setString(VSSPath.vehicleRearRightAirDistribution, direction, true); + } } }); } @@ -78,8 +71,9 @@ class _AcOnFaceState extends ConsumerState<AcOnFace> @override Widget build(BuildContext context) { - vehicle vehicledata = ref.watch(vehicleProvider); - if (vehicledata.isAcDirectionUp == false) { + bool isAcDirectionUp = ref.watch(vehicleAcStatusProvider.select((p) => p.isAcDirectionUp)); + bool isAcDirectionDown = ref.watch(vehicleAcStatusProvider.select((p) => p.isAcDirectionDown)); + if (isAcDirectionUp == false) { _controller.reverse(); } @@ -95,7 +89,7 @@ class _AcOnFaceState extends ConsumerState<AcOnFace> decoration: BoxDecoration( - gradient: vehicledata.isAcDirectionUp + gradient: isAcDirectionUp ? RadialGradient( colors: [Colors.black, Colors.lightBlue], radius: 2, @@ -122,18 +116,16 @@ class _AcOnFaceState extends ConsumerState<AcOnFace> ), ), onTap: () { - if (vehicledata.isAcDirectionDown) { + if (isAcDirectionDown) { ref - .watch(vehicleProvider.notifier) - .update(isAcDirectionDown: !vehicledata.isAcDirectionDown); + .watch(vehicleAcStatusProvider.notifier) + .update(isAcDirectionDown: !isAcDirectionDown); } Future.delayed(Duration(milliseconds: 500),(){ - vehicledata.isAcDirectionUp - ? _controller.reverse() - : _controller.forward(); + isAcDirectionUp ? _controller.reverse() : _controller.forward(); - ref.watch(vehicleProvider.notifier).update( - isAcDirectionUp: !vehicledata.isAcDirectionUp, + ref.watch(vehicleAcStatusProvider.notifier).update( + isAcDirectionUp: !isAcDirectionUp, ); }); |