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

Merge branch 'develop_sky_liyi' into 'develop_sky'

Browse Source 
Develop sky liyi

See merge request StarlockTeam/app-starlock!216
This commit is contained in:
李仪 2025-07-23 03:38:22 +00:00
commit 41c4623876
4 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/blue/blue_manage.dart
View File

@ -348,21 +348,43 @@ class BlueManage {
} else {
// 128位，判断前8位的第3、第4位
if (cleanUuid.length >= 32) {
final String thirdAndFourth = cleanUuid.substring(2, 4); // 索引2和3
for (final prefix in prefixes) {
if (thirdAndFourth == prefix) {
if (isSingle) {
return true; // isSingle为true，前缀匹配即返回true
} else {
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
if (cleanUuid.length >= 32) {
String pairStatus =
cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
// 00=未配对，01=已配对
if (pairStatus == '00') {
return true; // 未配对才返回true
if (deviceType == DeviceType.blue) {
final String thirdAndFourth = cleanUuid.substring(6, 8); // 索引2和3
for (final prefix in prefixes) {
if (thirdAndFourth == prefix) {
if (isSingle) {
return true; // isSingle为true，前缀匹配即返回true
} else {
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
if (cleanUuid.length >= 32) {
String pairStatus =
cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
// 00=未配对，01=已配对
if (pairStatus == '00') {
return true; // 未配对才返回true
}
// 已配对（01）不返回true，继续判断下一个uuid
}
}
}
}
} else if (deviceType == DeviceType.gateway) {
final String thirdAndFourth = cleanUuid.substring(6, 8); // 索引2和3
for (final prefix in prefixes) {
if (thirdAndFourth == prefix) {
if (isSingle) {
return true; // isSingle为true，前缀匹配即返回true
} else {
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
if (cleanUuid.length >= 32) {
String pairStatus =
cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
// 00=未配对，01=已配对
if (pairStatus == '00') {
return true; // 未配对才返回true
}
// 已配对（01）不返回true，继续判断下一个uuid
}
// 已配对（01）不返回true，继续判断下一个uuid
}
}
}

4
lib/blue/io_type.dart
View File

@ -9,10 +9,10 @@ List<String> getDeviceType(DeviceType deviceType) {
List<String> t = ['758824'];
switch (deviceType) {
case DeviceType.blue:
t = ['758824', '75', '768824', '76'];
t = ['758824', '75', '768824', '76','24'];
break;
case DeviceType.gateway:
t = ['758825'];
t = ['758825','25'];
break;
}
return t;

20
lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
View File

@ -337,17 +337,15 @@ class NearbyLockLogic extends BaseGetXController {
// 'featureSettingValue': state.featureSettingValue,
// 'featureSettingParams': state.featureSettingParams,
// });
Get.toNamed(Routers.saveLockPage,
arguments: <String, Object?>{
'addressInfo': {},
'pwdTimestamp': state.timestampValue * 1000,
'lockInfo': state.lockInfo,
'featureValue': state.featureValue,
'featureSettingValue': state.featureSettingValue,
'featureSettingParams': state.featureSettingParams,
'isFromMap': 0,
});
Get.toNamed(Routers.saveLockPage, arguments: <String, Object?>{
'addressInfo': {},
'pwdTimestamp': state.timestampValue * 1000,
'lockInfo': state.lockInfo,
'featureValue': state.featureValue,
'featureSettingValue': state.featureSettingValue,
'featureSettingParams': state.featureSettingParams,
'isFromMap': 0,
});
break;
case 0x06:

11
lib/mine/gateway/addGateway/selectGateway/selectGatewayList_logic.dart
View File

@ -25,6 +25,7 @@ class SelectGatewayListLogic extends BaseGetXController {
// 监听设备返回的数据
late StreamSubscription<Reply> _replySubscription;
void _initReplySubscription() {
_replySubscription =
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
@ -35,7 +36,6 @@ class SelectGatewayListLogic extends BaseGetXController {
});
}
// WIFI配网结果
Future<void> _replyGatewayGetStatusReply(Reply reply) async {
final int status = reply.data[2];
@ -99,7 +99,7 @@ class SelectGatewayListLogic extends BaseGetXController {
void startScanBlueList() {
state.devices.clear();
BlueManage().startScan(2000, DeviceType.gateway, (List<ScanResult> list) {
AppLog.log('ScanResultList:$list');
// AppLog.log('ScanResultList:$list');
for (int i = 0; i < list.length; i++) {
final ScanResult device = list[i];
// if ((device.advertisementData.serviceUuids.isNotEmpty
@ -211,7 +211,12 @@ class SelectGatewayListLogic extends BaseGetXController {
@override
void dispose() {
super.dispose();
_replySubscription.cancel();
super.dispose();
}
@override
void onClose() {
_replySubscription.cancel();
super.onClose();
}
}