From b3b6a944ac3f8279a04f496bc2c4533a92555a71 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 17 二月 2020 15:05:03 +0800
Subject: [PATCH] 1.删除无用消息 2.完成结束考试协议
---
/dev/null | 34 -----------------
im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java | 8 ++++
app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java | 36 +++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java | 1
4 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExamMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExamMessage.java
deleted file mode 100644
index d08cdef..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExamMessage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-/**
- * 缁欏钩鍙板彂閫佸紑濮嬭�冭瘯娑堟伅
- * MyApplication2
- * Created by lzw on 2019/12/19. 18:28:47
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-public class StartExamMessage extends DriveExamProtocol {
-
-
-
- private static final int BODY_LENGTH = 0;
-// TODO: 2019/12/19
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param msg_id 娑堟伅ID
- */
- public StartExamMessage(short msg_id) {
- super(msg_id);
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-
- @Override
- protected byte[] createMessageBody() {
- return new byte[BODY_LENGTH];
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java
index 5fef4d0..176e7db 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java
@@ -1,10 +1,22 @@
package safeluck.drive.evaluation.platformMessage;
+import android.text.TextUtils;
+
+import com.anyun.im_lib.util.ByteUtil;
+
/**
* 涓婃姤缁撴潫鑰冭瘯
*/
public class StopExamMessage extends DriveExamProtocol {
- private static final short BODY_LENGTH = 29;
+ private static final short BODY_LENGTH = 30;
+
+ private int currPos = 0;
+
+ private String ID;//韬唤璇�
+ private String BCDStr;//鏃堕棿BCD[6] YYMMDDhhmmss
+ private int exam_id;// DWORD 4瀛楄妭 鍞竴鑰冭瘯ID鏍囧織
+ private short score;//鎵ｅ垎鍒嗘暟 涓�瀛楄妭
+ private short reasonType;
/**
* 鏋勯�犲嚱鏁�
@@ -18,6 +30,28 @@
@Override
protected byte[] createMessageBody() {
byte [] messageBody = new byte[BODY_LENGTH];
+ byte[] idBytes = !TextUtils.isEmpty(ID)?ID.getBytes():"".getBytes();
+ byte[] timeStampBCD = ByteUtil.str2Bcd(BCDStr);
+ byte[] examIdBytes = ByteUtil.intGetBytes(exam_id);
+ byte[] score_bytes = ByteUtil.shortGetByte(score);
+ byte[] reason_bytes = ByteUtil.shortGetByte(reasonType);
+
+
+
+ System.arraycopy(idBytes,0,messageBody,currPos,idBytes.length);
+ currPos += 18;
+
+ System.arraycopy(timeStampBCD,0,messageBody,currPos,timeStampBCD.length);
+ currPos += timeStampBCD.length;
+
+ System.arraycopy(examIdBytes,0,messageBody,currPos,examIdBytes.length);
+ currPos += 4;
+
+ System.arraycopy(score_bytes,0,messageBody,currPos,1);
+ currPos += 1;
+
+ System.arraycopy(reason_bytes,0,messageBody,currPos,1);
+
return messageBody;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java
index c24e80b..980352e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java
@@ -4,7 +4,6 @@
import com.anyun.im_lib.util.ByteUtil;
-import java.text.SimpleDateFormat;
/**
* 涓婃姤瀛﹀憳鍗曢」鎵ｅ垎椤圭洰
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 d871bef..3e45dd5 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
@@ -7,6 +7,7 @@
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
+import java.text.SimpleDateFormat;
/**
* MyApplication2
@@ -237,6 +238,13 @@
short aShort= getShort(bytes);
System.out.println(aShort);
+
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyMMddhhmmss");
+ String time = sdf.format(System.currentTimeMillis());
+ byte[] timeStampBCD = ByteUtil.str2Bcd(time);
+
+
}
public static byte[] subArray(byte[] srcBytes, int begin, int length) {
--
Gitblit v1.8.0