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/bean/ObdPackageData.kt | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/obd/socket/bean/ObdPackageData.kt b/src/main/kotlin/com/flightfeather/obd/socket/bean/ObdPackageData.kt index 838a048..f6b5466 100644 --- a/src/main/kotlin/com/flightfeather/obd/socket/bean/ObdPackageData.kt +++ b/src/main/kotlin/com/flightfeather/obd/socket/bean/ObdPackageData.kt @@ -1,16 +1,40 @@ package com.flightfeather.obd.socket.bean +import com.flightfeather.obd.socket.eunm.ObdCommandUnit + /** * @author riku * Date: 2019/9/12 + * 鏁版嵁鍖呯粨鏋� + * + * 璧峰瀛楄妭 瀹氫箟 鏁版嵁绫诲瀷 鎻忚堪鍙婅姹� + * 0 璧峰绗� STRING 鍥哄畾涓� ASCII 瀛楃鈥�##鈥欙紝鐢ㄢ��0x23锛�0x23鈥濊〃绀� + * 2 鍛戒护鍗曞厓 BYTE 鍛戒护鍗曞厓瀹氫箟 @see [ObdCommandUnit] + * 3 杞﹁締璇嗗埆鍙� STRING 杞﹁締璇嗗埆鐮佹槸璇嗗埆鐨勫敮涓�鏍囪瘑锛岀敱 17 浣嶅瓧鐮佺粍鎴愶紝瀛楃爜搴旂鍚� GB16735 涓� 4.5 鐨勮瀹� + * 20 缁堢杞欢鐗堟湰鍙� BYTE 缁堢杞欢鐗堟湰鍙锋湁鏁堝�艰寖鍥� 0~255 + * 21 鏁版嵁鍔犲瘑鏂瑰紡 BYTE 0x01锛氭暟鎹笉鍔犲瘑锛� + * 0x02锛氭暟鎹粡杩� RSA 绠楁硶鍔犲瘑锛� + * 0x03锛氭暟鎹粡杩囧浗瀵� SM2 绠楁硶鍔犲瘑锛� + * 鈥�0xFE鈥濇爣璇嗗紓甯革紝鈥�0xFF鈥濊〃绀烘棤鏁堬紝鍏朵粬棰勭暀 + * 22 鏁版嵁鍗曞厓闀垮害 WORD 鏁版嵁鍗曞厓闀垮害鏄暟鎹崟鍏冪殑鎬诲瓧鑺傛暟锛屾湁鏁堣寖鍥达細0~65531 + * 24 鏁版嵁鍗曞厓 瑙佹暟鎹崟鍏冩牸寮忓拰瀹氫箟 @see [DataUnit] + * 鍊掓暟绗� 1 鏍¢獙鐮� BYTE 閲囩敤 BCC锛堝紓鎴栨牎楠岋級娉曪紝鏍¢獙鑼冨洿鑱槑鏄熷崟鍏冪殑绗竴涓瓧鑺傚紑濮嬶紝鍚屽悗涓�涓瓧鑺傚紓鎴栵紝鐩村埌鏍¢獙鐮佸墠涓�瀛楄妭涓烘锛屾牎楠岀爜鍗犵敤涓�涓瓧鑺� */ data class ObdPackageData constructor( + //璧峰绗� var head: String? = null, + //鍛戒护鍗曞厓 var commandUnit: Int? = null, - var vinCode: String? = null, + //杞﹁締璇嗗埆鍙�(鎸噊bd鏁版嵁閲囬泦璁惧鐨勭紪鍙�) + var deviceCode: String? = null, + //缁堢杞欢鐗堟湰鍙� var softwareVersion: Int? = null, + //鏁版嵁鍔犲瘑鏂瑰紡 var encryptionWay: Int? = null, + //鏁版嵁鍗曞厓闀垮害 var dataLength: Int? = null, + //鏁版嵁鍗曞厓 var dataUnit: List<DataUnit>, + //鏍¢獙鐮� var checkCode: Int? = null ) \ No newline at end of file -- Gitblit v1.9.3