From f4af8ca307ea8b01a465ff09b595d75ddc3d7394 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 13 二月 2020 20:53:53 +0800
Subject: [PATCH] 协议校验码的计算；消息转义方法封装
---
im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java | 10 ++++
app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java | 14 ++++--
app/src/main/java/safeluck/drive/evaluation/util/Utils.java | 49 ++++++++++++++++++++++++
3 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java b/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java
index 06af76c..5bbf99a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java
@@ -2,7 +2,10 @@
import android.util.Log;
+import com.anyun.exam.lib.MyLog;
import com.anyun.im_lib.util.ByteUtil;
+
+import safeluck.drive.evaluation.util.Utils;
/**
* MyApplication2
@@ -117,16 +120,17 @@
pos+=messageBodyBytes.length;
//鏍￠獙鐮�
- // TODO: 2019/12/18 鏍￠獙鐮侀渶瑕佽绠� 杩樻湁杞箟闇�瑕佸鐞�
+ checkCode = Utils.calCheckCode(ByteUtil.subArray(desBytes,1,pos-1));
desBytes[pos] = checkCode;
pos++;
//鏈熬缁撴潫鏍囪瘑浣�
desBytes[pos] = MESSAGE_TAIL;
- Log.i(TAG, "鍖呴暱搴�="+(pos+1));
- Log.i(TAG, "鍖呭唴瀹�: "+ByteUtil.byte2HexStr(desBytes));
-
- return desBytes;
+ MyLog.i(TAG, "鍘熷鍖呴暱搴�="+(pos+1));
+ MyLog.i(TAG, "鍘熷鍖呭唴瀹�: "+ByteUtil.byte2HexStr(desBytes));
+ byte[] tranferbytes = Utils.transferMeaning(desBytes);
+ MyLog.i(TAG,"杞箟鍚庣殑鍖呭唴瀹癸細"+ByteUtil.byte2HexStr(tranferbytes));
+ return tranferbytes;
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
index cad654f..e5bf8e6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
@@ -1,7 +1,11 @@
package safeluck.drive.evaluation.util;
import android.content.res.Resources;
+import android.util.Log;
import android.util.TypedValue;
+
+import com.anyun.exam.lib.MyLog;
+import com.anyun.exam.lib.util.ByteUtil;
/**
* MyApplication2
@@ -10,6 +14,7 @@
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
public class Utils {
+ private static final String TAG = "Utils";
public static float px2dp(float value){
return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,value, Resources.getSystem().getDisplayMetrics());
}
@@ -22,4 +27,48 @@
public static float dp2Px(int dpValue){
return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,dpValue,Resources.getSystem().getDisplayMetrics());
}
+
+ /**
+ * 骞冲彴鍗忚鐢熸垚鐨勬牎楠岀爜
+ * @param bytes
+ * @return
+ */
+
+ public static byte calCheckCode(byte[] bytes){
+ byte checkCode =0;
+ //銆�鍙備笌杩愮畻鐨勪袱涓�硷紝濡傛灉涓や釜鐩稿簲bit浣嶇浉鍚岋紝鍒欑粨鏋滀负0锛屽惁鍒欎负1銆�
+ for (int i = 0; i < bytes.length; i++) {
+ checkCode ^= bytes[i];
+ }
+
+ return checkCode;
+ }
+
+ /**
+ * 杞箟
+ * 閲囩敤Ox7e琛ㄧず锛岃嫢鏍￠獙鐮併�佹秷鎭ご浠ュ強娑堟伅浣撲腑鍑虹幇0x7e锛屽垯瑕佽繘琛岃浆涔夊鐞嗭紝杞箟瑙勫垯瀹氫箟濡備笅:
+ * 0x7e<鈥斺��>0x7d鍚庣揣璺熶竴涓�0x02锛�
+ * 0x7d<鈥斺��>0x7d鍚庣揣璺熶竴涓�0x01銆�
+ * @param datas
+ * @return
+ */
+ public static byte[] transferMeaning(byte[] datas){
+ byte [] temp = new byte[datas.length*2];
+ int y = 0;
+ temp[y++] = 0x7e;
+ for (int i = 1; i < datas.length-1; i++) {
+ if (datas[i] == 0x7E) {
+ temp[y++] = 0x7D;
+ temp[y++] = 0x02;
+ } else if (datas[i] == 0x7D) {
+ temp[y++] = 0x7D;
+ temp[y++] = 0x01;
+ } else {
+ temp[y++] = datas[i];
+ }
+ }
+ temp[y++] = 0x7e;
+ Log.i(TAG,"杞箟杩囧悗锛�"+ ByteUtil.byte2hex(temp));
+ return temp;
+ }
}
diff --git a/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java b/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java
index 7c93921..6b0fb24 100644
--- a/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java
+++ b/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java
@@ -1,6 +1,7 @@
package com.anyun.im_lib.util;
import android.text.TextUtils;
+import android.util.Log;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
@@ -15,7 +16,7 @@
*/
public class ByteUtil {
-
+private static final String TAG = "ByteUtil";
/**
* @鍔熻兘: BCD鐮佽浆涓�10杩涘埗涓�(闃挎媺浼暟鎹�)
* @鍙傛暟: BCD鐮�
@@ -69,6 +70,7 @@
byte b = (byte) a;
bbt[p] = b;
}
+ Log.i(TAG, "str2Bcd: "+byte2HexStr(bbt));
return bbt;
}
@@ -206,4 +208,10 @@
System.out.println(byte2HexStr(shortGetBytes((short) b)));
}
+ public static byte[] subArray(byte[] srcBytes, int begin, int length) {
+ byte[] bytes = new byte[length];
+ System.arraycopy(srcBytes,begin,bytes,0,length);
+ Log.i(TAG, "subArray: "+byte2HexStr(bytes));
+ return bytes;
+ }
}
--
Gitblit v1.8.0