Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Added UI for speed dial and made some UI changes #946

Merged
merged 2 commits into from
Jun 7, 2024
Merged

feat: Added UI for speed dial and made some UI changes #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
339be98
chore: resolved merge conflicts
Jhalakupadhyay Jun 5, 2024
d54dd5a
chore: formated code
Jhalakupadhyay Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
258 changes: 129 additions & 129 deletions lib/bademagic_module/bluetooth/bluetooth.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,129 @@
import 'dart:async';
import 'package:badgemagic/bademagic_module/models/data.dart';
import 'package:badgemagic/bademagic_module/utils/data_to_bytearray_converter.dart';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:logger/logger.dart';

class BadgeMagicBluetooth {
static final Logger logger = Logger();

static Future<void> writeCharacteristic(
BluetoothDevice device,
Guid characteristicId,
Data data,
) async {
List<List<int>> dataChunks = convert(data);
logger.d("Data to write: $dataChunks");

try {
List<BluetoothService> services = await device.discoverServices();
for (BluetoothService service in services) {
for (BluetoothCharacteristic characteristic
in service.characteristics) {
if (characteristic.uuid == characteristicId &&
characteristic.properties.write) {
for (int attempt = 1; attempt <= 3; attempt++) {
for (List<int> chunk in dataChunks) {
bool success = false;
try {
await characteristic.write(chunk, withoutResponse: false);
await Future.delayed(const Duration(
milliseconds: 100)); // Add a delay between writes
success = true;
} catch (e) {
logger.e("Write failed, retrying ($attempt/3): $e");
}
if (!success) {
throw Exception(
"Failed to write chunk after 3 attempts: $chunk");
}
}
}
logger.d("Characteristic written successfully");
return; // Exit once the target characteristic is written
}
}
}
logger.d("Target characteristic not found");
} catch (e) {
logger.e("Failed to write characteristic: $e");
}
}

static Future<void> scanAndConnect(Data data) async {
ScanResult? foundDevice;

StreamSubscription<List<ScanResult>>? subscription;

try {
subscription = FlutterBluePlus.scanResults.listen(
(results) async {
if (results.isNotEmpty) {
foundDevice = results.firstWhere(
(result) =>
result.device.remoteId.toString() == "50:54:7B:63:10:F5",
);
if (foundDevice != null) {
await connectToDevice(foundDevice!, data);
} else {
logger.e("Target device not found.");
}
}
},
onError: (e) {
logger.e("Scan error: $e");
},
);

await FlutterBluePlus.startScan(
withServices: [Guid("0000fee0-0000-1000-8000-00805f9b34fb")],
timeout: const Duration(seconds: 10),
);

// Wait for the scan to complete before cancelling the subscription
await Future.delayed(const Duration(seconds: 11));
} finally {
await subscription?.cancel();
}
}

static Future<void> connectToDevice(ScanResult scanResult, Data data) async {
const int maxRetries = 3;
int attempt = 0;
bool connected = false;

while (attempt < maxRetries && !connected) {
try {
await scanResult.device.connect(autoConnect: false);
BluetoothConnectionState connectionState =
await scanResult.device.connectionState.first;

if (connectionState == BluetoothConnectionState.connected) {
logger.d("Device connected");
await writeCharacteristic(
scanResult.device,
Guid("0000fee1-0000-1000-8000-00805f9b34fb"),
data,
);
connected = true;
} else {
logger.e("Failed to connect to the device");
}
} catch (e) {
logger.e("Connection error: $e");
attempt++;
if (attempt < maxRetries) {
logger.d("Retrying connection ($attempt/$maxRetries)...");
await Future.delayed(
const Duration(seconds: 2)); // Wait before retrying
} else {
logger.e("Max retries reached. Connection failed.");
}
} finally {
if (!connected) {
await scanResult.device.disconnect();
}
}
}
}
}
import 'dart:async';
import 'package:badgemagic/bademagic_module/models/data.dart';
import 'package:badgemagic/bademagic_module/utils/data_to_bytearray_converter.dart';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:logger/logger.dart';
class BadgeMagicBluetooth {
static final Logger logger = Logger();
static Future<void> writeCharacteristic(
BluetoothDevice device,
Guid characteristicId,
Data data,
) async {
List<List<int>> dataChunks = convert(data);
logger.d("Data to write: $dataChunks");
try {
List<BluetoothService> services = await device.discoverServices();
for (BluetoothService service in services) {
for (BluetoothCharacteristic characteristic
in service.characteristics) {
if (characteristic.uuid == characteristicId &&
characteristic.properties.write) {
for (int attempt = 1; attempt <= 3; attempt++) {
for (List<int> chunk in dataChunks) {
bool success = false;
try {
await characteristic.write(chunk, withoutResponse: false);
await Future.delayed(const Duration(
milliseconds: 100)); // Add a delay between writes
success = true;
} catch (e) {
logger.e("Write failed, retrying ($attempt/3): $e");
}
if (!success) {
throw Exception(
"Failed to write chunk after 3 attempts: $chunk");
}
}
}
logger.d("Characteristic written successfully");
return; // Exit once the target characteristic is written
}
}
}
logger.d("Target characteristic not found");
} catch (e) {
logger.e("Failed to write characteristic: $e");
}
}
static Future<void> scanAndConnect(Data data) async {
ScanResult? foundDevice;
StreamSubscription<List<ScanResult>>? subscription;
try {
subscription = FlutterBluePlus.scanResults.listen(
(results) async {
if (results.isNotEmpty) {
foundDevice = results.firstWhere(
(result) =>
result.device.remoteId.toString() == "50:54:7B:63:10:F5",
);
if (foundDevice != null) {
await connectToDevice(foundDevice!, data);
} else {
logger.e("Target device not found.");
}
}
},
onError: (e) {
logger.e("Scan error: $e");
},
);
await FlutterBluePlus.startScan(
withServices: [Guid("0000fee0-0000-1000-8000-00805f9b34fb")],
timeout: const Duration(seconds: 10),
);
// Wait for the scan to complete before cancelling the subscription
await Future.delayed(const Duration(seconds: 11));
} finally {
await subscription?.cancel();
}
}
static Future<void> connectToDevice(ScanResult scanResult, Data data) async {
const int maxRetries = 3;
int attempt = 0;
bool connected = false;
while (attempt < maxRetries && !connected) {
try {
await scanResult.device.connect(autoConnect: false);
BluetoothConnectionState connectionState =
await scanResult.device.connectionState.first;
if (connectionState == BluetoothConnectionState.connected) {
logger.d("Device connected");
await writeCharacteristic(
scanResult.device,
Guid("0000fee1-0000-1000-8000-00805f9b34fb"),
data,
);
connected = true;
} else {
logger.e("Failed to connect to the device");
}
} catch (e) {
logger.e("Connection error: $e");
attempt++;
if (attempt < maxRetries) {
logger.d("Retrying connection ($attempt/$maxRetries)...");
await Future.delayed(
const Duration(seconds: 2)); // Wait before retrying
} else {
logger.e("Max retries reached. Connection failed.");
}
} finally {
if (!connected) {
await scanResult.device.disconnect();
}
}
}
}
}
52 changes: 26 additions & 26 deletions lib/bademagic_module/utils/byte_array_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import 'package:logger/logger.dart';

