sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复蓝牙添加数据问题

Browse Source
This commit is contained in:
魏少阳 2023-12-20 11:54:54 +08:00
parent e258d9b49c
commit febbab97da
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
star_lock/lib/blue/blue_manage.dart
View File

@ -26,7 +26,6 @@ class BlueManage{
Uuid characteristicIdWrite = Uuid.parse("fff2");// 用来写入的特征id Uuid characteristicIdWrite = Uuid.parse("fff2");// 用来写入的特征id
String connectDeviceMacAddress = ""; String connectDeviceMacAddress = "";
String connectDeviceName = ""; String connectDeviceName = "";
// final int _limitLen = 20; // final int _limitLen = 20;
// 监听发送事件 // 监听发送事件
@ -302,23 +301,23 @@ class BlueManage{
// 听上报来的数据,参数来自前面扫描到的结果 // 听上报来的数据,参数来自前面扫描到的结果
var allData = <int>[]; var allData = <int>[];
int? dataLen;
_subScribeToCharacteristic(QualifiedCharacteristic characteristic) { _subScribeToCharacteristic(QualifiedCharacteristic characteristic) {
_flutterReactiveBle!.subscribeToCharacteristic(characteristic).listen((data) { _flutterReactiveBle!.subscribeToCharacteristic(characteristic).listen((data) {
// code to handle incoming data // code to handle incoming data
print("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data"); print("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data");
var dataLen = 0;// 高16位用来指示后面数据块内容的长度
if((data[0] == 0xEF)&&(data[1] == 0x01)&&(data[2] == 0xEE)&&(data[3] == 0x02)){ if((data[0] == 0xEF)&&(data[1] == 0x01)&&(data[2] == 0xEE)&&(data[3] == 0x02)){
// 当包有头时 // 当包有头时
// 判断是否需要分包 // 判断是否需要分包
dataLen = data[8] * 256 + data[9]; dataLen = data[8] * 256 + data[9]; // 高16位用来指示后面数据块内容的长度
// print("dataLen1111:$dataLen getDataLength:${data.length}"); print("dataLen1111:$dataLen getDataLength:${data.length}");
if(dataLen + 12 > data.length){ if(dataLen! + 12 > data.length){
// 当前包的长度小于实际的包时 分包添加 不解析 // 当前包的长度小于实际的包时 分包添加 不解析
allData.addAll(data); allData.addAll(data);
}else{ }else{
// 当前包的长度小于实际的包时 不分包 解析 // 当前包的长度小于实际的包时 不分包 解析
allData.addAll(data); allData.addAll(data);
print("dataLen2222:$dataLen getDataLength:${data.length}");
CommandReciverManager.appDataReceive(allData); CommandReciverManager.appDataReceive(allData);
// 发送完解析初始化数组 // 发送完解析初始化数组
allData = <int>[]; allData = <int>[];
@ -327,8 +326,9 @@ class BlueManage{
// 当包没有头时 是分包的包 直接添加 // 当包没有头时 是分包的包 直接添加
allData.addAll(data); allData.addAll(data);
// var len = allData[8] * 256 + allData[9]; // var len = allData[8] * 256 + allData[9];
// print("dataLen222:$dataLen"); print("dataLen3333:$dataLen");
if(dataLen <= (allData.length - 14)){ if((dataLen! + 14) <= allData.length){
print("44444数据被解析了");
// 当长度小于等于当前包的数据时 直接解析数据 // 当长度小于等于当前包的数据时 直接解析数据
CommandReciverManager.appDataReceive(allData); CommandReciverManager.appDataReceive(allData);
// 发送完解析初始化数组 // 发送完解析初始化数组
@ -346,7 +346,7 @@ class BlueManage{
QualifiedCharacteristic characteristic = QualifiedCharacteristic(characteristicId: characteristicIdWrite, serviceId: serviceId, deviceId: connectDeviceMacAddress); QualifiedCharacteristic characteristic = QualifiedCharacteristic(characteristicId: characteristicIdWrite, serviceId: serviceId, deviceId: connectDeviceMacAddress);
print('Write with characteristicId：${characteristic.characteristicId} serviceId：${characteristic.serviceId} deviceId：${characteristic.deviceId} value : $value \nhexStr:${radixHex16String(value)}'); print('Write with characteristicId：${characteristic.characteristicId} serviceId：${characteristic.serviceId} deviceId：${characteristic.deviceId} value : $value \nhexStr:${radixHex16String(value)}');
int mtuLength = await _flutterReactiveBle!.requestMtu(deviceId: characteristic.deviceId, mtu: 250); int mtuLength = await _flutterReactiveBle!.requestMtu(deviceId: characteristic.deviceId, mtu: 250);
print("mtuLength:$mtuLength"); // print("mtuLength:$mtuLength");
try { try {
List<int> valueList = value; List<int> valueList = value;
List subData = splitList(valueList, mtuLength); List subData = splitList(valueList, mtuLength);

2
star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart
View File

@ -48,7 +48,7 @@ class _LockMonitoringPageState extends State<LockMonitoringPage> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(30.h)), borderRadius: BorderRadius.circular(25.h)),
padding: EdgeInsets.all(10.w), padding: EdgeInsets.all(10.w),
child: Image( child: Image(
width: 40.w, width: 40.w,

1
star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
View File

@ -35,6 +35,7 @@ class NearbyLockLogic extends BaseGetXController{
// IoSenderManage.getPublicKey(lockId: deviceName); // IoSenderManage.getPublicKey(lockId: deviceName);
// } // }
// }, isShowLoading: true); // }, isShowLoading: true);
BlueManage().disconnect("");
BlueManage().connect(lockId, deviceName, isFrist: true, isShowLoading: true); BlueManage().connect(lockId, deviceName, isFrist: true, isShowLoading: true);
} }