diff --git a/star_lock/lib/app.dart b/star_lock/lib/app.dart index ba772731..3f537778 100644 --- a/star_lock/lib/app.dart +++ b/star_lock/lib/app.dart @@ -39,6 +39,7 @@ class _MyAppState extends State with WidgetsBindingObserver, BaseWidget { } GetMaterialApp _initMaterialApp() => GetMaterialApp( + enableLog: false, title: F.navTitle, navigatorObservers: [AppRouteObserver().routeObserver], translations: TranslationMessage(), diff --git a/star_lock/lib/app_settings/app_settings.dart b/star_lock/lib/app_settings/app_settings.dart index 473b0ed0..d70682a7 100644 --- a/star_lock/lib/app_settings/app_settings.dart +++ b/star_lock/lib/app_settings/app_settings.dart @@ -12,8 +12,8 @@ class AppLog { static log(String msg,{bool? error}){ if(!kDebugMode)return; error = error ?? false; - if(!_printLog)return; - if(_onlyError && !error) return; + // if(!_printLog)return; + // if(_onlyError && !error) return; if(error){ msg = '----->>> $msg'; } diff --git a/star_lock/lib/blue/blue_manage.dart b/star_lock/lib/blue/blue_manage.dart index ee2bd718..f1ffcfcf 100644 --- a/star_lock/lib/blue/blue_manage.dart +++ b/star_lock/lib/blue/blue_manage.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'io_tool/io_model.dart'; import 'io_tool/io_tool.dart'; @@ -80,7 +81,6 @@ class BlueManage { BlueManage? get manager => shareManager(); void _initBlue() { - Get.log("蓝牙功能初始化监听"); FlutterBluePlus.setLogLevel(LogLevel.error, color: true); _initSendStreamSubscription(); _initAdapterStateStateSubscription(); @@ -91,7 +91,7 @@ class BlueManage { void _initGetMtuSubscription() { _mtuSubscription ??= bluetoothConnectDevice!.mtu.listen((value) { _mtuSize = value - 3; - print('_mtuSizeValue:$value mtuSize:$_mtuSize'); + AppLog.log('_mtuSizeValue:$value mtuSize:$_mtuSize'); }); } @@ -110,7 +110,7 @@ class BlueManage { // // if (scanResult.device.advName.isEmpty) { // // return; // // } - // print("scanResult.device.advName:${scanResult.device.advName}" + // AppLog.log("scanResult.device.advName:${scanResult.device.advName}" // " scanResult.advertisementData.serviceUuids:${scanResult.advertisementData.serviceUuids}" // " rssi:${scanResult.rssi}"); // if (((scanResult.advertisementData.serviceUuids.isNotEmpty ? scanResult.advertisementData.serviceUuids[0] : "").toString().contains("758824")) && (scanResult.rssi >= -100)) { @@ -127,16 +127,16 @@ class BlueManage { // EventBusManager().eventBusFir(scanDevices); // // FlutterBluePlus.stopScan(); // }, onError: (e) { - // print("Scan Error:$e", ); + // AppLog.log("Scan Error:$e", ); // }); // // FlutterBluePlus.cancelWhenScanComplete(subscription); // FlutterBluePlus.isScanning.listen((state) { // if (state) { - // print('Scanning'); + // prAppLog.logint('Scanning'); // } else { - // print('Not scanning'); + // AppLog.log('Not scanning'); // } // }); // } @@ -145,10 +145,9 @@ class BlueManage { _connectionStateSubscription?.cancel(); _connectionStateSubscription = null; - _connectionStateSubscription = - bluetoothConnectDevice!.connectionState.listen((state) async { + _connectionStateSubscription = bluetoothConnectDevice!.connectionState.listen((state) async { bluetoothConnectionState = state; - print("蓝牙连接状态:$state"); + // AppLog.log("蓝牙连接状态:$state"); }); } @@ -165,11 +164,11 @@ class BlueManage { writeCharacteristicWithResponse(model.data); } else { try {} catch (e) { - print("Error Turning On:"); + AppLog.log("蓝牙打开失败"); } } } else { - print("写入数据 蓝牙不可用，不能进行蓝牙操作"); + AppLog.log("写入数据 蓝牙不可用，不能进行蓝牙操作"); } }); } @@ -186,7 +185,7 @@ class BlueManage { FlutterBluePlus.startScan(timeout: Duration(seconds: timeout)); Completer completer = Completer(); var subscription = FlutterBluePlus.scanResults.listen((results) { - // print("startScanSingle扫描到的设备:$results"); + // AppLog.log("startScanSingle扫描到的设备:$results"); bool isExit = results.any((element) => (element.device.platformName == deviceName) || (element.advertisementData.advName == deviceName)); @@ -215,16 +214,14 @@ class BlueManage { completer.complete(); } }, onError: (e) { - print( - "Scan Error:$e", - ); + AppLog.log("扫描失败:$e",); }); FlutterBluePlus.cancelWhenScanComplete(subscription); await completer.future; scanDevicesCallBack(scanDevices); subscription.cancel(); } catch (e) { - print("扫描失败"); + AppLog.log("扫描失败"); } } else { try { @@ -232,11 +229,11 @@ class BlueManage { await FlutterBluePlus.turnOn(); } } catch (e) { - print("Error Turning On:"); + AppLog.log("蓝牙打开失败"); } } } else { - print("开始扫描 蓝牙不可用，不能进行蓝牙操作"); + AppLog.log("开始扫描 蓝牙不可用，不能进行蓝牙操作"); } }); } @@ -257,9 +254,9 @@ class BlueManage { // if (scanResult.device.advName.isEmpty) { // return; // } - Get.log("scanResult.device.advName:${scanResult.device.advName}" - " scanResult.advertisementData.serviceUuids:${scanResult.advertisementData.serviceUuids}" - " rssi:${scanResult.rssi}"); + // AppLog.log("scanResult.device.advName:${scanResult.device.advName}" + // " scanResult.advertisementData.serviceUuids:${scanResult.advertisementData.serviceUuids}" + // " rssi:${scanResult.rssi}"); if (((scanResult.advertisementData.serviceUuids.isNotEmpty ? scanResult.advertisementData.serviceUuids[0] : "") @@ -284,14 +281,12 @@ class BlueManage { // EventBusManager().eventBusFir(scanDevices); // FlutterBluePlus.stopScan(); }, onError: (e) { - print( - "Scan Error:$e", - ); + AppLog.log("扫描失败:$e",); }); FlutterBluePlus.cancelWhenScanComplete(subscription); } catch (e) { - print("扫描失败"); + AppLog.log("扫描失败"); } } else { try { @@ -299,11 +294,11 @@ class BlueManage { await FlutterBluePlus.turnOn(); } } catch (e) { - print("Error Turning On:"); + AppLog.log("蓝牙打开失败"); } } } else { - Get.log("开始扫描 蓝牙不可用，不能进行蓝牙操作"); + AppLog.log("开始扫描 蓝牙不可用，不能进行蓝牙操作"); } }); } @@ -328,11 +323,11 @@ class BlueManage { stateCallBack(BluetoothConnectionState.disconnected); openBlue(); } catch (e) { - print("Error Turning On:"); + AppLog.log("蓝牙打开失败"); } } } else { - print("开始扫描 蓝牙不可用，不能进行蓝牙操作"); + AppLog.log("开始扫描 蓝牙不可用，不能进行蓝牙操作"); } }); } @@ -350,7 +345,7 @@ class BlueManage { if (isAddEquipment == false && isExistDevice == false) { // startScan(10, (scanDevices){ startScanSingle(deviceName, 10, (List scanDevices) { - print("扫描到的设备:$scanDevices"); + // AppLog.log("扫描到的设备:$scanDevices"); devicesList = scanDevices; _connectDevice(devicesList, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment); @@ -365,7 +360,7 @@ class BlueManage { ConnectStateCallBack connectStateCallBack, {bool isAddEquipment = false}) async { // 判断数组列表里面是否有这个设备 - print("devicesList:$devicesList"); + // AppLog.log("devicesList:$devicesList"); final knownDeviceIndex = devicesList.indexWhere((d) => (d.device.platformName == deviceName) || (d.advertisementData.advName == deviceName)); @@ -377,21 +372,20 @@ class BlueManage { : devicesList[knownDeviceIndex].device.platformName; bluetoothConnectDevice = devicesList[knownDeviceIndex].device; - print('bluetoothConnectDevice: $bluetoothConnectDevice'); + // AppLog.log('bluetoothConnectDevice: $bluetoothConnectDevice'); scanResult = devicesList[knownDeviceIndex]; _initGetMtuSubscription(); _initListenConnectionState(); } - print( - "1 connectDeviceId:$connectDeviceMacAddress connectDeviceName:$connectDeviceName"); + // AppLog.log("1 connectDeviceId:$connectDeviceMacAddress connectDeviceName:$connectDeviceName"); // stopScan(); if (connectDeviceMacAddress.isEmpty) { // connectStateCallBack(BluetoothConnectionState.disconnected!); return; } - print("调用了停止扫描的方法"); + // AppLog.log("调用了停止扫描的方法"); await stopScan(); if ((scanResult!.advertisementData.serviceUuids[0].toString()[31] == "0") && @@ -409,16 +403,16 @@ class BlueManage { await bluetoothConnectDevice!.connect(timeout: 5.seconds); break; // If the connection is successful, break the loop } catch (e) { - print('Failed to connect: $e'); + AppLog.log('连接失败 重连了: $e'); attempt++; // Increase the attempt count if (attempt < maxAttempts) { - print('Retrying connection...'); + AppLog.log('重新尝试连接...'); } } } if (attempt >= maxAttempts) { - print('Failed to connect after $maxAttempts attempts.'); + AppLog.log('$maxAttempts次后尝试连接失败'); connectStateCallBack(BluetoothConnectionState.disconnected); } @@ -427,10 +421,10 @@ class BlueManage { try { bluetoothConnectDevice!.discoverServices().then((services) { for (BluetoothService service in services) { - print("11111service.remoteId:${service.remoteId}" - " service.uuid:${service.uuid}" - " service.characteristics:${service.characteristics}" - " service.includedServices:${service.includedServices}"); + // AppLog.log("11111service.remoteId:${service.remoteId}" + // " service.uuid:${service.uuid}" + // " service.characteristics:${service.characteristics}" + // " service.includedServices:${service.includedServices}"); if (service.uuid == _serviceIdConnect) { for (BluetoothCharacteristic characteristic in service.characteristics) { @@ -441,7 +435,7 @@ class BlueManage { if (characteristic.characteristicUuid == _characteristicIdSubscription) { _subScribeToCharacteristic(characteristic); - print('Discovering services finished'); + // AppLog.log('Discovering services finished'); bluetoothConnectionState = BluetoothConnectionState.connected; connectStateCallBack(bluetoothConnectionState!); } @@ -451,9 +445,8 @@ class BlueManage { }); } on Exception catch (e) { bluetoothConnectionState = BluetoothConnectionState.disconnected; - print("5555 回调状态:$bluetoothConnectionState"); connectStateCallBack(bluetoothConnectionState!); - print('Error occurred when discovering services: $e'); + AppLog.log('发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState'); rethrow; } } @@ -468,15 +461,14 @@ class BlueManage { _subScribeToCharacteristic(BluetoothCharacteristic characteristic) async { final subscription = characteristic.onValueReceived.listen((data) { - // Get.log("启动对特性的通知。当特性的值发生变化时，设备会发送一个通知"); - print("订阅获取的数据：$data"); + // AppLog.log("订阅获取的数据：$data"); if (data == lastTimeData || data.isEmpty) { return; } else { lastTimeData = data; } // code to handle incoming data - // print("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data"); + // AppLog.log("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data"); if ((data[0] == 0xEF) && (data[1] == 0x01) && (data[2] == 0xEE) && @@ -484,14 +476,14 @@ class BlueManage { // 当包有头时 // 判断是否需要分包 dataLen = data[8] * 256 + data[9]; // 高16位用来指示后面数据块内容的长度 - // print("dataLen1111:$dataLen getDataLength:${data.length} data:$data"); + // AppLog.log("dataLen1111:$dataLen getDataLength:${data.length} data:$data"); if (dataLen! + 12 > data.length) { // 当前包的长度小于实际的包时 分包添加 不解析 allData.addAll(data); } else { // 当前包的长度小于实际的包时 不分包 解析 allData.addAll(data); - // print("dataLen2222:$dataLen getDataLength:${data.length}"); + // AppLog.log("dataLen2222:$dataLen getDataLength:${data.length}"); CommandReciverManager.appDataReceive(allData); // 发送完解析初始化数组 allData = []; @@ -500,10 +492,8 @@ class BlueManage { // 当包没有头时 是分包的包 直接添加 allData.addAll(data); // var len = allData[8] * 256 + allData[9]; - print( - "dataLen3333:$dataLen allData.length:${allData.length} allData:$allData"); + // AppLog.log("dataLen3333:$dataLen allData.length:${allData.length} allData:$allData"); if ((dataLen! + 14) <= allData.length) { - print("44444数据被解析了"); // 当长度小于等于当前包的数据时 直接解析数据 CommandReciverManager.appDataReceive(allData); // 发送完解析初始化数组 @@ -519,9 +509,9 @@ class BlueManage { await characteristic.setNotifyValue(true); // characteristic.setNotifyValue(true).then((_) { - // print("启动对特性的通知。当特性的值发生变化时，设备会发送一个通知"); + // AppLog.log("启动对特性的通知。当特性的值发生变化时，设备会发送一个通知"); // characteristic.lastValueStream.listen((data) { - // print("订阅获取的数据：$data"); + // AppLog.log("订阅获取的数据：$data"); // // do something with new value // if(data == lastTimeData || data.isEmpty){ // return; @@ -529,19 +519,19 @@ class BlueManage { // lastTimeData = data; // } // // code to handle incoming data - // // print("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data"); + // // AppLog.log("subscribeToCharacteristic: deviceId = ${characteristic.deviceId} characteristicId =${characteristic.characteristicId}---上报来的数据data = $data"); // if ((data[0] == 0xEF) && (data[1] == 0x01) && (data[2] == 0xEE) && (data[3] == 0x02)) { // // 当包有头时 // // 判断是否需要分包 // dataLen = data[8] * 256 + data[9]; // 高16位用来指示后面数据块内容的长度 - // // print("dataLen1111:$dataLen getDataLength:${data.length}"); + // // AppLog.log("dataLen1111:$dataLen getDataLength:${data.length}"); // if (dataLen! + 12 > data.length) { // // 当前包的长度小于实际的包时 分包添加 不解析 // allData.addAll(data); // } else { // // 当前包的长度小于实际的包时 不分包 解析 // allData.addAll(data); - // // print("dataLen2222:$dataLen getDataLength:${data.length}"); + // // AppLog.log("dataLen2222:$dataLen getDataLength:${data.length}"); // CommandReciverManager.appDataReceive(allData); // // 发送完解析初始化数组 // allData = []; @@ -550,9 +540,9 @@ class BlueManage { // // 当包没有头时 是分包的包 直接添加 // allData.addAll(data); // // var len = allData[8] * 256 + allData[9]; - // // print("dataLen3333:$dataLen"); + // // AppLog.log("dataLen3333:$dataLen"); // if ((dataLen! + 14) <= allData.length) { - // // print("44444数据被解析了"); + // // AppLog.log("44444数据被解析了"); // // 当长度小于等于当前包的数据时 直接解析数据 // CommandReciverManager.appDataReceive(allData); // // 发送完解析初始化数组 @@ -565,17 +555,16 @@ class BlueManage { // 写入 Future writeCharacteristicWithResponse(List value) async { - List services = - await bluetoothConnectDevice!.discoverServices(); + + List services = await bluetoothConnectDevice!.discoverServices(); for (BluetoothService service in services) { - // print("33333 service.remoteId:${service.remoteId}" + // AppLog.log("33333 service.remoteId:${service.remoteId}" // " service.uuid:${service.uuid}\n\n" // " service.characteristics:${service.characteristics}\n\n" // " service.includedServices:${service.includedServices}"); if (service.uuid == _serviceIdConnect) { - for (BluetoothCharacteristic characteristic - in service.characteristics) { - // print("44444 characteristic.remoteId:${characteristic.remoteId}" + for (BluetoothCharacteristic characteristic in service.characteristics) { + // AppLog.log("44444 characteristic.remoteId:${characteristic.remoteId}" // " characteristic.uuid:${characteristic.uuid}\n\n" // " characteristic.secondaryServiceUuid:${characteristic // .secondaryServiceUuid}\n\n" @@ -585,18 +574,17 @@ class BlueManage { try { List valueList = value; List subData = splitList(valueList, _mtuSize!); - // print('writeCharacteristicWithResponse _mtuSize:$_mtuSize 得到的分割数据:$subData'); + // AppLog.log('writeCharacteristicWithResponse _mtuSize:$_mtuSize 得到的分割数据:$subData'); for (int i = 0; i < subData.length; i++) { await characteristic.write(subData[i],withoutResponse: true).then((value) async { // await Future.delayed(const Duration(milliseconds: 1)).then(( // value) async { - // print('分包发送成功了'); + // AppLog.log('分包发送成功了'); // }); }); } } on Exception catch (e, s) { - print('Error occurred when writing: $e'); - // Get.log(s); + AppLog.log('APP写入失败: $e'); rethrow; } } @@ -611,18 +599,18 @@ class BlueManage { // try { // List valueList = value; // List subData = splitList(valueList, _mtuSize!); - // print('writeCharacteristicWithResponse 得到的分割数据:$subData'); + // AppLog.log('writeCharacteristicWithResponse 得到的分割数据:$subData'); // // for (int i = 0; i < subData.length; i++) { // await characteristic.write(subData[i]).then((value) async { // await Future.delayed(const Duration(milliseconds: 1)).then((value) async { - // print('分包发送成功了'); + // AppLog.log('分包发送成功了'); // }); // }); // } // } on Exception catch (e, s) { - // print('Error occurred when writing: $e'); - // print(s); + // AppLog.log('Error occurred when writing: $e'); + // AppLog.log(s); // rethrow; // } } @@ -632,10 +620,10 @@ class BlueManage { // try { // final result = // await _flutterReactiveBle!.readCharacteristic(characteristic); - // print("readListresult$result"); + // AppLog.log("readListresult$result"); // return result; // } on Exception catch (e, s) { - // print( + // AppLog.log( // 'Error occurred when reading ${characteristic.characteristicId} : $e', // ); // rethrow; @@ -649,7 +637,7 @@ class BlueManage { // .writeCharacteristicWithoutResponse(characteristic, value: value); // } on Exception catch (e, s) { // // ignore: avoid_print - // print(s); + // AppLog.log(s); // rethrow; // } // } @@ -659,7 +647,7 @@ class BlueManage { try { await FlutterBluePlus.stopScan(); } catch (e) { - print("停止扫描失败"); + AppLog.log("停止扫描失败"); } } @@ -670,11 +658,11 @@ class BlueManage { connectDeviceMacAddress = ""; if (bluetoothConnectionState == BluetoothConnectionState.connected) { await bluetoothConnectDevice!.disconnect(); - print("断开连接成功"); + AppLog.log("断开连接成功"); } // } } on Exception catch (e, _) { - print("Error disconnecting from a device: $e"); + AppLog.log("断开连接失败: $e"); } finally { bluetoothConnectionState = BluetoothConnectionState.disconnected; } diff --git a/star_lock/lib/blue/io_protocol/io_addFace.dart b/star_lock/lib/blue/io_protocol/io_addFace.dart index 0545d938..24baf88f 100644 --- a/star_lock/lib/blue/io_protocol/io_addFace.dart +++ b/star_lock/lib/blue/io_protocol/io_addFace.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -68,13 +69,11 @@ class SenderAddFaceCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -159,7 +158,7 @@ class SenderAddFaceCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addFaceWithTimeCycleCoercion.dart b/star_lock/lib/blue/io_protocol/io_addFaceWithTimeCycleCoercion.dart index 47a3d867..d10ecec2 100644 --- a/star_lock/lib/blue/io_protocol/io_addFaceWithTimeCycleCoercion.dart +++ b/star_lock/lib/blue/io_protocol/io_addFaceWithTimeCycleCoercion.dart @@ -62,13 +62,11 @@ import '../io_type.dart'; // // // keyID 40 // int keyIDLength = utf8.encode(keyID!).length; -// // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); // subData.addAll(utf8.encode(keyID!)); // subData = getFixedLengthList(subData, 40 - keyIDLength); // // //userID 20 // int userIDLength = utf8.encode(userID!).length; -// // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); // subData.addAll(utf8.encode(userID!)); // subData = getFixedLengthList(subData, 20 - userIDLength); // diff --git a/star_lock/lib/blue/io_protocol/io_addFingerprint.dart b/star_lock/lib/blue/io_protocol/io_addFingerprint.dart index 8d684f5a..fcd4d397 100644 --- a/star_lock/lib/blue/io_protocol/io_addFingerprint.dart +++ b/star_lock/lib/blue/io_protocol/io_addFingerprint.dart @@ -46,8 +46,6 @@ import 'package:crypto/crypto.dart' as crypto; // List subData = []; // List ebcData = []; // -// print("pwdNopwdNopwdNopwdNo:$fingerNo"); -// // // 指令类型 // int type = commandType!.typeValue; // double typeDouble = type / 256; @@ -61,13 +59,11 @@ import 'package:crypto/crypto.dart' as crypto; // // // keyID 40 // int keyIDLength = utf8.encode(keyID!).length; -// // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); // subData.addAll(utf8.encode(keyID!)); // subData = getFixedLengthList(subData, 40 - keyIDLength); // // //userID 20 // int userIDLength = utf8.encode(userID!).length; -// // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); // subData.addAll(utf8.encode(userID!)); // subData = getFixedLengthList(subData, 20 - userIDLength); // @@ -124,7 +120,6 @@ import 'package:crypto/crypto.dart' as crypto; // data.add(0); // } // } -// print("${commandType!.typeName} SM4Data:$data"); // // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 // ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); // return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addFingerprintWithTimeCycleCoercion.dart b/star_lock/lib/blue/io_protocol/io_addFingerprintWithTimeCycleCoercion.dart index c954355a..8fd20c5e 100644 --- a/star_lock/lib/blue/io_protocol/io_addFingerprintWithTimeCycleCoercion.dart +++ b/star_lock/lib/blue/io_protocol/io_addFingerprintWithTimeCycleCoercion.dart @@ -1,8 +1,7 @@ import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -70,13 +69,11 @@ class SenderAddFingerprintWithTimeCycleCoercionCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -161,7 +158,7 @@ class SenderAddFingerprintWithTimeCycleCoercionCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addICCard.dart b/star_lock/lib/blue/io_protocol/io_addICCard.dart index a984db3d..740f6515 100644 --- a/star_lock/lib/blue/io_protocol/io_addICCard.dart +++ b/star_lock/lib/blue/io_protocol/io_addICCard.dart @@ -46,8 +46,6 @@ import '../sm4Encipher/sm4.dart'; // List subData = []; // List ebcData = []; // -// print("pwdNopwdNopwdNopwdNo:$cardNo"); -// // // 指令类型 // int type = commandType!.typeValue; // double typeDouble = type / 256; @@ -61,13 +59,11 @@ import '../sm4Encipher/sm4.dart'; // // // keyID 40 // int keyIDLength = utf8.encode(keyID!).length; -// // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); // subData.addAll(utf8.encode(keyID!)); // subData = getFixedLengthList(subData, 40 - keyIDLength); // // //userID 20 // int userIDLength = utf8.encode(userID!).length; -// // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); // subData.addAll(utf8.encode(userID!)); // subData = getFixedLengthList(subData, 20 - userIDLength); // @@ -124,7 +120,6 @@ import '../sm4Encipher/sm4.dart'; // data.add(0); // } // } -// print("${commandType!.typeName} SM4Data:$data"); // // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 // ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); // return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addICCardWithTimeCycleCoercion.dart b/star_lock/lib/blue/io_protocol/io_addICCardWithTimeCycleCoercion.dart index 6084f252..d688093b 100644 --- a/star_lock/lib/blue/io_protocol/io_addICCardWithTimeCycleCoercion.dart +++ b/star_lock/lib/blue/io_protocol/io_addICCardWithTimeCycleCoercion.dart @@ -1,8 +1,7 @@ import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -70,13 +69,11 @@ class SenderAddICCardWithTimeCycleCoercionCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -161,7 +158,7 @@ class SenderAddICCardWithTimeCycleCoercionCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addStressFingerprint.dart b/star_lock/lib/blue/io_protocol/io_addStressFingerprint.dart index afa3ff90..0980e2c8 100644 --- a/star_lock/lib/blue/io_protocol/io_addStressFingerprint.dart +++ b/star_lock/lib/blue/io_protocol/io_addStressFingerprint.dart @@ -62,13 +62,11 @@ import 'package:crypto/crypto.dart' as crypto; // // // keyID 40 // int keyIDLength = utf8.encode(keyID!).length; -// // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); // subData.addAll(utf8.encode(keyID!)); // subData = getFixedLengthList(subData, 40 - keyIDLength); // // //userID 20 // int userIDLength = utf8.encode(userID!).length; -// // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); // subData.addAll(utf8.encode(userID!)); // subData = getFixedLengthList(subData, 20 - userIDLength); // @@ -128,7 +126,6 @@ import 'package:crypto/crypto.dart' as crypto; // data.add(0); // } // } -// print("${commandType!.typeName} SM4Data:$data"); // // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 // ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); // return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addStressICCard.dart b/star_lock/lib/blue/io_protocol/io_addStressICCard.dart index 9e277648..bd99ff55 100644 --- a/star_lock/lib/blue/io_protocol/io_addStressICCard.dart +++ b/star_lock/lib/blue/io_protocol/io_addStressICCard.dart @@ -64,13 +64,11 @@ import 'package:crypto/crypto.dart' as crypto; // // // keyID 40 // int keyIDLength = utf8.encode(keyID!).length; -// // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); // subData.addAll(utf8.encode(keyID!)); // subData = getFixedLengthList(subData, 40 - keyIDLength); // // //userID 20 // int userIDLength = utf8.encode(userID!).length; -// // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); // subData.addAll(utf8.encode(userID!)); // subData = getFixedLengthList(subData, 20 - userIDLength); // @@ -131,7 +129,6 @@ import 'package:crypto/crypto.dart' as crypto; // data.add(0); // } // } -// print("${commandType!.typeName} SM4Data:$data"); // // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 // ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); // return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addStressPassword.dart b/star_lock/lib/blue/io_protocol/io_addStressPassword.dart index 22e7b345..983b3a09 100644 --- a/star_lock/lib/blue/io_protocol/io_addStressPassword.dart +++ b/star_lock/lib/blue/io_protocol/io_addStressPassword.dart @@ -1,8 +1,7 @@ import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -60,13 +59,11 @@ class SenderAddStressPasswordCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -125,7 +122,7 @@ class SenderAddStressPasswordCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_addUser.dart b/star_lock/lib/blue/io_protocol/io_addUser.dart index f2f9870e..870db21c 100644 --- a/star_lock/lib/blue/io_protocol/io_addUser.dart +++ b/star_lock/lib/blue/io_protocol/io_addUser.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -59,26 +60,21 @@ class AddUserCommand extends SenderProtocol { // 锁id 40 int lockIDLength = utf8.encode(lockID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - lockIDLength); //authUserID 20 int authUserIDLength = utf8.encode(authUserID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); data.addAll(utf8.encode(authUserID!)); data = getFixedLengthList(data, 20 - authUserIDLength); //KeyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}keyIDLength:$keyIDLength utf8.encode(keyID!)${utf8.encode(keyID!)}"); data.addAll(utf8.encode(keyID!)); data = getFixedLengthList(data, 40 - keyIDLength); //userID 要接受钥匙的用户的useid 20 - print("添加授权管理员userId：${userID}"); int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}userIDLength:$userIDLength utf8.encode(userID!)${utf8.encode(userID!)}"); data.addAll(utf8.encode(userID!)); data = getFixedLengthList(data, 20 - userIDLength); @@ -119,7 +115,6 @@ class AddUserCommand extends SenderProtocol { // token 长度4 首次请求 Token 填 0，如果锁需要鉴权 操作者身份，则会分配动态口令并在应答消息中返回，二次请求时带上。 当token失效或者第一次发送的时候token为0 data.addAll(token!); - print("pubToken:$token"); if(needAuthor == 0){ //AuthCodeLen 1 @@ -152,7 +147,7 @@ class AddUserCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_automaticPadlock.dart b/star_lock/lib/blue/io_protocol/io_automaticPadlock.dart index 62672a0e..cce2bfaf 100644 --- a/star_lock/lib/blue/io_protocol/io_automaticPadlock.dart +++ b/star_lock/lib/blue/io_protocol/io_automaticPadlock.dart @@ -51,7 +51,6 @@ import 'package:crypto/crypto.dart' as crypto; // // //userID 要接受钥匙的用户的useid 20 // int userIDLength = utf8.encode(userID!).length; -// print("openDoorUserId:${utf8.encode(userID!)} utf8.encode(userID!).length:${utf8.encode(userID!).length}"); // subData.addAll(utf8.encode(userID!)); // subData = getFixedLengthList(subData, 20 - userIDLength); // @@ -61,14 +60,12 @@ import 'package:crypto/crypto.dart' as crypto; // data.add(subData.length); // data.addAll(subData); // -// print("data:$data data.length:${data.length} (data.length % 16):${(data.length % 16)}"); // if ((data.length % 16) != 0) { // int add = (16 - data.length % 16); // for (int i = 0; i < add; i++) { // data.add(0); // } // } -// print("${commandType!.typeName} SM4Data:$data"); // ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); // return ebcData; // } diff --git a/star_lock/lib/blue/io_protocol/io_changeAdministratorPassword.dart b/star_lock/lib/blue/io_protocol/io_changeAdministratorPassword.dart index b1cb7f2b..d9a5c9c1 100644 --- a/star_lock/lib/blue/io_protocol/io_changeAdministratorPassword.dart +++ b/star_lock/lib/blue/io_protocol/io_changeAdministratorPassword.dart @@ -1,8 +1,7 @@ import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -58,13 +57,11 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -73,7 +70,6 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { // pwd 20 int pwdLength = utf8.encode(pwd!).length; - // print("${commandType!.typeValue}keyIDLength:$keyIDLength utf8.encode(keyID!)${utf8.encode(keyID!)}"); subData.addAll(utf8.encode(pwd!)); subData = getFixedLengthList(subData, 20 - pwdLength); @@ -129,7 +125,7 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_checkingCardStatus.dart b/star_lock/lib/blue/io_protocol/io_checkingCardStatus.dart index fdbc9d35..f7a0678d 100644 --- a/star_lock/lib/blue/io_protocol/io_checkingCardStatus.dart +++ b/star_lock/lib/blue/io_protocol/io_checkingCardStatus.dart @@ -2,8 +2,7 @@ //TODO:查询指纹状态 import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -105,7 +104,7 @@ class SenderCheckingCardStatusCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_checkingUserInfoCount.dart b/star_lock/lib/blue/io_protocol/io_checkingUserInfoCount.dart index b7466def..474f7892 100644 --- a/star_lock/lib/blue/io_protocol/io_checkingUserInfoCount.dart +++ b/star_lock/lib/blue/io_protocol/io_checkingUserInfoCount.dart @@ -2,8 +2,7 @@ //TODO:查询用户、指纹、密码、卡片数量(用于判断是否同步) import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -106,7 +105,7 @@ class SenderCheckingUserInfoCountCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_configuringWifi.dart b/star_lock/lib/blue/io_protocol/io_configuringWifi.dart index 9dc0c61d..57c79014 100644 --- a/star_lock/lib/blue/io_protocol/io_configuringWifi.dart +++ b/star_lock/lib/blue/io_protocol/io_configuringWifi.dart @@ -2,8 +2,7 @@ //TODO:WIFI配网 import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -131,7 +130,7 @@ class SenderConfiguringWifiCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_deletUser.dart b/star_lock/lib/blue/io_protocol/io_deletUser.dart index 0f77fab0..75f61101 100644 --- a/star_lock/lib/blue/io_protocol/io_deletUser.dart +++ b/star_lock/lib/blue/io_protocol/io_deletUser.dart @@ -1,10 +1,8 @@ - //TODO:添加用户 import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -48,25 +46,21 @@ class DeletUserCommand extends SenderProtocol { // 锁id 40 int lockIDLength = utf8.encode(lockID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - lockIDLength); //authUserID 20 int authUserIDLength = utf8.encode(authUserID!).length; - // print("${commandType!.typeValue}authUserIDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); data.addAll(utf8.encode(authUserID!)); data = getFixedLengthList(data, 20 - authUserIDLength); //KeyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}keyIDLength:$keyIDLength utf8.encode(keyID!)${utf8.encode(keyID!)}"); data.addAll(utf8.encode(keyID!)); data = getFixedLengthList(data, 40 - keyIDLength); //delUserID 20 int delUserIDLength = utf8.encode(delUserID!).length; - // print("${commandType!.typeValue}authUserIDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); data.addAll(utf8.encode(delUserID!)); data = getFixedLengthList(data, 20 - delUserIDLength); @@ -104,7 +98,7 @@ class DeletUserCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_editUser.dart b/star_lock/lib/blue/io_protocol/io_editUser.dart index 9ef370dd..3f720b06 100644 --- a/star_lock/lib/blue/io_protocol/io_editUser.dart +++ b/star_lock/lib/blue/io_protocol/io_editUser.dart @@ -3,8 +3,7 @@ //TODO:修改用户 import 'dart:convert'; -import 'package:get/get.dart'; - +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -60,25 +59,21 @@ class EditUserCommand extends SenderProtocol { // 锁id 40 int lockIDLength = utf8.encode(lockID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - lockIDLength); //authUserID 20 int authUserIDLength = utf8.encode(authUserID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); data.addAll(utf8.encode(authUserID!)); data = getFixedLengthList(data, 20 - authUserIDLength); //KeyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}keyIDLength:$keyIDLength utf8.encode(keyID!)${utf8.encode(keyID!)}"); data.addAll(utf8.encode(keyID!)); data = getFixedLengthList(data, 40 - keyIDLength); //userID 要接受钥匙的用户的useid 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}userIDLength:$userIDLength utf8.encode(userID!)${utf8.encode(userID!)}"); data.addAll(utf8.encode(userID!)); data = getFixedLengthList(data, 20 - userIDLength); @@ -119,7 +114,6 @@ class EditUserCommand extends SenderProtocol { // token 长度4 首次请求 Token 填 0，如果锁需要鉴权 操作者身份，则会分配动态口令并在应答消息中返回，二次请求时带上。 当token失效或者第一次发送的时候token为0 data.addAll(token!); - print("pubToken:$token"); if(needAuthor == 0){ //AuthCodeLen 1 @@ -152,7 +146,7 @@ class EditUserCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_factoryDataReset.dart b/star_lock/lib/blue/io_protocol/io_factoryDataReset.dart index 0212ebf8..231a3760 100644 --- a/star_lock/lib/blue/io_protocol/io_factoryDataReset.dart +++ b/star_lock/lib/blue/io_protocol/io_factoryDataReset.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../../tools/storage.dart'; import '../blue_manage.dart'; import '../io_tool/io_manager.dart'; @@ -49,19 +50,16 @@ class FactoryDataResetCommand extends SenderProtocol { // 锁id 40 int lockIDLength = utf8.encode(lockID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - lockIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); data.addAll(utf8.encode(userID!)); data = getFixedLengthList(data, 20 - userIDLength); // token 长度4 首次请求 Token 填 0，如果锁需要鉴权 操作者身份，则会分配动态口令并在应答消息中返回，二次请求时带上。 当token失效或者第一次发送的时候token为0 data.addAll(token!); - print("恢复出厂设置、pubToken:$token"); if(needAuthor == 0){ //AuthCodeLen 1 @@ -91,7 +89,7 @@ class FactoryDataResetCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_getLockStatu.dart b/star_lock/lib/blue/io_protocol/io_getLockStatu.dart index 3c5a1485..cbea6f1e 100644 --- a/star_lock/lib/blue/io_protocol/io_getLockStatu.dart +++ b/star_lock/lib/blue/io_protocol/io_getLockStatu.dart @@ -35,13 +35,11 @@ // // // 锁id 40 // int lockIDLength = utf8.encode(lockID!).length; -// // print("addUserLockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); // data.addAll(utf8.encode(lockID!)); // data = getFixedLengthList(data, 40 - lockIDLength); // // //userID 要接受钥匙的用户的useid 20 // int userIDLength = utf8.encode(userID!).length; -// // print("userIDLength:$userIDLength utf8.encode(userID!)${utf8.encode(userID!)}"); // data.addAll(utf8.encode(userID!)); // data = getFixedLengthList(data, 20 - userIDLength); // @@ -51,7 +49,6 @@ // data.add(0); // } // } -// print("${commandType!.typeName} SM4Data:$data"); // // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 // ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); // return ebcData; @@ -69,65 +66,50 @@ // case 0x00: // //成功 // var softVersion = data.sublist(3, 7); -// // print("softVersion:$softVersion"); // // var power = data[7]; -// // print("power:$power"); // // // APP 用户数量 // var appUserCount = data.sublist(50, 53); -// // print("appUserCount:$appUserCount"); // // // 黑名单用户数量 // var blacklistCount = data[53]; -// // print("blacklistCount:$blacklistCount"); // // // 蓝牙钥匙数量 // var bleKeyCount = data[54]; -// // print("bleKeyCount:$bleKeyCount"); // // // 剩余可添加用户数量 // var remainCount = data.sublist(54, 56); -// // print("remainCount:$remainCount"); // // // 未上传开锁记录数量 // var notUploadCount = data.sublist(56, 58); -// // print("notUploadCount:$notUploadCount"); // // // 已设置开门密码数量 // var pwdCount = data[58]; -// // print("pwdCount:$pwdCount"); // // // 已设置开门指纹数量 // var fingerprintCount = data[59]; -// // print("fingerprintCount:$fingerprintCount"); // // // 锁当前时间 // var lockTime = data.sublist(60, 64); -// // print("lockTime:$lockTime"); // // // 硬件版本信息，为固件升级提供判断依据 // var hardVersion = data.sublist(64, 68); -// // print("hardVersion:$hardVersion"); // break; // case 0x06: // //无权限 -// print("${commandType.typeValue} 需要鉴权"); // // break; // case 0x07: // //无权限 -// print("${commandType.typeValue} 用户无权限"); // // break; // case 0x09: // // 权限校验错误 -// print("${commandType.typeValue} 权限校验错误"); // // break; // default: // //失败 -// print("${commandType.typeValue} 领锁失败"); // // break; // } diff --git a/star_lock/lib/blue/io_protocol/io_getPrivateKey.dart b/star_lock/lib/blue/io_protocol/io_getPrivateKey.dart index 1a557625..f944b03e 100644 --- a/star_lock/lib/blue/io_protocol/io_getPrivateKey.dart +++ b/star_lock/lib/blue/io_protocol/io_getPrivateKey.dart @@ -5,6 +5,7 @@ import 'package:get/get.dart'; import 'package:star_lock/blue/blue_manage.dart'; import 'package:star_lock/blue/sm4Encipher/sm4.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../io_reply.dart'; import '../io_sender.dart'; @@ -35,7 +36,6 @@ class GetPrivateKeyCommand extends SenderProtocol { publicKeyDataList = publicKeyData!; List data = []; List ebcData = []; - // print("lockID：${lockID!} lockID.utf8.encode${utf8.encode(lockID!)}"); // 指令类型 int type = commandType!.typeValue; @@ -44,9 +44,6 @@ class GetPrivateKeyCommand extends SenderProtocol { int type2 = type % 256; data.add(type1); data.add(type2); - // print("type:$type"); - // print("type1:$type1"); - // print("type2:$type2"); // 锁id int lockIDLength = utf8.encode(lockID!).length; @@ -108,7 +105,7 @@ class GetPrivateKeyCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: utf8.encode(BlueManage().connectDeviceName), mode: SM4CryptoMode.ECB); @@ -121,6 +118,5 @@ class GetPrivateKeyReply extends Reply { : super.parseData(commandType, dataDetail) { data = dataDetail.sublist(2); status = data[0]; - // print("getData:$getData"); } } diff --git a/star_lock/lib/blue/io_protocol/io_getPublicKey.dart b/star_lock/lib/blue/io_protocol/io_getPublicKey.dart index 9eb97822..a1b1e8ae 100644 --- a/star_lock/lib/blue/io_protocol/io_getPublicKey.dart +++ b/star_lock/lib/blue/io_protocol/io_getPublicKey.dart @@ -28,11 +28,7 @@ class GetPublicKeyCommand extends SenderProtocol { int type2 = type % 256; data.add(type1); data.add(type2); - // print("type:$type"); - // print("type1:$type1"); - // print("type2:$type2"); - Get.log("lockID：${lockID!} lockID.utf8.encode${utf8.encode(lockID!)}"); int length = utf8.encode(lockID!).length; data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - length); diff --git a/star_lock/lib/blue/io_protocol/io_getStarLockStatusInfo.dart b/star_lock/lib/blue/io_protocol/io_getStarLockStatusInfo.dart index 304e57c9..1185249b 100644 --- a/star_lock/lib/blue/io_protocol/io_getStarLockStatusInfo.dart +++ b/star_lock/lib/blue/io_protocol/io_getStarLockStatusInfo.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -50,7 +51,7 @@ class GetStarLockStatuInfoCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_getWifiList.dart b/star_lock/lib/blue/io_protocol/io_getWifiList.dart index 12210576..a0e62ce5 100644 --- a/star_lock/lib/blue/io_protocol/io_getWifiList.dart +++ b/star_lock/lib/blue/io_protocol/io_getWifiList.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -93,7 +94,7 @@ class SenderGetWifiCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_openLock.dart b/star_lock/lib/blue/io_protocol/io_openLock.dart index b250bc0a..126b2fe2 100644 --- a/star_lock/lib/blue/io_protocol/io_openLock.dart +++ b/star_lock/lib/blue/io_protocol/io_openLock.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; @@ -68,7 +69,6 @@ class OpenLockCommand extends SenderProtocol { // token 长度4 首次请求 Token 填 0，如果锁需要鉴权 操作者身份，则会分配动态口令并在应答消息中返回，二次请求时带上。 当token失效或者第一次发送的时候token为0 data.addAll(token!); - print("pubToken:$token"); if(needAuthor == 0){ //AuthCodeLen 1 @@ -107,7 +107,7 @@ class OpenLockCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_otaUpgrade.dart b/star_lock/lib/blue/io_protocol/io_otaUpgrade.dart index 679213be..c25094a4 100644 --- a/star_lock/lib/blue/io_protocol/io_otaUpgrade.dart +++ b/star_lock/lib/blue/io_protocol/io_otaUpgrade.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -55,21 +56,21 @@ class OTAUpgradeCommand extends SenderProtocol { data.add(type1); data.add(type2); - print('---> 指令 : $type1 $type2' ); + AppLog.log('---> 指令 : $type1 $type2' ); // 锁id 40 int lockIDLength = utf8.encode(lockID!).length; data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - lockIDLength); - print('---> 锁id :' + utf8.encode(lockID!).toString()); + AppLog.log('---> 锁id :${utf8.encode(lockID!)}'); //userID 20 int userIDLength = utf8.encode(userID!).length; data.addAll(utf8.encode(userID!)); data = getFixedLengthList(data, 20 - userIDLength); - print('---> userID :' + utf8.encode(userID!).toString()); + AppLog.log('---> userID :${utf8.encode(userID!)}'); //platform 2 int platform0 = (platform! & 0xFF00) >> 8; @@ -77,7 +78,7 @@ class OTAUpgradeCommand extends SenderProtocol { data.add(platform0); data.add(platform1); - print('---> platform : $platform0 $platform1'); + AppLog.log('---> platform : $platform0 $platform1'); //product 2 // int product0 = (product! & 0xFF00) >> 8; @@ -86,21 +87,21 @@ class OTAUpgradeCommand extends SenderProtocol { // data.add(product1); data.addAll([0,1]);//先默认是 01 - print('---> platform : ${[0,1]}'); + AppLog.log('---> platform : ${[0,1]}'); //HwVersion 20 int hwVersionLength = utf8.encode(hwVersion!).length; data.addAll(utf8.encode(hwVersion!)); data = getFixedLengthList(data, 20 - hwVersionLength); - print('---> hwVersion : ${utf8.encode(hwVersion!)}'); + AppLog.log('---> hwVersion : ${utf8.encode(hwVersion!)}'); //FwVersion 20 int fwVersionLength = utf8.encode(fwVersion!).length; data.addAll(utf8.encode(fwVersion!)); data = getFixedLengthList(data, 20 - fwVersionLength); - print('---> FwVersion : ${utf8.encode(fwVersion!)}'); + AppLog.log('---> FwVersion : ${utf8.encode(fwVersion!)}'); //fwSize 4 ByteData bytes = ByteData(4); // 创建一个长度为4的字节数据 @@ -108,7 +109,7 @@ class OTAUpgradeCommand extends SenderProtocol { List byteList = bytes.buffer.asUint8List(); data.addAll(byteList); - print('---> fwSize : ${byteList}'); + AppLog.log('---> fwSize : ${byteList}'); // 创建一个16字节的字节数组 Uint8List result = Uint8List(16); @@ -119,14 +120,14 @@ class OTAUpgradeCommand extends SenderProtocol { result[i ~/ 2] = byteValue; } data.addAll(result); - print('---> fwMD5 : ${result}'); + AppLog.log('---> fwMD5 : $result'); // token 长度4 首次请求 Token 填 0，如果锁需要鉴权 操作者身份，则会分配动态口令并在应答消息中返回，二次请求时带上。 当token失效或者第一次发送的时候token为0 data.addAll(token!); - print('---> token : ${token}'); + AppLog.log('---> token : $token'); - print('--->1' + data.toString()); + AppLog.log('--->1$data'); if (needAuthor == 0) { //AuthCodeLen 1 @@ -145,7 +146,7 @@ class OTAUpgradeCommand extends SenderProtocol { authCodeData.addAll(signKey!); - print('---> ${utf8.encode(keyID!)} ${utf8.encode(userID!)} $token $signKey'); + AppLog.log('---> ${utf8.encode(keyID!)} ${utf8.encode(userID!)} $token $signKey'); // 把KeyID、authUserID、时间戳、公钥通过md5加密之后就是authCode var authCode = crypto.md5.convert(authCodeData); @@ -161,7 +162,7 @@ class OTAUpgradeCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; @@ -176,7 +177,7 @@ class OTAUpgradeReply extends Reply { data = dataDetail; token = data.sublist(2, 6); status = data[6]; - print('--->2' + data.toString()); + AppLog.log('--->2' + data.toString()); errorWithStstus(status); } } diff --git a/star_lock/lib/blue/io_protocol/io_queryingFaceStatus.dart b/star_lock/lib/blue/io_protocol/io_queryingFaceStatus.dart index b9389706..76909da2 100644 --- a/star_lock/lib/blue/io_protocol/io_queryingFaceStatus.dart +++ b/star_lock/lib/blue/io_protocol/io_queryingFaceStatus.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -103,7 +104,7 @@ class SenderQueryingFaceStatusCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; } diff --git a/star_lock/lib/blue/io_protocol/io_queryingFingerprintStatus.dart b/star_lock/lib/blue/io_protocol/io_queryingFingerprintStatus.dart index 73038965..0a1172f2 100644 --- a/star_lock/lib/blue/io_protocol/io_queryingFingerprintStatus.dart +++ b/star_lock/lib/blue/io_protocol/io_queryingFingerprintStatus.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -105,7 +106,7 @@ class SenderQueryingFingerprintStatusCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_readAdminPassword.dart b/star_lock/lib/blue/io_protocol/io_readAdminPassword.dart index 2a86bab3..72c4fecd 100644 --- a/star_lock/lib/blue/io_protocol/io_readAdminPassword.dart +++ b/star_lock/lib/blue/io_protocol/io_readAdminPassword.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -54,13 +55,11 @@ class SenderReadAdminPasswordCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -107,7 +106,7 @@ class SenderReadAdminPasswordCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_readSupportFunctionsNoParameters.dart b/star_lock/lib/blue/io_protocol/io_readSupportFunctionsNoParameters.dart index f478ec76..b6fa6073 100644 --- a/star_lock/lib/blue/io_protocol/io_readSupportFunctionsNoParameters.dart +++ b/star_lock/lib/blue/io_protocol/io_readSupportFunctionsNoParameters.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -51,13 +52,11 @@ class ReadSupportFunctionsNoParametersCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -98,7 +97,7 @@ class ReadSupportFunctionsNoParametersCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_readSupportFunctionsWithParameters.dart b/star_lock/lib/blue/io_protocol/io_readSupportFunctionsWithParameters.dart index e91549cb..ed6d393b 100644 --- a/star_lock/lib/blue/io_protocol/io_readSupportFunctionsWithParameters.dart +++ b/star_lock/lib/blue/io_protocol/io_readSupportFunctionsWithParameters.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -51,13 +52,11 @@ class ReadSupportFunctionsWithParametersCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -98,7 +97,7 @@ class ReadSupportFunctionsWithParametersCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_referEventRecordNumber.dart b/star_lock/lib/blue/io_protocol/io_referEventRecordNumber.dart index 0cd45589..af1ec26c 100644 --- a/star_lock/lib/blue/io_protocol/io_referEventRecordNumber.dart +++ b/star_lock/lib/blue/io_protocol/io_referEventRecordNumber.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -103,7 +104,7 @@ class SenderReferEventRecordNumberCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_referEventRecordTime.dart b/star_lock/lib/blue/io_protocol/io_referEventRecordTime.dart index e8f84cb7..74cd8da1 100644 --- a/star_lock/lib/blue/io_protocol/io_referEventRecordTime.dart +++ b/star_lock/lib/blue/io_protocol/io_referEventRecordTime.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -106,7 +107,7 @@ class SenderReferEventRecordTimeCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_senderCustomPasswords.dart b/star_lock/lib/blue/io_protocol/io_senderCustomPasswords.dart index 2d66e7ce..476af520 100644 --- a/star_lock/lib/blue/io_protocol/io_senderCustomPasswords.dart +++ b/star_lock/lib/blue/io_protocol/io_senderCustomPasswords.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -61,13 +62,11 @@ class SenderCustomPasswordsCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -76,13 +75,11 @@ class SenderCustomPasswordsCommand extends SenderProtocol { // pwd 20 int pwdLength = utf8.encode(pwd!).length; - // print("${commandType!.typeValue}keyIDLength:$keyIDLength utf8.encode(keyID!)${utf8.encode(keyID!)}"); subData.addAll(utf8.encode(pwd!)); subData = getFixedLengthList(subData, 20 - pwdLength); // UseCountLimit subData.add(useCountLimit!); - print("useCountLimituseCountLimituseCountLimit:$useCountLimit"); // token subData.addAll(token!); @@ -133,7 +130,7 @@ class SenderCustomPasswordsCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_setSupportFunctionsNoParameters.dart b/star_lock/lib/blue/io_protocol/io_setSupportFunctionsNoParameters.dart index 5bf5fc3e..5e1186e2 100644 --- a/star_lock/lib/blue/io_protocol/io_setSupportFunctionsNoParameters.dart +++ b/star_lock/lib/blue/io_protocol/io_setSupportFunctionsNoParameters.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -53,13 +54,11 @@ class SetSupportFunctionsNoParametersCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -103,7 +102,7 @@ class SetSupportFunctionsNoParametersCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_setSupportFunctionsWithParameters.dart b/star_lock/lib/blue/io_protocol/io_setSupportFunctionsWithParameters.dart index a264a13c..54c0337b 100644 --- a/star_lock/lib/blue/io_protocol/io_setSupportFunctionsWithParameters.dart +++ b/star_lock/lib/blue/io_protocol/io_setSupportFunctionsWithParameters.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_reply.dart'; import '../io_sender.dart'; import '../io_tool/io_tool.dart'; @@ -55,13 +56,11 @@ class SetSupportFunctionsWithParametersCommand extends SenderProtocol { // keyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); //userID 20 int userIDLength = utf8.encode(userID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); @@ -108,7 +107,7 @@ class SetSupportFunctionsWithParametersCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); // 拿到数据之后通过LockId进行SM4 ECB加密 key:544d485f633335373034383064613864 ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; diff --git a/star_lock/lib/blue/io_protocol/io_timing.dart b/star_lock/lib/blue/io_protocol/io_timing.dart index 1a094af8..0268bf1e 100644 --- a/star_lock/lib/blue/io_protocol/io_timing.dart +++ b/star_lock/lib/blue/io_protocol/io_timing.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -48,13 +49,11 @@ class TimingCommand extends SenderProtocol { //userID 要接受钥匙的用户的useid 20 int userIDLength = utf8.encode(userID!).length; - Get.log("openDoorUserId:${utf8.encode(userID!)} utf8.encode(userID!).length:${utf8.encode(userID!).length}"); data.addAll(utf8.encode(userID!)); data = getFixedLengthList(data, 20 - userIDLength); // nowTime 4 int? d1 = nowTime; - Get.log("timing d1:$d1"); data.add((d1! & 0xff000000) >> 24); data.add((d1 & 0xff0000) >> 16); data.add((d1 & 0xff00) >> 8); @@ -67,7 +66,7 @@ class TimingCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; } diff --git a/star_lock/lib/blue/io_protocol/io_transferPermissions.dart b/star_lock/lib/blue/io_protocol/io_transferPermissions.dart index 5ba78ef6..4ff7531d 100644 --- a/star_lock/lib/blue/io_protocol/io_transferPermissions.dart +++ b/star_lock/lib/blue/io_protocol/io_transferPermissions.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:get/get.dart'; +import '../../app_settings/app_settings.dart'; import '../io_tool/io_tool.dart'; import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; @@ -49,37 +50,31 @@ class TransferPermissionsCommand extends SenderProtocol { // 锁id 40 int lockIDLength = utf8.encode(lockID!).length; - print("${commandType!.typeValue} lockID：$lockID LockIDLength:$lockIDLength utf8.encode(lockID!)${utf8.encode(lockID!)}"); data.addAll(utf8.encode(lockID!)); data = getFixedLengthList(data, 40 - lockIDLength); //authUserID 20 int authUserIDLength = utf8.encode(authUserID!).length; - // print("${commandType!.typeValue}IDLength:$authUserIDLength utf8.encode(authUserID!)${utf8.encode(authUserID!)}"); data.addAll(utf8.encode(authUserID!)); data = getFixedLengthList(data, 20 - authUserIDLength); //KeyID 40 int keyIDLength = utf8.encode(keyID!).length; - // print("${commandType!.typeValue}keyIDLength:$keyIDLength utf8.encode(keyID!)${utf8.encode(keyID!)}"); data.addAll(utf8.encode(keyID!)); data = getFixedLengthList(data, 40 - keyIDLength); //oldUserID 20 int oldUserIDLength = utf8.encode(oldUserID!).length; - // print("${commandType!.typeValue}userIDLength:$userIDLength utf8.encode(userID!)${utf8.encode(userID!)}"); data.addAll(utf8.encode(oldUserID!)); data = getFixedLengthList(data, 20 - oldUserIDLength); //newUserID 20 int newUserIDLength = utf8.encode(newUserID!).length; - // print("${commandType!.typeValue}userIDLength:$userIDLength utf8.encode(userID!)${utf8.encode(userID!)}"); data.addAll(utf8.encode(newUserID!)); data = getFixedLengthList(data, 20 - newUserIDLength); // token 长度4 首次请求 Token 填 0，如果锁需要鉴权 操作者身份，则会分配动态口令并在应答消息中返回，二次请求时带上。 当token失效或者第一次发送的时候token为0 data.addAll(token!); - print("pubToken:$token"); if(needAuthor == 0){ //AuthCodeLen 1 @@ -112,7 +107,7 @@ class TransferPermissionsCommand extends SenderProtocol { } } - Get.log("${commandType!.typeName} SM4Data:$data"); + AppLog.log("App发给锁的数据，指令类型是:${commandType!.typeName} 加密之前数据是:$data"); ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB); return ebcData; } diff --git a/star_lock/lib/blue/io_reply.dart b/star_lock/lib/blue/io_reply.dart index 2cf0ea7b..61d8a25d 100644 --- a/star_lock/lib/blue/io_reply.dart +++ b/star_lock/lib/blue/io_reply.dart @@ -2,6 +2,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; +import '../app_settings/app_settings.dart'; import 'io_type.dart'; abstract class Reply{ @@ -14,119 +15,118 @@ abstract class Reply{ Reply.parseData(this.commandType, List dataDetail); void errorWithStstus(int status){ - // Get.log("errorWithStstus status:$status commandType:$commandType"); switch(status){ case 0x00: // 成功 - // Get.log("$commandType成功"); break; case 0x01: // 包格式错误 - Get.log("${commandType!.typeName} 包格式错误"); + AppLog.log("${commandType!.typeName} 0x01 包格式错误"); showErrorMessage("包格式错误"); break; case 0x02: // 密码错误 - Get.log("${commandType!.typeName} 密码错误"); + AppLog.log("${commandType!.typeName} 0x02 密码错误"); showErrorMessage("密码错误"); break; case 0x03: // 网络中断 - Get.log("${commandType!.typeName} 网络中断"); + AppLog.log("${commandType!.typeName} 0x03 网络中断"); showErrorMessage("网络中断"); break; case 0x04: // 用户未登记 - Get.log("${commandType!.typeName} 用户未登记"); + AppLog.log("${commandType!.typeName} 0x04 用户未登记"); showErrorMessage("用户未登记"); break; case 0x05: // 参数错误 - Get.log("${commandType!.typeName}参数错误"); + AppLog.log("${commandType!.typeName} 0x05 参数错误"); showErrorMessage("参数错误"); break; case 0x06: // 需要鉴权 - Get.log("${commandType!.typeName}需要鉴权"); + AppLog.log("${commandType!.typeName} 0x06 需要鉴权"); // showErrorMessage("需要鉴权"); break; case 0x07: // 无权限 - Get.log("${commandType!.typeName}无权限"); - showErrorMessage("无权限"); + AppLog.log("${commandType!.typeName} 0x07 无权限"); + // showErrorMessage("无权限"); break; case 0x08: // 应答超时 - Get.log("${commandType!.typeName}应答超时"); + AppLog.log("${commandType!.typeName} 0x08 应答超时"); showErrorMessage("应答超时"); break; case 0x09: // 权限校验错误 - Get.log("${commandType!.typeName}权限校验错误"); + AppLog.log("${commandType!.typeName} 0x09 权限校验错误"); + showErrorMessage("权限校验错误"); break; case 0x0a: // 钥匙不存在 - // showErrorMessage("钥匙不存在"); - Get.log("${commandType!.typeName}钥匙不存在"); + showErrorMessage("钥匙不存在"); + AppLog.log("${commandType!.typeName} 0x0a 钥匙不存在"); break; case 0x0b: // 钥匙过期 showErrorMessage("钥匙过期"); - Get.log("${commandType!.typeName}钥匙过期"); + AppLog.log("${commandType!.typeName} 0x0b 钥匙过期"); break; case 0x0c: // 钥匙数量已到上限 showErrorMessage("钥匙数量已到上限"); - Get.log("${commandType!.typeName}钥匙数量已到上限"); + AppLog.log("${commandType!.typeName} 0x0c 钥匙数量已到上限"); break; case 0x0d: // 钥匙无效 showErrorMessage("钥匙无效"); - Get.log("${commandType!.typeName}钥匙无效"); + AppLog.log("${commandType!.typeName} 0x0d 钥匙无效"); break; case 0x0e: // 钥匙已存在 showErrorMessage("钥匙已存在"); - Get.log("${commandType!.typeName}钥匙无效"); + AppLog.log("${commandType!.typeName} 0x0e 钥匙无效"); break; case 0x0f: // 用户已存在 - Get.log("${commandType!.typeName}用户已存在"); + AppLog.log("${commandType!.typeName} 0x0f 用户已存在"); showErrorMessage("用户已存在"); break; case 0x10: // 密码失效 - Get.log("${commandType!.typeName}密码失效"); + AppLog.log("${commandType!.typeName} 0x11 密码失效"); showErrorMessage("密码失效"); break; case 0x11: // 无效指令 - Get.log("${commandType!.typeName}无效指令"); + AppLog.log("${commandType!.typeName} 0x11 无效指令"); showErrorMessage("无效指令"); break; case 0x12: // 门锁时间异常 - Get.log("${commandType!.typeName}门锁时间异常"); + AppLog.log("${commandType!.typeName} 0x12 门锁时间异常"); showErrorMessage("门锁时间异常"); break; case 0x15: // APP(手机)未联网 - Get.log("${commandType!.typeName}APP(手机)未联网"); + AppLog.log("${commandType!.typeName} 0x15 APP(手机)未联网"); showErrorMessage("APP(手机)未联网"); break; case 0x16: // 正在开锁中... - Get.log("${commandType!.typeName}正在开锁中..."); - showErrorMessage("正在开锁中..."); + AppLog.log("${commandType!.typeName}正在开锁中..."); + // showErrorMessage("正在开锁中..."); break; case 0xff: // 异常，未知错误 - Get.log("${commandType!.typeName} 0xff"); + AppLog.log("${commandType!.typeName} 0xff"); showErrorMessage("异常，未知错误"); break; default: //失败 - Get.log("蓝牙返回其他错误问题"); + AppLog.log("蓝牙返回其他错误问题"); break; } } diff --git a/star_lock/lib/blue/io_sender.dart b/star_lock/lib/blue/io_sender.dart index 004047d4..8ec957d7 100644 --- a/star_lock/lib/blue/io_sender.dart +++ b/star_lock/lib/blue/io_sender.dart @@ -38,11 +38,9 @@ abstract class SenderProtocol extends IOData { // 帧头 commandList.addAll(header); - // print("header:$header"); //包类型 commandList.add(ask); //包类型 - // print("ask:$ask"); // 包序号 int commandIndexChange = _commandIndex!; @@ -51,17 +49,15 @@ abstract class SenderProtocol extends IOData { int commandIndexChang2 = commandIndexChange % 256; commandList.add(commandIndexChang1); commandList.add(commandIndexChang2); - // print("_commandIndex:$_commandIndex commandIndexChang1$commandIndexChang1 commandIndexChang2:$commandIndexChang2"); // 包标识 // 指令类型 高 4 位表示包版本，低 4 位用来指示后面数据的加密类型，长度为 1 字节，加密类型取值说明，0：明文，1：AES128，2：SM4（事先约定密钥），3：SM4（设备指定密钥） commandList.add(commandType!.identifierValue); - // print("commandType!.identifierValue:${commandType!.identifierValue}"); // 数据长度 int dataLen = dataSourceLength(); // commandList.add(dataLength); - // print("dataLen:$dataLen"); + // var dataLen = 42; double dataLength = dataLen / 256; commandList.add(dataLength.toInt()); @@ -71,7 +67,6 @@ abstract class SenderProtocol extends IOData { // 数据块 commandList.addAll(commandData!); //数据块 - // print("commandData:$commandData"); // 校验位 var mcrc = crc_16(commandList); diff --git a/star_lock/lib/blue/io_tool/io_tool.dart b/star_lock/lib/blue/io_tool/io_tool.dart index 18fc8e69..4db02eb7 100644 --- a/star_lock/lib/blue/io_tool/io_tool.dart +++ b/star_lock/lib/blue/io_tool/io_tool.dart @@ -59,9 +59,7 @@ List getFixedLengthList(List data, int length) { //int ---> 指定长度的hex (如指定长度为6的情况,0x000001 0x001234, 0xefab23) String intToFormatHex(int num, int length) { String hexString = num.toRadixString(16); - // print("hexString=$hexString"); String formatString = hexString.padLeft(length, "0"); - // print("formatHexString=$formatString"); return formatString; } @@ -205,7 +203,6 @@ int _toUInt32(int value) { bool checkListIndex(List dataDetail, int index, int offsetLength) { if (dataDetail == null) { - print('❌解析 dataDetail == null'); return true; } var len = dataDetail.length; @@ -296,7 +293,6 @@ bool compareTwoList({List? list1, List? list2}) { int v1 = list1[i]; int v2 = list2[i]; if (v1 != v2) { - print('不包含 $i'); return false; } } diff --git a/star_lock/lib/blue/reciver_data.dart b/star_lock/lib/blue/reciver_data.dart index b256b1be..23914c11 100644 --- a/star_lock/lib/blue/reciver_data.dart +++ b/star_lock/lib/blue/reciver_data.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/blue/blue_manage.dart'; import 'package:star_lock/blue/io_protocol/io_addFace.dart'; import 'package:star_lock/blue/io_protocol/io_changeAdministratorPassword.dart'; @@ -64,18 +65,16 @@ class CommandReciverManager { return; } - // Get.log("appDataReceiveData:$data"); // &&(data[4] == 0x11) if ((data[0] == 0xEF) && (data[1] == 0x01) && (data[2] == 0xEE) && (data[3] == 0x02)) { var tmpType = (data[7] & 0x0f); // 包标识 - // print("temType:$tmpType"); + // AppLog.log("temType:$tmpType"); var dataLen = data[8] * 256 + data[9]; // 高16位用来指示后面数据块内容的长度 var oriLen = data[10] * 256 + data[11]; // 低16位用来指示数据加密前的原长度 - // print("dataLen:$dataLen oriLen:$oriLen"); - // List dataList = []; + // AppLog.log("dataLen:$dataLen oriLen:$oriLen"); List oriDataList = []; switch (tmpType) { case 0: //不加密 @@ -83,7 +82,7 @@ class CommandReciverManager { // oriDataList.add(data[12 + i]); // } oriDataList = data.sublist(12, 12 + dataLen); - // print("不加密 oriDataList:$oriDataList"); + AppLog.log("不加密 :$oriDataList"); break; case 1: //AES128 @@ -99,7 +98,7 @@ class CommandReciverManager { key: utf8.encode(BlueManage().connectDeviceName), mode: SM4CryptoMode.ECB); oriDataList = oriDataList.sublist(0, oriLen); - // print("SM4 oriDataList:$oriDataList"); + AppLog.log("APP收到的解密后的数据:$oriDataList"); break; case 3: //SM4（设备指定密钥） @@ -108,24 +107,21 @@ class CommandReciverManager { var res = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(res!); - // print("getPrivateKeyList$getPrivateKeyList"); // 解密 oriDataList = SM4.decrypt(getDataList, key: getPrivateKeyList, mode: SM4CryptoMode.ECB); oriDataList = oriDataList.sublist(0, oriLen); - print("SM4 oriDataList:$oriDataList"); + AppLog.log("APP收到的解密后的数据:$oriDataList"); break; } parseData(oriDataList).then((value) async { - // Get.log("parseData222 data:$value"); EasyLoading.dismiss(); await EventBusManager().eventBusFir(value); }).catchError((error) { - Get.log("Error occurred while parsing data: $error"); + AppLog.log("APP解析数据时发生错误: $error"); }); } - // print('✅ 执行结束 _buffer:${_buffer.length}'); } static Future parseData(List data) async { @@ -134,7 +130,6 @@ class CommandReciverManager { CommandType commandType = ExtensionCommandType.getCommandType(cmd); await IoManager().increaseCommandIndex(); // data.removeRange(0, 2); - // Get.log("parseData cmd:$cmd commandType:$commandType data:$data"); var reply; switch (commandType) { case CommandType.getLockPublicKey: @@ -159,7 +154,6 @@ class CommandReciverManager { break; case CommandType.openLock: { - // Get.log("openLockReply data:$data"); reply = OpenDoorReply.parseData(commandType, data); } break; diff --git a/star_lock/lib/blue/sender_beforeDataManage.dart b/star_lock/lib/blue/sender_beforeDataManage.dart index 734aa793..5517c707 100644 --- a/star_lock/lib/blue/sender_beforeDataManage.dart +++ b/star_lock/lib/blue/sender_beforeDataManage.dart @@ -48,13 +48,7 @@ class SenderBeforeDataManage { // 添加用户 Future _replyAddUserKey(Reply reply) async { - // var lockId = reply.data.sublist(2, 42); - // print("lockId:$lockId"); - int status = reply.data[46]; - // print("status:$status reply.data:${reply.data}"); - - print("status:$status"); switch (status) { case 0x00: //成功 @@ -73,7 +67,6 @@ class SenderBeforeDataManage { var token = reply.data.sublist(42, 46); List strTokenList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, strTokenList); - // print("token:$token"); // IoSenderManage.senderAddUser( // lockID: BlueManage().connectDeviceName, diff --git a/star_lock/lib/blue/sender_data.dart b/star_lock/lib/blue/sender_data.dart index 40332a56..4f9d47ba 100644 --- a/star_lock/lib/blue/sender_data.dart +++ b/star_lock/lib/blue/sender_data.dart @@ -48,9 +48,9 @@ class CommandSenderManager { Future managerSendData ({required SenderProtocol command, bool isBeforeAddUser = false, CommandSendCallBack? callBack}) async { if (callBack != null) { // if (!BluetoothManager().connected) { - print('❌ 蓝牙断开了'); + AppLog.log('❌ 蓝牙断开了'); if (callBack != null) { - print('managerSendData ❌ callBack'); + AppLog.log('managerSendData ❌ callBack'); // EasyLoading.dismiss(); callBack(ErrorType.notConnected); } @@ -58,7 +58,6 @@ class CommandSenderManager { } List value = command.packageData(); - // print("command.commandTyp:${command.commandType}"); if(isBeforeAddUser == true){ _sendNormalData(value); }else{ @@ -69,7 +68,6 @@ class CommandSenderManager { dataBeforeAddTheUser = value; return; }else{ - // print("继续发送数据了继续发送数据了继续发送数据了"); _sendNormalData(value); } } @@ -106,7 +104,7 @@ class CommandSenderManager { // AppLog.log('''' // ------->\n超时 第 $outTimeCount 次 重发 $commandType 指令 ''',error: true); // // if(commandType != CommandType.upgrade){ -// // print('重发重置帧序号'); +// // AppLog.log('重发重置帧序号'); // // bufferList.replaceRange(1, 2, [IoManager().commandIndex]); // // } // _sendNormalData(bufferList); diff --git a/star_lock/lib/blue/sm4Encipher/sm4.dart b/star_lock/lib/blue/sm4Encipher/sm4.dart index 3a4941a2..d989d07b 100644 --- a/star_lock/lib/blue/sm4Encipher/sm4.dart +++ b/star_lock/lib/blue/sm4Encipher/sm4.dart @@ -413,7 +413,7 @@ class SM4 { } else { // final lastByte = input.last; // final cutLen = input.length - lastByte; - // print("object input.length：${input.length} lastByte:$lastByte input:$input cutLen:$cutLen"); + // AppLog.log("object input.length：${input.length} lastByte:$lastByte input:$input cutLen:$cutLen"); // return input.sublist(0, cutLen); return input; } diff --git a/star_lock/lib/common/safetyVerification/safetyVerification_page.dart b/star_lock/lib/common/safetyVerification/safetyVerification_page.dart index 523aef71..65359b74 100644 --- a/star_lock/lib/common/safetyVerification/safetyVerification_page.dart +++ b/star_lock/lib/common/safetyVerification/safetyVerification_page.dart @@ -50,7 +50,6 @@ class _SafetyVerificationPageState extends State with Ti sliderMoveFinish = false; checkResultAfterDrag = false; }); - // print("countryCode:${state.getData["countryCode"]} getAccount:${state.getData["getAccount"]}"); var entity = await ApiRepository.to.getSliderVerifyImg(state.getData["countryCode"].toString(), state.getData["account"].toString()); if(entity.errorCode! == 0){ @@ -338,23 +337,19 @@ class _SafetyVerificationPageState extends State with Ti onPanStart: (startDetails) { ///开始 _checkMilliseconds = DateTime.now().millisecondsSinceEpoch; - // print(startDetails.localPosition); sliderStartX = startDetails.localPosition.dx; }, onPanUpdate: (updateDetails) { ///更新 - // print(updateDetails.localPosition); double offset = updateDetails.localPosition.dx - sliderStartX; if(offset < 0){ offset = 0; } - // print("offset ------ $offset"); setState(() { state.sliderXMoved.value = offset; }); }, onPanEnd: (endDetails) { //结束 - // print("endDetails sliderXMoved:${state.sliderXMoved.value}"); checkCaptcha(state.sliderXMoved.value); int nowTime = DateTime.now().millisecondsSinceEpoch; _checkMilliseconds = nowTime - _checkMilliseconds; diff --git a/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart b/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart index 79fbc851..e3352377 100644 --- a/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart +++ b/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_logic.dart'; import '../../appRouters.dart'; @@ -47,7 +48,7 @@ class _StarLockForgetPasswordPageState state.countryCode.value = result['code']; state.countryName.value = result['countryName']; } - print("路由返回值: ${result}, countryCode:${state.countryName.value} ,state.countryName.value:${state.countryName.value}"); + // AppLog.log("路由返回值: $result, countryCode:${state.countryName.value} ,state.countryName.value:${state.countryName.value}"); }, child: SizedBox( height: 70.h, diff --git a/star_lock/lib/login/register/starLock_register_page.dart b/star_lock/lib/login/register/starLock_register_page.dart index 4e661deb..b23883c5 100644 --- a/star_lock/lib/login/register/starLock_register_page.dart +++ b/star_lock/lib/login/register/starLock_register_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; @@ -145,7 +146,7 @@ class _StarLockRegisterPageState extends State { state.countryCode.value = result['code']; state.countryName.value = result['countryName']; } - Get.log("路由返回值: $result, countryCode:${logic.state.countryCode}"); + AppLog.log("路由返回值: $result, countryCode:${logic.state.countryCode}"); }, child: Obx(() => SizedBox( height: 70.h, diff --git a/star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart b/star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart index 0bbf4d63..826e4baf 100644 --- a/star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart +++ b/star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart @@ -71,9 +71,7 @@ class _SelectCountryRegionPageState extends State { // show sus tag. SuspensionUtil.setShowSuspensionStatus(list); - setState(() { - Get.log('list.length:${list.length}'); - }); + setState(() {}); } @override @@ -105,11 +103,9 @@ class _SelectCountryRegionPageState extends State { CountryRegionModel countryModel = countriesList[i]; if(countryModel.name!.contains(searchController.text) || countryModel.code!.contains(searchController.text)){ searchList.add(countryModel); - Get.log('countryModel.name:${countryModel.name} countryModel.code:${countryModel.code}'); } } countriesList= searchList; - Get.log('searchList.length:${searchList.length}'); _handleList(searchList); } setState(() {}); @@ -142,7 +138,7 @@ class _SelectCountryRegionPageState extends State { resultMap['code'] = model.code; resultMap['countryId'] = model.countryId.toString(); resultMap['countryName'] = model.name; - print("model.name:${model.name} model.code:${model.code} model.countryId:${model.countryId} model.flag:${model.flag} model.group:${model.group} model.tagIndex:${model.tagIndex}"); + // AppLog.log("model.name:${model.name} model.code:${model.code} model.countryId:${model.countryId} model.flag:${model.flag} model.group:${model.group} model.tagIndex:${model.tagIndex}"); Navigator.pop(context, resultMap); }); }, diff --git a/star_lock/lib/main.dart b/star_lock/lib/main.dart index 6e111af5..9fb0b04e 100644 --- a/star_lock/lib/main.dart +++ b/star_lock/lib/main.dart @@ -50,5 +50,4 @@ Future _setCommonServices() async { } else { await Get.putAsync(() => DeviceInfoService().init()); } - // Get.log(PlatformInfoService.to.info.version); } diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart index 25710563..3b5aadb4 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/blue/io_type.dart'; import 'package:star_lock/tools/dateTool.dart'; @@ -32,20 +33,16 @@ class AuthorizedAdminLogic extends BaseGetXController { if (reply is TransferPermissionsReply) { var token = reply.data.sublist(2, 6); var saveStrList = changeIntListToStringList(token); - Get.log("_replyFactoryDataResetKeyToken:$token"); Storage.setStringList(saveBlueToken, saveStrList); int status = reply.data[6]; - Get.log("status:$status"); switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -69,78 +66,9 @@ class AuthorizedAdminLogic extends BaseGetXController { break; } } - - // if (reply is AddUserReply) { - // _replyAddUserKey(reply); - // } }); } - // Future _replyAddUserKey(Reply reply) async { - // var lockId = reply.data.sublist(2, 42); - // print("lockId:$lockId"); - // - // var token = reply.data.sublist(42, 46); - // List strTokenList = changeIntListToStringList(token); - // Storage.setStringList(saveBlueToken, strTokenList); - // print("token:$token"); - // - // int status = reply.data[46]; - // print("status:$status"); - // - // // userNo = reply.data[46]; - // // print("status:$status"); - // switch (status) { - // case 0x00: - // //成功 - // print("添加用户数据解析成功"); - // state.isSendSuccess.value = true; - // showToast("添加成功"); - // // bindBlueAdmin(); - // break; - // case 0x06: - // //无权限 - // print("需要鉴权"); - // var privateKey = await Storage.getStringList(saveBluePrivateKey); - // List getPrivateKeyList = changeStringListToIntList(privateKey!); - // - // var publicKey = await Storage.getStringList(saveBluePublicKey); - // List publicKeyDataList = changeStringListToIntList(publicKey!); - // - // IoSenderManage.senderAddUser( - // lockID: BlueManage().connectDeviceName, - // authUserID: await Storage.getUid(), - // keyID: "1", - // userID: state.addUserId.value, - // openMode: 1, - // keyType: (state.type.value == "1") ? 0 : 1, - // startDate: state.effectiveDateTime.value.millisecondsSinceEpoch, - // expireDate: state.failureDateTime.value.millisecondsSinceEpoch, - // role: 0, - // password: "123456", - // needAuthor: 1, - // publicKey: publicKeyDataList, - // privateKey: getPrivateKeyList, - // token: token); - // break; - // case 0x07: - // //无权限 - // print("用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("添加用户权限校验错误"); - // - // break; - // default: - // //失败 - // print("领锁失败"); - // - // break; - // } - // } - // 转移权限 Future transferPermissionsAction() async { BlueManage().bludSendData(BlueManage().connectDeviceName, @@ -154,7 +82,6 @@ class AuthorizedAdminLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - print("openDoorTokenPubToken:$getTokenList"); IoSenderManage.senderTransferPermissions( lockID: BlueManage().connectDeviceName, @@ -170,43 +97,6 @@ class AuthorizedAdminLogic extends BaseGetXController { }); } - // 添加用户 - // Future addUserConnectBlue(String receiveId) async { - // // 进来之后首先连接 - // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connecteState) async { - // if (connecteState == DeviceConnectionState.connected) { - // // 私钥 - // var privateKey = await Storage.getStringList(saveBluePrivateKey); - // List getPrivateKeyList = changeStringListToIntList(privateKey!); - // - // var publicKey = await Storage.getStringList(saveBluePublicKey); - // List publicKeyDataList = changeStringListToIntList(publicKey!); - // - // var token = await Storage.getStringList(saveBlueToken); - // List getTokenList = [0, 0, 0, 0]; - // if (token != null) { - // getTokenList = changeStringListToIntList(token); - // } - // - // IoSenderManage.senderAddUser( - // lockID: BlueManage().connectDeviceName, - // authUserID: await Storage.getUid(), - // keyID: "1", - // userID: receiveId, - // openMode: 1, - // keyType: (state.type.value == "1") ? 0 : 1, - // startDate: state.effectiveDateTime.value.millisecondsSinceEpoch, - // expireDate: state.failureDateTime.value.millisecondsSinceEpoch, - // role: 0, - // password: "123456", - // needAuthor: 1, - // publicKey: publicKeyDataList, - // privateKey: getPrivateKeyList, - // token: getTokenList); - // } - // }); - // } - //发送授权管理员列表请求 Future sendElectronicKeyRequest() async { if (state.emailOrPhoneController.text.isEmpty) { @@ -222,7 +112,7 @@ class AuthorizedAdminLogic extends BaseGetXController { var endDate = "0"; var startTime = "0"; var endTime = "0"; - Get.log("state.type.value:${state.seletType.value}"); + AppLog.log("state.type.value:${state.seletType.value}"); String getKeyType = "1"; if (state.seletType.value == 0) { getKeyType = "2"; @@ -268,7 +158,6 @@ class AuthorizedAdminLogic extends BaseGetXController { endTime: int.parse(endTime), isOnlyManageSelf: state.onlyManageYouCreatesUser.value ? 1 : 0); if (entity.errorCode!.codeIsSuccessful) { - Get.log('发送电子钥匙成功'); state.isCreateUser.value = false; state.isSendSuccess.value = true; // Toast.show(msg: "添加成功"); diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart index f442ff25..e6c5decd 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart @@ -345,7 +345,6 @@ class _VolumeAuthorizationLockPageState usernameType:'1', ); if (entity.errorCode!.codeIsSuccessful) { - print('发送电子钥匙成功'); _isSendSuccess = true; setState(() {}); } else { diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart index ab7f5561..c5a0a42b 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart @@ -18,14 +18,12 @@ class AddCardTypeLogic extends BaseGetXController{ var startTime = ""; var endTime = ""; if (state.selectType.value == "0") { - print("永久卡永久卡永久卡"); carType = 1; startDate = "0"; endDate = "0"; startTime = "0"; endTime = "0"; } else if (state.selectType.value == "1") { - print("限时卡限时卡限时卡"); carType = 2; startDate = DateTool().dateToTimestamp(state.timeLimitBeginTime.value, 1).toString(); endDate = DateTool().dateToTimestamp(state.timeLimitEndTime.value, 1).toString(); @@ -51,7 +49,6 @@ class AddCardTypeLogic extends BaseGetXController{ return; } } else if (state.selectType.value == "2") { - print("循环卡循环卡循环卡"); if (state.cycleBeginTime.value.isEmpty) { showToast("请选择有效期".tr); return; diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart index feba7075..5a0209ec 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart @@ -274,7 +274,6 @@ class _AddCardPageState extends State with SingleTickerProviderStat onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名".tr); return; diff --git a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart index 8d2c29b6..14793897 100644 --- a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart +++ b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/blue/io_type.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -64,16 +65,6 @@ class AddICCardLogic extends BaseGetXController{ // var publicKey = await Storage.getStringList(saveBluePublicKey); // List publicKeyDataList = changeStringListToIntList(publicKey!); - // var weekStr = "00000000"; - // for (var day in state.weekDay.value) { - // int index = day % 7; // 将周日的索引转换为 0 - // weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; - // } - // // 倒序 weekStr - // weekStr = weekStr.split('').reversed.join(''); - // int weekRound = int.parse(weekStr, radix: 2); - // print("weekStrweekStrweekStr:$weekStr weekRound:$weekRound"); - var token = reply.data.sublist(5, 9); var saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -98,14 +89,12 @@ class AddICCardLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } Future _replyAddICCardConfirmation(Reply reply) async { int status = reply.data[2]; - Get.log("_replyAddCardtatus:$status"); switch(status){ case 0x00: @@ -132,7 +121,6 @@ class AddICCardLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } @@ -143,7 +131,7 @@ class AddICCardLogic extends BaseGetXController{ // switch(status){ // case 0x00: // //成功 - // Get.log("${reply.commandType!.typeValue} 数据解析成功"); + // AppLog.log("${reply.commandType!.typeValue} 数据解析成功"); // addICCardData(); // break; // case 0x06: @@ -161,7 +149,7 @@ class AddICCardLogic extends BaseGetXController{ // var saveStrList = changeIntListToStringList(token); // Storage.setStringList(saveBlueToken, saveStrList); // - // Get.log("state.isAdministrator.value:${state.isAdministrator.value}"); + // AppLog.log("state.isAdministrator.value:${state.isAdministrator.value}"); // IoSenderManage.senderAddStressICCardCommand( // keyID:"1", // userID:await Storage.getUid(), @@ -179,17 +167,17 @@ class AddICCardLogic extends BaseGetXController{ // break; // case 0x07: // //无权限 - // Get.log("${reply.commandType!.typeValue} 用户无权限"); + // AppLog.log("${reply.commandType!.typeValue} 用户无权限"); // // break; // case 0x09: // // 权限校验错误 - // Get.log("${reply.commandType!.typeValue} 权限校验错误"); + // AppLog.log("${reply.commandType!.typeValue} 权限校验错误"); // // break; // default: // //失败 - // Get.log("${reply.commandType!.typeValue} 失败"); + // AppLog.log("${reply.commandType!.typeValue} 失败"); // break; // } // } @@ -205,17 +193,6 @@ class AddICCardLogic extends BaseGetXController{ // var publicKey = await Storage.getStringList(saveBluePublicKey); // List publicKeyDataList = changeStringListToIntList(publicKey!); - // var weekStr = "00000000"; - // print("state.weekDay.value:${state.weekDay.value}"); - // for (var day in state.weekDay.value) { - // int index = day % 7; // 将周日的索引转换为 0 - // weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; - // } - // // 倒序 weekStr - // weekStr = weekStr.split('').reversed.join(''); - // int weekRound = int.parse(weekStr, radix: 2); - // // print("weekStrweekStrweekStr:$weekStr weekRound:$weekRound"); - var signKey = await Storage.getStringList(saveBlueSignKey); List signKeyDataList = changeStringListToIntList(signKey!); @@ -225,7 +202,6 @@ class AddICCardLogic extends BaseGetXController{ var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - Get.log("state.isAdministrator.value:${state.isAdministrator.value}"); IoSenderManage.senderAddCardWithTimeCycleCoercionCommand( keyID:"1", userID:await Storage.getUid(), diff --git a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_page.dart b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_page.dart index 97e0d039..8845cddf 100644 --- a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_page.dart +++ b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_page.dart @@ -91,7 +91,6 @@ class _AddICCardPageState extends State with RouteAware { @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } @@ -99,7 +98,6 @@ class _AddICCardPageState extends State with RouteAware { @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); state.ifCurrentScreen.value = false; } @@ -108,7 +106,6 @@ class _AddICCardPageState extends State with RouteAware { @override void didPopNext() { super.didPopNext(); - print("lockSet===didPopNext"); state.ifCurrentScreen.value = true; } @@ -116,10 +113,8 @@ class _AddICCardPageState extends State with RouteAware { @override void didPushNext() { super.didPushNext(); - print("lockSet===didPushNext"); logic.cancelBlueConnetctToastTimer(); - state.ifCurrentScreen.value = false; } } diff --git a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_state.dart b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_state.dart index 8a116132..2243469b 100644 --- a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_state.dart +++ b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_state.dart @@ -31,7 +31,6 @@ class AddICCardState{ cardType.value = map["cardType"]; isCoerced.value = map["isCoerced"]; isAdministrator.value = map["isAdministrator"]; - print("isAdministrator.value isAdministrator.value:${isAdministrator.value}"); startDate.value = map["startDate"]; weekDay.value = map["weekDay"]; fromType.value = map["fromType"]; diff --git a/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_logic.dart b/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_logic.dart index 7b7f39be..cd320298 100644 --- a/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_logic.dart @@ -39,7 +39,6 @@ class CardDetailLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); cancelBlueConnetctToastTimer(); dismissEasyLoading(); if(state.isDeletCard.value == true){ @@ -50,7 +49,6 @@ class CardDetailLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -84,7 +82,6 @@ class CardDetailLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } diff --git a/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart b/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart index 6785498e..cb83a71a 100644 --- a/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart +++ b/star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart @@ -231,7 +231,6 @@ class _CardDetailPageState extends State with RouteAware { @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/card/cardList/cardList_logic.dart b/star_lock/lib/main/lockDetail/card/cardList/cardList_logic.dart index b6b501d1..ea8845c8 100644 --- a/star_lock/lib/main/lockDetail/card/cardList/cardList_logic.dart +++ b/star_lock/lib/main/lockDetail/card/cardList/cardList_logic.dart @@ -50,14 +50,12 @@ class CardListLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.isDeletCardData = false; cancelBlueConnetctToastTimer(); deletICCardData(); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -91,7 +89,6 @@ class CardListLogic extends BaseGetXController { break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } @@ -102,24 +99,13 @@ class CardListLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - Get.log("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - Get.log("${reply.commandType}权限校验错误"); break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -130,11 +116,9 @@ class CardListLogic extends BaseGetXController { // 用户数量 int userNum = reply.data[5]; - // print("userNum:$userNum"); // 指纹数量 int fingerNum = reply.data[6]; - // print("fingerNum:$fingerNum"); // 密码数量 int pwdNum = reply.data[7]; @@ -168,21 +152,17 @@ class CardListLogic extends BaseGetXController { // 序列号 var serialNo = reply.data.sublist(17, 21); - Get.log("serialNo:$serialNo"); switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //需要鉴权 - Get.log("${reply.commandType}需要鉴权"); break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -365,7 +345,6 @@ class CardListLogic extends BaseGetXController { } String getKeyType(FingerprintItemData fingerprintItemData){ - // fingerprintStatus 1:正常 2:失效 var keyTypeStr = "";// if(fingerprintItemData.cardStatus == 1){ if(fingerprintItemData.startDate! > DateTime.now().millisecondsSinceEpoch){ @@ -394,7 +373,6 @@ class CardListLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - Get.log("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); @@ -409,7 +387,6 @@ class CardListLogic extends BaseGetXController { Future onInit() async { // TODO: implement onInit super.onInit(); - Get.log("onInit()"); } @override diff --git a/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart b/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart index 47508f6c..ba42f7dc 100644 --- a/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart +++ b/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart @@ -49,7 +49,6 @@ class _CardListPageState extends State with RouteAware { @override Widget build(BuildContext context) { - Get.log("DateTime.now().timeZoneName:${DateTime.now().timeZoneName} timeZoneOffset:${DateTime.now().timeZoneOffset}"); return Scaffold( backgroundColor: AppColors.mainBackgroundColor, @@ -323,7 +322,6 @@ class _CardListPageState extends State with RouteAware { @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_logic.dart b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_logic.dart index 25fb4b3d..c400d4c3 100644 --- a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_logic.dart +++ b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_logic.dart @@ -46,12 +46,10 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{ // 添加人脸开始 Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("status:$status"); switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 删除人脸数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -152,14 +150,12 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); cancelBlueConnetctToastTimer(); dismissEasyLoading(); editICCardData(); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -190,7 +186,6 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } @@ -201,7 +196,6 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -209,7 +203,6 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -240,7 +233,6 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } diff --git a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_page.dart b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_page.dart index 1d710198..fc5dfe48 100644 --- a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_page.dart +++ b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_page.dart @@ -136,7 +136,6 @@ class _OtherTypeKeyChangeDatePageState extends State @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } @@ -144,7 +143,6 @@ class _OtherTypeKeyChangeDatePageState extends State @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); state.ifCurrentScreen.value = false; @@ -155,7 +153,6 @@ class _OtherTypeKeyChangeDatePageState extends State @override void didPopNext() { super.didPopNext(); - print("lockSet===didPopNext"); state.ifCurrentScreen.value = true; } @@ -163,7 +160,6 @@ class _OtherTypeKeyChangeDatePageState extends State @override void didPushNext() { super.didPushNext(); - print("lockSet===didPushNext"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart index fa688688..c1eb0e14 100644 --- a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart +++ b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart @@ -48,12 +48,10 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ // 添加人脸开始 Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("status:$status"); switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 删除人脸数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -154,14 +152,12 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); cancelBlueConnetctToastTimer(); dismissEasyLoading(); editICCardData(); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -192,7 +188,6 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } @@ -203,7 +198,6 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -211,7 +205,6 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -242,7 +235,6 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_logic.dart index 7dbbd897..2ebcc0c6 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_logic.dart @@ -30,7 +30,6 @@ class CheckingInDetailLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); // getCheckInDetailData(); } @@ -39,7 +38,6 @@ class CheckingInDetailLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart index 94557742..accf916e 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart @@ -46,22 +46,17 @@ class _CheckingInDetailPageState extends State { //加载月历事件，请求接口 _loadAttendanceMonthRecord(String dateTime) async { - // print("_datas.length:${_datas.length} state.monthListData:${state.monthListData.length}"); // 显示的上个月的天数 var placeholderDays = _getPlaceholderDays(year: _year, month: _month); // 当月多少天 var currentMonthDays = _getCurrentMonthDays(year: _year, month: _month); - // var changeList = _datas.sublist(placeholderDays, placeholderDays + currentMonthDays); - // print("_datas.length:${_datas.length} placeholderDays:$placeholderDays currentMonthDays:$currentMonthDays"); setState(() { // 因为_datas这个月上个月都包含的都有 遍历把本月的赋值 for (int i = 0; i < _datas.length; i++) { // 因为i从0开始 所以i>=上个月的天数 且小于上个月跟本月天数之和 if((i >= placeholderDays) && (i < (placeholderDays + currentMonthDays))){ - // print("i:$i placeholderDays:$placeholderDays currentMonthDays:$currentMonthDays state.monthListData.length：${state.monthListData.length}"); _datas[i].workType = state.monthListData[i-placeholderDays].colorType.toString(); - // print("_datas[i].workType:${_datas[i].workType} i:$i"); } } }); @@ -70,9 +65,7 @@ class _CheckingInDetailPageState extends State { //加载日事件，请求接口 _loadAttendanceDayRecord(String dateTime) async { //可根据接口返回的内容在日历下面打卡信息或者其余内容 - print("点击的是$dateTime"); state.checkDate.value = DateTime.parse(dateTime).millisecondsSinceEpoch; - print("点击的是$dateTime state.checkDate.value:${state.checkDate.value}"); logic.getCheckInDetailData((){ //设置模拟数据，日历月事件，可根据接口返回的结果 _loadAttendanceMonthRecord("$_year-$_month"); @@ -209,7 +202,6 @@ class _CheckingInDetailPageState extends State { //子组件宽高长度比例 childAspectRatio: 1), itemBuilder: (context, index) { - // print("_datas[index].workType:${_datas[index].workType}"); Color backColor = Colors.white; // Color textColor = const Color(0xFFFFFFFF); if(_datas[index].workType == "1"){ diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_logic.dart index 113c214c..3f17db49 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_logic.dart @@ -31,7 +31,6 @@ class CheckingInAddHolidaysLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); } @@ -39,7 +38,6 @@ class CheckingInAddHolidaysLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart index c9685f70..70fc8e32 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart @@ -23,7 +23,6 @@ class CheckingInSetHolidaysLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); editStaffLoadData(); } @@ -32,7 +31,6 @@ class CheckingInSetHolidaysLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart index 123158f5..76480bc8 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart @@ -255,7 +255,6 @@ class _CheckingInSetHolidaysPageState extends State { onConfirm: (p) { state.selectYear.value = p.year!; logic.editStaffLoadData(); - print("longer >>> 返回数据：${p.year}"); }, ); } @@ -303,7 +302,6 @@ class _CheckingInSetHolidaysPageState extends State { colorType = const Color(0xFF333333); break; } - // print("colorType:$colorType"); return colorType; } } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_logic.dart index 3b3ef16a..116e84cf 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_logic.dart @@ -115,7 +115,6 @@ class CheckingInListLogic extends BaseGetXController{ Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); @@ -130,7 +129,6 @@ class CheckingInListLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart index c5c02883..ceaf5b91 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart @@ -85,7 +85,6 @@ class CheckingInSetLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); _initLoadDataAction(); openCheckingInData(); @@ -95,7 +94,6 @@ class CheckingInSetLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } @override diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart index d52c3fed..0cf124c0 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart @@ -95,7 +95,6 @@ class _CheckingInSetPageState extends State { "checkingInSetInfo": state.checkingInSetInfo.value, }); if(data != null) { - Get.log("data: $data"); state.isCustom.value = data["attendanceType"]; state.weekDays.value = data["weekDays"]; state.weekDaysStr.value = state.weekDays.value.join(","); diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart index 9fb59fd5..17d3c4d7 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart @@ -125,7 +125,6 @@ class _CheckingInSetWorkTimePageState extends State { // //获取当前时间的秒 // int millisecond = now.millisecond; - // print("组合 $year-$month-$day $hour:$minute:$millisecond"); return dateSlug; } } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_logic.dart index 8ccc50ff..cf5cafe4 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_logic.dart @@ -34,7 +34,6 @@ class CheckingInSetWorkdaySetLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); Map map = Get.arguments; state.pushType.value = map["pushType"]; @@ -59,7 +58,6 @@ class CheckingInSetWorkdaySetLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_state.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_state.dart index c6b4737d..4ea5923e 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_state.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_state.dart @@ -26,7 +26,6 @@ class CheckingInSetWorkdaySetState{ weekDays.value = checkingInSetInfo.value.workDay!; isCustom.value = (checkingInSetInfo.value.attendanceType! == 0) ? true : false; - Get.log("weekDays: $weekDays checkingInSetInfo.value.workDay!: ${checkingInSetInfo.value.workDay!} checkingInSetInfo.value.attendanceType!: ${checkingInSetInfo.value.attendanceType!}"); if(isCustom.value == false){ if(checkingInSetInfo.value.workDay!.length == 5){ isSingledayWeekend.value = 1; diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart index 7427ebe1..ef9613a5 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart @@ -19,7 +19,6 @@ class CheckingInAddStaffLogic extends BaseGetXController{ _getNumberEvent = eventBus.on().listen((event) { state.attendanceWayNumber.value = event.number; isCanClickAction(); - // print("event.number = ${event.number} state.getDataPassword.value = ${state.attendanceWayNumber.value}"); }); } @@ -106,7 +105,6 @@ class CheckingInAddStaffLogic extends BaseGetXController{ isCoerced: 1); if (entity.errorCode!.codeIsSuccessful) { - // print('获取密码成功'); if (entity.data != null) { state.attendanceWayNumber.value = entity.data!.keyboardPwd!; isCanClickAction(); @@ -134,14 +132,12 @@ class CheckingInAddStaffLogic extends BaseGetXController{ }else{ state.isCanClick.value = state.staffNameIsNotEmpty && state.attendanceWayNumberIsNotEmpty; } - // print("state.isCanClick.value = ${state.isCanClick.value}"); } @override void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); _initLoadDataAction(); changeInput(state.staffNameController); @@ -151,7 +147,6 @@ class CheckingInAddStaffLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } @override diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index 1948cf27..4f600d95 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart @@ -308,7 +308,6 @@ class _CheckingInAddStaffPageState extends State { state.attendanceWayNumber.value = numberList[index].toString(); } logic.isCanClickAction(); - // print("object:$index str:$str type:$showBottomSheetToolType state.selectPrintingMethodType.value:${state.selectPrintingMethodType.value}"); }); }); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_logic.dart index af93f6d1..2eb50805 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_logic.dart @@ -43,7 +43,6 @@ class CheckingInStaffManageLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); getStaffList(); @@ -54,7 +53,6 @@ class CheckingInStaffManageLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_state.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_state.dart index a2326a88..a0d76bc5 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_state.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_state.dart @@ -14,7 +14,6 @@ class CheckingInStaffManageState{ Map map = Get.arguments; getKeyInfosData.value = map["getKeyInfosData"]; companyId.value = map["companyId"]; - // print("companyId.value:${companyId.value}"); } } \ No newline at end of file diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart index fd4077d2..4ae11cef 100644 --- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart +++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'package:flutter/services.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; // import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_entity.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_state.dart'; @@ -45,28 +46,18 @@ class DoorLockLogLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // // _getLockStatus(); // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); // // break; // case 0x07: // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // // break; // default: // //失败 - // print("${reply.commandType}失败"); - // // break; // } // } @@ -77,16 +68,15 @@ class DoorLockLogLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); if (reply.data[5] > 0) { reply.data.removeRange(0, 6); // 把得到的数据按8位分割成数组 然后塞进一个新的数组里面 var getList = splitList(reply.data, 8); - // print("getList:$getList"); + // AppLog.log("getList:$getList"); var uploadList = []; for (int i = 0; i < getList.length; i++) { var indexList = getList[i]; - // print("indexList:$indexList"); + // AppLog.log("indexList:$indexList"); var indexMap = {}; indexMap["seq"] = indexList[0].toString(); indexMap["user"] = indexList[3].toString(); @@ -99,34 +89,19 @@ class DoorLockLogLogic extends BaseGetXController { (0xff & indexList[6]) << 8 | (0xFF & indexList[7])); // indexMap["date"] = DateTool().dateToYMDHNSString("$value"); - // print("value：${DateTool().dateToYMDHNSString("$value")}"); indexMap["date"] = "${value * 1000}"; uploadList.add(indexMap); } lockRecordUploadData(uploadList); - print("reply.data:${reply.data} getList:$getList}"); } break; case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); + //无权限 需要鉴权 break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -258,7 +233,6 @@ class DoorLockLogLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart index 032c9ede..d5a84cd8 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart @@ -223,7 +223,6 @@ class ElectronicKeyDetailLogic extends BaseGetXController { void onReady() { // TODO: implement onReady super.onReady(); - } @override @@ -236,6 +235,5 @@ class ElectronicKeyDetailLogic extends BaseGetXController { void onClose() { // TODO: implement onClose super.onClose(); - } } diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_state.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_state.dart index d6d1e6c8..5d215e3d 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_state.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_state.dart @@ -23,7 +23,6 @@ class ElectronicKeyDetailChangeDateState { Map map = Get.arguments; if ((map["itemData"] != null)) { itemData.value = map["itemData"]; - Get.log("itemData.value.keyId:${itemData.value.keyId}"); if(map["pushType"] != null){ pushType.value = map["pushType"]; } @@ -44,7 +43,6 @@ class ElectronicKeyDetailChangeDateState { if ((map["expireLockItem"] != null)) { expireLockItem.value = map["expireLockItem"]; - Get.log("itemData.value.keyId:${expireLockItem.value.keyId}"); keyId.value = expireLockItem.value.keyId!; lockId.value = expireLockItem.value.lockId!; diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_state.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_state.dart index 115fa619..372d381f 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_state.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_state.dart @@ -47,7 +47,6 @@ class ElectronicKeyPeriodValidityState { if ((map["expireLockItem"] != null)) { expireLockItem.value = map["expireLockItem"]; - Get.log("itemData.value.keyId:${expireLockItem.value.keyId}"); keyId.value = expireLockItem.value.keyId!; lockId.value = expireLockItem.value.lockId!; diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_logic.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_logic.dart index 7b176b1c..a0ed4b20 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_logic.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_logic.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_entity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_state.dart'; import 'package:star_lock/network/api_repository.dart'; @@ -41,28 +42,14 @@ class KeyOperationRecordLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // // _getLockStatus(); // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // // break; // default: // //失败 - // print("${reply.commandType}失败"); - // // break; // } // } @@ -73,16 +60,15 @@ class KeyOperationRecordLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); if (reply.data[5] > 0) { reply.data.removeRange(0, 6); // 把得到的数据按8位分割成数组 然后塞进一个新的数组里面 var getList = splitList(reply.data, 8); - // print("getList:$getList"); + // AppLog.log("getList:$getList"); var uploadList = []; for (int i = 0; i < getList.length; i++) { var indexList = getList[i]; - // print("indexList:$indexList"); + // AppLog.log("indexList:$indexList"); var indexMap = {}; indexMap["seq"] = indexList[0].toString(); indexMap["user"] = indexList[3].toString(); @@ -95,18 +81,15 @@ class KeyOperationRecordLogic extends BaseGetXController { (0xff & indexList[6]) << 8 | (0xFF & indexList[7])); // indexMap["date"] = DateTool().dateToYMDHNSString("$value"); - // print("value：${DateTool().dateToYMDHNSString("$value")}"); indexMap["date"] = "${value * 1000}"; uploadList.add(indexMap); } lockRecordUploadData(uploadList); - // print("reply.data:${reply.data} getList:$getList}"); } break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); break; default: @@ -188,7 +171,6 @@ class KeyOperationRecordLogic extends BaseGetXController { cardId:state.cardId.value, fingerprintId:state.fingerprintId.value); if (entity.errorCode!.codeIsSuccessful) { - // print("操作记录列表成功:${entity.data?.itemList}"); state.dataList.value = entity.data!.itemList!; } } @@ -226,7 +208,6 @@ class KeyOperationRecordLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); @@ -241,7 +222,6 @@ class KeyOperationRecordLogic extends BaseGetXController { Future onInit() async { // TODO: implement onInit super.onInit(); - print("onInit()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart index 9cee46ed..3b9d58b8 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart @@ -46,7 +46,6 @@ class _MassSendElectronicKeyPageState extends State { @override Widget build(BuildContext context) { state.type.value = widget.type; - Get.log('state.type.value:${state.type.value}'); return SingleChildScrollView( child: state.isDemoMode ? indexChangeWidget() : Obx(() => indexChangeWidget()), @@ -205,7 +204,6 @@ class _MassSendElectronicKeyPageState extends State { if (value != null) { value as Map; state.lockIdList = value['selectLockIdList']; - print("_lockIdList:$state.lockIdList"); setState(() {}); } }); @@ -284,7 +282,6 @@ class _MassSendElectronicKeyPageState extends State { state.endTime.value = result['endDate']; state.effectiveDateTime.value = result['starTime']; state.failureDateTime.value = result['endTime']; - // Get.log('得到的有效期数据:${state.weekdaysList.value} == ${state.beginTime.value} == ${state.endTime.value}== ${state.effectiveDateTime.value} == ${state.failureDateTime.value}'); } })), Obx(() => Visibility( diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart index 86737ab9..8bab454e 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart @@ -71,7 +71,6 @@ class _MassSendLockGroupListPageState extends State { SubmitBtn( btnName: '确定'.tr, onClick: () { - // print('得到lockid为$selectLockIdList '); Map resultMap = {}; resultMap['selectLockIdList'] = selectLockIdList; Navigator.pop(context, resultMap); diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart index 74334728..856fad32 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart @@ -89,7 +89,6 @@ class MassSendReceiverCell extends StatelessWidget { TextEditingController controller = TextEditingController(text: getStr); controller.addListener(() { userData.userid = controller.text; - print(controller.text); }); return controller; @@ -99,7 +98,6 @@ class MassSendReceiverCell extends StatelessWidget { TextEditingController controller = TextEditingController(text: getStr); controller.addListener(() { userData.nickname = controller.text; - print(controller.text); }); return controller; diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart index 82cccf90..a114011f 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart @@ -268,7 +268,6 @@ class _SendElectronicKeyPageState extends State with Sing state.endTime.value = result['endDate']; state.effectiveDateTime.value = result['starTime']; state.failureDateTime.value = result['endTime']; - Get.log('得到的有效期数据:${state.weekdaysList.value} == ${state.beginTime.value} == ${state.endTime.value}== ${state.effectiveDateTime.value} == ${state.failureDateTime.value}'); } })), Obx(() => Visibility( @@ -463,7 +462,6 @@ class _SendElectronicKeyPageState extends State with Sing // var entity = await ApiRepository.to // .updateSetting(state.keyInfo.value.lockId.toString(), '1', '13'); // if (entity.errorCode!.codeIsSuccessful) { - // print("标记为已入住成功啦啦啦啦啦"); // Toast.show(msg: "标记成功"); // } else { // Toast.show(msg: '操作失败'); diff --git a/star_lock/lib/main/lockDetail/face/addFace/addFace_logic.dart b/star_lock/lib/main/lockDetail/face/addFace/addFace_logic.dart index 4826ddeb..6c60559f 100644 --- a/star_lock/lib/main/lockDetail/face/addFace/addFace_logic.dart +++ b/star_lock/lib/main/lockDetail/face/addFace/addFace_logic.dart @@ -44,23 +44,19 @@ class AddFaceLogic extends BaseGetXController { Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("_replyAddFaceBegin status:$status"); switch (status) { case 0x00: //成功 - // print("${reply.commandType!.typeValue} 人脸开始数据解析成功"); state.ifConnectScuess.value = true; // 最大图片数 state.maxRegCount.value = reply.data[10]; - print("人脸开始state.maxRegCount.value:${state.maxRegCount.value}"); - // state.fingerprintNumber.value = reply.data.last.toString(); + // AppLog.log("人脸开始state.maxRegCount.value:${state.maxRegCount.value}"); break; case 0x06: //无权限 var weekStr = "00000000"; - print("state.weekDay.value:${state.weekDay.value}"); for (var day in state.weekDay.value) { int index = day % 7; // 将周日的索引转换为 0 weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; @@ -68,7 +64,6 @@ class AddFaceLogic extends BaseGetXController { // 倒序 weekStr weekStr = weekStr.split('').reversed.join(''); int weekRound = int.parse(weekStr, radix: 2); - // print("weekStrweekStrweekStr:$weekStr weekRound:$weekRound"); var signKey = await Storage.getStringList(saveBlueSignKey); List signKeyDataList = changeStringListToIntList(signKey!); @@ -97,20 +92,9 @@ class AddFaceLogic extends BaseGetXController { privateKey:getPrivateKeyList, token: token, ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} 失败"); break; } @@ -118,56 +102,36 @@ class AddFaceLogic extends BaseGetXController { Future _replyAddFaceProcess(Reply reply) async { int status = reply.data[2]; - print("******33 status:$status"); switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} 注册人脸过程数据解析成功"); if (reply.data[5] == 255) { // 注册人脸失败 - print("${reply.commandType!.typeValue} 注册人脸过程失败"); showToast("添加失败"); Get.close(2); } else { // state.addFaceProcessNumber.value++; - // 当前注册数 state.regIndex.value = reply.data[6]; - print("注册人脸过程state.regIndex.value:${state.regIndex.value}"); + // AppLog.log("注册人脸过程state.regIndex.value:${state.regIndex.value}"); } break; case 0x06: //需要权限 - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} 注册人脸过程default失败"); - break; } } Future _replyAddFaceConfirmation(Reply reply) async { int status = reply.data[2]; - print("status:$status"); - switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} 人脸确认数据解析成功"); - // print("添加人脸确认成功，调用添加指纹接口"); if (state.faceNumber.value == (reply.data[6]).toString()) { return; } else { @@ -178,21 +142,9 @@ class AddFaceLogic extends BaseGetXController { case 0x06: //需要权限 - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} 人脸确认default失败"); - break; } } @@ -207,7 +159,6 @@ class AddFaceLogic extends BaseGetXController { if (deviceConnectionState == BluetoothConnectionState.connected) { cancelBlueConnetctToastTimer(); var weekStr = "00000000"; - print("state.weekDay.value:${state.weekDay.value}"); for (var day in state.weekDay.value) { int index = day % 7; // 将周日的索引转换为 0 weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; @@ -215,7 +166,6 @@ class AddFaceLogic extends BaseGetXController { // 倒序 weekStr weekStr = weekStr.split('').reversed.join(''); int weekRound = int.parse(weekStr, radix: 2); - // print("weekStrweekStrweekStr:$weekStr weekRound:$weekRound"); var signKey = await Storage.getStringList(saveBlueSignKey); List signKeyDataList = changeStringListToIntList(signKey!); @@ -225,9 +175,6 @@ class AddFaceLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - print( - "openDoorTokenPubToken:$getTokenList state.startDate.value:${state.startDate.value}"); - // print("限时人脸开始时间:${state.startDate.value ~/ 1000} 限时人脸结束时间:${state.endDate.value ~/ 1000}"); IoSenderManage.senderAddFaceCommand( keyID:"1", @@ -273,7 +220,6 @@ class AddFaceLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { // Toast.show(msg: "添加成功"); - print('更新人脸用户账号成功了么1'); updateFaceUserNoLoadData(entity.data!.faceId!); } } @@ -286,7 +232,6 @@ class AddFaceLogic extends BaseGetXController { faceUserNo: state.faceNumber.value, ); if (entity.errorCode!.codeIsSuccessful) { - print('更新人脸用户账号成功了么2'); showToast("添加成功"); if (state.fromType.value == 2) { // 回调人脸号 diff --git a/star_lock/lib/main/lockDetail/face/addFace/addFace_state.dart b/star_lock/lib/main/lockDetail/face/addFace/addFace_state.dart index abea9978..5183d2ac 100644 --- a/star_lock/lib/main/lockDetail/face/addFace/addFace_state.dart +++ b/star_lock/lib/main/lockDetail/face/addFace/addFace_state.dart @@ -39,7 +39,6 @@ class AddFaceState { weekDay.value = map["cyclicConfig"]; fromType.value = map["fromType"]; isAdministrator.value = map["isAdministrator"]; - print("isAdministrator.value isAdministrator.value:${isAdministrator.value}"); startDate.value = map["startDate"]; // weekDay.value = map["weekDay"]; fromType.value = map["fromType"]; diff --git a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_logic.dart b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_logic.dart index b791b9c6..814ea5c6 100644 --- a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_logic.dart +++ b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_logic.dart @@ -16,14 +16,12 @@ class AddFaceTypeLogic extends BaseGetXController { var startTime = ""; var endTime = ""; if (state.selectType.value == "0") { - print("永久卡永久卡永久卡"); faceType = 1; startDate = "0"; endDate = "0"; startTime = "0"; endTime = "0"; } else if (state.selectType.value == "1") { - print("限时卡限时卡限时卡"); faceType = 2; startDate = DateTool().dateToTimestamp(state.timeLimitBeginTime.value, 1).toString(); endDate = DateTool().dateToTimestamp(state.timeLimitEndTime.value, 1).toString(); @@ -49,7 +47,6 @@ class AddFaceTypeLogic extends BaseGetXController { return; } } else if (state.selectType.value == "2") { - print("循环卡循环卡循环卡"); if (state.cycleBeginTime.value.isEmpty) { showToast("请选择有效期".tr); return; diff --git a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart index fd745afb..f7c27b4c 100644 --- a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart +++ b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart @@ -257,7 +257,6 @@ class _AddFaceTypePageState extends State with SingleTickerProv onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; diff --git a/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart b/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart index f2ab7884..4e1717a4 100644 --- a/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart @@ -33,12 +33,10 @@ class FaceDetailLogic extends BaseGetXController { // 添加人脸开始 Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("status:$status"); switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 删除人脸数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); diff --git a/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart index 91dc1678..6136c67a 100644 --- a/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart +++ b/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart @@ -101,11 +101,6 @@ class _FaceDetailPageState extends State with RouteAware { }); if (data != null) { setState(() { - // print("state.starDate.value:${data["starDate"]} " - // "state.endDate.value:${data["endDate"]} " - // "state.starTime.value:${data["starTime"]} " - // "state.endTime.value:${data["endTime"]} " - // "state.weekDay.value:${data["weekDay"]}"); state.startDate.value = data["starDate"]; state.endDate.value = data["endDate"]; state.startTime.value = data["starTime"]; @@ -249,7 +244,6 @@ class _FaceDetailPageState extends State with RouteAware { @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/face/faceList/faceList_logic.dart b/star_lock/lib/main/lockDetail/face/faceList/faceList_logic.dart index 4766fe57..6a92f38b 100644 --- a/star_lock/lib/main/lockDetail/face/faceList/faceList_logic.dart +++ b/star_lock/lib/main/lockDetail/face/faceList/faceList_logic.dart @@ -47,12 +47,10 @@ class FaceListLogic extends BaseGetXController { // 添加人脸开始---这里用作删除人脸 Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("status:$status"); switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} list人脸数据解析成功"); state.isDeletFaceData = false; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -64,7 +62,6 @@ class FaceListLogic extends BaseGetXController { break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -105,21 +102,9 @@ class FaceListLogic extends BaseGetXController { // privateKey: getPrivateKeyList, // token: getTokenList, // ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} list人脸失败"); - break; } } @@ -131,28 +116,14 @@ class FaceListLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -163,28 +134,15 @@ class FaceListLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); + // _getLockStatus(); break; case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); + //无权限 需要鉴权 break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -195,11 +153,9 @@ class FaceListLogic extends BaseGetXController { // 用户数量 int userNum = reply.data[5]; - // print("userNum:$userNum"); // 指纹数量 int fingerNum = reply.data[6]; - // print("fingerNum:$fingerNum"); // 密码数量 int pwdNum = reply.data[7]; @@ -233,33 +189,18 @@ class FaceListLogic extends BaseGetXController { // 序列号 var serialNo = reply.data.sublist(17, 21); - print("serialNo:$serialNo"); switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -401,7 +342,6 @@ class FaceListLogic extends BaseGetXController { faceId = state.deletKeyID; type = "0"; } - print("delet faceId $faceId"); var entity = await ApiRepository.to.deleteFaceData( faceId: int.parse(faceId), lockId: state.lockId.value, @@ -421,7 +361,6 @@ class FaceListLogic extends BaseGetXController { faceId = state.deletKeyID; type = "0"; } - print("delet faceId $faceId"); var entity = await ApiRepository.to.clearFaceData( lockId: state.lockId.value, ); @@ -470,11 +409,9 @@ class FaceListLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); - // print("aaaaaaa:$isDemoMode"); if (isDemoMode == false) { _initReplySubscription(); @@ -488,7 +425,6 @@ class FaceListLogic extends BaseGetXController { Future onInit() async { // TODO: implement onInit super.onInit(); - print("onInit()"); var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { // senderQueryingFingerprintStatus(); diff --git a/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart b/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart index 96c43b4a..bb6215fd 100644 --- a/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -117,11 +117,6 @@ class _FaceListPageState extends State { getFaceItemData.faceName!, logic.getKeyType(getFaceItemData), logic.getKeyDateType(getFaceItemData), - // (getFaceItemData.faceType! != 1) ? (getFaceItemData.endDate! < DateTime.now().millisecondsSinceEpoch ? "已失效" : "") : "", - // getFaceItemData.validTimeStr!, - // fingerprintItemData.fingerprintType! == 1 - // ? "永久" - // : "${DateTool().dateToYMDHNString(fingerprintItemData.startDate.toString())} - ${DateTool().dateToYMDHNString(fingerprintItemData.endDate.toString())}", () async { var data = await Get.toNamed(Routers.faceDetailPage, arguments: { "faceItemData": getFaceItemData, diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart index 9b5326ff..ae5ba930 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart @@ -4,12 +4,10 @@ import 'dart:async'; // import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:get/get.dart'; -import 'package:star_lock/blue/io_type.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/tools/dateTool.dart'; import '../../../../../blue/blue_manage.dart'; -// import '../../../../../blue/io_protocol/io_addFingerprint.dart'; -import '../../../../../blue/io_protocol/io_addStressFingerprint.dart'; import '../../../../../blue/io_reply.dart'; import '../../../../../blue/io_tool/io_tool.dart'; import '../../../../../blue/io_tool/manager_event_bus.dart'; @@ -52,22 +50,19 @@ class AddFingerprintLogic extends BaseGetXController { Future _replyAddFingerprintBegin(Reply reply) async { int status = reply.data[2]; - // Get.log("status:$status"); switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.ifConnectScuess.value = true; // 最大图片数 state.maxRegCount.value = reply.data[10]; - Get.log("state.maxRegCount.value:${state.maxRegCount.value}"); + // AppLog.log("state.maxRegCount.value:${state.maxRegCount.value}"); // state.fingerprintNumber.value = reply.data.last.toString(); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -110,21 +105,18 @@ class AddFingerprintLogic extends BaseGetXController { break; case 0x07: //无权限 - Get.log("${reply.commandType!.typeValue} 用户无权限"); showToast("添加指纹失败", something: (){ Get.back(); }); break; case 0x09: // 权限校验错误 - Get.log("${reply.commandType!.typeValue} 权限校验错误"); showToast("添加指纹失败", something: (){ Get.back(); }); break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); showToast("添加指纹失败", something: (){ Get.back(); }); @@ -134,12 +126,10 @@ class AddFingerprintLogic extends BaseGetXController { Future _replyAddFingerprintProcess(Reply reply) async { int status = reply.data[2]; - Get.log("33 status:$status"); switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); if(reply.data[5] == 255){ // 注册指纹失败 showToast("添加失败"); @@ -149,7 +139,7 @@ class AddFingerprintLogic extends BaseGetXController { // 当前注册数 state.regIndex.value = reply.data[6]; - Get.log("state.regIndex.value:${state.regIndex.value}"); + AppLog.log("当前注册数 state.regIndex.value:${state.regIndex.value}"); } break; case 0x06: @@ -157,19 +147,16 @@ class AddFingerprintLogic extends BaseGetXController { break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } Future _replyAddFingerprintConfirmation(Reply reply) async { int status = reply.data[2]; - Get.log("status:$status"); switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); if(state.fingerprintNumber.value == (reply.data[6]).toString()){ return; }else{ @@ -188,20 +175,16 @@ class AddFingerprintLogic extends BaseGetXController { break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } // Future _replyAddStressFingerprint(Reply reply) async { // int status = reply.data[2]; - // Get.log("status:$status"); // // switch(status){ // case 0x00: // //成功 - // Get.log("${reply.commandType!.typeValue} 数据解析成功"); - // // print("添加指纹确认成功，调用添加指纹接口"); // addFingerprintsData(); // break; // case 0x06: @@ -236,15 +219,12 @@ class AddFingerprintLogic extends BaseGetXController { // break; // case 0x07: // //无权限 - // Get.log("${reply.commandType!.typeValue} 用户无权限"); // break; // case 0x09: // // 权限校验错误 - // Get.log("${reply.commandType!.typeValue} 权限校验错误"); // break; // default: // //失败 - // Get.log("${reply.commandType!.typeValue} 失败"); // break; // } // } @@ -257,18 +237,6 @@ class AddFingerprintLogic extends BaseGetXController { BlueManage().bludSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected){ cancelBlueConnetctToastTimer(); - // var publicKey = await Storage.getStringList(saveBluePublicKey); - // List publicKeyDataList = changeStringListToIntList(publicKey!); - - // var weekStr = "00000000"; - // for (var day in state.weekDay.value) { - // int index = day % 7; // 将周日的索引转换为 0 - // weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; - // } - // // 倒序 weekStr - // weekStr = weekStr.split('').reversed.join(''); - // int weekRound = int.parse(weekStr, radix: 2); - // Get.log("weekStrweekStrweekStr:$weekStr weekRound:$weekRound"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -279,7 +247,6 @@ class AddFingerprintLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - Get.log("state.isCoerced.value:${state.isCoerced.value}"); IoSenderManage.senderAddFingerprintWithTimeCycleCoercionCommand( keyID:"1", userID:await Storage.getUid(), @@ -321,7 +288,6 @@ class AddFingerprintLogic extends BaseGetXController { // var token = await Storage.getStringList(saveBlueToken); // List getTokenList = changeStringListToIntList(token!); // - // Get.log("state.isAdministrator.value:${state.isAdministrator.value}"); // IoSenderManage.senderAddFingerprintCommand( // keyID:"1", // userID:await Storage.getUid(), @@ -382,8 +348,6 @@ class AddFingerprintLogic extends BaseGetXController { // 添加指纹 void addFingerprintsData() async{ - Get.log("effectiveDateTime:${state.effectiveDateTime.value} failureDateTime:${state.failureDateTime.value}"); - var entity = await ApiRepository.to.addFingerprintsData( lockId: state.lockId.value.toString(), endDate: state.endDate.value, diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart index 82f18e01..74d970a0 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart @@ -162,7 +162,6 @@ class _AddFingerprintPageState extends State with RouteAware @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_state.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_state.dart index c25fbcbc..6a0e5f06 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_state.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_state.dart @@ -32,17 +32,13 @@ class AddFingerprintState{ fingerprintName.value = map["fingerprintName"]; fingerprintType.value = map["fingerprintType"]; isCoerced.value = map["isCoerced"]; - Get.log("isCoerced.valueisCoerced.value:${isCoerced.value}"); isAdministrator.value = map["isAdministrator"]; - Get.log("isAdministrator.value isAdministrator.value:${isAdministrator.value}"); startDate.value = map["startDate"]; lockId.value = map["lockId"]; weekDay.value = map["weekDay"]; fromType.value = map["fromType"]; effectiveDateTime.value = map["effectiveTime"]; - Get.log("effectiveDateTime.value:${effectiveDateTime.value}"); failureDateTime.value = map["failureTime"]; - Get.log("failureDateTime.value:${failureDateTime.value}"); selectType.value = map["selectType"]; } } \ No newline at end of file diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart index c24162f0..50bcd7bf 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart @@ -59,7 +59,6 @@ class AddFingerprintTypeLogic extends BaseGetXController{ fingerprintType = 4; } // var isCoerced = state.isStressFingerprint.value == false ? "1" : "2"; // 1:非胁迫指纹 2:胁迫指纹 - // Get.log("addOtherType startDate:$startDate endDate:$endDate isCoerced:$isCoerced"); // 指纹 Get.toNamed(Routers.addFingerprintPage, arguments: { diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart index 8a8a76a0..f396279c 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart @@ -275,7 +275,6 @@ class _AddFingerprintTypePageState extends State with Si onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名".tr); return; @@ -417,7 +416,6 @@ class _AddFingerprintTypePageState extends State with Si value: state.isStressFingerprint.value, onChanged: (value) { state.isStressFingerprint.value = value; - // Get.log("state.isStressFingerprint.value:${state.isStressFingerprint.value}"); }, ); } diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_logic.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_logic.dart index 6a5775bf..a1e602d2 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_logic.dart @@ -38,7 +38,6 @@ class FingerprintDetailLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -50,7 +49,6 @@ class FingerprintDetailLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -84,7 +82,6 @@ class FingerprintDetailLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); break; } } diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart index 4ee6133e..d2b97f6a 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart @@ -97,18 +97,11 @@ class _FingerprintDetailPageState extends State with Rout }); if(data != null) { setState(() { - print("state.starDate.value:${data["starDate"]} " - "state.endDate.value:${data["endDate"]} " - "state.starTime.value:${data["starTime"]} " - "state.endTime.value:${data["endTime"]} " - "state.weekDay.value:${data["weekDay"]}"); - state.starDate.value = data["starDate"]; state.endDate.value = data["endDate"]; state.startDate.value = data["starTime"]; state.endTime.value = data["endTime"]; state.weekDay.value = data["weekDay"]; - }); } } @@ -268,7 +261,6 @@ class _FingerprintDetailPageState extends State with Rout @override void didPushNext() { super.didPushNext(); - print("lockSet===didPushNext"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart index fa6cefc7..5a00da5d 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart @@ -15,7 +15,7 @@ class FingerprintListDataEntity { } Map toJson() { - final Map data = Map(); + final Map data = {}; data['errorCode'] = errorCode; data['description'] = description; data['errorMsg'] = errorMsg; diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart index c1cf4b1b..7f7fc8d8 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart @@ -46,12 +46,10 @@ class FingerprintListLogic extends BaseGetXController{ // 添加指纹开始---这里用作删除指纹 Future _replyAddFingerprintBegin(Reply reply) async { int status = reply.data[2]; - // Get.log("status:$status"); switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.isDeletFingerprintData = false; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -59,7 +57,6 @@ class FingerprintListLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -105,8 +102,6 @@ class FingerprintListLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); - break; } } @@ -117,16 +112,12 @@ class FingerprintListLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); - break; case 0x06: //需要鉴权 - Get.log("${reply.commandType}需要鉴权"); break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -137,28 +128,19 @@ class FingerprintListLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); - break; case 0x07: //无权限 - Get.log("${reply.commandType}用户无权限"); - break; case 0x09: // 权限校验错误 - Get.log("${reply.commandType}权限校验错误"); - break; default: //失败 - Get.log("${reply.commandType}失败"); - break; } } @@ -169,11 +151,9 @@ class FingerprintListLogic extends BaseGetXController{ // 用户数量 int userNum = reply.data[5]; - // print("userNum:$userNum"); // 指纹数量 int fingerNum = reply.data[6]; - // print("fingerNum:$fingerNum"); // 密码数量 int pwdNum = reply.data[7]; @@ -207,21 +187,17 @@ class FingerprintListLogic extends BaseGetXController{ // 序列号 var serialNo = reply.data.sublist(17, 21); - Get.log("serialNo:$serialNo"); switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -371,7 +347,6 @@ class FingerprintListLogic extends BaseGetXController{ fingerprintId = state.deletKeyID; type = "0"; } - Get.log("delet fingerprintId $fingerprintId"); var entity = await ApiRepository.to.deletFingerprintsData( fingerprintId: fingerprintId, lockId: state.lockId.value.toString(), @@ -435,7 +410,6 @@ class FingerprintListLogic extends BaseGetXController{ Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); @@ -450,7 +424,6 @@ class FingerprintListLogic extends BaseGetXController{ Future onInit() async { // TODO: implement onInit super.onInit(); - Get.log("onInit()"); } @override diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index 4d637333..86ecc688 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -274,7 +274,6 @@ class _FingerprintListPageState extends State with RouteAwa @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisTypeManage/addIrisTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisTypeManage/addIrisTypeManage_tabbar.dart index 0826096f..d57ed65c 100644 --- a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisTypeManage/addIrisTypeManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisTypeManage/addIrisTypeManage_tabbar.dart @@ -51,7 +51,6 @@ class _AddIrisTypeManageTabbarState extends State initialIndex: widget.initialIndex); _tabController.addListener(() { - // print("_tabController.animation!.value:${_tabController.animation!.value} _tabController.index:${_tabController.index}"); if (_tabController.animation!.value == _tabController.index) { FocusScope.of(context).requestFocus(FocusNode()); } diff --git a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart index 94b64c55..749a5939 100644 --- a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart +++ b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart @@ -186,8 +186,6 @@ class _AddIrisTypePageState extends State { state.endTime.value = result['endDate']; state.effectiveDateTime.value = result['starTime']; state.failureDateTime.value = result['endTime']; - Get.log( - '得到的有效期数据:${state.weekdaysList.value} == ${state.beginTime.value} == ${state.endTime.value}== ${state.effectiveDateTime.value} == ${state.failureDateTime.value}'); } })), Obx(() => Visibility( @@ -259,7 +257,6 @@ class _AddIrisTypePageState extends State { onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; diff --git a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_state.dart b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_state.dart index 3ac6f27a..1a931268 100644 --- a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_state.dart +++ b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_state.dart @@ -25,6 +25,5 @@ class AddIrisTypeState { // // nameController.text = fromTypeTwoStaffName.value; // } - // print("lockId:${lockId.value} fromType:${fromType.value}"); } } diff --git a/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_logic.dart b/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_logic.dart index 4e2f4ddb..71422e46 100644 --- a/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_logic.dart @@ -35,19 +35,16 @@ class IrisDetailLogic extends BaseGetXController { // 添加卡片开始(此处用作删除卡片) Future _replyAddICCardBegin(Reply reply) async { int status = reply.data[2]; - print("_replyAddFingerprintStatus:$status"); switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} 数据解析成功"); cancelBlueConnetctToastTimer(); dismissEasyLoading(); deletICCardData(); break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -73,20 +70,9 @@ class IrisDetailLogic extends BaseGetXController { // privateKey: getPrivateKeyList, // token: getTokenList, // ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} 失败"); break; } @@ -118,7 +104,6 @@ class IrisDetailLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - print("openDoorTokenPubToken:$getTokenList"); String? userID = await Storage.getUid(); // IoSenderManage.senderAddICCardCommand( diff --git a/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart b/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart index c90a01cd..35d714af 100644 --- a/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart +++ b/star_lock/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart @@ -95,12 +95,6 @@ class _CardDetailPageState extends State with RouteAware { }); if (data != null) { setState(() { - print("state.starDate.value:${data["starDate"]} " - "state.endDate.value:${data["endDate"]} " - "state.starTime.value:${data["starTime"]} " - "state.endTime.value:${data["endTime"]} " - "state.weekDay.value:${data["weekDay"]}"); - state.starDate.value = data["starDate"]; state.endDate.value = data["endDate"]; state.starTime.value = data["starTime"]; @@ -378,7 +372,6 @@ class _CardDetailPageState extends State with RouteAware { @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/iris/irisList/irisList_logic.dart b/star_lock/lib/main/lockDetail/iris/irisList/irisList_logic.dart index 68820df4..228e0e45 100644 --- a/star_lock/lib/main/lockDetail/iris/irisList/irisList_logic.dart +++ b/star_lock/lib/main/lockDetail/iris/irisList/irisList_logic.dart @@ -43,12 +43,10 @@ class IrisListLogic extends BaseGetXController { // 添加人脸开始---这里用作删除人脸 Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("status:$status"); switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} list人脸数据解析成功"); state.isDeletFaceData = false; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -60,7 +58,6 @@ class IrisListLogic extends BaseGetXController { break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -87,21 +84,9 @@ class IrisListLogic extends BaseGetXController { // privateKey:getPrivateKeyList, // token: getTokenList, // ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} list人脸失败"); - break; } } @@ -113,27 +98,14 @@ class IrisListLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); break; default: //失败 - print("${reply.commandType}失败"); break; } @@ -145,28 +117,14 @@ class IrisListLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -177,11 +135,9 @@ class IrisListLogic extends BaseGetXController { // 用户数量 int userNum = reply.data[5]; - // print("userNum:$userNum"); // 指纹数量 int fingerNum = reply.data[6]; - // print("fingerNum:$fingerNum"); // 密码数量 int pwdNum = reply.data[7]; @@ -215,23 +171,18 @@ class IrisListLogic extends BaseGetXController { // 序列号 var serialNo = reply.data.sublist(17, 21); - print("serialNo:$serialNo"); switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //需要鉴权 - print("${reply.commandType}需要鉴权"); break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -360,7 +311,6 @@ class IrisListLogic extends BaseGetXController { faceId = state.deletKeyID; type = "0"; } - print("delet faceId $faceId"); var entity = await ApiRepository.to.deleteFaceData( faceId: int.parse(faceId), lockId: state.lockId.value, @@ -380,7 +330,6 @@ class IrisListLogic extends BaseGetXController { faceId = state.deletKeyID; type = "0"; } - print("delet faceId $faceId"); var entity = await ApiRepository.to.clearFaceData( lockId: state.lockId.value, ); @@ -403,11 +352,9 @@ class IrisListLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); - // print("aaaaaaa:$isDemoMode"); if (isDemoMode == false) { // _initReplySubscription(); @@ -421,7 +368,7 @@ class IrisListLogic extends BaseGetXController { Future onInit() async { // TODO: implement onInit super.onInit(); - print("onInit()"); + var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { // senderQueryingFingerprintStatus(); diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 4502a738..9664ca8b 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:io'; import 'package:flutter/scheduler.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; @@ -8,10 +7,9 @@ import 'package:intl/intl.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_entity.dart'; -import 'package:star_lock/tools/appFirstEnterHandle.dart'; +import '../../../app_settings/app_settings.dart'; import '../../../blue/blue_manage.dart'; -import '../../../blue/io_protocol/io_addUser.dart'; import '../../../blue/io_protocol/io_openLock.dart'; import '../../../blue/io_protocol/io_referEventRecordTime.dart'; import '../../../blue/io_reply.dart'; @@ -35,7 +33,6 @@ class LockDetailLogic extends BaseGetXController { // 监听设备返回的数据 void initReplySubscription() { state.replySubscription = EventBusManager().eventBus!.on().listen((reply) async { - // Get.log("锁详情收到了蓝牙解析消息 reply:${reply.commandType}"); // 开门 if (reply is OpenDoorReply && state.ifCurrentScreen.value == true) { _replyOpenLock(reply); @@ -71,7 +68,6 @@ class LockDetailLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // _showFullScreenOverlay(Get.context!); state.iSClosedUnlockSuccessfulPopup.value = true; @@ -98,8 +94,6 @@ class LockDetailLogic extends BaseGetXController { break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); - var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -109,7 +103,6 @@ class LockDetailLogic extends BaseGetXController { var tokenData = reply.data.sublist(2, 6); var saveStrList = changeIntListToStringList(tokenData); Storage.setStringList(saveBlueToken, saveStrList); - // Get.log("openDoorToken:$tokenData"); IoSenderManage.senderOpenLock( keyID: BlueManage().connectDeviceName, @@ -126,17 +119,10 @@ class LockDetailLogic extends BaseGetXController { break; case 0x07: //无权限 - Get.log("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - Get.log("${reply.commandType}校验错误"); break; case 0x16: // 正在开锁中... - Get.log("${reply.commandType}正在开锁中..."); state.openLockBtnState.value = 0; eventBus.fire(RefreshLockDetailInfoDataEvent()); showToast("正在开锁中...".tr, something: () { @@ -145,8 +131,6 @@ class LockDetailLogic extends BaseGetXController { break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -157,82 +141,16 @@ class LockDetailLogic extends BaseGetXController { // switch (status) { // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // dismissEasyLoading(); // cancelBlueConnetctToastTimer(); // - // // 厂商名称 - // var vendor = reply.data.sublist(3, 23); - // // print("vendor:$vendor"); - // - // // 锁设备类型 - // var product = reply.data[23]; - // // print("product:$product"); - // - // // 产品名称 - // var model = reply.data.sublist(24, 44); - // // print("model:$model"); - // - // // 软件版本 - // var fwVersion = reply.data.sublist(44, 64); - // // print("fwVersion:$fwVersion"); - // - // // 硬件版本 - // var hwVersion = reply.data.sublist(64, 84); - // // print("hwVersion:$hwVersion"); - // - // // 厂商序列号 - // var serialNum0 = reply.data.sublist(84, 100); - // // print("serialNum0:$serialNum0"); - // - // // 成品商序列号 - // var serialNum1 = reply.data.sublist(100, 116); - // // print("serialNum1:$serialNum1"); - // - // // 蓝牙名称 - // var btDeviceName = reply.data.sublist(116, 132); - // // print("btDeviceName:$btDeviceName"); - // - // // 电池剩余电量 - // var battRemCap = reply.data[132]; - // // print("battRemCap:$battRemCap"); - // // uploadElectricQuantityRequest(battRemCap.toString()); - // // 重置次数 - // var restoreCounter = reply.data.sublist(133, 135); - // // print("restoreCounter:$restoreCounter"); - // - // // 重置时间 - // var restoreDate = reply.data.sublist(135, 139); - // // print("restoreDate:$restoreDate"); - // - // // 主控芯片型号 - // var icPartNo = reply.data.sublist(139, 149); - // // print("icPartNo:$icPartNo"); - // - // // 有效时间 - // var indate = reply.data.sublist(149, 153); - // // print("indate:$indate"); - // // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // // break; // default: // //失败 - // print("${reply.commandType}失败"); - // // break; // } // } @@ -243,16 +161,13 @@ class LockDetailLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); if (reply.data[5] > 0) { reply.data.removeRange(0, 6); // 把得到的数据按8位分割成数组 然后塞进一个新的数组里面 var getList = splitList(reply.data, 8); - // print("getList:$getList"); var uploadList = []; for (int i = 0; i < getList.length; i++) { var indexList = getList[i]; - // print("indexList:$indexList"); var indexMap = {}; indexMap["seq"] = indexList[0].toString(); indexMap["user"] = indexList[3].toString(); @@ -265,35 +180,19 @@ class LockDetailLogic extends BaseGetXController { (0xff & indexList[6]) << 8 | (0xFF & indexList[7])); // indexMap["date"] = DateTool().dateToYMDHNSString("$value"); - // print("value：${DateTool().dateToYMDHNSString("$value")}"); indexMap["date"] = "${value * 1000}"; uploadList.add(indexMap); } lockRecordUploadData(uploadList); - // print("reply.data:${reply.data} getList:$getList}"); await BlueManage().disconnect(); } break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - Get.log("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - Get.log("${reply.commandType}权限校验错误"); break; default: - //失败 - Get.log("${reply.commandType}失败"); - break; } } @@ -301,21 +200,16 @@ class LockDetailLogic extends BaseGetXController { // // 添加用户 // Future _replyAddUserKey(Reply reply) async { // var lockId = reply.data.sublist(2, 42); - // // print("lockId:$lockId"); // // var token = reply.data.sublist(42, 46); // List strTokenList = changeIntListToStringList(token); // Storage.setStringList(saveBlueToken, strTokenList); - // // print("token:$token"); // // int status = reply.data[46]; - // // print("status:$status reply.data:${reply.data}"); // - // print("status:$status"); // switch (status) { // case 0x00: // //成功 - // Get.log("添加用户数据解析成功"); // cancelBlueConnetctToastTimer(); // state.lockUserNo = reply.data[47]; // _updateLockUserNo(); @@ -323,7 +217,6 @@ class LockDetailLogic extends BaseGetXController { // break; // case 0x06: // //无权限 - // Get.log("需要鉴权"); // var privateKey = await Storage.getStringList(saveBluePrivateKey); // List getPrivateKeyList = changeStringListToIntList(privateKey!); // @@ -347,9 +240,6 @@ class LockDetailLogic extends BaseGetXController { // token: token); // break; // default: - // //失败 - // Get.log("领锁失败"); - // // break; // } // } @@ -391,7 +281,6 @@ class LockDetailLogic extends BaseGetXController { // getTokenList = changeStringListToIntList(token); // } // - // Get.log("BlueManage().connectDeviceName:${BlueManage().connectDeviceName} authUserID:${state.senderUserId.toString()} keyID:${state.keyInfos.value.keyId.toString()} userID:${await Storage.getUid()}"); // IoSenderManage.senderAddUser( // lockID: BlueManage().connectDeviceName, // authUserID: state.senderUserId.toString(), @@ -435,7 +324,6 @@ class LockDetailLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - Get.log("openMode:${state.openDoorModel}"); BlueManage().bludSendData(state.keyInfos.value.bluetooth!.bluetoothDeviceName!, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { IoSenderManage.senderOpenLock( @@ -498,10 +386,10 @@ class LockDetailLogic extends BaseGetXController { LockNetTokenEntity entity = await ApiRepository.to.getLockNetToken(lockId: state.keyInfos.value.lockId.toString()); if (entity.errorCode!.codeIsSuccessful) { state.lockNetToken = entity.data!.token!.toString(); - Get.log("state.lockNetToken:${state.lockNetToken}"); + AppLog.log("从服务器获取联网token:${state.lockNetToken}"); openDoorAction(); }else{ - showToast("获取联网token失败", something: (){ + showToast("", something: (){ state.openLockBtnState.value = 0; cancelBlueConnetctToastTimer(); }); @@ -581,8 +469,6 @@ class LockDetailLogic extends BaseGetXController { state.isOpenLockNeedOnline.value = int.parse(event.setResult); state.keyInfos.value.lockSetting!.appUnlockOnline = int.parse(event.setResult); state.lockNetToken = "";// 改变开锁时是否联网状态的时候清空token - Get.log( - "state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}"); } else if (event.type == 2) { // 2 常开模式 state.isOpenPassageMode.value = int.parse(event.setResult); @@ -634,20 +520,8 @@ class LockDetailLogic extends BaseGetXController { @override Future onReady() async { super.onReady(); - Get.log("LockDetailPage onReady"); await PermissionDialog.request(Permission.location); await PermissionDialog.requestBluetooth(); } - @override - void onInit() { - super.onInit(); - Get.log("LockDetailPage onInit"); - } - - @override - void onClose() { - super.onClose(); - Get.log("LockDetailPage onClose"); - } } diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 57d326af..e535dac3 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1,8 +1,5 @@ import 'dart:async'; -import 'package:colorfilter_generator/addons.dart'; -import 'package:colorfilter_generator/colorfilter_generator.dart'; -import 'package:colorfilter_generator/presets.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -50,11 +47,6 @@ class _LockDetailPageState extends State // TODO: implement initState super.initState(); - // print("openDoor：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([5])}"); - // print("onLine：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([1])}"); - // print("onLine openDoor：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([5, 1])}"); - // logic.startScanAction(); - listeningAnimations(); state.pageController.addListener(() { @@ -97,7 +89,6 @@ class _LockDetailPageState extends State // state.bottomBtnisEable.value = true; // } - // print("state.keyInfos.value.keyStatus:${state.keyInfos.value.keyStatus}"); if (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitIneffective || state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusFrozen || @@ -110,7 +101,6 @@ class _LockDetailPageState extends State } state.isOnlyOneData = widget.isOnlyOneData; - // print("state.lockUserNo==${state.lockUserNo}"); state.senderUserId = state.keyInfos.value.senderUserId!; state.isAttendance.value = state.keyInfos.value.lockSetting!.attendance!; state.isOpenLockNeedOnline.value = @@ -591,9 +581,7 @@ class _LockDetailPageState extends State children: [ Center( child: GestureDetector( - onTap: state.openDoorBtnisUneable.value == true - ? () { - // Get.log("点击开锁"); + onTap: state.openDoorBtnisUneable.value == true ? () { setState(() { startOpenLock(); }); @@ -601,7 +589,6 @@ class _LockDetailPageState extends State : null, onLongPressStart: state.openDoorBtnisUneable.value == true ? (details) { - // Get.log("长按闭锁"); setState(() { startUnLock(); }); @@ -1149,7 +1136,6 @@ class _LockDetailPageState extends State state.animationController!.repeat(); //动画开始、结束、向前移动或向后移动时会调用StatusListener state.animationController!.addStatusListener((status) { - // print("AnimationStatus:$status"); if (status == AnimationStatus.completed) { state.animationController!.reset(); state.animationController!.forward(); diff --git a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart index d488527c..16d714df 100644 --- a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart +++ b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart @@ -41,27 +41,14 @@ class LockOperatingRecordLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // // _getLockStatus(); // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // // break; // default: // //失败 - // print("${reply.commandType}失败"); // // break; // } @@ -73,16 +60,13 @@ class LockOperatingRecordLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); if (reply.data[5] > 0) { reply.data.removeRange(0, 6); // 把得到的数据按8位分割成数组 然后塞进一个新的数组里面 var getList = splitList(reply.data, 8); - print("getList:$getList"); var uploadList = []; for (int i = 0; i < getList.length; i++) { var indexList = getList[i]; - print("indexList:$indexList"); var indexMap = {}; indexMap["seq"] = indexList[0].toString(); indexMap["user"] = indexList[3].toString(); @@ -95,34 +79,19 @@ class LockOperatingRecordLogic extends BaseGetXController { (0xff & indexList[6]) << 8 | (0xFF & indexList[7])); // indexMap["date"] = DateTool().dateToYMDHNSString("$value"); - // print("value：${DateTool().dateToYMDHNSString("$value")}"); indexMap["date"] = "${value * 1000}"; uploadList.add(indexMap); } lockRecordUploadData(uploadList); - // print("reply.data:${reply.data} getList:$getList}"); } break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -202,7 +171,6 @@ class LockOperatingRecordLogic extends BaseGetXController { cardId:'', fingerprintId:''); if (entity.errorCode!.codeIsSuccessful) { - print("操作记录列表成功:${entity.data?.itemList}"); state.lockOperatingRecordListData.value = entity.data!.itemList!; } else {} } @@ -240,7 +208,6 @@ class LockOperatingRecordLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); @@ -255,7 +222,6 @@ class LockOperatingRecordLogic extends BaseGetXController { Future onInit() async { // TODO: implement onInit super.onInit(); - print("onInit()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); diff --git a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart index 412839fa..1e5b0d33 100644 --- a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart +++ b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart @@ -44,8 +44,6 @@ class _LockOperatingRecordPageState extends State { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { // JhPopMenus.showLinePop(context, clickCallback: (index, selText) { - // print('选中index: $index'); - // print('选中text: $selText'); // if (index == 0) { // logic.mockNetworkDataRequest(); // } else if (index == 1) { diff --git a/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart index 7ecad0e7..8883773e 100644 --- a/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart @@ -73,28 +73,14 @@ class AutomaticBlockingLogic extends BaseGetXController{ // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.autoLockTime.value = reply.data[7].toString(); // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // // break; // default: // //失败 - // print("${reply.commandType}失败"); - // // break; // } // } @@ -105,7 +91,6 @@ class AutomaticBlockingLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); diff --git a/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart index fdbdcd42..f0b95ea1 100644 --- a/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart @@ -27,7 +27,7 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ late StreamSubscription _replySubscription; void _initReplySubscription() { _replySubscription = EventBusManager().eventBus!.on().listen((reply) { - if (reply is SenderCustomPasswordsReply) {// ChangeAdministratorPasswordReply + if (reply is ChangeAdministratorPasswordReply && state.ifCurrentScreen.value == true) { _replyChangeAdministratorPassword(reply); } @@ -39,15 +39,10 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ // 修改管理员密码 Future _replyChangeAdministratorPassword(Reply reply) async { - var token = reply.data.sublist(5, 9); - var saveStrList = changeIntListToStringList(token); - Storage.setStringList(saveBlueToken, saveStrList); - int status = reply.data[2]; switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.sureBtnState.value = 0; dismissEasyLoading(); cancelBlueConnetctToastTimer(); @@ -56,14 +51,17 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var signKey = await Storage.getStringList(saveBlueSignKey); List signKeyDataList = changeStringListToIntList(signKey!); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); - IoSenderManage.senderCustomPasswordsCommand( + var token = reply.data.sublist(5, 9); + var saveStrList = changeIntListToStringList(token); + Storage.setStringList(saveBlueToken, saveStrList); + + IoSenderManage.changeAdministratorPasswordCommand( keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), userID: await Storage.getUid(), pwdNo: 254, @@ -90,11 +88,9 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ Storage.setStringList(saveBlueToken, saveStrList); int status = reply.data[2]; - Get.log("status:$status"); switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); dismissEasyLoading(); cancelBlueConnetctToastTimer(); @@ -106,7 +102,6 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ var indexList = getList[i]; var pwd = indexList.sublist(1, 11); var pwdStr = utf8String(pwd); - Get.log("pwd:$pwd pwdStr:$pwdStr state.adminPwd.value:${state.adminPwd.value}"); if(pwdStr == state.adminPwd.value){ showToast("管理员密码相同，无需修改".tr); @@ -119,7 +114,6 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -207,7 +201,6 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - print("openDoorTokenPubToken:$getTokenList"); // IoSenderManage.changeAdministratorPasswordCommand( // keyID: "1", @@ -222,7 +215,7 @@ class AdminOpenLockPasswordLogic extends BaseGetXController{ // privateKey: getPrivateKeyList, // token: getTokenList); - IoSenderManage.senderCustomPasswordsCommand( + IoSenderManage.changeAdministratorPasswordCommand( keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), userID: await Storage.getUid(), pwdNo: 254, diff --git a/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart index a28354dc..e7f62fde 100644 --- a/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/tools/showTFView.dart'; import '../../../../../app_settings/app_colors.dart'; +import '../../../../../tools/appRouteObserver.dart'; import '../../../../../tools/commonItem.dart'; import '../../../../../tools/titleAppBar.dart'; import '../../../../../translations/trans_lib.dart'; @@ -18,7 +20,7 @@ class AdminOpenLockPasswordPage extends StatefulWidget { State createState() => _AdminOpenLockPasswordPageState(); } -class _AdminOpenLockPasswordPageState extends State { +class _AdminOpenLockPasswordPageState extends State with RouteAware { final logic = Get.put(AdminOpenLockPasswordLogic()); final state = Get.find().state; @@ -114,4 +116,59 @@ class _AdminOpenLockPasswordPageState extends State { }, ); } + + @override + void didChangeDependencies() { + // TODO: implement didChangeDependencies + super.didChangeDependencies(); + + /// 路由订阅 + AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!); + } + + @override + void dispose() { + // TODO: implement dispose + /// 取消路由订阅 + AppRouteObserver().routeObserver.unsubscribe(this); + super.dispose(); + } + + /// 从上级界面进入 当前界面即将出现 + @override + void didPush() { + super.didPush(); + + state.ifCurrentScreen.value = true; + } + + /// 返回上一个界面 当前界面即将消失 + @override + void didPop() { + super.didPop(); + + logic.cancelBlueConnetctToastTimer(); + if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); + state.ifCurrentScreen.value = false; + state.sureBtnState.value = 0; + } + + /// 从下级返回 当前界面即将出现 + @override + void didPopNext() { + super.didPopNext(); + + state.ifCurrentScreen.value = true; + } + + /// 进入下级界面 当前界面即将消失 + @override + void didPushNext() { + super.didPushNext(); + logic.cancelBlueConnetctToastTimer(); + if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); + state.ifCurrentScreen.value = false; + state.sureBtnState.value = 0; + + } } diff --git a/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart index e49c3053..3cb7a9ec 100644 --- a/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart @@ -89,7 +89,6 @@ class UploadElectricQuantityLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; dismissEasyLoading(); cancelBlueConnetctToastTimer(); @@ -106,8 +105,6 @@ class UploadElectricQuantityLogic extends BaseGetXController { break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); - var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); IoSenderManage.senderGetStarLockStatuInfo( @@ -119,7 +116,6 @@ class UploadElectricQuantityLogic extends BaseGetXController { break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } diff --git a/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart index c7a83118..29ec45bd 100644 --- a/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart @@ -127,7 +127,6 @@ class _UploadElectricQuantityPageState extends State @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); logic.dismissEasyLoading(); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart b/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart index 9666bd36..d48cff1c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart @@ -58,24 +58,12 @@ class BurglarAlarmLogic extends BaseGetXController{ // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.burglarAlarmEnable.value = reply.data[6]; // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // break; // default: - // //失败 - // print("${reply.commandType}失败"); // break; // } // } @@ -86,7 +74,6 @@ class BurglarAlarmLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; dismissEasyLoading(); cancelBlueConnetctToastTimer(); @@ -94,7 +81,7 @@ class BurglarAlarmLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); + break; default: break; diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart index a53cae25..0ae9bf24 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart @@ -129,7 +129,6 @@ class _CatEyeSetPageState extends State { } break; default: - print('clickIndex is not match'); break; } }, diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart index e4ac0d6c..00b8ee8c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart @@ -66,8 +66,6 @@ class CatEyeWorkModeLogic extends BaseGetXController { // state.selectCatEyeWorkMode.value = // state.catEyeConfigData.value.catEyeMode!; - // print('得到了选中哪个模式：${state.catEyeConfigData.value.catEyeMode}'); - if (state.catEyeConfigData.value.catEyeMode == XSConstantMacro.catEyeWorkModePowerSaving) { // state.boolList.value[0] = true; diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart index 522a5301..14a56478 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart @@ -64,7 +64,6 @@ class _CatEyeWorkModePageState extends State { } Widget _buildTipsView(String titleStr, String subTitle, int clickIndex) { - // print('选中了哪个模式${state.boolList.value[clickIndex]}'); return GestureDetector( child: Container( width: ScreenUtil().screenWidth - 40.w, diff --git a/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart index 65250366..5c8eec8a 100644 --- a/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart @@ -61,7 +61,6 @@ class ConfiguringWifiLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -69,8 +68,6 @@ class ConfiguringWifiLogic extends BaseGetXController{ break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); - var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -119,7 +116,6 @@ class ConfiguringWifiLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -152,7 +148,6 @@ class ConfiguringWifiLogic extends BaseGetXController{ var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - // print("millisecondsSinceEpoch/1000:${DateTime.now().millisecondsSinceEpoch~/1000}"); var serversList = []; for(int i = 0; i getWifiName() async { - // if(!(await checkLocationPermission())) { - // print("未获取定位权限"); - // return ''; - // } var ssid = ''; ssid = (await _networkInfo.getWifiName())!; ssid = ssid ?? ''; ssid = ssid.replaceAll(r'"', ''); - print("ssid:$ssid"); return ssid ?? ''; } @@ -235,7 +223,6 @@ class ConfiguringWifiLogic extends BaseGetXController{ if(state.wifiName.value.isEmpty){ getWifiName().then((value) { - print("wifiName:$value"); state.wifiNameController.text = value; }); } diff --git a/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart index a2b97767..b5405189 100644 --- a/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart @@ -131,16 +131,13 @@ class _ConfiguringWifiPageState extends State with RouteAwa @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; - } /// 返回上一个界面 当前界面即将消失 @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); state.ifCurrentScreen.value = false; @@ -151,7 +148,6 @@ class _ConfiguringWifiPageState extends State with RouteAwa @override void didPopNext() { super.didPopNext(); - print("lockSet===didPopNext"); state.ifCurrentScreen.value = true; } @@ -159,7 +155,6 @@ class _ConfiguringWifiPageState extends State with RouteAwa @override void didPushNext() { super.didPushNext(); - print("lockSet===didPushNext"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart index 9e9d217c..d1b3b6c0 100644 --- a/star_lock/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart @@ -38,7 +38,6 @@ class WifiListLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); showEasyLoading(); cancelBlueConnetctToastTimer(); Future.delayed(5.seconds, (){ @@ -47,7 +46,6 @@ class WifiListLogic extends BaseGetXController { break; case 0x06: // 需要鉴权 - Get.log("${reply.commandType}需要鉴权"); // var token = await Storage.getStringList(saveBlueToken); // List getTokenList = changeStringListToIntList(token!); @@ -68,8 +66,6 @@ class WifiListLogic extends BaseGetXController { // ); break; default: - //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -80,7 +76,6 @@ class WifiListLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // showEasyLoading(); dismissEasyLoading(); state.sureBtnState.value = 0; @@ -89,26 +84,20 @@ class WifiListLogic extends BaseGetXController { reply.data.removeRange(0, 7); // 把得到的数据按33位分割成数组 然后塞进一个新的数组里面 var getList = splitList(reply.data, 33); - // print("getList:$getList"); var uploadList = >[]; for (int i = 0; i < getList.length; i++) { var indexList = getList[i]; - // print("indexList:$indexList"); var indexMap = {}; var wifiName = indexList.sublist(0, 32); - // print("wifiName:$wifiName"); indexMap["wifiName"] = utf8String(wifiName); indexMap["rssi"] = (indexList.last - 255).toString(); uploadList.add(indexMap); state.wifiNameDataList.value = uploadList; } - // print("reply.data:${reply.data} getList:$getList}"); } break; default: - //失败 - Get.log("${reply.commandType}失败"); break; } } diff --git a/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_logic.dart b/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_logic.dart index e337f57e..0384652c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_logic.dart @@ -28,15 +28,12 @@ class DiagnoseLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); - } @override void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } @override diff --git a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart index e25119da..249c884c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart @@ -21,6 +21,7 @@ import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/storage.dart'; +import '../../../../app_settings/app_settings.dart'; import 'lockEscalation_state.dart'; class LockEscalationLogic extends BaseGetXController { @@ -117,7 +118,7 @@ class LockEscalationLogic extends BaseGetXController { String msg = '传输完成 时间：${now - startSecond}秒 otaCount:$otaCount otaIndex:$otaIndex '; closeOTADAta(); - print(msg); + AppLog.log(msg); // showToast(msg); return; } @@ -176,7 +177,7 @@ class LockEscalationLogic extends BaseGetXController { // 读取和解析元数据 Uint8List metaStrList = data.sublist(16, 16 + metaLen); String metaStr = utf8.decode(metaStrList); - print(metaStr); + AppLog.log(metaStr); var meta = jsonDecode(metaStr); return meta..['metaLen'] = metaLen; } @@ -188,7 +189,7 @@ class LockEscalationLogic extends BaseGetXController { Uint8List bin = data.sublist(binOffset.toInt(), data.length); //md5 校验有问题，暂时不解析 String md5Str = md5.convert(bin).toString().toUpperCase(); - print('---> $md5Str ${meta['fwMd5']}'); + AppLog.log('---> $md5Str ${meta['fwMd5']}'); if (md5Str != meta['fwMd5']) { showToast('文件校验失败 0x02'); return null; diff --git a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart index dde24faa..3ed29ee8 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart @@ -42,9 +42,9 @@ class _LockEscalationPageState extends State { logic.closeOTADAta(); } }, - child: SizedBox(), + child: const SizedBox(), ) - : SizedBox(); + : const SizedBox(); }), SizedBox( height: 60.h, diff --git a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart index 39eba93e..7fb4a80f 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart @@ -60,23 +60,18 @@ class LockSetLogic extends BaseGetXController { // Future _replyDeletUserKey(Reply reply) async { // var tokenData = reply.data.sublist(2, 6); // var saveStrList = changeIntListToStringList(tokenData); - // print("openDoorToken:$tokenData"); // Storage.setStringList(saveBlueToken, saveStrList); // // int status = reply.data[6]; - // print("status:$status"); // switch (status) { // case 0x00: // //成功 - // print("${reply.commandType}解析成功"); // dismissEasyLoading(); // cancelBlueConnetctToastTimer(); // deletKeyData(); // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // // var privateKey = await Storage.getStringList(saveBluePrivateKey); // List getPrivateKeyList = changeStringListToIntList(privateKey!); // @@ -93,21 +88,8 @@ class LockSetLogic extends BaseGetXController { // privateKey: getPrivateKeyList, // token: tokenData); // break; - // case 0x07: - // //无权限 - // print("${reply.commandType!.typeValue} 用户无权限"); - // dismissEasyLoading(); - // showToast("用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType!.typeValue} "); - // dismissEasyLoading(); - // showToast("权限校验错误"); - // break; // default: // //失败 - // print("${reply.commandType!.typeValue} 失败"); // dismissEasyLoading(); // showToast("删除失败"); // break; @@ -124,14 +106,12 @@ class LockSetLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); dismissEasyLoading(); cancelBlueConnetctToastTimer(); deletLockInfoData(); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -152,21 +132,15 @@ class LockSetLogic extends BaseGetXController { break; case 0x07: //无权限 - Get.log("${reply.commandType!.typeValue} 用户无权限"); dismissEasyLoading(); - showToast("用户无权限".tr); break; case 0x09: // 权限校验错误 - Get.log("${reply.commandType!.typeValue} "); dismissEasyLoading(); - // showToast("权限校验错误"); break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); dismissEasyLoading(); - // showToast("权限校验错误"); break; } } @@ -177,25 +151,13 @@ class LockSetLogic extends BaseGetXController { // switch (status) { // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.isOpenBlueBroadcast.value = reply.data[6]; - // print("isOpenBlueBroadcast:${state.isOpenBlueBroadcast.value}"); // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // break; // default: // //失败 - // print("${reply.commandType}失败"); // break; // } // } @@ -206,7 +168,6 @@ class LockSetLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); // Toast.show(msg: "操作成功");featureEnable = state.isOpenStayWarn.value == 1 ? 0 : 1; dismissEasyLoading(); cancelBlueConnetctToastTimer(); @@ -234,7 +195,6 @@ class LockSetLogic extends BaseGetXController { state.lockSetInfoData.value.lockSettingInfo!.abnormalWarn = state.isOpenExceptionWarnings.value; } - Get.log("isOpenBlueBroadcast111:${state.isOpenBlueBroadcast.value}"); break; case 0x06: //无权限 @@ -249,7 +209,6 @@ class LockSetLogic extends BaseGetXController { // showEasyLoading(); // showBlueConnetctToastTimer(isShowBlueConnetctToast: false, action: (){ // dismissEasyLoading(); - // // print("1111111"); // showDeletAlertTipDialog(); // }); // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { @@ -278,7 +237,6 @@ class LockSetLogic extends BaseGetXController { // } else if (connectionState == DeviceConnectionState.disconnected) { // dismissEasyLoading(); // cancelBlueConnetctToastTimer(); - // print("222222"); // if(state.ifCurrentScreen.value == true){ // showDeletAlertTipDialog(); // } @@ -477,7 +435,6 @@ class LockSetLogic extends BaseGetXController { showToast("设置成功".tr,something: (){ eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(1, state.lockSettingInfo.value.appUnlockOnline!.toString())); eventBus.fire(RefreshLockListInfoDataEvent()); - // print("state.lockSettingInfo.value.appUnlockOnline:${state.lockSettingInfo.value.appUnlockOnline}"); }); } } diff --git a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index f029c0f4..9632b5e3 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -72,7 +72,6 @@ class _LockSetPageState extends State with RouteAware { // 根据权限显示不同的列表 List getListWidget() { - // print("state.lockBasicInfo.value.isLockOwner:${state.lockBasicInfo.value.isLockOwner} state.lockBasicInfo.value.keyRight:${state.lockBasicInfo.value.keyRight}"); if (state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1) { // 超级管理员、授权管理员 @@ -688,7 +687,6 @@ class _LockSetPageState extends State with RouteAware { // 异常警告 // CupertinoSwitch _lockExceptionWarningsSwitch() { - // print("isOpenBlueBroadcast222:${state.isOpenExceptionWarnings.value}"); // return CupertinoSwitch( // activeColor: CupertinoColors.activeBlue, // trackColor: CupertinoColors.systemGrey5, diff --git a/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart index 1a84fe16..d2ea4555 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart @@ -60,29 +60,14 @@ class LockSoundSetLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // // state.autoLockTime.value = reply.data[7].toString(); // // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); - // // break; // default: // //失败 - // print("${reply.commandType}失败"); - // // break; // } // } @@ -93,7 +78,6 @@ class LockSoundSetLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); diff --git a/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart index 3ec43f89..b2921f58 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart @@ -29,9 +29,9 @@ class LockTimeLogic extends BaseGetXController{ } // 获取锁状态 - if(reply is GetStarLockStatuInfoReply && state.ifCurrentScreen.value == true) { - _replyGetStarLockStatusInfo(reply); - } + // if(reply is GetStarLockStatuInfoReply && state.ifCurrentScreen.value == true) { + // _replyGetStarLockStatusInfo(reply); + // } }); } @@ -41,8 +41,6 @@ class LockTimeLogic extends BaseGetXController{ switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); - cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -53,14 +51,9 @@ class LockTimeLogic extends BaseGetXController{ (0xff & indate[2]) << 8 | (0xFF & indate[3])); state.dateTime.value = DateTool().dateToYMDHNString("$indateValue"); - // state.dateTime = indateValue * 1000; - Get.log("indate:$indate indateValue:$indateValue"); - break; case 0x06: //需要鉴权 - Get.log("${reply.commandType}需要鉴权"); - var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); IoSenderManage.senderGetStarLockStatuInfo( @@ -72,7 +65,6 @@ class LockTimeLogic extends BaseGetXController{ break; default: //失败 - Get.log("${reply.commandType}失败"); break; } } @@ -144,32 +136,32 @@ class LockTimeLogic extends BaseGetXController{ } // 获取锁状态 更新电量 - Future getStarLockStatus() async { - showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - }); - BlueManage().bludSendData(BlueManage().connectDeviceName, - (BluetoothConnectionState deviceConnectionState) async { - if (deviceConnectionState == BluetoothConnectionState.connected) { - dismissEasyLoading(); - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - IoSenderManage.senderGetStarLockStatuInfo( - lockID: BlueManage().connectDeviceName, - userID: await Storage.getUid(), - isBeforeAddUser: false, - privateKey: getPrivateKeyList, - ); - } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { - dismissEasyLoading(); - cancelBlueConnetctToastTimer(); - if (state.ifCurrentScreen.value == true) { - showBlueConnetctToast(); - } - } - }); - } + // Future getStarLockStatus() async { + // showEasyLoading(); + // showBlueConnetctToastTimer(action: () { + // dismissEasyLoading(); + // }); + // BlueManage().bludSendData(BlueManage().connectDeviceName, + // (BluetoothConnectionState deviceConnectionState) async { + // if (deviceConnectionState == BluetoothConnectionState.connected) { + // dismissEasyLoading(); + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // IoSenderManage.senderGetStarLockStatuInfo( + // lockID: BlueManage().connectDeviceName, + // userID: await Storage.getUid(), + // isBeforeAddUser: false, + // privateKey: getPrivateKeyList, + // ); + // } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { + // dismissEasyLoading(); + // cancelBlueConnetctToastTimer(); + // if (state.ifCurrentScreen.value == true) { + // showBlueConnetctToast(); + // } + // } + // }); + // } // 从网关获取时间 void getLockTimeFromGateway() async{ @@ -198,7 +190,6 @@ class LockTimeLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - Get.log("onReady()"); _initReplySubscription(); @@ -211,7 +202,6 @@ class LockTimeLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - Get.log("onInit()"); // _getLockStatus(); } diff --git a/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_page.dart index 3815a732..c05cc946 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_page.dart @@ -55,7 +55,6 @@ class _LockTimePageState extends State with RouteAware{ // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), padding: EdgeInsets.only(top: 20.w, bottom: 20.w), onClick: () { - // print("1111111"); // logic.sendTiming(); // logic.getServerDatetime(); logic.getServerDatetime(true); @@ -114,7 +113,6 @@ class _LockTimePageState extends State with RouteAware{ @override void didPopNext() { super.didPopNext(); - print("lockSet===didPopNext"); state.ifCurrentScreen.value = true; } diff --git a/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart index d20b8457..f9781b3e 100644 --- a/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart @@ -56,24 +56,13 @@ class MotorPowerLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.motorTorsion.value = reply.data[6]; // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // break; // default: // //失败 - // print("${reply.commandType}失败"); // break; // } // } @@ -88,7 +77,7 @@ class MotorPowerLogic extends BaseGetXController { break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); + break; default: break; diff --git a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart index 6e925428..fa9ed712 100644 --- a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart @@ -40,7 +40,6 @@ class NormallyOpenModeLogic extends BaseGetXController{ }; passageModeConfig.add(map); - // print("state.isOpenNormallyOpenMode.value:${state.isOpenNormallyOpenMode.value}"); var entity = await ApiRepository.to.setNormallyModeData( lockId: state.lockSetInfoData.value.lockId!, passageMode:state.isOpenNormallyOpenMode.value == true ? 1:0, @@ -78,29 +77,14 @@ class NormallyOpenModeLogic extends BaseGetXController{ // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.isOpenNormallyOpenMode.value = reply.data[4] == 0 ? false : true; // // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); - // // break; // default: // //失败 - // print("${reply.commandType}失败"); - // // break; // } // } @@ -111,7 +95,6 @@ class NormallyOpenModeLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); diff --git a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart index d6c133bf..a5b361f3 100644 --- a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart @@ -197,7 +197,6 @@ class _NormallyOpenModePageState extends State with RouteA } state.weekDays.value.sort(); setState(() {}); - print("index:$index data:${state.weekDays.value}"); }, child: Obx(() => Container( width: 40.w, diff --git a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart index 8095b856..885fe31e 100644 --- a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart @@ -27,7 +27,6 @@ class NormallyOpenModeState{ isOpenNormallyOpenMode.value = lockSetInfoData.value.lockSettingInfo!.passageMode! == 1 ? true : false; - print("lockBasicInfo.value.isLockOwner:${lockBasicInfo.value.isLockOwner} lockBasicInfo.value.keyRight:${lockBasicInfo.value.keyRight}"); if(lockBasicInfo.value.isLockOwner == 1 || lockBasicInfo.value.keyRight == 1){ isJustForShow.value = false; }else{ diff --git a/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart b/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart index 6e237c29..da169195 100644 --- a/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart @@ -56,24 +56,13 @@ class OpenDoorDirectionLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.openDirectionValue.value = reply.data[6]; // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // break; // default: // //失败 - // print("${reply.commandType}失败"); // break; // } // } diff --git a/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart index 3a948783..2e82f560 100644 --- a/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart @@ -64,24 +64,13 @@ class RemoteUnlockingLogic extends BaseGetXController { // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.remoteEnable.value = reply.data[6]; // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // break; // default: // //失败 - // print("${reply.commandType}失败"); // break; // } // } @@ -92,7 +81,6 @@ class RemoteUnlockingLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); diff --git a/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart index 27d7b443..f23a5d45 100644 --- a/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart @@ -51,7 +51,6 @@ class _RemoteUnlockingPageState extends State height: 20.h, ), Obx(() { - // print("state.remoteEnable:${state.remoteEnable}"); return Row( mainAxisAlignment: MainAxisAlignment.start, children: [ diff --git a/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart index 73379d19..77ee2526 100644 --- a/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart @@ -57,24 +57,13 @@ class ResetButtonLogic extends BaseGetXController{ // switch(status){ // case 0x00: // //成功 - // print("${reply.commandType}数据解析成功"); // state.resetButtonEnable.value = reply.data[6]; // break; // case 0x06: // //无权限 - // print("${reply.commandType}需要鉴权"); - // break; - // case 0x07: - // //无权限 - // print("${reply.commandType}用户无权限"); - // break; - // case 0x09: - // // 权限校验错误 - // print("${reply.commandType}权限校验错误"); // break; // default: // //失败 - // print("${reply.commandType}失败"); // break; // } // } @@ -85,7 +74,6 @@ class ResetButtonLogic extends BaseGetXController{ switch(status){ case 0x00: //成功 - Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); diff --git a/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart index 6b695337..ab2bfcae 100644 --- a/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart @@ -122,7 +122,6 @@ class _ResetButtonPageState extends State with RouteAware { @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_page.dart b/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_page.dart index bd6b522e..1479bcfb 100644 --- a/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_page.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_page.dart @@ -76,8 +76,6 @@ class _AddFamilyPageState extends State { if (val != null) { state.emailListStr.value = logic.getEmailListStr(val); state.phontListStr.value = logic.getPhoneListStr(val); - print( - 'emailListStr:${state.emailListStr.value},phontListStr:${state.phontListStr.value}'); } }); }, diff --git a/star_lock/lib/main/lockDetail/messageWarn/lockUser/lockUser_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/lockUser/lockUser_logic.dart index 94590d17..94123019 100644 --- a/star_lock/lib/main/lockDetail/messageWarn/lockUser/lockUser_logic.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/lockUser/lockUser_logic.dart @@ -136,7 +136,6 @@ class LockUserLogic extends BaseGetXController { int starHour = startDateStr.hour; int endHour = endDateStr.hour; - // print("sendDateStr.toLocal().toString():${sendDateStr.toLocal().toString()}"); switch (getPwdType) { case 1: //单次 1 只能在开始时间后6小时内使用一次 diff --git a/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart index 36b0c3f4..fa6b8516 100644 --- a/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart @@ -66,8 +66,6 @@ class _CoerceFingerprintPageState extends State { if (val != null) { state.emailListStr.value = logic.getEmailListStr(val); state.phontListStr.value = logic.getPhoneListStr(val); - print( - 'emailListStr:${state.emailListStr.value},phontListStr:${state.phontListStr.value}'); } }); }, diff --git a/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart index 0235db0a..8b3fcef3 100644 --- a/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart @@ -102,8 +102,6 @@ class _NDaysUnopenedPageState extends State { if (val != null) { state.emailListStr.value = logic.getEmailListStr(val); state.phontListStr.value = logic.getPhoneListStr(val); - print( - 'emailListStr:${state.emailListStr.value},phontListStr:${state.phontListStr.value}'); } }); }, diff --git a/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_logic.dart b/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_logic.dart index 236919b4..83612b36 100644 --- a/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_logic.dart +++ b/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_logic.dart @@ -7,6 +7,7 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/talk/call/callTalk.dart'; import 'package:star_lock/talk/udp/udp_talkClass.dart'; +import '../../../../app_settings/app_settings.dart'; import '../../../../talk/udp/udp_manage.dart'; import '../../../../talk/udp/udp_senderManage.dart'; import '../../../../tools/baseGetXController.dart'; @@ -45,7 +46,7 @@ class LockMonitoringLogic extends BaseGetXController { if (state.oneMinuteTime.value >= 60) { t.cancel(); // 取消定时器 initiateUdpHangUpAction(1); // 挂断操作 - print('通话时间超过60秒，自动挂断'); + AppLog.log('通话时间超过60秒，自动挂断'); state.oneMinuteTime.value = 0; } }); @@ -77,7 +78,7 @@ class LockMonitoringLogic extends BaseGetXController { /// 接听 udpAnswerAction() async { - print('点了接听么'); + AppLog.log('点了接听么'); UDPSenderManage.sendMainProtocol( command: 150, commandTypeIsCalling: 1, @@ -107,7 +108,7 @@ class LockMonitoringLogic extends BaseGetXController { /// 挂断 udpHangUpAction() async { - print('点了挂断么'); + AppLog.log('点了挂断么'); UDPSenderManage.sendMainProtocol( command: 150, commandTypeIsCalling: 1, @@ -176,7 +177,7 @@ class LockMonitoringLogic extends BaseGetXController { // } state.allFrames.add(frame); // 将帧添加到状态变量中 List concatenatedFrames = concatenateFrames(state.allFrames); // 连接所有帧 - Get.log("pcm数据:$concatenatedFrames"); + AppLog.log("pcm数据:$concatenatedFrames"); List pcmBytes = listLinearToULaw(frame); // await Future.delayed(const Duration(milliseconds: 100)); @@ -305,10 +306,8 @@ class LockMonitoringLogic extends BaseGetXController { topBytes[6] = (state.udpSendDataFrameNumber & 0x000000FF); topBytes[7] = ((state.udpSendDataFrameNumber & 0x0000FF00) >> 8); - // print( - // "udpSendDataFrameNumber:${state.udpSendDataFrameNumber} topBytes[63]:${topBytes[6]} topBytes[64]:${topBytes[7]}"); topBytes.addAll(bytes); - Get.log("G711编码后为:$topBytes"); + AppLog.log("G711编码后为:$topBytes"); UDPSenderManage.sendMainProtocol( command: 150, @@ -419,7 +418,6 @@ class LockMonitoringLogic extends BaseGetXController { @override void onClose() { // TODO: implement onClose - print("锁详情界面销毁了"); CallTalk().finishAVData(); stopProcessing(); _getUDPStatusRefreshUIEvent!.cancel(); diff --git a/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart b/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart index f267e5be..2cd66610 100644 --- a/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart +++ b/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart @@ -15,6 +15,7 @@ import 'package:star_lock/talk/udp/udp_manage.dart'; import 'package:star_lock/tools/eventBusEventManage.dart'; import '../../../../app_settings/app_colors.dart'; +import '../../../../app_settings/app_settings.dart'; import '../../../../login/selectCountryRegion/common/index.dart'; import '../../../../tools/showTFView.dart'; import 'lockMonitoring_logic.dart'; @@ -182,7 +183,7 @@ class _LockMonitoringPageState extends State { } }, longPress: () { // 开始长按 - print("onLongPress"); + AppLog.log("onLongPress"); state.listAudioData.value = []; if (state.udpStatus.value == 8) { state.udpStatus.value = 9; @@ -191,7 +192,7 @@ class _LockMonitoringPageState extends State { logic.startProcessing(); }, longPressUp: () async { // 长按结束 - print("onLongPressUp"); + AppLog.log("onLongPressUp"); if (state.udpStatus.value == 9) { state.udpStatus.value = 8; } @@ -207,7 +208,7 @@ class _LockMonitoringPageState extends State { state.isClickHangUp.value = true; } // else { - // print('点了这里？'); + // AppLog.log('点了这里？'); // state.isClickHangUp.value = true; // UDPTalkClass().stopLocalAudio(); // logic.initiateUdpHangUpAction(4); @@ -308,7 +309,7 @@ class _LockMonitoringPageState extends State { for (int i = 0; i < 6 - lockIDData.length; i++) { numbers.add(0); } - print("numbersnumbersnumbers:$numbers"); + // AppLog.log("numbersnumbersnumbers:$numbers"); logic.udpOpenDoorAction(numbers); }, cancelClick: () { @@ -327,7 +328,7 @@ class _LockMonitoringPageState extends State { } // state.isSenderAudioData.value = false; - // print("发送接听了"); + // AppLog.log("发送接听了"); // 刚进来是接听状态，然后改为长按对讲 }); } @@ -335,7 +336,7 @@ class _LockMonitoringPageState extends State { Future captureAndSavePng() async { try { if (state.globalKey.currentContext == null) { - print('截图失败: 未找到当前上下文'); + AppLog.log('截图失败: 未找到当前上下文'); return; } RenderRepaintBoundary boundary = state.globalKey.currentContext! @@ -344,7 +345,7 @@ class _LockMonitoringPageState extends State { ByteData? byteData = await image.toByteData(format: ui.ImageByteFormat.png); if (byteData == null) { - print('截图失败: 图像数据为空'); + AppLog.log('截图失败: 图像数据为空'); return; } Uint8List pngBytes = byteData.buffer.asUint8List(); @@ -360,10 +361,10 @@ class _LockMonitoringPageState extends State { // 将截图保存到相册 await ImageGallerySaver.saveFile(imagePath); - print('截图保存路径: $imagePath'); + AppLog.log('截图保存路径: $imagePath'); logic.showToast('截图已保存到相册'); } catch (e) { - print('截图失败: $e'); + AppLog.log('截图失败: $e'); } } @@ -382,7 +383,6 @@ class _LockMonitoringPageState extends State { // 设置标志为true，表示需要更新UI state.shouldUpdateUI.value = true; // WidgetsBinding.instance.addPostFrameCallback((_) { - // print('addPostFrameCallback'); // 调用setState方法之前检查标志，只有当标志为true时才更新UI if (state.shouldUpdateUI.value) { setState(() { diff --git a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmTypeManage/addPalmTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmTypeManage/addPalmTypeManage_tabbar.dart index bfa3a7b6..0e8c268a 100644 --- a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmTypeManage/addPalmTypeManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmTypeManage/addPalmTypeManage_tabbar.dart @@ -51,7 +51,6 @@ class _AddPalmTypeManageTabbarState extends State initialIndex: widget.initialIndex); _tabController.addListener(() { - // print("_tabController.animation!.value:${_tabController.animation!.value} _tabController.index:${_tabController.index}"); if (_tabController.animation!.value == _tabController.index) { FocusScope.of(context).requestFocus(FocusNode()); } diff --git a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart index 019caaa3..6c6fe494 100644 --- a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart +++ b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart @@ -186,8 +186,6 @@ class _AddPalmTypePageState extends State { state.endTime.value = result['endDate']; state.effectiveDateTime.value = result['starTime']; state.failureDateTime.value = result['endTime']; - Get.log( - '得到的有效期数据:${state.weekdaysList.value} == ${state.beginTime.value} == ${state.endTime.value}== ${state.effectiveDateTime.value} == ${state.failureDateTime.value}'); } })), Obx(() => Visibility( @@ -259,7 +257,6 @@ class _AddPalmTypePageState extends State { onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; diff --git a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_state.dart b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_state.dart index d3e394a5..f54b67c3 100644 --- a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_state.dart +++ b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_state.dart @@ -24,7 +24,5 @@ class AddPalmTypeState { // fromTypeTwoStaffName = map["fromTypeTwoStaffName"]; // 从添加员工进入 传入员工名字 // // nameController.text = fromTypeTwoStaffName.value; // } - - // print("lockId:${lockId.value} fromType:${fromType.value}"); } } diff --git a/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_logic.dart b/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_logic.dart index ae88b60c..780e5189 100644 --- a/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_logic.dart @@ -35,19 +35,16 @@ class PalmDetailLogic extends BaseGetXController { // 添加卡片开始(此处用作删除卡片) Future _replyAddICCardBegin(Reply reply) async { int status = reply.data[2]; - print("_replyAddFingerprintStatus:$status"); switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} 数据解析成功"); cancelBlueConnetctToastTimer(); dismissEasyLoading(); deletPalmData(); break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -73,21 +70,9 @@ class PalmDetailLogic extends BaseGetXController { // privateKey: getPrivateKeyList, // token: getTokenList, // ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} 失败"); - break; } } @@ -118,7 +103,6 @@ class PalmDetailLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - print("openDoorTokenPubToken:$getTokenList"); String? userID = await Storage.getUid(); // IoSenderManage.senderAddICCardCommand( diff --git a/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart b/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart index ce0f0631..c31c0a3d 100644 --- a/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart +++ b/star_lock/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart @@ -94,12 +94,6 @@ class _PalmDetailPageState extends State with RouteAware { }); if (data != null) { setState(() { - print("state.starDate.value:${data["starDate"]} " - "state.endDate.value:${data["endDate"]} " - "state.starTime.value:${data["starTime"]} " - "state.endTime.value:${data["endTime"]} " - "state.weekDay.value:${data["weekDay"]}"); - state.starDate.value = data["starDate"]; state.endDate.value = data["endDate"]; state.starTime.value = data["starTime"]; diff --git a/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart b/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart index d08330e3..6ae1c428 100644 --- a/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart +++ b/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart @@ -43,12 +43,10 @@ class PalmListLogic extends BaseGetXController { // 添加人脸开始---这里用作删除人脸 Future _replyAddFaceBegin(Reply reply) async { int status = reply.data[2]; - print("status:$status"); switch (status) { case 0x00: //成功 - print("${reply.commandType!.typeValue} list人脸数据解析成功"); state.isDeletFaceData = false; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -60,7 +58,6 @@ class PalmListLogic extends BaseGetXController { break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -87,21 +84,9 @@ class PalmListLogic extends BaseGetXController { // privateKey:getPrivateKeyList, // token: getTokenList, // ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: //失败 - print("${reply.commandType!.typeValue} list人脸失败"); - break; } } @@ -113,28 +98,13 @@ class PalmListLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -145,28 +115,14 @@ class PalmListLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); break; default: //失败 - print("${reply.commandType}失败"); - break; } } @@ -177,11 +133,9 @@ class PalmListLogic extends BaseGetXController { // 用户数量 int userNum = reply.data[5]; - // print("userNum:$userNum"); // 指纹数量 int fingerNum = reply.data[6]; - // print("fingerNum:$fingerNum"); // 密码数量 int pwdNum = reply.data[7]; @@ -215,33 +169,16 @@ class PalmListLogic extends BaseGetXController { // 序列号 var serialNo = reply.data.sublist(17, 21); - print("serialNo:$serialNo"); switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // _getLockStatus(); break; case 0x06: //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; default: - //失败 - print("${reply.commandType}失败"); - break; } } @@ -370,7 +307,6 @@ class PalmListLogic extends BaseGetXController { faceId = state.deletKeyID; type = "0"; } - print("delet faceId $faceId"); var entity = await ApiRepository.to.deleteFaceData( faceId: int.parse(faceId), lockId: state.lockId.value, @@ -390,7 +326,6 @@ class PalmListLogic extends BaseGetXController { faceId = state.deletKeyID; type = "0"; } - print("delet faceId $faceId"); var entity = await ApiRepository.to.clearFaceData( lockId: state.lockId.value, ); @@ -413,11 +348,9 @@ class PalmListLogic extends BaseGetXController { Future onReady() async { // TODO: implement onReady super.onReady(); - print("onReady()"); // 获取是否是演示模式 演示模式不获取接口 var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); - // print("aaaaaaa:$isDemoMode"); if (isDemoMode == false) { // _initReplySubscription(); @@ -431,7 +364,6 @@ class PalmListLogic extends BaseGetXController { Future onInit() async { // TODO: implement onInit super.onInit(); - print("onInit()"); var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { // senderQueryingFingerprintStatus(); diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart index b42d5838..0cd61d56 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart @@ -88,7 +88,6 @@ class _PasswordKeyDetailPageState extends State with Rout 'itemData': state.itemData.value, }); if (backData != null) { - print("backData:$backData beginTimeTimestamp:${backData["beginTimeTimestamp"]} endTimeTimestamp:${backData["endTimeTimestamp"]}"); state.itemData.value.startDate = int.parse(backData["beginTimeTimestamp"])*1000; state.itemData.value.endDate = int.parse(backData["endTimeTimestamp"])*1000; // 改了日期之后，永久只能改限时的 @@ -388,7 +387,6 @@ class _PasswordKeyDetailPageState extends State with Rout @override void didPush() { super.didPush(); - Get.log("PasswordKeyDetailPage===didPush"); state.ifCurrentScreen.value = true; } @@ -396,7 +394,6 @@ class _PasswordKeyDetailPageState extends State with Rout @override void didPop() { super.didPop(); - Get.log("PasswordKeyDetailPage===didPop"); logic.cancelBlueConnetctToastTimer(); logic.dismissEasyLoading(); state.ifCurrentScreen.value = false; @@ -407,7 +404,6 @@ class _PasswordKeyDetailPageState extends State with Rout @override void didPopNext() { super.didPopNext(); - Get.log("PasswordKeyDetailPage===didPopNext"); state.ifCurrentScreen.value = true; } @@ -415,7 +411,6 @@ class _PasswordKeyDetailPageState extends State with Rout @override void didPushNext() { super.didPushNext(); - Get.log("PasswordKeyDetailPage===didPushNext"); logic.cancelBlueConnetctToastTimer(); logic.dismissEasyLoading(); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_logic.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_logic.dart index a268610d..4ad6b6d5 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_logic.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_logic.dart @@ -11,8 +11,6 @@ class PasswordKeyDetailChangeDateLogic extends BaseGetXController { //更新密码请求 Future updatePwdRequest() async { - // print("state.itemData.value.startDate!:${state.itemData.value.startDate!}"); - // print("state.itemData.value.endDate!:${state.itemData.value.endDate!}"); var beginTimeTimestamp = state.itemData.value.startDate! ~/ 1000; var endTimeTimestamp = state.itemData.value.endDate! ~/ 1000; if (beginTimeTimestamp > endTimeTimestamp || diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_page.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_page.dart index 020b92cb..77533088 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_page.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_page.dart @@ -66,7 +66,6 @@ class _PasswordKeyDetailChangeDatePage getStartDate = "${formatDate(DateTime.now(), [yyyy,'-',mm,'-', dd, ' ', HH,])}:00"; //生效时间 // state.selectEffectiveDate.value = getStartDate; state.itemData.value.startDate = DateTime.parse(getStartDate).millisecondsSinceEpoch; - // print("state.selectEffectiveDate.value:${state.selectEffectiveDate.value}"); } if (state.itemData.value.endDate != 0) { @@ -80,7 +79,6 @@ class _PasswordKeyDetailChangeDatePage getEndDate = "${formatDate(DateTime.now(), [yyyy, '-', mm, '-', dd, ' ', HH,])}:00"; //失效时间 state.itemData.value.endDate = DateTime.parse(getEndDate).millisecondsSinceEpoch; - // print("state.selectFailureDate.value:${state.selectFailureDate.value}"); } return Column( diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart index 0dc5f0fa..3d89f3e6 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart @@ -40,7 +40,6 @@ class PasswordKeyListLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); state.isDeletPWDData = false; cancelBlueConnetctToastTimer(); if(state.isDeletAll){ @@ -51,7 +50,6 @@ class PasswordKeyListLogic extends BaseGetXController { break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -188,7 +186,6 @@ class PasswordKeyListLogic extends BaseGetXController { int starHour = startDateStr.hour; int endHour = endDateStr.hour; - // print("sendDateStr.toLocal().toString():${sendDateStr.toLocal().toString()}"); switch (getPwdType) { case 1: //单次 1 只能在开始时间后6小时内使用一次 diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart index 7795a6bf..c669ff2a 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart @@ -265,7 +265,6 @@ class _PasswordKeyListPageState extends State with RouteAwa @override void didPush() { super.didPush(); - Get.log("PasswordKeyDetailPage===didPush"); state.ifCurrentScreen.value = true; } @@ -273,7 +272,6 @@ class _PasswordKeyListPageState extends State with RouteAwa @override void didPop() { super.didPop(); - Get.log("PasswordKeyDetailPage===didPop"); logic.cancelBlueConnetctToastTimer(); logic.dismissEasyLoading(); state.ifCurrentScreen.value = false; @@ -284,7 +282,6 @@ class _PasswordKeyListPageState extends State with RouteAwa @override void didPopNext() { super.didPopNext(); - Get.log("PasswordKeyDetailPage===didPopNext"); state.ifCurrentScreen.value = true; } @@ -292,7 +289,6 @@ class _PasswordKeyListPageState extends State with RouteAwa @override void didPushNext() { super.didPushNext(); - Get.log("PasswordKeyDetailPage===didPushNext"); logic.cancelBlueConnetctToastTimer(); logic.dismissEasyLoading(); state.ifCurrentScreen.value = false; diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyManage/passwordKeyManage_tabbar.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyManage/passwordKeyManage_tabbar.dart index 9b7dd9ef..6e29e1a8 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyManage/passwordKeyManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyManage/passwordKeyManage_tabbar.dart @@ -42,7 +42,6 @@ class _PasswordKeyManageTabbarPageState extends State getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -303,7 +301,6 @@ class PasswordKeyPerpetualLogic extends BaseGetXController { showToast("请输入6-9位数字密码"); return; } - Get.log("startDate:$startDate endDate:$endDate"); if(state.sureBtnState.value == 1){ return; @@ -326,7 +323,6 @@ class PasswordKeyPerpetualLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - Get.log("state.isAdministrator.value:${state.isAdministrator.value}"); IoSenderManage.senderCustomPasswordsCommand( keyID: "1", userID: await Storage.getUid(), diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart index 53253748..a4e530d4 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart @@ -230,7 +230,6 @@ class _PasswordKeyPerpetualPageState extends State wit } else { state.beginTime.value = DateTool().getYMDHNDateString(p, 4); } - Get.log("beginTime:${state.beginTime.value}"); }); }), ), @@ -246,7 +245,6 @@ class _PasswordKeyPerpetualPageState extends State wit } else { state.endTime.value = DateTool().getYMDHNDateString(p, 4); } - Get.log("endTime:${state.endTime.value}"); }); }), Container(height: 10.h), diff --git a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_logic.dart b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_logic.dart index 7b9dbcba..6e6eaa03 100644 --- a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_logic.dart +++ b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_logic.dart @@ -12,6 +12,7 @@ import '../../../../talk/udp/udp_manage.dart'; import '../../../../talk/udp/udp_senderManage.dart'; import '../../../../tools/baseGetXController.dart'; import '../../../../tools/eventBusEventManage.dart'; +import '../../../app_settings/app_settings.dart'; import 'realTimePicture_state.dart'; class RealTimePictureLogic extends BaseGetXController { @@ -57,7 +58,6 @@ class RealTimePictureLogic extends BaseGetXController { userMobile: await state.userUid, userMobileIP: await state.userMobileIP, endData: []); - // print('得到lockName------${state.getLockName.value}'); } /// 挂断 @@ -90,13 +90,13 @@ class RealTimePictureLogic extends BaseGetXController { Future _readG711Data() async { String filePath = 'assets/s10-g711.bin'; List audioData = await G711().readAssetFile(filePath); - // Get.log('发送读取711文件数据为:$audioData');// 数据为:$audioData + // AppLog.log('发送读取711文件数据为:$audioData');// 数据为:$audioData // return; - // print('发送读取711文件数据长度为:${audioData.length}');// 数据为:$audioData + // AppLog.log('发送读取711文件数据长度为:${audioData.length}');// 数据为:$audioData if (audioData.isNotEmpty) { // 在这里处理你的音频数据 // pcmBytes = G711().convertList(audioData); - // print('发送转换pcmBytes数据长度为:${pcmBytes.length}'); + // AppLog.log('发送转换pcmBytes数据长度为:${pcmBytes.length}'); int start = 0; int length = 320; @@ -115,22 +115,22 @@ class RealTimePictureLogic extends BaseGetXController { "userMobile": await state.userUid, "userMobileIP": await state.userMobileIP, }); - print(sublist); + AppLog.log(sublist.toString()); start += length; } - print('G711数据发送完成'); + AppLog.log('G711数据发送完成'); } else { - print('Failed to read audio data.'); + AppLog.log('Failed to read audio data.'); } } Future startProcessing() async { frameListener(List frame) async { - // Get.log('Get data.length:${frame.length} Received data:$frame'); + // AppLog.log('Get data.length:${frame.length} Received data:$frame'); for (int i = 0; i < frame.length; i++) { frame[i] = linearToULaw(frame[i]); } - // Get.log('change Get data.length:${frame.length} change Received data:$frame'); + // AppLog.log('change Get data.length:${frame.length} change Received data:$frame'); await Future.delayed(const Duration(milliseconds: 50)); sendRecordData({ "bytes": frame, @@ -143,10 +143,9 @@ class RealTimePictureLogic extends BaseGetXController { } errorListener(VoiceProcessorException error) { - print("VoiceProcessorException: $error"); + AppLog.log("VoiceProcessorException: $error"); } - ; state.voiceProcessor?.addFrameListener(frameListener); state.voiceProcessor?.addErrorListener(errorListener); @@ -156,7 +155,7 @@ class RealTimePictureLogic extends BaseGetXController { bool? isRecording = await state.voiceProcessor?.isRecording(); } else {} } on PlatformException catch (ex) { - Get.log("PlatformException: $ex"); + AppLog.log("PlatformException: $ex"); } finally {} } @@ -164,12 +163,12 @@ class RealTimePictureLogic extends BaseGetXController { try { await state.voiceProcessor?.stop(); } on PlatformException catch (ex) { - Get.log("PlatformException: $ex"); + AppLog.log("PlatformException: $ex"); } finally {} } void onError(Object e) { - print(e); + AppLog.log(e.toString()); } sendRecordData(Map args) async { @@ -198,10 +197,8 @@ class RealTimePictureLogic extends BaseGetXController { topBytes[6] = (state.udpSendDataFrameNumber & 0x000000FF); topBytes[7] = ((state.udpSendDataFrameNumber & 0x0000FF00) >> 8); - // print( - // "udpSendDataFrameNumber:${state.udpSendDataFrameNumber} topBytes[63]:${topBytes[6]} topBytes[64]:${topBytes[7]}"); topBytes.addAll(bytes); - Get.log("setVoiceBytes:$topBytes"); + AppLog.log("setVoiceBytes:$topBytes"); UDPSenderManage.sendMainProtocol( command: 152, @@ -300,7 +297,6 @@ class RealTimePictureLogic extends BaseGetXController { void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); _getTVDataRefreshUIAction(); _getUDPStatusRefreshUIAction(); @@ -317,7 +313,6 @@ class RealTimePictureLogic extends BaseGetXController { @override void onClose() { // TODO: implement onClose - print("锁详情界面销毁了"); CallTalk().finishAVData(); _getTVDataRefreshUIEvent!.cancel(); _getUDPStatusRefreshUIEvent!.cancel(); diff --git a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart index 25dbad23..f6ae83fc 100644 --- a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart +++ b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart @@ -9,6 +9,7 @@ import 'package:star_lock/talk/call/callTalk.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../tools/showTFView.dart'; +import '../../../app_settings/app_settings.dart'; import 'realTimePicture_logic.dart'; class RealTimePicturePage extends StatefulWidget { @@ -40,7 +41,7 @@ class _RealTimePicturePageState extends State state.animationController.repeat(); //动画开始、结束、向前移动或向后移动时会调用StatusListener state.animationController.addStatusListener((status) { - // print("AnimationStatus:$status"); + // AppLog.log("AnimationStatus:$status"); if (status == AnimationStatus.completed) { state.animationController.reset(); state.animationController.forward(); @@ -97,8 +98,8 @@ class _RealTimePicturePageState extends State fit: BoxFit.cover, ); } catch (e, stackTrace) { - print('Error loading image: $e'); - print('Stack trace: $stackTrace'); + AppLog.log('Error loading image: $e'); + AppLog.log('Stack trace: $stackTrace'); return Container(); } }, @@ -231,7 +232,7 @@ class _RealTimePicturePageState extends State }, longPress: () async { /* // 开始长按 - print("onLongPress"); + AppLog.log("onLongPress"); //获取麦克风权限 await logic.getPermissionStatus().then((value) async { if (!value) { @@ -251,7 +252,7 @@ class _RealTimePicturePageState extends State }, longPressUp: () async { /* // 长按结束 - print("onLongPressUp"); + AppLog.log("onLongPressUp"); if (state.udpStatus.value == 9) { state.udpStatus.value = 8; } @@ -358,7 +359,6 @@ class _RealTimePicturePageState extends State for (int i = 0; i < 6 - lockIDData.length; i++) { numbers.add(0); } - print("numbersnumbersnumbers:$numbers"); logic.udpOpenDoorAction(numbers); }, cancelClick: () { diff --git a/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_page.dart b/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_page.dart index 0bf6b189..7e377b7f 100644 --- a/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_page.dart +++ b/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_page.dart @@ -255,7 +255,6 @@ class _AddRemoteControlPageState extends State with Single onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; diff --git a/star_lock/lib/main/lockDetail/videoLog/common/video/video_player_control.dart b/star_lock/lib/main/lockDetail/videoLog/common/video/video_player_control.dart index 94cb335b..662d53eb 100644 --- a/star_lock/lib/main/lockDetail/videoLog/common/video/video_player_control.dart +++ b/star_lock/lib/main/lockDetail/videoLog/common/video/video_player_control.dart @@ -201,7 +201,6 @@ class VideoPlayerControlState extends State { } void backPress() { - print(_isFullScreen); // 如果是全屏，点击返回键则关闭全屏，如果不是，则系统返回键 if (_isFullScreen) { _toggleFullScreen(); diff --git a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_logic.dart b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_logic.dart index b2cbf02d..62d3b4a9 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_logic.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_logic.dart @@ -8,7 +8,6 @@ class DemoModeLockDetailLogic extends BaseGetXController { void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); Storage.setBool(ifIsDemoModeOrNot, true); } @@ -17,7 +16,6 @@ class DemoModeLockDetailLogic extends BaseGetXController { void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); } diff --git a/star_lock/lib/main/lockMian/lockList/lockList_logic.dart b/star_lock/lib/main/lockMian/lockList/lockList_logic.dart index 379dbd20..db7de770 100644 --- a/star_lock/lib/main/lockMian/lockList/lockList_logic.dart +++ b/star_lock/lib/main/lockMian/lockList/lockList_logic.dart @@ -46,15 +46,12 @@ class LockListLogic extends BaseGetXController{ switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); dismissEasyLoading(); cancelBlueConnetctToastTimer(); deletLockInfoData(); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); - var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); @@ -69,19 +66,16 @@ class LockListLogic extends BaseGetXController{ break; case 0x07: //无权限 - Get.log("${reply.commandType!.typeValue} 用户无权限"); dismissEasyLoading(); showToast("用户无权限"); break; case 0x09: // 权限校验错误 - Get.log("${reply.commandType!.typeValue} "); dismissEasyLoading(); // showToast("权限校验错误"); break; default: //失败 - Get.log("${reply.commandType!.typeValue} 失败"); dismissEasyLoading(); // showToast("权限校验错误"); break; diff --git a/star_lock/lib/main/lockMian/lockList/lockList_page.dart b/star_lock/lib/main/lockMian/lockList/lockList_page.dart index 34da7623..2dc91e9b 100644 --- a/star_lock/lib/main/lockMian/lockList/lockList_page.dart +++ b/star_lock/lib/main/lockMian/lockList/lockList_page.dart @@ -300,7 +300,6 @@ class _LockListPageState extends State with RouteAware { @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } @@ -308,7 +307,6 @@ class _LockListPageState extends State with RouteAware { @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); // BlueManage().stopScan(); @@ -319,7 +317,6 @@ class _LockListPageState extends State with RouteAware { @override void didPopNext() { super.didPopNext(); - print("lockSet===didPopNext"); state.ifCurrentScreen.value = true; } @@ -327,7 +324,6 @@ class _LockListPageState extends State with RouteAware { @override void didPushNext() { super.didPushNext(); - print("lockSet===didPushNext"); logic.cancelBlueConnetctToastTimer(); // BlueManage().stopScan(); diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart index 10020b36..90e0b474 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:get/get.dart'; +import '../../../app_settings/app_settings.dart'; import '../../../blue/blue_manage.dart'; import '../../../network/api_repository.dart'; import '../../../talk/udp/udp_help.dart'; @@ -19,14 +20,12 @@ class LockMainLogic extends BaseGetXController { pageNo: pageNo, pageSize: 50, ); - Get.log("entity.errorCode!:${entity.errorCode!}"); if (entity.errorCode!.codeIsSuccessful) { loadMainDataLogic(entity.data!); Storage.saveMainListData(entity.data!); // return entity.data!; } // else { - // Get.log("首页锁列表请求失败"); // // showToast("数据请求失败"); // // state.dataLength.value = 0; // LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData(); @@ -59,15 +58,15 @@ class LockMainLogic extends BaseGetXController { if (connectResult == ConnectivityResult.mobile) { // _netType = "4G"; state.networkConnectionStatus.value = 1; - Get.log("4G 4G 4G 4G 4G"); + AppLog.log("网络连接: 4G 4G 4G 4G 4G"); } else if (connectResult == ConnectivityResult.wifi) { // _netType = "wifi"; state.networkConnectionStatus.value = 1; - Get.log("wifi wifi wifi wifi wifi"); + AppLog.log("网络连接: wifi wifi wifi wifi wifi"); } else { // _netType = "未连接"; state.networkConnectionStatus.value = 0; - Get.log("未连接 未连接 未连接 未连接 未连接"); + AppLog.log("网络连接: 未连接 未连接 未连接 未连接 未连接"); // showToast("网络访问失败，请检查网络是否正常"); } } @@ -81,7 +80,7 @@ class LockMainLogic extends BaseGetXController { /// 设置网络切换监听 connectListener() async { Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { - Get.log("设置网络切换监听:$result"); + AppLog.log("设置网络切换监听:$result"); if (state.networkConnectionStatus.value == 0 && result != ConnectivityResult.none) { // 从无网络到有网络 state.networkConnectionStatus.value = 1; diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart index b7d82663..3993ee28 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart @@ -38,7 +38,6 @@ class _StarLockMainPageState extends State with BaseWidget { Future getHttpData() async { LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData(); - // Get.log("lockListInfoGroupEntity:${lockListInfoGroupEntity!.groupList!.length}"); if (lockListInfoGroupEntity != null) { var localLockListInfoGroupEntity = lockListInfoGroupEntity; logic.loadMainDataLogic(localLockListInfoGroupEntity).then((value) { @@ -127,8 +126,6 @@ class _StarLockMainPageState extends State with BaseWidget { case 1: // 只有一条数据 Storage.setBool(ifIsDemoModeOrNot, false); - print( - "state.lockListInfoEntity.value.data!.groupList![0].lockList![0]:${state.lockListInfoGroupEntity.value.groupList![0].lockList![0].endDate}"); returnWidget = LockDetailPage( isOnlyOneData: true, lockListInfoItemEntity: @@ -214,11 +211,9 @@ class _StarLockMainPageState extends State with BaseWidget { late StreamSubscription _teamEvent; void _initLoadDataAction() { - print("监听刷新首页数据消息"); _teamEvent = eventBus.on().listen((event) { logic.pageNo = 1; getHttpData(); - print("收到刷新首页数据消息"); }); } diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index ece9be41..96463107 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -38,7 +38,6 @@ class _AboutPageState extends State { packageName = packageInfo.packageName; version = packageInfo.version; buildNumber = packageInfo.buildNumber; - Get.log("aboutGetversion:$version"); }); } diff --git a/star_lock/lib/mine/about/webviewShow_logic.dart b/star_lock/lib/mine/about/webviewShow_logic.dart index 9ee40aa5..be433070 100644 --- a/star_lock/lib/mine/about/webviewShow_logic.dart +++ b/star_lock/lib/mine/about/webviewShow_logic.dart @@ -7,19 +7,16 @@ class WebviewShowLogic extends BaseGetXController { @override Future onReady() async { - print("ready home"); super.onReady(); } @override void onInit() { - print("init home"); super.onInit(); } @override void onClose() { - print("close home"); super.onClose(); } } diff --git a/star_lock/lib/mine/addLock/addLock/addLock_logic.dart b/star_lock/lib/mine/addLock/addLock/addLock_logic.dart index fccb00a0..c7193c39 100644 --- a/star_lock/lib/mine/addLock/addLock/addLock_logic.dart +++ b/star_lock/lib/mine/addLock/addLock/addLock_logic.dart @@ -11,15 +11,7 @@ import 'package:star_lock/tools/baseGetXController.dart'; class AddLockLogic extends BaseGetXController { final AddLockState state = AddLockState(); - @override - void onReady() { - super.onReady(); - } - @override - void onInit() { - super.onInit(); - } @override void onClose() { diff --git a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_logic.dart b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_logic.dart index 829ebdef..dd6c9add 100644 --- a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_logic.dart +++ b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_logic.dart @@ -12,20 +12,20 @@ class LockAddressGaoDeLogic extends BaseGetXController{ // Future requestPermission() async { // final status = await Permission.location.request(); - // print("Permission.location.request()=status:$status"); + // AppLog.log("Permission.location.request()=status:$status"); // // state.permissionStatus = status; // switch (status) { // case PermissionStatus.denied: - // print("拒绝"); + // AppLog.log("拒绝"); // break; // case PermissionStatus.granted: // requestLocation(); // break; // case PermissionStatus.limited: - // print("限制"); + // AppLog.log("限制"); // break; // default: - // print("其他状态"); + // AppLog.log("其他状态"); // requestLocation(); // break; // } @@ -35,7 +35,7 @@ class LockAddressGaoDeLogic extends BaseGetXController{ // state.location = AMapFlutterLocation() // ..setLocationOption(AMapLocationOption()) // ..onLocationChanged().listen((event) { - // print("listenLocationChanged$event"); + // AppLog.log("listenLocationChanged$event"); // state.latitude.value = double.parse(event['latitude'] as String); // state.longitude.value = double.parse(event['longitude'] as String); // if (state.latitude.value != 0 && state.longitude.value != 0) { diff --git a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart index 31e6f4b4..7cccf522 100644 --- a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart +++ b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart @@ -54,7 +54,7 @@ class _LockAddressGaoDePageState extends State // Future requestPermission() async { // final status = await Permission.location.request(); - // print("Permission.location.request()=status:$status"); + // AppLog.log("Permission.location.request()=status:$status"); // permissionStatus = status; // if(Platform.isIOS){ // _setLocationOption(); @@ -62,7 +62,7 @@ class _LockAddressGaoDePageState extends State // } // switch (status) { // case PermissionStatus.denied: - // // print("拒绝"); + // // AppLog.log("拒绝"); // break; // case PermissionStatus.granted: // if(Platform.isIOS){ @@ -74,16 +74,16 @@ class _LockAddressGaoDePageState extends State // } // break; // case PermissionStatus.limited: - // // print("限制"); + // // AppLog.log("限制"); // break; // case PermissionStatus.permanentlyDenied: - // // print("永久的否认"); + // // AppLog.log("永久的否认"); // break; // case PermissionStatus.provisional: - // // print("临时"); + // // AppLog.log("临时"); // break; // default: - // // print("其他状态"); + // // AppLog.log("其他状态"); // // requestLocation(); // break; // } @@ -117,7 +117,7 @@ class _LockAddressGaoDePageState extends State location = AMapFlutterLocation() ..setLocationOption(AMapLocationOption()) ..onLocationChanged().listen((event) { - // print("listenLocationChanged$event"); + // AppLog.log("listenLocationChanged$event"); // EasyLoading.dismiss(); if (event.isNotEmpty) { setState(() { @@ -346,7 +346,6 @@ class _LockAddressGaoDePageState extends State location.stopLocation(); location.destroy(); - Get.log("地图界面销毁了"); } /// 从上级界面进入 当前界面即将出现 diff --git a/star_lock/lib/mine/addLock/lockAddress/google/lockAddressGoogle_page.dart b/star_lock/lib/mine/addLock/lockAddress/google/lockAddressGoogle_page.dart index b39110fe..c435170d 100644 --- a/star_lock/lib/mine/addLock/lockAddress/google/lockAddressGoogle_page.dart +++ b/star_lock/lib/mine/addLock/lockAddress/google/lockAddressGoogle_page.dart @@ -37,7 +37,7 @@ class _LockAddressGooglePageState extends State { // List placemarks = await placemarkFromCoordinates(deviceFindData.latitude, deviceFindData.longitude); // Placemark place1 = placemarks[0]; // currentAddress = "${place1.country} ${place1.administrativeArea} ${place1.locality} ${place1.subLocality} ${place1.name}"; - // // print("objectfasdfasdfasdfasdf:${placemarks}fasdfasdf${place1} ${currentAddress}"); + // // AppLog.log("objectfasdfasdfasdfasdf:${placemarks}fasdfasdf${place1} ${currentAddress}"); // // restaurantMarker = await BitmapDescriptor.fromAssetImage( // ImageConfiguration(size: Size(w(27), h(31))), Platform.isIOS ? R.assetsImgsDeviceFindDeviceIcon : R.assetsImgsDeviceFindDeviceAndroidIcon); diff --git a/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_logic.dart b/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_logic.dart index d36aa1be..0d461d86 100644 --- a/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_logic.dart +++ b/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_logic.dart @@ -7,23 +7,18 @@ class LockAddressLogic extends BaseGetXController { void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); - } @override void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); - } @override void onClose() { // TODO: implement onClose super.onClose(); - print("地图界面onClose()"); } } \ No newline at end of file diff --git a/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart b/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart index a911149e..df739b71 100644 --- a/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart +++ b/star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart @@ -55,7 +55,6 @@ class _LockAddressPageState extends State with RouteAware{ void dispose() { super.dispose(); // routeObserver.unsubscribe(this); - print("地图界面销毁了"); } @override @@ -68,13 +67,11 @@ class _LockAddressPageState extends State with RouteAware{ @override void didPush() { // 当前页面入栈 - print("当前页面入栈"); } @override void didPopNext() { // 当前路由的下个路由出栈，且当前页面显示 - print("当前路由的下个路由出栈，且当前页面显示"); } } diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart index 6821a58f..d41b2ae9 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart @@ -7,6 +7,7 @@ import 'package:star_lock/blue/io_protocol/io_getPublicKey.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../appRouters.dart'; +import '../../../app_settings/app_settings.dart'; import '../../../blue/blue_manage.dart'; import '../../../blue/io_protocol/io_getStarLockStatusInfo.dart'; import '../../../blue/io_reply.dart'; @@ -57,7 +58,6 @@ class NearbyLockLogic extends BaseGetXController { switch (reply.status) { case 0x00: //成功 - Get.log("获取公钥成功"); // 储存公钥 var publicKey = reply.data.sublist(3); var saveStrList = changeIntListToStringList(publicKey); @@ -72,17 +72,7 @@ class NearbyLockLogic extends BaseGetXController { publicKeyData: publicKey, needAuthor: 1); break; - case 0x07: - //无权限 - Get.log("获取公钥无权限"); - break; - case 0x0f: - //用户已存在 - Get.log("获取公钥用户已存在"); - break; default: - //失败 - Get.log("获取公钥失败"); break; } } @@ -91,19 +81,15 @@ class NearbyLockLogic extends BaseGetXController { switch (reply.status) { case 0x00: //成功 - Get.log('获取私钥成功'); reply.data.removeAt(0); - Get.log("reply.data:${reply.data}"); // 私钥 List privateKey = reply.data.sublist(0, 16); - Get.log("privateKey:$privateKey"); var savePrivateKeyList = changeIntListToStringList(privateKey); Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); // signKey List signKey = reply.data.sublist(16, 32); - Get.log("signKey:$signKey"); var saveSignKeyList = changeIntListToStringList(signKey); Storage.setStringList(saveBlueSignKey, saveSignKeyList); @@ -116,18 +102,7 @@ class NearbyLockLogic extends BaseGetXController { _getStarLockStatus(); break; - case 0x07: - //无权限 - Get.log('获取私钥无权限'); - - break; - case 0x0f: - //用户已存在 - Get.log('获取私钥：用户已存在'); - break; default: - //失败 - Get.log('获取私钥失败'); break; } } @@ -138,69 +113,66 @@ class NearbyLockLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - print("${reply.commandType}数据解析成功"); // 厂商名称 var vendor = reply.data.sublist(3, 23); var vendorStr = utf8String(vendor); state.lockInfo["vendor"] = vendorStr; // state.lockInfo["vendor"] = "XL"; - Get.log("vendor:$vendor vendorStr:$vendorStr reply.data:${reply.data}"); + AppLog.log("vendor:$vendor vendorStr:$vendorStr reply.data:${reply.data}"); // 锁设备类型 var product = reply.data[23]; state.lockInfo["product"] = product; - // Get.log("product:$product"); + // AppLog.log("product:$product"); // 产品名称 var model = reply.data.sublist(24, 44); var modelStr = utf8String(model); state.lockInfo["model"] = modelStr; // state.lockInfo["model"] = "JL-BLE-01"; - // Get.log("model:$model modelStr:$modelStr modelStr:${modelStr.length}"); + // AppLog.log("model:$model modelStr:$modelStr modelStr:${modelStr.length}"); // 软件版本 var fwVersion = reply.data.sublist(44, 64); var fwVersionStr = utf8String(fwVersion); state.lockInfo["fwVersion"] = fwVersionStr; - // Get.log("fwVersion:$fwVersion fwVersionStr:$fwVersionStr fwVersionStr:${fwVersionStr.length}"); + // AppLog.log("fwVersion:$fwVersion fwVersionStr:$fwVersionStr fwVersionStr:${fwVersionStr.length}"); // 硬件版本 var hwVersion = reply.data.sublist(64, 84); var hwVersionStr = utf8String(hwVersion); state.lockInfo["hwVersion"] = hwVersionStr; - // Get.log("hwVersion:$hwVersion hwVersionStr:${hwVersionStr.length}"); + // AppLog.log("hwVersion:$hwVersion hwVersionStr:${hwVersionStr.length}"); // 厂商序列号 var serialNum0 = reply.data.sublist(84, 100); var serialNum0Str = utf8String(serialNum0); state.lockInfo["serialNum0"] = serialNum0Str; // state.lockInfo["serialNum0"] = "${DateTime.now().millisecondsSinceEpoch ~/ 10}"; - Get.log( - "serialNum0Str:$serialNum0Str serialNum0Str:${serialNum0Str.length}"); // 成品商序列号 var serialNum1 = reply.data.sublist(100, 116); var serialNum1Str = utf8String(serialNum1); state.lockInfo["serialNum1"] = serialNum1Str; - // Get.log("serialNum1Str:$serialNum1Str serialNum1Str:${serialNum1Str.length}"); + // AppLog.log("serialNum1Str:$serialNum1Str serialNum1Str:${serialNum1Str.length}"); // 蓝牙名称 var btDeviceName = reply.data.sublist(116, 132); var btDeviceNameStr = utf8String(btDeviceName); state.lockInfo["btDeviceName"] = btDeviceNameStr; - // Get.log("btDeviceName:$btDeviceName btDeviceNameStr:$btDeviceNameStr btDeviceNameStr:${btDeviceNameStr.length}"); + // AppLog.log("btDeviceName:$btDeviceName btDeviceNameStr:$btDeviceNameStr btDeviceNameStr:${btDeviceNameStr.length}"); // 电池剩余电量 var battRemCap = reply.data[132]; state.lockInfo["electricQuantity"] = battRemCap; - // Get.log("battRemCap:$battRemCap"); + // AppLog.log("battRemCap:$battRemCap"); // 重置次数 var restoreCounter = reply.data.sublist(133, 135); state.lockInfo["restoreCount"] = restoreCounter[0] * 256 + restoreCounter[1]; - // Get.log("restoreCounter:$restoreCounter"); + // AppLog.log("restoreCounter:$restoreCounter"); // 重置时间 var restoreDate = reply.data.sublist(135, 139); @@ -210,13 +182,13 @@ class NearbyLockLogic extends BaseGetXController { (0xFF & restoreDate[3])); // String restoreDateStr = DateTool().dateToYMDHNSString(restoreDateValue.toString()); state.lockInfo["restoreDate"] = restoreDateValue * 1000; - // Get.log("restoreDate:$restoreDate restoreDateValue:$restoreDateValue"); + // AppLog.log("restoreDate:$restoreDate restoreDateValue:$restoreDateValue"); // 主控芯片型号 var icPartNo = reply.data.sublist(139, 149); var icPartNoStr = utf8String(icPartNo); state.lockInfo["icPartNo"] = icPartNoStr; - // Get.log("icPartNo:$icPartNo icPartNoStr:$icPartNoStr"); + // AppLog.log("icPartNo:$icPartNo icPartNoStr:$icPartNoStr"); // 有效时间 var indate = reply.data.sublist(149, 153); @@ -226,13 +198,12 @@ class NearbyLockLogic extends BaseGetXController { (0xFF & indate[3])); // String indateStr = DateTool().dateToYMDHNSString("$indateValue"); state.lockInfo["indate"] = indateValue * 1000; - // Get.log("indate:$indate indateValue:$indateValue"); + // AppLog.log("indate:$indate indateValue:$indateValue"); // mac地址 var macAddress = reply.data.sublist(153, 173); var macAddressStr = utf8String(macAddress); state.lockInfo["mac"] = macAddressStr; - Get.log("macAddress:$macAddress macAddressStr:$macAddressStr"); var index = 173; // 锁特征值字符串长度 @@ -249,7 +220,7 @@ class NearbyLockLogic extends BaseGetXController { String featureValueStr = asciiString(featureValue); state.featureValue = featureValueStr; // List allFeatureValueTwoList = charListChangeIntList(featureValue); - // Get.log("featureValueLength:$featureValueLength featureValue:$featureValue \n featureValueStr:$featureValueStr"); + // AppLog.log("featureValueLength:$featureValueLength featureValue:$featureValue \n featureValueStr:$featureValueStr"); index = index + featureValueLength + 1; // 使能特征值字符串长度 @@ -265,7 +236,7 @@ class NearbyLockLogic extends BaseGetXController { String featureEnValStr = asciiString(featureEnVal); state.featureSettingValue = featureEnValStr; // List allFeatureEnValTwoList = charListChangeIntList(featureEnVal); - // Get.log("featureEnValLength:$featureEnValLength featureEnVal:$featureEnVal \n featureEnValStr:$featureEnValStr"); + // AppLog.log("featureEnValLength:$featureEnValLength featureEnVal:$featureEnVal \n featureEnValStr:$featureEnValStr"); index = index + featureEnValLength + 1; // 支持的带参数特征值的总条目数 @@ -273,7 +244,7 @@ class NearbyLockLogic extends BaseGetXController { var featureParaTotalList = reply.data.sublist(index); state.featureSettingParams = featureParaTotalList; - // Get.log("featureParaTotalList:$featureParaTotalList"); + // AppLog.log("featureParaTotalList:$featureParaTotalList"); Get.toNamed(Routers.lockAddressGaoDePage, arguments: { "pwdTimestamp": state.timestampValue * 1000, @@ -286,7 +257,7 @@ class NearbyLockLogic extends BaseGetXController { break; case 0x06: //无权限 - Get.log("${reply.commandType}需要鉴权"); + AppLog.log("${reply.commandType}需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -305,7 +276,7 @@ class NearbyLockLogic extends BaseGetXController { break; default: //失败 - Get.log("${reply.commandType}失败"); + AppLog.log("${reply.commandType}失败"); break; } } @@ -322,13 +293,11 @@ class NearbyLockLogic extends BaseGetXController { // // 逆序 // featureValueTwoList = featureValueTwoList.reversed.toList(); // List allFeatureValueTwoList = getFixedLengthList(featureValueTwoList, 60 - featureValueTwoList.length); - // // print("featureValueStr:$featureValueStr featureValueTwoStr:$featureValueTwoStr featureValueTwoList:$featureValueTwoList allFeatureValueTwoList:$allFeatureValueTwoList"); // return allFeatureValueTwoList; // } // 获取锁状态 Future _getStarLockStatus() async { - // print("connectDeviceMacAddress:${BlueManage().connectDeviceMacAddress} connectDeviceName:${BlueManage().connectDeviceName}"); // 进来之后首先连接 BlueManage().bludSendData(BlueManage().connectDeviceName, (BluetoothConnectionState state) async { diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart index f8053a56..bc750610 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart @@ -28,7 +28,6 @@ class _NearbyLockPageState extends State with RouteAware { // TODO: implement initState super.initState(); - print("NearbyLockLogic initState()"); } @override @@ -52,7 +51,6 @@ class _NearbyLockPageState extends State with RouteAware { // Navigator.pushNamed(context, Routers.lockAddressPage); // logic.getPublicKey(state.devices[index].serviceUuids[0].toString()); state.selectLockName.value = state.devices[index].advertisementData.advName; - // print("connect-lockId:${state.devices[index].id} deviceName:${state.devices[index].name}"); logic.connect(state.devices[index].advertisementData.advName); // Get.toNamed(Routers.lockAddressGaoDePage); }); @@ -135,22 +133,18 @@ class _NearbyLockPageState extends State with RouteAware { /// 取消路由订阅 AppRouteObserver().routeObserver.unsubscribe(this); super.dispose(); - Get.log("NearbyLockLogic dispose()"); } /// 从上级界面进入 当前界面即将出现 @override void didPush() { super.didPush(); - Get.log("NearbyLockLogic didPush()"); - } /// 返回上一个界面 当前界面即将消失 @override void didPop() { super.didPop(); - Get.log("NearbyLockLogic didPop()"); EasyLoading.isShow ? EasyLoading.dismiss() : null; @@ -164,7 +158,6 @@ class _NearbyLockPageState extends State with RouteAware { @override void didPopNext() { super.didPopNext(); - Get.log("NearbyLockLogic didPopNext()"); state.ifCurrentScreen.value = true; logic.startScanBlueList(); @@ -174,7 +167,6 @@ class _NearbyLockPageState extends State with RouteAware { @override void didPushNext() { super.didPushNext(); - Get.log("NearbyLockLogic didPushNext()"); state.ifCurrentScreen.value = false; logic.cancelBlueConnetctToastTimer(); diff --git a/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart b/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart index bbebccce..b09bfb46 100644 --- a/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart +++ b/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart @@ -56,7 +56,6 @@ class SaveLockLogic extends BaseGetXController { switch (status) { case 0x00: //成功 - Get.log("添加用户数据解析成功"); state.lockUserNo = reply.data[47]; cancelBlueConnetctToastTimer(); @@ -64,7 +63,6 @@ class SaveLockLogic extends BaseGetXController { break; case 0x06: //无权限 - Get.log("需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -90,17 +88,14 @@ class SaveLockLogic extends BaseGetXController { break; case 0x07: //无权限 - Get.log("用户无权限"); dismissEasyLoading(); break; case 0x09: // 权限校验错误 - Get.log("添加用户权限校验错误"); dismissEasyLoading(); break; default: //失败 - Get.log("领锁失败"); dismissEasyLoading(); break; } @@ -113,18 +108,15 @@ class SaveLockLogic extends BaseGetXController { Storage.setStringList(saveBlueToken, saveStrList); int status = reply.data[2]; - Get.log("status:$status"); switch (status) { case 0x00: //成功 - Get.log("${reply.commandType!.typeValue} 数据解析成功"); dismissEasyLoading(); addLockAdminPassword(true); break; case 0x06: //无权限 - Get.log("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -157,19 +149,15 @@ class SaveLockLogic extends BaseGetXController { // Storage.setStringList(saveBlueToken, saveStrList); // // int status = reply.data[2]; - // Get.log("status:$status"); // // switch (status) { // case 0x00: // //成功 - // Get.log("${reply.commandType!.typeValue} 数据解析成功"); // cancelBlueConnetctToastTimer(); // addLockAdminPassword(false); // break; // case 0x06: // //无权限 - // Get.log("${reply.commandType!.typeValue} 需要鉴权"); - // // var signKey = await Storage.getStringList(saveBlueSignKey); // List signKeyDataList = changeStringListToIntList(signKey!); // @@ -191,8 +179,6 @@ class SaveLockLogic extends BaseGetXController { // token: token); // break; // default: - // // 失败 - // Get.log("${reply.commandType!.typeValue} 失败"); // break; // } // } diff --git a/star_lock/lib/mine/mall/lockMall_logic.dart b/star_lock/lib/mine/mall/lockMall_logic.dart index 9705be81..f7f61251 100644 --- a/star_lock/lib/mine/mall/lockMall_logic.dart +++ b/star_lock/lib/mine/mall/lockMall_logic.dart @@ -10,6 +10,7 @@ import 'package:star_lock/tools/pay/wx_pay_tool.dart'; import 'package:star_lock/webview/webview_logic.dart'; import 'package:webview_flutter/webview_flutter.dart'; +import '../../app_settings/app_settings.dart'; import '../../tools/baseGetXController.dart'; class LockMallLogic extends BaseGetXController { @@ -61,7 +62,7 @@ class LockMallLogic extends BaseGetXController { //监听webview的调用 Future flutterBridge(JavaScriptMessage message) async { final dynamic obj = jsonDecode(message.message); - print(obj); + AppLog.log(obj); if (obj is! Map && obj['action'] is String) { return; } @@ -106,20 +107,17 @@ class LockMallLogic extends BaseGetXController { @override Future onReady() async { - print("ready home"); super.onReady(); } @override void onInit() { - print("init home"); super.onInit(); getMallURLRequest(); } @override void onClose() { - print("close home"); super.onClose(); } } diff --git a/star_lock/lib/mine/mine/safeVerify/safeVerify_logic.dart b/star_lock/lib/mine/mine/safeVerify/safeVerify_logic.dart index ac48e88e..c590b381 100644 --- a/star_lock/lib/mine/mine/safeVerify/safeVerify_logic.dart +++ b/star_lock/lib/mine/mine/safeVerify/safeVerify_logic.dart @@ -75,15 +75,13 @@ class SafeVerifyLogic extends BaseGetXController { ///本地存储 登录信息 void saveLoginData(LoginData? data) async { - print("saveLoginData:${data!.mobile}"); await Storage.setString(saveUserLoginData, jsonEncode(data)); - state.loginData.value = data; + state.loginData.value = data!; } ///初始化本地数据 void initLoginData() async { final data = await Storage.getString(saveUserLoginData); - print("getLoginData:$data"); if (data != null && data.isNotEmpty) { state.loginData.value = LoginData.fromJson(jsonDecode(data)); bool mobileIsNotEmpty = state.loginData.value.mobile != null && state.loginData.value.mobile!.isNotEmpty; @@ -93,19 +91,16 @@ class SafeVerifyLogic extends BaseGetXController { state.accountStr.value = state.loginData.value.mobile!; state.channel.value = '1'; state.isToggle.value = false; - Get.log("1111111 mobileIsNotEmpty:$mobileIsNotEmpty emailIsNotEmpty:$emailIsNotEmpty"); } else if (mobileIsNotEmpty == true && emailIsNotEmpty == true) { //有手机号有邮箱 优先显示手机号 可切换至邮箱 state.accountStr.value = state.loginData.value.mobile!; state.channel.value = '1'; state.isToggle.value = true; - Get.log("22222222 mobileIsNotEmpty:$mobileIsNotEmpty emailIsNotEmpty:$emailIsNotEmpty"); } else if (mobileIsNotEmpty == false && emailIsNotEmpty == true) { //无手机号有邮箱 优先显示邮箱 不可切换 state.accountStr.value = state.loginData.value.email!; state.channel.value = '2'; state.isToggle.value = false; - Get.log("33333333 mobileIsNotEmpty:$mobileIsNotEmpty emailIsNotEmpty:$emailIsNotEmpty"); } } } diff --git a/star_lock/lib/mine/mine/starLockMine_logic.dart b/star_lock/lib/mine/mine/starLockMine_logic.dart index f10e043f..020c4097 100644 --- a/star_lock/lib/mine/mine/starLockMine_logic.dart +++ b/star_lock/lib/mine/mine/starLockMine_logic.dart @@ -34,14 +34,11 @@ class StarLockMineLogic extends BaseGetXController { state.userMobile.value = (await Storage.getMobile())! ?? ''; state.userEmail.value = (await Storage.getEmail())!; state.userHeadUrl.value = (await Storage.getHeadUrl())!; - - // Get.log("userNickName:${state.userNickName.value} userMobile:${state.userMobile.value} userEmail:${state.userEmail.value} userHeadUrl:${state.userHeadUrl.value}"); } } @override void onReady() { - print("ready home"); super.onReady(); _mineInfoChangeRefreshUIAction(); @@ -49,7 +46,6 @@ class StarLockMineLogic extends BaseGetXController { @override Future onInit() async { - print("init home"); super.onInit(); getMineInfoData(); @@ -57,7 +53,6 @@ class StarLockMineLogic extends BaseGetXController { @override void onClose() { - print("close home"); super.onClose(); _mineInfoChangeRefreshUIEvent?.cancel(); } diff --git a/star_lock/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart b/star_lock/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart index c638d6c3..b20d4dea 100644 --- a/star_lock/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart +++ b/star_lock/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart @@ -1,6 +1,7 @@ import 'dart:ui'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import '../../tools/store_service.dart'; import '../../translations/app_dept.dart'; @@ -19,7 +20,7 @@ class MineMultiLanguageState { void resetLan() { currentLanguageType.value = ExtensionLanguageType.fromLanguageCode(Get.locale!.languageCode); - print("currentLanguageType.value:${currentLanguageType.value}"); + AppLog.log("currentLanguageType.value:${currentLanguageType.value}"); StoreService.to.saveLanguageCode(Get.locale!.languageCode); } } \ No newline at end of file diff --git a/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart b/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart index c2f75430..9821c692 100644 --- a/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart +++ b/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart @@ -36,15 +36,13 @@ class PersonInfoEditAccountState { ///本地存储 登录信息 void saveLoginData(LoginData? data) async { - print("saveLoginData:${data!.mobile}"); await Storage.setString(saveUserLoginData, jsonEncode(data)); - loginData.value = data; + loginData.value = data!; } ///初始化本地数据 void initLoginData() async { final data = await Storage.getString(saveUserLoginData); - // print("getLoginData:$data"); if (data != null && data.isNotEmpty) { loginData.value = LoginData.fromJson(jsonDecode(data)); } diff --git a/star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart b/star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart index 4382ad11..a222e01e 100644 --- a/star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart +++ b/star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart @@ -42,7 +42,6 @@ class MinePersonInfoLogic extends BaseGetXController { var bytes = File(state.image!.path); var enc = await bytes.readAsBytes(); // user[minePersonGetUploadFileInfoEntity.data!.fileField!] = enc; - // Get.log("minePersonGetUploadFileInfoEntity.data!.fileField!:${minePersonGetUploadFileInfoEntity.data!.fileField!}\n minePersonGetUploadFileInfoEntity.data!.formData![key]:${minePersonGetUploadFileInfoEntity.data!.formData!["key"]} \n enc.length:${enc.length} enc:$enc"); final form = FormData(minePersonGetUploadFileInfoEntity.data!.formData!); form.files.add(MapEntry(minePersonGetUploadFileInfoEntity.data!.fileField!, MultipartFile(enc, filename: minePersonGetUploadFileInfoEntity.data!.formData!["key"]))); diff --git a/star_lock/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_logic.dart b/star_lock/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_logic.dart index b85ffffb..03b016ed 100644 --- a/star_lock/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_logic.dart +++ b/star_lock/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_logic.dart @@ -32,8 +32,6 @@ class MinePersonInfoResetPasswordLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { showToast("重置成功"); Get.back(); - } else { - print('Error'); } } diff --git a/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_logic.dart b/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_logic.dart index faf9f7be..80e9314b 100644 --- a/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_logic.dart +++ b/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_logic.dart @@ -37,7 +37,6 @@ class AppUnlockNeedMobileNetworkingLockLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); mockNetworkDataRequest(); } @@ -46,8 +45,6 @@ class AppUnlockNeedMobileNetworkingLockLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("lockDetail_onInit()"); - } diff --git a/star_lock/lib/mine/mineSet/authorityManagement/authorityManagement_page.dart b/star_lock/lib/mine/mineSet/authorityManagement/authorityManagement_page.dart index 60ee2ba1..d088cc6f 100644 --- a/star_lock/lib/mine/mineSet/authorityManagement/authorityManagement_page.dart +++ b/star_lock/lib/mine/mineSet/authorityManagement/authorityManagement_page.dart @@ -170,7 +170,8 @@ class _AuthorityManagementPageState extends State //设备多层级列表 Widget _buildDeviceExpandedList(context, index, deviceName) { return ExpandedListTile( - onTap: () => print("onTap."), + onTap: () { + }, // title: deviceName, // imgName: 'images/icon_lock.png', typeImgList: const [], @@ -209,7 +210,8 @@ class _AuthorityManagementPageState extends State //姓名多层级列表 Widget _buildNameExpandedList(context, index, deviceName) { return ExpandedListTile( - onTap: () => print("onTap."), + onTap: () { + }, // title: deviceName, // imgName: 'images/controls_user.png', typeImgList: const ['images/icon_password.png', 'images/icon_card.png'], diff --git a/star_lock/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_tabbar.dart b/star_lock/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_tabbar.dart index eaa0d59e..b7798c23 100644 --- a/star_lock/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_tabbar.dart +++ b/star_lock/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_tabbar.dart @@ -35,7 +35,6 @@ class _AddAuthorizedAdministratorManageTabbarState extends State { _effectiveDateTime.millisecondsSinceEpoch.toString(), ''); if (entity.errorCode!.codeIsSuccessful) { - print("修改管理员信息成功啦啦啦啦啦"); + EasyLoading.showToast("修改成功",duration: 2000.milliseconds); setState(() { Navigator.pop(context); diff --git a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_logic.dart b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_logic.dart index 39f30052..4153b925 100644 --- a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_logic.dart +++ b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_logic.dart @@ -25,7 +25,6 @@ class AuthorizedAdministratorListLogic extends BaseGetXController{ } else { if (entity.data!.itemList!.isNotEmpty) { state.itemDataList.value.addAll(entity.data!.itemList!); - print("state.itemDataList.value.length:${state.itemDataList.value.length}"); pageNo++; } } diff --git a/star_lock/lib/mine/mineSet/lockGroup/lockGroupDetailList/lockItemList_page.dart b/star_lock/lib/mine/mineSet/lockGroup/lockGroupDetailList/lockItemList_page.dart index d781a526..45b6ce69 100644 --- a/star_lock/lib/mine/mineSet/lockGroup/lockGroupDetailList/lockItemList_page.dart +++ b/star_lock/lib/mine/mineSet/lockGroup/lockGroupDetailList/lockItemList_page.dart @@ -45,8 +45,6 @@ class _LockItemListPageState extends State { // 处理操作按钮的点击事件 _openModalBottomSheet(groupListItem); // JhPopMenus.showLinePop(context, clickCallback: (index, selText) { - // print('选中index: $index'); - // print('选中text: $selText'); // if (index == 0) { // Get.back(); // // Get.toNamed(Routers.groupEditLockPage, arguments: {'groupListItem': groupListItem, 'ungrouped': ungrouped, 'type': 0}); diff --git a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireCard/expireCard_logic.dart b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireCard/expireCard_logic.dart index 6c11a37b..92a8f978 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireCard/expireCard_logic.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireCard/expireCard_logic.dart @@ -39,14 +39,12 @@ class ExpireCardLogic extends BaseGetXController { switch(status){ case 0x00: //成功 - print("${reply.commandType!.typeValue} 数据解析成功"); cancelBlueConnetctToastTimer(); dismissEasyLoading(); deletICCardData(); break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -76,21 +74,8 @@ class ExpireCardLogic extends BaseGetXController { privateKey:getPrivateKeyList, token: getTokenList, ); - break; - case 0x07: - //无权限 - print("${reply.commandType!.typeValue} 用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType!.typeValue} 权限校验错误"); - break; default: - //失败 - print("${reply.commandType!.typeValue} 失败"); - break; } } @@ -120,7 +105,6 @@ class ExpireCardLogic extends BaseGetXController { var token = await Storage.getStringList(saveBlueToken); List getTokenList = changeStringListToIntList(token!); - print("openDoorTokenPubToken:$getTokenList"); IoSenderManage.senderAddCardWithTimeCycleCoercionCommand( keyID:"1", diff --git a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_logic.dart b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_logic.dart index e192c555..60866f80 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_logic.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_logic.dart @@ -37,7 +37,6 @@ class ExpireLockListLogic extends BaseGetXController{ includeUnderlings: includeUnderlings ); if (entity.errorCode!.codeIsSuccessful) { - print("删除电子钥匙成功"); showToast("删除成功", something: () { pageNo = 1; expireLockListRequest(); diff --git a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireFingerprint/expireFingerprint_logic.dart b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireFingerprint/expireFingerprint_logic.dart index e8cb6566..a60c5bfd 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireFingerprint/expireFingerprint_logic.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireFingerprint/expireFingerprint_logic.dart @@ -35,12 +35,10 @@ class ExpireFingerprintLogic extends BaseGetXController { // 添加指纹开始 Future _replyAddFingerprintBegin(Reply reply) async { int status = reply.data[2]; - // print("status:$status"); switch(status){ case 0x00: //成功 - print("${reply.commandType!.typeValue} 数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -48,7 +46,6 @@ class ExpireFingerprintLogic extends BaseGetXController { break; case 0x06: //无权限 - print("${reply.commandType!.typeValue} 需要鉴权"); var privateKey = await Storage.getStringList(saveBluePrivateKey); List getPrivateKeyList = changeStringListToIntList(privateKey!); @@ -80,8 +77,6 @@ class ExpireFingerprintLogic extends BaseGetXController { ); break; default: - //失败 - print("${reply.commandType!.typeValue} 失败"); break; } } diff --git a/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_logic.dart b/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_logic.dart index a41303c2..cd7057ee 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_logic.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_logic.dart @@ -24,7 +24,6 @@ class LockUserManageListLogic extends BaseGetXController { } else { if (entity.data!.isNotEmpty) { state.dataList.value.addAll(entity.data!); - print("state.itemDataList.value.length:${state.dataList.value.length}"); pageNo++; } } diff --git a/star_lock/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_logic.dart b/star_lock/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_logic.dart index 5c320971..fe56fc19 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_logic.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_logic.dart @@ -15,7 +15,6 @@ class OwnedKeyListLogic extends BaseGetXController { Future mockNetworkDataRequest() async { KeyListByUserEntity entity = await ApiRepository.to.keyListByUser(pageNo.toString(), pageSize, state.getUidStr.toString()); // if (entity.errorCode!.codeIsSuccessful) { - // print("请求用户拥有的锁:${entity.data!.keyList}"); // } // if (entity.data != null) { // return entity.data!.keyList!; @@ -31,7 +30,6 @@ class OwnedKeyListLogic extends BaseGetXController { } else { if (entity.data!.keyList!.isNotEmpty) { state.dataList.value.addAll(entity.data!.keyList!); - print("state.itemDataList.value.length:${state.dataList.value.length}"); pageNo++; } } @@ -46,7 +44,6 @@ class OwnedKeyListLogic extends BaseGetXController { includeUnderlings: 0 ); if (entity.errorCode!.codeIsSuccessful) { - print("删除电子钥匙成功"); showToast("删除成功", something: () { pageNo = 1; mockNetworkDataRequest(); diff --git a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart index 42446ce1..eaad3dc3 100644 --- a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -452,10 +452,8 @@ class _MineSetPageState extends State with WidgetsBindingObserver { } if (notificationEnabled) { - print('Notifications are enabled'); state.isPushNotification.value = true; } else { - print('Notifications are disabled'); state.isPushNotification.value = false; } } diff --git a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_logic.dart b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_logic.dart index cb7c37d7..4e24aa4e 100644 --- a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_logic.dart +++ b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_logic.dart @@ -22,7 +22,6 @@ class SelectGetewayListLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); getGetewayListData(); } @@ -31,8 +30,6 @@ class SelectGetewayListLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); - } @override diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart index 548f0756..bc8383f8 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart @@ -107,16 +107,12 @@ class RecipientInformationLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); - } @override void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); - } @override diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_logic.dart b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_logic.dart index 45ba9510..b7abde5f 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_logic.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_logic.dart @@ -20,8 +20,6 @@ class TransferSmartLockLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); - // getTransferLockListData(); } @@ -29,8 +27,6 @@ class TransferSmartLockLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); - } @override diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_logic.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_logic.dart index 3ce45d61..e4f29798 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_logic.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_logic.dart @@ -6,19 +6,16 @@ class ValueAddedServicesBuyLogic extends BaseGetXController { @override Future onReady() async { - print("ready home"); super.onReady(); } @override void onInit() { - print("init home"); super.onInit(); } @override void onClose() { - print("close home"); super.onClose(); } } diff --git a/star_lock/lib/network/api_provider_base.dart b/star_lock/lib/network/api_provider_base.dart index 2674385e..1ef6539e 100644 --- a/star_lock/lib/network/api_provider_base.dart +++ b/star_lock/lib/network/api_provider_base.dart @@ -1,6 +1,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import '../appRouters.dart'; import '../flavors.dart'; import 'api.dart'; @@ -34,26 +35,22 @@ class BaseProvider extends GetConnect with Api { bool? isUnShowLoading = false, // 是否显示loading bool? isUserBaseUrl = true, // 文件上传不使用baseUrl }) async { - Get.log("post: url:$url body:$body contentType:$contentType"); + AppLog.log("post: url:$url body:$body contentType:$contentType"); if (isUnShowLoading == false) EasyLoading.show(); - // print('请求url======>$url'); if (isUserBaseUrl == false) { httpClient.baseUrl = ''; } else { httpClient.baseUrl = '${F.apiPrefix}/api'; } - // print('请求body体======>$body'); var res = await super.post(url, body, contentType: contentType, headers: headers, query: query, decoder: decoder, uploadProgress: uploadProgress); - // print('res.body======>${res.body}'); if (res.body == null) { if (EasyLoading.isShow) await EasyLoading.dismiss(animation: true); - Get.log("111网络访问失败,请检查网络是否正常"); // EasyLoading.showToast("Network Error!", duration: 2000.milliseconds); if (res.statusCode == null) { EasyLoading.showToast("网络访问失败,请检查网络是否正常".tr, duration: 2000.milliseconds); @@ -74,7 +71,6 @@ class BaseProvider extends GetConnect with Api { statusText: res.statusText, ); } else {} - // print('得到的数据======>${res.bodyString}'); getDataResult(res.body); return res; } diff --git a/star_lock/lib/network/request_interceptor.dart b/star_lock/lib/network/request_interceptor.dart index b119e007..0e88f698 100644 --- a/star_lock/lib/network/request_interceptor.dart +++ b/star_lock/lib/network/request_interceptor.dart @@ -20,7 +20,6 @@ FutureOr requestInterceptor(Request request) async { request.headers['Accept-Language'] = 'zh-CN'; // request.headers['Content-Type'] = 'application/json'; // request.headers['token'] = StoreService.to.userToken!; - // print("11111${StoreService.to.userToken}"); String? xToken = ''; final data = await Storage.getString(saveUserLoginData); if (data != null && data.isNotEmpty) { diff --git a/star_lock/lib/network/request_interceptor_log.dart b/star_lock/lib/network/request_interceptor_log.dart index 030ca78b..65fbc184 100644 --- a/star_lock/lib/network/request_interceptor_log.dart +++ b/star_lock/lib/network/request_interceptor_log.dart @@ -1,12 +1,10 @@ import 'dart:async'; -import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:get/get_connect/http/src/request/request.dart'; -import 'package:star_lock/debug/log.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; FutureOr requestLogInterceptor(Request request) async { - Get.log( - 'GET HTTP REQUEST \n${request.url} \n${request.headers} ${request.toString()} '); - Get.log(request.headers.toString()); + AppLog.log('GET HTTP REQUEST \n${request.url} \n${request.headers} ${request.toString()} '); + AppLog.log(request.headers.toString()); return request; } diff --git a/star_lock/lib/network/response_interceptor.dart b/star_lock/lib/network/response_interceptor.dart index 66e602f6..15986185 100644 --- a/star_lock/lib/network/response_interceptor.dart +++ b/star_lock/lib/network/response_interceptor.dart @@ -13,7 +13,7 @@ FutureOr responseInterceptor( return response; } if (response.isOk) { - // Get.log('接口成功返回${response.body}'); + // AppLog.log('接口成功返回${response.body}'); } return response; } diff --git a/star_lock/lib/network/response_interceptor_log.dart b/star_lock/lib/network/response_interceptor_log.dart index c5f9a619..94015681 100644 --- a/star_lock/lib/network/response_interceptor_log.dart +++ b/star_lock/lib/network/response_interceptor_log.dart @@ -2,9 +2,10 @@ import 'dart:async'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:get/get_connect/http/src/request/request.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; FutureOr responseLogInterceptor(Request request, Response response) { - Get.log('HTTP request:${request.url}\n RESPONSE => stataCode:${response.statusCode} ${response.bodyString} ${response.headers}'); + AppLog.log('HTTP request:${request.url}\n RESPONSE => stataCode:${response.statusCode} ${response.bodyString} ${response.headers}'); EasyLoading.dismiss(animation: true); return response; } diff --git a/star_lock/lib/starLockApplication/starLockApplication.dart b/star_lock/lib/starLockApplication/starLockApplication.dart index 1d32a39f..18ac7817 100644 --- a/star_lock/lib/starLockApplication/starLockApplication.dart +++ b/star_lock/lib/starLockApplication/starLockApplication.dart @@ -20,7 +20,6 @@ class _StarLockApplicationState extends State { @override void initState() { super.initState(); - print("StarLockApplication initState"); WidgetsBinding.instance.addPostFrameCallback((_) { if (F.debug) { DeBug.showFloatWidget(); @@ -30,7 +29,6 @@ class _StarLockApplicationState extends State { @override Widget build(BuildContext context) { - print("StarLockApplication build"); AppFirstEnterHandle().getAppFirstEnter(context, isAgreePrivacy); getAgreePrivacyShowUpdate(); diff --git a/star_lock/lib/talk/call/callTalk.dart b/star_lock/lib/talk/call/callTalk.dart index 9c9cbebc..8e1670db 100644 --- a/star_lock/lib/talk/call/callTalk.dart +++ b/star_lock/lib/talk/call/callTalk.dart @@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'package:star_lock/talk/call/g711.dart'; import 'package:star_lock/talk/call/iFrameInfo.dart'; +import '../../app_settings/app_settings.dart'; import '../../tools/eventBusEventManage.dart'; import 'package:flutter_pcm_sound/flutter_pcm_sound.dart'; @@ -38,7 +39,7 @@ class CallTalk { Future getAVData(Uint8List bb, int len) async { // 音频数据 if (bb[61] == 1) { - // print('音频数据来了'); + // AppLog.log('音频数据来了'); Uint8List g711Data = bb.sublist(77, bb.length); List pcmBytes; @@ -55,34 +56,34 @@ class CallTalk { _initializeAudioPlayer(pcmBytes); } catch (e) { - print('Error decoding G.711 to PCM: $e'); + AppLog.log('Error decoding G.711 to PCM: $e'); } } // 视频数据 else { - // print('********视频数据来了'); + // AppLog.log('********视频数据来了'); // 音视频数据开始下标 var bagLen = bb[POS_blen + 2] + bb[POS_blen + 3] * 256; - // print('音视频数据开始下标 bagLen：$bagLen'); + // AppLog.log('音视频数据开始下标 bagLen：$bagLen'); // 获取帧序号 63 int getIframeIndex = bb[POS_iframe_index] + bb[POS_iframe_index + 1] * 256; - // print('获取帧序号 getIframeIndex：$getIframeIndex'); + // AppLog.log('获取帧序号 getIframeIndex：$getIframeIndex'); // 获取帧长度 65 int alen = bb[POS_alen] + bb[POS_alen + 1] * 256; - // print('获取帧长度 alen：$alen'); + // AppLog.log('获取帧长度 alen：$alen'); // 当前包号 71 int getBagIndex = bb[POS_bag_index] & 0xff; - // print('当前包号 getBagIndex：$getBagIndex'); + // AppLog.log('当前包号 getBagIndex：$getBagIndex'); // 总包数 69 int getBagNum = bb[POS_bag_num] & 0xff; - // print('总包数 getBagNum：$getBagNum'); + // AppLog.log('总包数 getBagNum：$getBagNum'); // 数据长度 73 int blen = bb[POS_blen] + bb[POS_blen + 1] * 256; - // print('数据长度 blen：$blen'); + // AppLog.log('数据长度 blen：$blen'); // 这里判断是否是同一帧，如果不是同一帧就重新创建一个 IframeInfo if (getIframeIndex != iframe!.iframeIndex) { @@ -101,27 +102,27 @@ class CallTalk { var getList = bb.sublist(POS_data, bb.length); iframe!.bb!.addAll(getList); } - // print( + // AppLog.log( // 'iframe.bagNum: ${iframe!.bagNum} iframe.bagReceive: ${iframe!.bagReceive}'); // 如果收到的包数等于总包数，说明这一帧数据已经接收完毕 if (iframe!.bagNum == iframe!.bagReceive) { - // print( + // AppLog.log( // '播放第${iframe!.iframeIndex}帧 一帧图片的hexStringData: ${Uint8List.fromList(growableList)}'); - // print('得到的一张图片的数据长度为${iframe!.bb!.length}'); + // AppLog.log('得到的一张图片的数据长度为${iframe!.bb!.length}'); // DateTime now = DateTime.now(); // String formattedTime = "${now.hour}:${now.minute}:${now.second}"; - // print('$formattedTime得到了一张图片共${iframe!.bagReceive}个数据包'); + // AppLog.log('$formattedTime得到了一张图片共${iframe!.bagReceive}个数据包'); eventBus.fire(GetTVDataRefreshUI(iframe!.bb!)); } else { - // print('接收到的包数不等于总包数'); + // AppLog.log('接收到的包数不等于总包数'); } } } //音频相关处理 Future _initializeAudioPlayer(List audioData) async { - // Get.log('_initializeAudioPlayer audioData:$audioData'); + // AppLog.log('_initializeAudioPlayer audioData:$audioData'); PcmArrayInt16 fromList = PcmArrayInt16.fromList(audioData); await FlutterPcmSound.feed(fromList); @@ -144,7 +145,7 @@ class CallTalk { FlutterPcmSound.pause(); FlutterPcmSound.clear(); FlutterPcmSound.stop(); - // print('已停止播放声音'); + // AppLog.log('已停止播放声音'); iframe = IframeInfo(); iframe!.iframeIndex = 0; diff --git a/star_lock/lib/talk/udp/io_protocol/udp_heart.dart b/star_lock/lib/talk/udp/io_protocol/udp_heart.dart index 5c7bd3ef..3ed4e84c 100644 --- a/star_lock/lib/talk/udp/io_protocol/udp_heart.dart +++ b/star_lock/lib/talk/udp/io_protocol/udp_heart.dart @@ -57,12 +57,12 @@ class UDPSendHeartCommand extends UDPSenderProtocol { var token = "token"; data.addAll(gbk.encode(token)); data = getFixedLengthList(data, 10 - gbk.encode(token).length); - // print("gbk.encode(token):${gbk.encode(token)}"); + // AppLog.log("gbk.encode(token):${gbk.encode(token)}"); // tokenStr // var tokenStr = "b989fa15f75c2ac02718b7c9bb64f80e"; data.addAll(gbk.encode(tokenStr!)); - // print("gbk.encode(tokenStr):${gbk.encode(tokenStr!)}"); + // AppLog.log("gbk.encode(tokenStr):${gbk.encode(tokenStr!)}"); var tokenStrLength = gbk.encode(tokenStr!).length; List tokenStrLengthArr = []; @@ -72,7 +72,7 @@ class UDPSendHeartCommand extends UDPSenderProtocol { tokenStrLengthArr.add((tokenStrLength & 0xff000000) >> 24); data.setRange(37, 41, tokenStrLengthArr); - // print("UDPSendHeartData:$data"); + // AppLog.log("UDPSendHeartData:$data"); return data; } diff --git a/star_lock/lib/talk/udp/io_protocol/udp_mainProtocol.dart b/star_lock/lib/talk/udp/io_protocol/udp_mainProtocol.dart index 478e4e55..a9f66641 100644 --- a/star_lock/lib/talk/udp/io_protocol/udp_mainProtocol.dart +++ b/star_lock/lib/talk/udp/io_protocol/udp_mainProtocol.dart @@ -72,7 +72,7 @@ class UDPMainProtocolCommand extends UDPSenderProtocol { data.addAll(endData!); - // print("datadatadata:$data"); + // AppLog.log("datadatadata:$data"); return data; } } diff --git a/star_lock/lib/talk/udp/io_udpSender.dart b/star_lock/lib/talk/udp/io_udpSender.dart index 6215271a..1ab32970 100644 --- a/star_lock/lib/talk/udp/io_udpSender.dart +++ b/star_lock/lib/talk/udp/io_udpSender.dart @@ -32,7 +32,7 @@ abstract class UDPSenderProtocol extends IOData { // 数据块 commandList.addAll(commandData!); //数据块 - // print("commandList:$commandList"); + // AppLog.log("commandList:$commandList"); return commandList; } diff --git a/star_lock/lib/talk/udp/udp_help.dart b/star_lock/lib/talk/udp/udp_help.dart index 4b6145cb..35b000b4 100644 --- a/star_lock/lib/talk/udp/udp_help.dart +++ b/star_lock/lib/talk/udp/udp_help.dart @@ -36,7 +36,7 @@ class UdpHelp { for (var element in itemList) { serversList.add(int.parse(element)); } - print('Resolved google.com to address: ${addresses.first.address} serversList：$serversList'); + // AppLog.log('Resolved google.com to address: ${addresses.first.address} serversList：$serversList'); } } @@ -49,7 +49,7 @@ class UdpHelp { ipList: serversList, tokenStr: "b989fa15f75c2ac02718b7c9bb64f80e", ); - // print('发送心跳了'); + // AppLog.log('发送心跳了'); } else { timer.cancel(); } diff --git a/star_lock/lib/talk/udp/udp_manage.dart b/star_lock/lib/talk/udp/udp_manage.dart index 2960de4d..88dc1845 100644 --- a/star_lock/lib/talk/udp/udp_manage.dart +++ b/star_lock/lib/talk/udp/udp_manage.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:star_lock/talk/udp/udp_reciverData.dart'; +import '../../app_settings/app_settings.dart'; import '../../blue/io_tool/io_model.dart'; import '../../blue/io_tool/manager_event_bus.dart'; @@ -15,7 +16,7 @@ class UDPManage { .eventBus! .on() .listen((EventSendModel sendModel) { - // print("sendModel.sendChannel:${sendModel.sendChannel}"); + // AppLog.log("sendModel.sendChannel:${sendModel.sendChannel}"); if (sendModel.sendChannel == DataChannel.udp) { List data = sendModel.data; sendData(data); @@ -45,7 +46,7 @@ class UDPManage { var listAddress = InternetAddress.lookup(host); listAddress.then((list) { list.forEach((element) { - // print('Udp ----> element.address:${element.address} element.host:${element.host}'); + // AppLog.log('Udp ----> element.address:${element.address} element.host:${element.host}'); host = element.address; }); }); @@ -55,10 +56,10 @@ class UDPManage { Future _initUdp() async { if (port == 0) { - // print('❌ Udp ----> _port == 0'); + // AppLog.log('❌ Udp ----> _port == 0'); return; } - // print('Udp ----> host:$host port:$port'); + // AppLog.log('Udp ----> host:$host port:$port'); var addressIListenFrom = InternetAddress.anyIPv4; int portIListenOn = 62288; RawDatagramSocket.bind(addressIListenFrom, portIListenOn) @@ -76,11 +77,11 @@ class UDPManage { if (event == RawSocketEvent.read) { Datagram? dg = socket.receive(); try { - // print('Did received data on the stream (length --> ${dg!.data.length}) dg!.data:${dg!.data}'); + // AppLog.log('Did received data on the stream (length --> ${dg!.data.length}) dg!.data:${dg!.data}'); // EventBusManager().eventBusFir(EventReceiveModel(data: dg?.data,sendChannel: DataChannel.udp)); CommandUDPReciverManager.appDataReceive(dg!.data); } catch (e) { - print('❌ Udp ----> $e'); + AppLog.log('❌ Udp ----> $e'); } } }); @@ -89,16 +90,16 @@ class UDPManage { void sendData(List data) { if (null == _udpSocket || null == data || data.isEmpty || host == '') { if (null == _udpSocket) { - // print('❌ Udp ----> null == _udpSocket'); + // AppLog.log('❌ Udp ----> null == _udpSocket'); initUdp(); } return; } try { - // print("sendData:$data"); + // AppLog.log("sendData:$data"); var result = _udpSocket?.send(data, InternetAddress(host), port); if (result != data.length) { - print('❌Udp ----> send data $result ${data.length}'); + AppLog.log('❌Udp ----> send data $result ${data.length}'); _udpSocket = null; } } catch (e) {} @@ -106,7 +107,7 @@ class UDPManage { bool exitUdpSocket() { if (null != _udpSocket) { - print('❌ Udp ----> close'); + AppLog.log('❌ Udp ----> close'); _udpSocket?.close(); } return true; diff --git a/star_lock/lib/talk/udp/udp_reciverData.dart b/star_lock/lib/talk/udp/udp_reciverData.dart index c8624dd1..c5f70481 100644 --- a/star_lock/lib/talk/udp/udp_reciverData.dart +++ b/star_lock/lib/talk/udp/udp_reciverData.dart @@ -5,6 +5,7 @@ import 'package:get/get.dart'; import 'package:star_lock/talk/udp/udp_manage.dart'; import 'package:star_lock/tools/storage.dart'; +import '../../app_settings/app_settings.dart'; import '../../blue/io_tool/io_tool.dart'; import '../../tools/eventBusEventManage.dart'; import '../call/callTalk.dart'; @@ -20,18 +21,18 @@ class CommandUDPReciverManager { if (dataSize < 4) { return; } - // print("appReceiveUDPData:$data"); + // AppLog.log("appReceiveUDPData:$data"); Uint8List data1 = Uint8List.fromList(data); if (data1.length == 1) { if (data[0] == 0x30 || data[0] == 0x31) { - print("p2p打洞"); + AppLog.log("p2p打洞"); } } if (data[6] == 4) { if (data[7] == 2) { - // print("心跳包反馈 在线状态"); + // AppLog.log("心跳包反馈 在线状态"); } else if (data[7] == 3) { // [Toast.show(msg: "您已在其他设备登录")]; EasyLoading.showToast("您已在其他设备登录", duration: 2000.milliseconds); @@ -44,7 +45,7 @@ class CommandUDPReciverManager { // 对讲命令 var beiCallType = data[8] & 0xff; - // print("被呼叫类型$beiCallType"); + // AppLog.log("被呼叫类型$beiCallType"); switch (beiCallType) { case 1: { @@ -62,12 +63,12 @@ class CommandUDPReciverManager { //接听 if ((data[7] & 0x3) == 2) { //被叫 接听反馈 - print("接听反馈"); + AppLog.log("接听反馈"); UDPTalkClass().status = 8; // 停止声音 UDPTalkClass().stopLocalAudio(); eventBus.fire(GetUDPStatusRefreshUI(UDPTalkClass().status)); - print('接听反馈刷新UI1'); + AppLog.log('接听反馈刷新UI1'); } } break; @@ -75,7 +76,7 @@ class CommandUDPReciverManager { case 8: { //音视频数据 - // print("音视频数据"); + // AppLog.log("音视频数据"); CallTalk cllTalk = CallTalk(); cllTalk.getAVData(data1, data1.length); } @@ -84,36 +85,36 @@ class CommandUDPReciverManager { { if ((data[7] & 0x3) == 1) { //对方保持连接 - //print("对方保持连接"); + //AppLog.log("对方保持连接"); data[7] = 2; } else { - //print("保持连接反馈"); + //AppLog.log("保持连接反馈"); } } break; case 10: { //开门反馈 - print("appReceiveUDPData:$data"); + AppLog.log("appReceiveUDPData:$data"); if ((data[7] & 0x3) == 2) { - print("开门成功"); + AppLog.log("开门成功"); EasyLoading.showToast("开门成功", duration: 2000.milliseconds); } else { - print("开门失败"); + AppLog.log("开门失败"); EasyLoading.showToast("开门失败", duration: 2000.milliseconds); } } break; case 30: { - // print('收到挂断反馈了'); + // AppLog.log('收到挂断反馈了'); // 挂断 if ((data[7] & 0x3) == 1) { // 对方结束对讲 - print("对方结束对讲"); + AppLog.log("对方结束对讲"); } else { //结束对讲反馈 - print("结束对讲反馈"); + AppLog.log("结束对讲反馈"); } // UDPTalkClass().status = 0; // UDPTalkClass().isBeCall = false; @@ -123,7 +124,7 @@ class CommandUDPReciverManager { eventBus.fire(GetUDPStatusRefreshUI(UDPTalkClass().status)); // Get.back(); UDPTalkClass().callNoAnswer(3); - // print('挂断反馈刷新UI1'); + // AppLog.log('挂断反馈刷新UI1'); } break; case 140: @@ -144,7 +145,7 @@ class CommandUDPReciverManager { case 143: { //p2p测试 NSAsk - print("p2pNSAskNSAsk"); + AppLog.log("p2pNSAskNSAsk"); } break; default: @@ -156,13 +157,13 @@ class CommandUDPReciverManager { case 2: { //被叫 - print("对方忙"); + AppLog.log("对方忙"); } break; case 4: { //监视成功 - print("监视成功"); + AppLog.log("监视成功"); UDPTalkClass().status = 8; eventBus.fire(GetUDPStatusMonitorUI(UDPTalkClass().status)); } @@ -171,7 +172,7 @@ class CommandUDPReciverManager { case 8: { //音视频数据 - // print("音视频数据"); + // AppLog.log("音视频数据"); CallTalk cllTalk = CallTalk(); cllTalk.getAVData(data1, data1.length); } @@ -181,10 +182,10 @@ class CommandUDPReciverManager { //保持连接 if ((data[7] & 0x3) == 1) { //对方保持连接 - //print("对方保持连接"); + //AppLog.log("对方保持连接"); data[7] = 2; } else { - //print("保持连接反馈"); + //AppLog.log("保持连接反馈"); } } break; @@ -192,11 +193,11 @@ class CommandUDPReciverManager { { //开门反馈 if ((data[7] & 0x3) == 2) { - print("开门成功"); + AppLog.log("开门成功"); // Toast.show(msg: "开门成功"); EasyLoading.showToast("开门成功", duration: 2000.milliseconds); } else { - print("开门失败"); + AppLog.log("开门失败"); EasyLoading.showToast("开门失败", duration: 2000.milliseconds); } } @@ -208,10 +209,10 @@ class CommandUDPReciverManager { // 监视结束 if ((data[7] & 0x3) == 1) { // 对方结束监视 - print("对方结束监视"); + AppLog.log("对方结束监视"); } else { //结束监视反馈 - print("结束监视反馈"); + AppLog.log("结束监视反馈"); } // Toast.show(msg: "对方已结束监视"); diff --git a/star_lock/lib/talk/udp/udp_senderData.dart b/star_lock/lib/talk/udp/udp_senderData.dart index 1bf7c90b..afbfdfdd 100644 --- a/star_lock/lib/talk/udp/udp_senderData.dart +++ b/star_lock/lib/talk/udp/udp_senderData.dart @@ -23,9 +23,9 @@ class CommandUDPSenderManager { Future managerSendData ({required UDPSenderProtocol command, CommandUDPSendCallBack? callBack}) async { if (callBack != null) { // if (!BluetoothManager().connected) { - print('❌ 蓝牙断开了'); + AppLog.log('❌ 蓝牙断开了'); if (callBack != null) { - print('managerSendData ❌ callBack'); + AppLog.log('managerSendData ❌ callBack'); // EasyLoading.dismiss(); callBack(ErrorType.notConnected); } @@ -33,7 +33,7 @@ class CommandUDPSenderManager { } List value = command.packageData(); - // print("sendData:${value}"); + // AppLog.log("sendData:${value}"); _sendNormalData(value); } diff --git a/star_lock/lib/talk/udp/udp_talkClass.dart b/star_lock/lib/talk/udp/udp_talkClass.dart index b253a883..4df516ee 100644 --- a/star_lock/lib/talk/udp/udp_talkClass.dart +++ b/star_lock/lib/talk/udp/udp_talkClass.dart @@ -8,6 +8,7 @@ import 'package:star_lock/main/lockDetail/monitoring/monitoring/lockMonitoring_s import 'package:star_lock/talk/call/callTalk.dart'; import 'package:star_lock/tools/eventBusEventManage.dart'; import '../../appRouters.dart'; +import '../../app_settings/app_settings.dart'; import '../../tools/storage.dart'; import 'udp_manage.dart'; @@ -36,7 +37,7 @@ class UDPTalkClass { late Timer playLocalAudioTimer; beCallW({List? data, String? ip, int? port}) async { - print("beCall status:$status"); + AppLog.log("beCall status:$status"); // if (await isCallMe(data)) { // return; // } @@ -83,12 +84,12 @@ class UDPTalkClass { playLocalAudio(); if (isEndCall == true) { - print('已经结束对讲1'); + AppLog.log('已经结束对讲1'); return; } playLocalAudioTimer = Timer.periodic(const Duration(seconds: 1), (timer) { playLocalAudioSecond++; - // print('还在工作么这个定时器$playLocalAudioSecond'); + // AppLog.log('还在工作么这个定时器$playLocalAudioSecond'); // 检查条件，如果达到60秒且未得到应答，则认为失败 if (playLocalAudioSecond >= 60) { timer.cancel(); // 取消定时器 @@ -122,7 +123,7 @@ class UDPTalkClass { // 判断是否是call的本人 Future isCallMe(List? data) async { final loginData = await Storage.getLoginData(); - print("getEquidFrombb(data, 1000):${getEquidFrombb(data, 12)}"); + AppLog.log("getEquidFrombb(data, 1000):${getEquidFrombb(data, 12)}"); if (loginData!.mobile == getEquidFrombb(data, 12)) { return true; } @@ -179,10 +180,10 @@ class UDPTalkClass { //呼叫有响铃无应答处理 void callNoAnswer(int clickIndex) { if (isEndCall == true) { - // print('已经结束对讲2'); + // AppLog.log('已经结束对讲2'); return; } - // print('$clickIndex****无应答处理'); + // AppLog.log('$clickIndex****无应答处理'); stopLocalAudio(); status = 0; isBeCall = false; diff --git a/star_lock/lib/tools/NativeInteractionTool.dart b/star_lock/lib/tools/NativeInteractionTool.dart index 1f187ea4..a94cf5e7 100644 --- a/star_lock/lib/tools/NativeInteractionTool.dart +++ b/star_lock/lib/tools/NativeInteractionTool.dart @@ -1,6 +1,8 @@ import 'package:flutter/services.dart'; +import '../app_settings/app_settings.dart'; + ///原生交互配置 class NativeInteractionConfig{ static String methodSendChannel = 'starLockFlutterSend'; @@ -26,13 +28,13 @@ class NativeInteractionTool{ ///获取设备蓝牙是否打开 receiveChannelBlueIsOnEvent(BlockBlueStatus blockBlueStatus){ receiveChannel.setMethodCallHandler((MethodCall call) async { - print('收到原生发送的信息call.method: ${call.method} call.arguments:${call.arguments}'); + AppLog.log('收到原生发送的信息call.method: ${call.method} call.arguments:${call.arguments}'); switch (call.method) { case 'getBlueStatus': // 获取设备蓝牙开启/关闭状态 final String message = call.arguments; blockBlueStatus(message); - print('收到原生发送的信息getBlueStatus: $message'); + AppLog.log('收到原生发送的信息getBlueStatus: $message'); break; default: throw MissingPluginException(); diff --git a/star_lock/lib/tools/advancedCalendar/src/week_days.dart b/star_lock/lib/tools/advancedCalendar/src/week_days.dart index 280fcf95..20d42529 100644 --- a/star_lock/lib/tools/advancedCalendar/src/week_days.dart +++ b/star_lock/lib/tools/advancedCalendar/src/week_days.dart @@ -29,7 +29,7 @@ class WeekDays extends StatelessWidget { return DateBox( child: Text(weekNames[index]), onPressed: () { - print('****Week day $index pressed'); + AppLog.log('****Week day $index pressed'); }, ); }), diff --git a/star_lock/lib/tools/advancedCalendar/src/widget.dart b/star_lock/lib/tools/advancedCalendar/src/widget.dart index 4653c63b..001840af 100644 --- a/star_lock/lib/tools/advancedCalendar/src/widget.dart +++ b/star_lock/lib/tools/advancedCalendar/src/widget.dart @@ -4,6 +4,7 @@ import 'package:intl/date_symbol_data_local.dart'; import 'package:intl/intl.dart'; import 'package:star_lock/tools/eventBusEventManage.dart'; +import '../../../app_settings/app_settings.dart'; import 'controller.dart'; import 'datetime_util.dart'; @@ -232,7 +233,7 @@ class _AdvancedCalendarState extends State child: ValueListenableBuilder( valueListenable: _controller, builder: (_, selectedDate, __) { - print('****selectedDate: $selectedDate'); + AppLog.log('****selectedDate: $selectedDate'); eventBus.fire(DoorLockLogListRefreshUI(selectedDate)); return Stack( alignment: Alignment.center, diff --git a/star_lock/lib/tools/appFirstEnterHandle.dart b/star_lock/lib/tools/appFirstEnterHandle.dart index 2eb2ad12..36b59836 100644 --- a/star_lock/lib/tools/appFirstEnterHandle.dart +++ b/star_lock/lib/tools/appFirstEnterHandle.dart @@ -37,9 +37,7 @@ class AppFirstEnterHandle { } break; default: - { - print('没有匹配的flagStr'); - } + break; } } diff --git a/star_lock/lib/tools/baseGetXController.dart b/star_lock/lib/tools/baseGetXController.dart index dd9eb1bf..537ecf40 100644 --- a/star_lock/lib/tools/baseGetXController.dart +++ b/star_lock/lib/tools/baseGetXController.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:star_lock/appRouters.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/blue/blue_manage.dart'; import 'package:system_settings/system_settings.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -25,7 +26,6 @@ class BaseGetXController extends GetxController { @override void onReady() { super.onReady(); - Get.log('$runtimeType onReady'); currentPage = true; } @@ -40,7 +40,6 @@ class BaseGetXController extends GetxController { @override void onInit() { // TODO: implement onInit - Get.log('$runtimeType onInit '); super.onInit(); } @@ -49,7 +48,6 @@ class BaseGetXController extends GetxController { // TODO: implement onClose super.onClose(); currentPage = false; - Get.log('onClose -----> $runtimeType'); } Future delay({Duration? duration, Function? something}) => Future.delayed( @@ -78,7 +76,7 @@ class BaseGetXController extends GetxController { } void cancelBlueConnetctToastTimer() { - Get.log('cancelBlueConnetctToastTimer'); + // AppLog.log('超过15秒未响应，APP主动关菊花断开连接'); if (_timer != null && _timer!.isActive) { _timer!.cancel(); _timer = null; @@ -125,19 +123,18 @@ class BaseGetXController extends GetxController { void checkBlueIsOpen(void Function() action) { NativeInteractionTool().sendGetBlueStatus(); NativeInteractionTool().receiveChannelBlueIsOnEvent((String status) { - print("22222222"); if (status == "1") { // 蓝牙已打开 - Get.log('蓝牙已打开'); + AppLog.log('蓝牙已打开'); action(); } else if (status == "0") { // 蓝牙未打开 - Get.log('蓝牙未打开'); + AppLog.log('蓝牙未打开'); showIosTipViewDialog(); return; } else { // 蓝牙未打开 - Get.log('设备不支持蓝牙'); + AppLog.log('设备不支持蓝牙'); showToast("设备不支持蓝牙"); return; } diff --git a/star_lock/lib/tools/dateTool.dart b/star_lock/lib/tools/dateTool.dart index 8f8e1d55..29bf7d79 100644 --- a/star_lock/lib/tools/dateTool.dart +++ b/star_lock/lib/tools/dateTool.dart @@ -57,7 +57,6 @@ class DateTool { dateStr = '$year-${month.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')} ${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}:${millisecond.toString().padLeft(2, '0')}'; break; } - // print("组合 $year-$month-$day $hour:$minute:$millisecond"); return dateStr; } @@ -125,7 +124,6 @@ class DateTool { /// 将时间戳传化为年月日 (年-月-日 时:分) String dateToYMDHNString(String timestamp){ - // Get.log('dateToYMDHNString timestamp: $timestamp'); int time = int.parse(timestamp); if(timestamp.length == 10){ time = time * 1000; @@ -148,7 +146,6 @@ class DateTool { int time = int.parse(timestamp); DateTime nowDate = DateTime.fromMillisecondsSinceEpoch(time); String appointmentDate = formatDate(nowDate, [HH,':',nn]); - // Get.log('timestamp:$timestamp dateToHNString appointmentDate: $appointmentDate'); return appointmentDate; } @@ -157,11 +154,9 @@ class DateTool { DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(endTiem); // 将时间戳转换为 DateTime DateTime now = DateTime.now(); // 获取当前时间 if (now.isAfter(dateTime)) { - print('The timestamp is after the current time.'); // 过期 return true; } else { - print('The timestamp is not after the current time.'); return false; } } @@ -172,7 +167,6 @@ class DateTool { DateTime now = DateTime.now(); // 获取当前时间 Duration difference = dateTime.difference(now); // 计算两个日期之间的差异 int days = difference.inDays; // 获取差异的天数 - // print('dateTime:$dateTime now:$now The difference is $days days.'); return days; } @@ -180,7 +174,6 @@ class DateTool { // 根据循环的循环周期转化为对应的整型(Bit0 -- 6 置位分别代表周日 -- 周六) int accordingTheCycleIntoTheCorrespondingNumber(List weekDay){ var weekStr = "00000000"; - // print("state.weekDay.value:$weekDay"); for (var day in weekDay) { int index = day % 7; // 将周日的索引转换为 0 weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; @@ -188,7 +181,6 @@ class DateTool { // 倒序 weekStr weekStr = weekStr.split('').reversed.join(''); int weekRound = int.parse(weekStr, radix: 2); - // print("weekStrweekStrweekStr:$weekStr weekRound:$weekRound"); return weekRound; } } \ No newline at end of file diff --git a/star_lock/lib/tools/dateUtils.dart b/star_lock/lib/tools/dateUtils.dart index 71635ffb..5330ef90 100644 --- a/star_lock/lib/tools/dateUtils.dart +++ b/star_lock/lib/tools/dateUtils.dart @@ -19,10 +19,8 @@ class XSDateUtils { // // 格式化日期时间 // DateTime now = DateTime.now(); // String formattedDateTime = DateUtils.formatDateTime(now, 'HH:mm'); -// print('Formatted DateTime: $formattedDateTime'); // // 解析日期时间字符串 // String dateString = '08:30'; // DateTime parsedDateTime = DateUtils.parseDateTime(dateString, 'HH:mm'); -// print('Parsed DateTime: $parsedDateTime'); // } diff --git a/star_lock/lib/tools/device_info_service.dart b/star_lock/lib/tools/device_info_service.dart index 9ecb21c2..955cef4d 100644 --- a/star_lock/lib/tools/device_info_service.dart +++ b/star_lock/lib/tools/device_info_service.dart @@ -19,7 +19,7 @@ class DeviceInfoService extends GetxService { String dId = ""; if(dId.isNotEmpty){ dId = const Uuid().v1(); - print('初始化设备ID:$dId'); + AppLog.log('初始化设备ID:$dId'); // StoreService.to.saveDeviceId(dId); } _deviceID = dId; @@ -35,7 +35,7 @@ class DeviceInfoService extends GetxService { IosDeviceInfo iosInfo = await deviceInfo.iosInfo; } AppManager().saveDeviceID(deviceID); - print(AppManager().deviceId); + AppLog.log(AppManager().deviceId); return this; } diff --git a/star_lock/lib/tools/keySearchWidget.dart b/star_lock/lib/tools/keySearchWidget.dart index 181c92f8..27255aa9 100644 --- a/star_lock/lib/tools/keySearchWidget.dart +++ b/star_lock/lib/tools/keySearchWidget.dart @@ -5,6 +5,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import '../app_settings/app_colors.dart'; +import '../app_settings/app_settings.dart'; class KeySearchWidget extends StatelessWidget { TextEditingController editingController; @@ -55,10 +56,10 @@ class KeySearchWidget extends StatelessWidget { autofocus: false, textAlign: TextAlign.start, onChanged: (value) { - Get.log("onChanged:$value"); + AppLog.log("onChanged:$value"); }, onEditingComplete: () { - Get.log("onEditingComplete:"); + AppLog.log("onEditingComplete:"); }, onSubmitted: (value) { onSubmittedAction!(); diff --git a/star_lock/lib/tools/permissionUtil.dart b/star_lock/lib/tools/permissionUtil.dart index 058e594a..06a88acf 100644 --- a/star_lock/lib/tools/permissionUtil.dart +++ b/star_lock/lib/tools/permissionUtil.dart @@ -3,6 +3,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; import 'package:permission_handler/permission_handler.dart'; +import '../app_settings/app_settings.dart'; + /// @ClassName ${NAME} /// 作者: szj /// 时间: ${DATE} ${TIME} @@ -27,7 +29,7 @@ class PermissionUtil { Permission permission = Permission.location; status ??= await permission.status; - print("statusstatusstatus:$status"); + AppLog.log("statusstatusstatus:$status"); if (status.isDenied) { //第一次申请 showPermissionDialog(_list[0], "同意", permission); diff --git a/star_lock/lib/tools/pickers/address_picker/locations_data.dart b/star_lock/lib/tools/pickers/address_picker/locations_data.dart index 89484820..e9ae7959 100644 --- a/star_lock/lib/tools/pickers/address_picker/locations_data.dart +++ b/star_lock/lib/tools/pickers/address_picker/locations_data.dart @@ -4145,7 +4145,7 @@ class Address { }); Map? areaList = locations[code]; - // print('longer >>>$code 城市数据：$areaList'); + // AppLog.log('longer >>>$code 城市数据：$areaList'); var data = []; if (areaList != null && addAllItem) data.add(emptyData); areaList?.forEach((key, value) { @@ -4202,13 +4202,13 @@ class Address { // 市级 if (PicketUtil.strEmpty(cityName)) { - // print('longer 区域代码 >>> $cityCode'); + // AppLog.log('longer 区域代码 >>> $cityCode'); return cityCode; } String initialCityCode = ''; var initialProvinceList = locations[initialProvinceCode]; if (initialProvinceList == null) { - // print('longer 区域代码 >>> $cityCode'); + // AppLog.log('longer 区域代码 >>> $cityCode'); return cityCode; } @@ -4224,13 +4224,13 @@ class Address { // 区域 if (PicketUtil.strEmpty(townName)) { - // print('longer 区域代码 >>> $cityCode'); + // AppLog.log('longer 区域代码 >>> $cityCode'); return cityCode; } String initialTownCode = ''; var initialTownList = locations[initialCityCode]; if (initialTownList == null) { - // print('longer 区域代码 >>> $cityCode'); + // AppLog.log('longer 区域代码 >>> $cityCode'); return cityCode; } @@ -4245,7 +4245,7 @@ class Address { } } } - // print('longer 区域代码 >>> $cityCode'); + // AppLog.log('longer 区域代码 >>> $cityCode'); return cityCode; } @@ -4272,7 +4272,7 @@ class Address { String initialCityName = ''; var initialProvinceList = locations[provinceCode]; if (PicketUtil.mapEmpty(initialProvinceList)) { - // print('longer 区域名 >>> $cityName'); + // AppLog.log('longer 区域名 >>> $cityName'); return cityName; } @@ -4290,7 +4290,7 @@ class Address { String initialTownName = ''; var initialTownList = locations[cityCode]; if (initialTownList == null) { - // print('longer 区域名 >>> $cityName'); + // AppLog.log('longer 区域名 >>> $cityName'); return cityName; } @@ -4305,7 +4305,7 @@ class Address { } } } - // print('longer 区域名 >>> $cityName'); + // AppLog.log('longer 区域名 >>> $cityName'); return cityName; } } diff --git a/star_lock/lib/tools/pickers/address_picker/route/address_picker_route.dart b/star_lock/lib/tools/pickers/address_picker/route/address_picker_route.dart index f09bad6f..43144f7e 100644 --- a/star_lock/lib/tools/pickers/address_picker/route/address_picker_route.dart +++ b/star_lock/lib/tools/pickers/address_picker/route/address_picker_route.dart @@ -196,7 +196,7 @@ class _PickerState extends State<_PickerContentView> { cindex = cindex >= 0 ? cindex : 0; _currentCity = cities[cindex]['name']; - // print('longer >>> 外面接到的$cities'); + // AppLog.log('longer >>> 外面接到的$cities'); if (hasTown) { towns = Address.getTowns(cities[cindex]['cityCode']); @@ -217,14 +217,14 @@ class _PickerState extends State<_PickerContentView> { void _setProvince(int index) { String selectedProvince = provinces[index]; - // print('longer >>> index:$index _currentProvince:$_currentProvince selectedProvince:$selectedProvince '); + // AppLog.log('longer >>> index:$index _currentProvince:$_currentProvince selectedProvince:$selectedProvince '); if (_currentProvince != selectedProvince) { setState(() { _currentProvince = selectedProvince; cities = Address.getCities(selectedProvince); - // print('longer >>> 返回的城市数据：$cities'); + // AppLog.log('longer >>> 返回的城市数据：$cities'); _currentCity = cities[0]['name']; cityScrollCtrl.jumpToItem(0); diff --git a/star_lock/lib/tools/pickers/more_pickers/route/multiple_link_picker_route.dart b/star_lock/lib/tools/pickers/more_pickers/route/multiple_link_picker_route.dart index 10f5c35c..c1bede84 100644 --- a/star_lock/lib/tools/pickers/more_pickers/route/multiple_link_picker_route.dart +++ b/star_lock/lib/tools/pickers/more_pickers/route/multiple_link_picker_route.dart @@ -210,7 +210,7 @@ class _PickerState extends State<_PickerContentView> { } else { /// 其他列 dynamic date = findNextData(i); - // print('longer 第$i列 >>> $date'); + // AppLog.log('longer 第$i列 >>> $date'); if (date is Map) { pindex = date.keys.toList().indexOf(_selectData[i]); @@ -295,7 +295,7 @@ class _PickerState extends State<_PickerContentView> { nextData = [data]; } } - // print('longer i:$i >>> $nextData'); + // AppLog.log('longer i:$i >>> $nextData'); /// 如果数据 还没有到最后 就 已经不是Map if (!(nextData is Map) && (i < position - 1)) { @@ -317,7 +317,7 @@ class _PickerState extends State<_PickerContentView> { // 肯定是map nextData = _data[_selectData[0]]; } else { - // print( + // AppLog.log( // 'longer 选中 >>> ${_selectData.join('-')} 当前选中： ${_selectData[i]}'); // 肯定是map dynamic data = nextData[_selectData[i]]; @@ -331,7 +331,7 @@ class _PickerState extends State<_PickerContentView> { nextData = [data]; } } - // print('longer i:$i >>> $nextData'); + // AppLog.log('longer i:$i >>> $nextData'); /// 如果是map 并且是最后一列 返回他的key if ((nextData is Map) && (i == position - 1)) { @@ -340,12 +340,12 @@ class _PickerState extends State<_PickerContentView> { /// 如果数据 还没有到最后 就 已经不是Map if (!(nextData is Map) && (i < position - 1)) { - // print('longer2 第:$position列之前返回数据 >>> $nextData'); + // AppLog.log('longer2 第:$position列之前返回数据 >>> $nextData'); return [placeData]; } } - // print('longer 第:$position列返回数据 >>> $nextData'); + // AppLog.log('longer 第:$position列返回数据 >>> $nextData'); return nextData; } diff --git a/star_lock/lib/tools/pickers/more_pickers/route/single_picker_route.dart b/star_lock/lib/tools/pickers/more_pickers/route/single_picker_route.dart index 435f4146..4b70d7d4 100644 --- a/star_lock/lib/tools/pickers/more_pickers/route/single_picker_route.dart +++ b/star_lock/lib/tools/pickers/more_pickers/route/single_picker_route.dart @@ -2,6 +2,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:star_lock/tools/pickers/more_pickers/init_data.dart'; import 'package:star_lock/tools/pickers/style/picker_style.dart'; + +import '../../../../app_settings/app_settings.dart'; // import 'package:flutter_pickers/more_pickers/init_data.dart'; // import 'package:flutter_pickers/style/picker_style.dart'; @@ -314,7 +316,7 @@ class _PickerState extends State<_PickerContentView> { InkWell( onTap: () { if (widget.route.onConfirm != null) { - print('longer _selectPosition >>> ${_selectPosition}'); + AppLog.log('longer _selectPosition >>> ${_selectPosition}'); widget.route.onConfirm!(_selectData, _selectPosition); } Navigator.pop(context, true); diff --git a/star_lock/lib/tools/pickers/pickers.dart b/star_lock/lib/tools/pickers/pickers.dart index d0d08500..0a2d5519 100644 --- a/star_lock/lib/tools/pickers/pickers.dart +++ b/star_lock/lib/tools/pickers/pickers.dart @@ -22,6 +22,7 @@ import 'package:star_lock/tools/pickers/time_picker/route/date_picker_route.dart // import 'package:flutter_pickers/time_picker/model/suffix.dart'; // import 'package:flutter_pickers/time_picker/route/date_picker_route.dart'; +import '../../app_settings/app_settings.dart'; import 'time_picker/model/date_item_model.dart'; /// [onChanged] 选择器发生变动 @@ -195,7 +196,7 @@ class Pickers { if ((dateItemModel.day || dateItemModel.year)) { if (intEmpty(selectDate.year)) { - print('picker Tip >>> initDate未设置years，默认设置为now().year'); + AppLog.log('picker Tip >>> initDate未设置years，默认设置为now().year'); selectDate.year = DateTime.now().year; } @@ -203,7 +204,7 @@ class Pickers { if (intEmpty(maxDate.year)) maxDate.year = 2100; if (intEmpty(minDate.year)) minDate.year = 1900; - // print('longer >>> ${minDate.year}'); + // AppLog.log('longer >>> ${minDate.year}'); if (dateItemModel.month || dateItemModel.day) { assert(minDate.year! > 1582, 'min Date Year must > 1582'); diff --git a/star_lock/lib/tools/pickers/time_picker/model/pduration.dart b/star_lock/lib/tools/pickers/time_picker/model/pduration.dart index bc89c690..f0f62ff0 100644 --- a/star_lock/lib/tools/pickers/time_picker/model/pduration.dart +++ b/star_lock/lib/tools/pickers/time_picker/model/pduration.dart @@ -6,15 +6,15 @@ import 'package:star_lock/tools/pickers/time_picker/model/date_type.dart'; /// /// /// var s = PDuration.now(); -/// print('longer1 >>> ${s.toString()}'); +/// AppLog.log('longer1 >>> ${s.toString()}'); /// {year: 2021, month: 1, day: 5, hour: 17, minute: 17, second: 3} /// /// var m = PDuration(year: 2011); -/// print('longer2 >>> ${m.toString()}'); +/// AppLog.log('longer2 >>> ${m.toString()}'); /// {year: 2011, month: 0, day: 0, hour: 0, minute: 0, second: 0} /// /// var d = PDuration.parse(DateTime.parse('20200304')); -/// print('longer3 >>> ${d.toString()}'); +/// AppLog.log('longer3 >>> ${d.toString()}'); /// {year: 2020, month: 3, day: 4, hour: 0, minute: 0, second: 0} bool intEmpty(int? value) { diff --git a/star_lock/lib/tools/screen_utils.dart b/star_lock/lib/tools/screen_utils.dart index 09061acc..5996bc0d 100644 --- a/star_lock/lib/tools/screen_utils.dart +++ b/star_lock/lib/tools/screen_utils.dart @@ -107,16 +107,16 @@ fontSize: ScreenUtil.getInstance().setSp(24), fontSize: ScreenUtil(allowFontScaling: true).setSp(24), -print('设备宽度:${ScreenUtil.screenWidth}'); //Device width -print('设备高度:${ScreenUtil.screenHeight}'); //Device height -print('设备的像素密度:${ScreenUtil.pixelRatio}'); //Device pixel density -print('底部安全区距离:${ScreenUtil.bottomBarHeight}'); //Bottom safe zone distance，suitable for buttons with full screen -print('状态栏高度:${ScreenUtil.statusBarHeight}px'); -print('实际宽度的dp与设计稿px的比例:${ScreenUtil.getInstance().scaleWidth}'); -print('实际高度的dp与设计稿px的比例:${ScreenUtil.getInstance().scaleHeight}'); -print( '宽度和字体相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleWidth * ScreenUtil.pixelRatio}'); -print( '高度相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}'); -print('系统的字体缩放比例:${ScreenUtil.textScaleFactor}'); +AppLog.log('设备宽度:${ScreenUtil.screenWidth}'); //Device width +AppLog.log('设备高度:${ScreenUtil.screenHeight}'); //Device height +AppLog.log('设备的像素密度:${ScreenUtil.pixelRatio}'); //Device pixel density +AppLog.log('底部安全区距离:${ScreenUtil.bottomBarHeight}'); //Bottom safe zone distance，suitable for buttons with full screen +AppLog.log('状态栏高度:${ScreenUtil.statusBarHeight}px'); +AppLog.log('实际宽度的dp与设计稿px的比例:${ScreenUtil.getInstance().scaleWidth}'); +AppLog.log('实际高度的dp与设计稿px的比例:${ScreenUtil.getInstance().scaleHeight}'); +AppLog.log( '宽度和字体相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleWidth * ScreenUtil.pixelRatio}'); +AppLog.log( '高度相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}'); +AppLog.log('系统的字体缩放比例:${ScreenUtil.textScaleFactor}'); */ diff --git a/star_lock/lib/tools/showCalendar.dart b/star_lock/lib/tools/showCalendar.dart index 09e6c815..551c355f 100644 --- a/star_lock/lib/tools/showCalendar.dart +++ b/star_lock/lib/tools/showCalendar.dart @@ -3,6 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import '../app_settings/app_settings.dart'; + typedef SelectDateCallback(DateTime dateTime); class ShowCalendar extends StatelessWidget { @@ -40,7 +42,7 @@ class ShowCalendar extends StatelessWidget { onDateChanged:selectAction!, // 月份改变回调函数 onDisplayedMonthChanged: (dateTime){ - print("onDisplayedMonthChanged $dateTime"); + AppLog.log("onDisplayedMonthChanged $dateTime"); }, // 筛选日期可不可点回调函数 selectableDayPredicate: (dayTime){ diff --git a/star_lock/lib/tools/showIosTipView.dart b/star_lock/lib/tools/showIosTipView.dart index 03bd5310..2a5996b0 100644 --- a/star_lock/lib/tools/showIosTipView.dart +++ b/star_lock/lib/tools/showIosTipView.dart @@ -73,7 +73,6 @@ class ShowIosTipView extends StatelessWidget { // ), // onPressed: () { // // Navigator.pop(context); - // // print("取消"); // if (cancelClick != null) { // cancelClick!(); // } @@ -87,7 +86,6 @@ class ShowIosTipView extends StatelessWidget { // sureClick!(); // } // // Navigator.pop(context); - // // print("确定"); // }, // ), // ], diff --git a/star_lock/lib/tools/showSeletDateTime.dart b/star_lock/lib/tools/showSeletDateTime.dart index 6110936a..f7b8c5c5 100644 --- a/star_lock/lib/tools/showSeletDateTime.dart +++ b/star_lock/lib/tools/showSeletDateTime.dart @@ -61,7 +61,7 @@ class ShowSelectDateTime { // // //获取当前时间的秒 // // int millisecond = now.millisecond; // - // // print("组合 $year-$month-$day $hour:$minute:$millisecond"); + // // AppLog.log("组合 $year-$month-$day $hour:$minute:$millisecond"); // return dateSlug; // } } diff --git a/star_lock/lib/tools/showTFView.dart b/star_lock/lib/tools/showTFView.dart index d246ce98..586d0057 100644 --- a/star_lock/lib/tools/showTFView.dart +++ b/star_lock/lib/tools/showTFView.dart @@ -76,7 +76,6 @@ class ShowTFView extends StatelessWidget { ), onPressed: () { // Navigator.pop(context); - // print("取消"); if (cancelClick != null) { cancelClick!(); } @@ -91,7 +90,6 @@ class ShowTFView extends StatelessWidget { sureClick!(); } // Navigator.pop(context); - // print("确定"); }, ), ], diff --git a/star_lock/lib/tools/storage.dart b/star_lock/lib/tools/storage.dart index 2c476856..6ecf6d19 100644 --- a/star_lock/lib/tools/storage.dart +++ b/star_lock/lib/tools/storage.dart @@ -129,7 +129,7 @@ class Storage { static Future ifHaveKey(key) async { SharedPreferences sp = await SharedPreferences.getInstance(); bool isContainKey = sp.containsKey(key) ?? false; - print(isContainKey); + // AppLog.log(isContainKey); return isContainKey; } @@ -148,14 +148,14 @@ class Storage { static Future getUid() async { LoginData? loginData = await getLoginData(); String? uid = loginData!.uid.toString(); - // print("pubUid:$uid"); + // AppLog.log("pubUid:$uid"); return uid; } static Future getUserid() async { LoginData? loginData = await getLoginData(); String? userid = loginData!.userid.toString(); - // print("pubUid:$uid"); + // AppLog.log("pubUid:$uid"); return userid; } @@ -189,7 +189,7 @@ class Storage { if (data != null && data.isNotEmpty) { loginData = LoginData.fromJson(jsonDecode(data)); } - // print("loginData:$loginData"); + // AppLog.log("loginData:$loginData"); return loginData; } diff --git a/star_lock/lib/tools/xs_jPhush.dart b/star_lock/lib/tools/xs_jPhush.dart index 5cabfefb..40b1cad8 100644 --- a/star_lock/lib/tools/xs_jPhush.dart +++ b/star_lock/lib/tools/xs_jPhush.dart @@ -7,6 +7,8 @@ import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/storage.dart'; +import '../app_settings/app_settings.dart'; + class XSJPushProvider { final JPush jpush = JPush(); @@ -23,15 +25,15 @@ class XSJPushProvider { jpush.addEventHandler( // 接收通知回调方法。 onReceiveNotification: (Map message) async { - print("flutter onReceiveNotification: $message"); + AppLog.log("flutter onReceiveNotification: $message"); }, // 点击通知回调方法。 onOpenNotification: (Map message) async { - print("flutter onOpenNotification: $message"); + AppLog.log("flutter onOpenNotification: $message"); }, // 接收自定义消息回调方法。 onReceiveMessage: (Map message) async { - print("flutter onReceiveMessage: $message"); + AppLog.log("flutter onReceiveMessage: $message"); }, ); @@ -42,7 +44,7 @@ class XSJPushProvider { // Platform messages may fail, so we use a try/catch PlatformException. jpush.getRegistrationID().then((rid) { - print("flutter get registration id : $rid"); + AppLog.log("flutter get registration id : $rid"); Storage.setString( pushDeviceID, rid, @@ -55,7 +57,7 @@ class XSJPushProvider { void pushBindDeviceID(String deviceID, int deviceType) async { var entity = await ApiRepository.to.pushBindAppId(deviceID, deviceType); if (entity.errorCode!.codeIsSuccessful) { - print("绑定成功"); + AppLog.log("绑定成功"); } } diff --git a/star_lock/lib/versionUndate/versionUndateTool.dart b/star_lock/lib/versionUndate/versionUndateTool.dart index 2e2fc2f7..5db4fb1a 100644 --- a/star_lock/lib/versionUndate/versionUndateTool.dart +++ b/star_lock/lib/versionUndate/versionUndateTool.dart @@ -9,6 +9,7 @@ import 'package:get/get.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../app_settings/app_settings.dart'; import '../network/api_repository.dart'; import '../translations/trans_lib.dart'; import 'versionUndate_entity.dart'; @@ -40,7 +41,7 @@ class VersionUndateTool { String brandName = ''; if (Platform.isAndroid) { AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo; - Get.log('androidInfo.manufacturer:${androidInfo.manufacturer}' + AppLog.log('androidInfo.manufacturer:${androidInfo.manufacturer}' 'androidInfo.device:${androidInfo.device}' 'androidInfo.model:${androidInfo.model}' 'androidInfo.product:${androidInfo.product}' @@ -60,7 +61,7 @@ class VersionUndateTool { PackageInfo packageInfo = await PackageInfo.fromPlatform(); var version = packageInfo.version; - Get.log("updateGetversion:${version}"); + AppLog.log("updateGetversion:$version"); var entity = await ApiRepository.to.getVersionData( brandName: brandName, currentVersion: version,