diff --git a/bin/quality_checks.sh b/bin/quality_checks.sh index 25a89370..4742ac24 100755 --- a/bin/quality_checks.sh +++ b/bin/quality_checks.sh @@ -4,7 +4,7 @@ echo 'export PATH="$PATH":"$FLUTTER_ROOT/.pub-cache/bin"' >>~/.bashrc echo 'export PATH="$PATH":"$FLUTTER_ROOT/bin"' >>~/.bashrc source ~/.bashrc -dart pub global activate melos +dart pub global activate melos 2.9.0 melos bootstrap melos run analyze diff --git a/packages/reactive_ble_mobile/android/src/main/kotlin/com/signify/hue/flutterreactiveble/converters/ManufacturerDataConverter.kt b/packages/reactive_ble_mobile/android/src/main/kotlin/com/signify/hue/flutterreactiveble/converters/ManufacturerDataConverter.kt index 8257d996..d6e5abaa 100644 --- a/packages/reactive_ble_mobile/android/src/main/kotlin/com/signify/hue/flutterreactiveble/converters/ManufacturerDataConverter.kt +++ b/packages/reactive_ble_mobile/android/src/main/kotlin/com/signify/hue/flutterreactiveble/converters/ManufacturerDataConverter.kt @@ -6,12 +6,17 @@ fun extractManufacturerData(manufacturerData: SparseArray?): ByteArra val rawData = mutableListOf() if (manufacturerData != null && manufacturerData.size() > 0) { - val companyId = manufacturerData.keyAt(0) - val payload = manufacturerData.get(companyId) - - rawData.add((companyId.toByte())) - rawData.add(((companyId.shr(Byte.SIZE_BITS)).toByte())) - rawData.addAll(2, payload.asList()) + var pos = 0 + for (i in 0 until manufacturerData.size()) { + val companyId = manufacturerData.keyAt(i) + val payload = manufacturerData.get(companyId) + rawData.add((companyId.toByte())) + rawData.add(((companyId.shr(Byte.SIZE_BITS)).toByte())) + pos += 2 + val list = payload.asList() + rawData.addAll(pos, list) + pos += list.size + } } return rawData.toByteArray() diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift index 95f2f9dc..ce2ae1e0 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift @@ -99,7 +99,8 @@ final class Central { ) self.centralManager = CBCentralManager( delegate: centralManagerDelegate, - queue: nil + queue: nil, + options: [CBCentralManagerOptionShowPowerAlertKey:false] ) }