From c9a3c06b37b5b2eb9b02d4e6348e5c53145284d9 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 16 九月 2019 17:40:20 +0800 Subject: [PATCH] 1. 添加注释 2. 添加粘包分包解码器 3. 修改数据单元信息体获取逻辑 4. 修改接收数据转换后的string列表,展示为16进制数时,小于16的应该在前面补0,否则之后计算会出错 --- src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt b/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt index 3acf5e8..e1067f6 100644 --- a/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt +++ b/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt @@ -123,13 +123,15 @@ override fun getDataListByDataType(list: List<String>): MutableList<String> { if (list.isEmpty()) return mutableListOf() + //fixme 2019.9.16 涓嶇绗竴浣嶇殑淇℃伅绫诲瀷鏍囧織鏄惁姝g‘锛岃嚦灏戣繑鍥炰竴涓�硷紝姝ゆ柟娉曞湪淇℃伅浣撶粨鏋勬病鏈変弗鏍兼寜鐓ф爣鍑嗭紝 + //fixme 鍗冲湪鍚庝竴涓俊鎭被鍨嬫爣蹇楀拰鍓嶄竴涓俊鎭綋涔嬮棿鏈夋棤鏁堝瓧绗︽椂锛岃兘澶熷皢鍏跺拷鐣ワ紝浣嗕笉纭畾杩欑澶勭悊鏂瑰紡鏄惁姝g‘鍜屽繀瑕� val resultList = mutableListOf<String>().apply { - //娣诲姞 淇℃伅绫诲瀷鏍囧織 add(list[0]) } when (list[0].toIntOrNull(16)) { ObdDataType.ObdData.value -> { + //浠庤捣濮嬪瓧鑺� 1 寮�濮嬶紝鍥哄畾鏈�97涓瓧鑺傜殑鏁版嵁 for (i in 1..96) { resultList.add(list[i]) @@ -144,12 +146,14 @@ } } ObdDataType.EngineDataFlow.value -> { + //浠庤捣濮嬪瓧鑺� 1 寮�濮嬶紝鍥哄畾鏈�37涓瓧鑺傜殑鏁版嵁 for (i in 1..37) { resultList.add(list[i]) } } ObdDataType.SupplementDataFlow.value -> { + //浠庤捣濮嬪瓧鑺� 1 寮�濮嬶紝鍥哄畾鏈�17涓瓧鑺傜殑鏁版嵁 for (i in 1..17) { resultList.add(list[i]) -- Gitblit v1.9.3