Merge remote-tracking branch 'origin/master'

# Conflicts:
#	star_lock/lib/blue/blue_manage.dart
This commit is contained in:
魏少阳 2023-08-09 09:32:58 +08:00
commit 1b2e797e50

View File

@ -6,7 +6,6 @@ import 'package:star_lock/blue/sender_manage.dart';
import '../app_settings/app_settings.dart';
import 'io_tool/io_tool.dart';
import 'io_tool/manager_event_bus.dart';
import 'reciver_data.dart';
typedef ScanResultCallBack = void Function(List<DiscoveredDevice> devices);
@ -17,6 +16,7 @@ class BlueManage{
DiscoveredCharacteristic? getDiscoveredCharacteristic;
Uuid serviceId = Uuid.parse('0000FFF0-0000-1000-8000-00805F9B34FB');
final int _limitLen = 20;
final int _sleepTimes = AppPlatform.isAndroid ? 6 : 0;
static BlueManage? _manager;
BlueManage._init();
@ -139,7 +139,7 @@ class BlueManage{
_flutterReactiveBle!.subscribeToCharacteristic(characteristic).listen((data) {
// code to handle incoming data
print("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data");
CommandReciverManager.appDataReceive(data, "");
}, onError: (dynamic error) {
print("subscribeToCharacteristic error:$error");
});