final Logger logger = Logger();

String toHex(List<int> bytes) {
StringBuffer buffer = StringBuffer();
for (int byte in bytes) {
buffer.write('${byte < 16 ? '0' : ''}${byte.toRadixString(16)}');
}
return buffer.toString().toUpperCase();
}

List<int> hexStringToByteArray(String hexString) {
if (hexString.length % 2 != 0) {
throw ArgumentError("Invalid hex string: $hexString");
}

List<int> data = [];
for (int i = 0; i < hexString.length; i += 2) {
int firstDigit = int.parse(hexString[i], radix: 16);
int secondDigit = int.parse(hexString[i + 1], radix: 16);
data.add((firstDigit << 4) + secondDigit);
}
logger.d(data.length);
return data;
}
import 'package:logger/logger.dart';
final Logger logger = Logger();
String toHex(List<int> bytes) {
StringBuffer buffer = StringBuffer();
for (int byte in bytes) {
buffer.write('${byte < 16 ? '0' : ''}${byte.toRadixString(16)}');
}
return buffer.toString().toUpperCase();
}
List<int> hexStringToByteArray(String hexString) {
if (hexString.length % 2 != 0) {
throw ArgumentError("Invalid hex string: $hexString");
}
List<int> data = [];
for (int i = 0; i < hexString.length; i += 2) {
int firstDigit = int.parse(hexString[i], radix: 16);
int secondDigit = int.parse(hexString[i + 1], radix: 16);
data.add((firstDigit << 4) + secondDigit);
}
logger.d(data.length);
return data;
}
Loading