diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index ab65262..49bb04a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -9,7 +9,7 @@ //ByteArray转设备编号 fun ByteArray.toDeviceCode(): String { /** - * [51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] + * [51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10, -86, 0, 0, 10, -10, 1] * * 51是数据标头 * 13,10是数据结束位 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index ab65262..49bb04a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -9,7 +9,7 @@ //ByteArray转设备编号 fun ByteArray.toDeviceCode(): String { /** - * [51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] + * [51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10, -86, 0, 0, 10, -10, 1] * * 51是数据标头 * 13,10是数据结束位 diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 77da8b0..91cd394 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -518,7 +518,7 @@ * * */ private fun parseMethaneData(bytes: ByteArray) { - if ((bytes[0].toInt() and 0xFF) == 51 && bytes.size == 14) { + if ((bytes[0].toInt() and 0xFF) == 51 && bytes.size >= 14) { //解析deviceCode //[51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] homeView.deviceStatusView.text = "设备编号: ${bytes.toDeviceCode()}" diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index ab65262..49bb04a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -9,7 +9,7 @@ //ByteArray转设备编号 fun ByteArray.toDeviceCode(): String { /** - * [51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] + * [51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10, -86, 0, 0, 10, -10, 1] * * 51是数据标头 * 13,10是数据结束位 diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 77da8b0..91cd394 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -518,7 +518,7 @@ * * */ private fun parseMethaneData(bytes: ByteArray) { - if ((bytes[0].toInt() and 0xFF) == 51 && bytes.size == 14) { + if ((bytes[0].toInt() and 0xFF) == 51 && bytes.size >= 14) { //解析deviceCode //[51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] homeView.deviceStatusView.text = "设备编号: ${bytes.toDeviceCode()}" diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index b76b3a8..81ffffd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -491,7 +491,7 @@ * * */ private fun parseMethaneData(bytes: ByteArray) { - if ((bytes[0].toInt() and 0xFF) == 51 && bytes.size == 14) { + if ((bytes[0].toInt() and 0xFF) == 51 && bytes.size >= 14) { //解析deviceCode //[51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] homeView.deviceStatusView.text = "设备编号: ${bytes.toDeviceCode()}"