From 87e1dfffd2c17ef0e3d0711394122456e9d0c7c8 Mon Sep 17 00:00:00 2001 From: uvok Date: Wed, 30 Jul 2025 20:25:03 +0200 Subject: Move FlutterBleCode to new classes --- lib/model/device.dart | 2 - lib/model/device_connection.dart | 29 ++++++ lib/model/device_connection_factory.dart | 32 ++++++ lib/model/flutter_blue_plus_device_connection.dart | 109 +++++++++++++++++++++ lib/model/mock_device_connection.dart | 33 +++++++ 5 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 lib/model/device_connection.dart create mode 100644 lib/model/device_connection_factory.dart create mode 100644 lib/model/flutter_blue_plus_device_connection.dart create mode 100644 lib/model/mock_device_connection.dart (limited to 'lib/model') diff --git a/lib/model/device.dart b/lib/model/device.dart index 27d33dd..98445fa 100644 --- a/lib/model/device.dart +++ b/lib/model/device.dart @@ -1,5 +1,3 @@ -enum ConnectionStatus { disconnected, connected, error } - /// Represents a (badge) device to be connected to. abstract class Device { String? get name; diff --git a/lib/model/device_connection.dart b/lib/model/device_connection.dart new file mode 100644 index 0000000..6d5c248 --- /dev/null +++ b/lib/model/device_connection.dart @@ -0,0 +1,29 @@ +// Copyright (C) 2025, uvok cheetah +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'package:uvok_epaper_badge/model/device.dart'; +import 'package:uvok_epaper_badge/model/mock_device_connection.dart'; + +enum ConnectionStatus { disconnected, connected, error } + +abstract class DeviceConnection { + Future connect(); + Future disconnect(); + ConnectionStatus get status; + + // Future read(String endpoint); + // Future write(String endpoint, Uint8List data); + // Stream subscribe(String endpoint); +} diff --git a/lib/model/device_connection_factory.dart b/lib/model/device_connection_factory.dart new file mode 100644 index 0000000..23a186e --- /dev/null +++ b/lib/model/device_connection_factory.dart @@ -0,0 +1,32 @@ +// Copyright (C) 2025, uvok cheetah +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'package:uvok_epaper_badge/model/device.dart'; +import 'package:uvok_epaper_badge/model/device_connection.dart'; +import 'package:uvok_epaper_badge/model/mock_device_connection.dart'; + +class DeviceConnectionFactory { + static DeviceConnection createConnection(Device device) { + // switch (device.type) { + // case DeviceType.ble: + // return BleDeviceConnection(device); + // case DeviceType.tcp: + // return TcpDeviceConnection(device); + // case DeviceType.http: + // return HttpDeviceConnection(device); + // } + return MockDeviceConnection(); + } +} diff --git a/lib/model/flutter_blue_plus_device_connection.dart b/lib/model/flutter_blue_plus_device_connection.dart new file mode 100644 index 0000000..93aa67e --- /dev/null +++ b/lib/model/flutter_blue_plus_device_connection.dart @@ -0,0 +1,109 @@ +// Copyright (C) 2025, uvok cheetah +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'dart:async'; + +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:logger/logger.dart'; +import 'package:uvok_epaper_badge/first_where_ext.dart'; +import 'package:uvok_epaper_badge/model/device.dart'; +import 'package:uvok_epaper_badge/model/device_connection.dart'; +import 'package:uvok_epaper_badge/model/flutter_blue_plus_device.dart'; + +var logger = Logger(); + +class FlutterBluePlusDeviceConnection implements DeviceConnection { + ConnectionStatus _status = ConnectionStatus.disconnected; + // Just to have a resonable default subscription? + StreamSubscription subs = + Stream.empty().listen((e) => ()); + BluetoothCharacteristic? current; + BluetoothCharacteristic? available; + + final FlutterBluePlusDevice device; + + FlutterBluePlusDeviceConnection({required this.device}); + + @override + Future connect() async { + subs.cancel().ignore(); + final dev = device.scanResult.device; + subs = dev.connectionState.listen(_onConnStateChange); + // connect timeout doesn't work under Linux + await dev.connect().timeout(Duration(seconds: 2)); + // // ???? WTF ???? + List svcs = await dev.discoverServices(); + dev.onServicesReset.listen((_) async { + logger.i("Services Reset"); + try { + List svcs = await dev.discoverServices(); + findCharac(svcs); + } catch (e) { + logger.e(e); + } + }); + + logger.i("services discovered"); + + findCharac(svcs); + + _status = ConnectionStatus.connected; + } + + @override + Future disconnect() async { + _status = ConnectionStatus.disconnected; + } + + void dispose() { + subs.cancel().ignore(); + } + + @override + ConnectionStatus get status => _status; + + void _onConnStateChange(BluetoothConnectionState event) { + logger.i("New conn state: ${event.toString()}"); + } + + void findCharac(List svcs) { + if (svcs.isEmpty) { + logger.w("No services found!"); + return; + } + logger.i("Services found!"); + BluetoothService? badgeService = svcs.firstWhereOrNull( + (s) => s.serviceUuid.str == "ca260000-b4bb-46b2-bd06-b7b7a61ea990", + ); + + if (badgeService == null) { + } else { + logger.i("badge service found"); + current = badgeService.characteristics.firstWhereOrNull( + (c) => + c.characteristicUuid.str == "ca260001-b4bb-46b2-bd06-b7b7a61ea990", + ); + available = badgeService.characteristics.firstWhereOrNull( + (c) => + c.characteristicUuid.str == "ca260002-b4bb-46b2-bd06-b7b7a61ea990", + ); + } + + if (current == null || available == null) { + } else { + logger.i("characteristics found"); + } + } +} diff --git a/lib/model/mock_device_connection.dart b/lib/model/mock_device_connection.dart new file mode 100644 index 0000000..3153387 --- /dev/null +++ b/lib/model/mock_device_connection.dart @@ -0,0 +1,33 @@ +// Copyright (C) 2025, uvok cheetah +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'package:uvok_epaper_badge/model/device_connection.dart'; + +class MockDeviceConnection implements DeviceConnection { + ConnectionStatus _status = ConnectionStatus.disconnected; + + @override + Future connect() async { + _status = ConnectionStatus.connected; + } + + @override + Future disconnect() async { + _status = ConnectionStatus.disconnected; + } + + @override + ConnectionStatus get status => _status; +} -- cgit v1.2.3