From 1d05a7834361cfa6c4caec132363863974453f52 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 18 二月 2020 18:01:36 +0800
Subject: [PATCH] 删除无用文件；协议基类写死phone
---
/dev/null | 126 -------------------------------
app/src/main/java/safeluck/drive/evaluation/platformMessage/RegisterResp.java | 7 -
im_lib/src/main/java/com/safeluck/aykj/message/BinMessageBase.java | 1
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0001.java | 2
im_lib/src/main/java/com/safeluck/aykj/decoder/Int16Coder.java | 4
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 44 ----------
app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java | 3
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 10 --
8 files changed, 6 insertions(+), 191 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 50165f4..425303d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -28,15 +28,13 @@
import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.im.MessageProcessor;
-import safeluck.drive.evaluation.platformMessage.GainStuMessage;
-import safeluck.drive.evaluation.platformMessage.JKClientCommonMessage;
+import safeluck.drive.evaluation.platformMessage.JKMessage0001;
import safeluck.drive.evaluation.platformMessage.JKMessage0100;
import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.JKMessage0201;
import safeluck.drive.evaluation.platformMessage.JKMessage0202;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
-import safeluck.drive.evaluation.platformMessage.RegisterMessage;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
/**
@@ -137,48 +135,14 @@
//// }
-//
-// MessageProcessor.getInstance().sendMessage(sendEditText.getText().toString().trim());
-// sendEditText.getText().clear();
-
- //娓呴櫎app_status 琛�
-// OneTimeWorkRequest oneTimeWorkRequest = new OneTimeWorkRequest.Builder(AppStatusInitWork.class).build();
-// WorkManager.getInstance(_mActivity).enqueue(oneTimeWorkRequest);
-// RegisterMessage registerMessage = new RegisterMessage((short)0x802);
-// registerMessage.setCityid((short) 1);
-// registerMessage.setProviceId((short)23);
-// registerMessage.setImei("460123874561");
-// registerMessage.setModel("123");
-// registerMessage.setSn("2019101500000001");
-
-
-// GainStuMessage gainStuMessage = new GainStuMessage((short) 0x201);
-// gainStuMessage.setId("123456789");
-// gainStuMessage.setExamaCourse((short) 0);
-// MessageProcessor.getInstance().sendMessage(gainStuMessage.toBytes());
ByteUtil.str2Bcd("13021245");
String strbcd=ByteUtil.bcd2Str(ByteUtil.str2Bcd("13021245"));
Log.i(TAG, "onClick: strbcd="+strbcd);
-// JKMessage0100 jkRegisterMessage = new JKMessage0100();
-// jkRegisterMessage.phone = "0314200100000004";
-// jkRegisterMessage.proviceid = 23;
-// jkRegisterMessage.cityid = 1;
-// jkRegisterMessage.imei = "460123874561";
-// jkRegisterMessage.model = "123";
-// jkRegisterMessage.sn = "0314200100000004";
-//
-// Log.i(TAG, "onClick: msg len "+jkRegisterMessage.getMessageLen()+" "+ jkRegisterMessage.props.value);
-// byte[] str = jkRegisterMessage.toBytes();
-// MessageProcessor.getInstance().sendMessage(str);
-// Log.i(TAG, "onClick: "+ BytesUtils.bytesToHexString(str)+" ============");
- JKClientCommonMessage jkClientCommonMessage =new JKClientCommonMessage();
+ JKMessage0001 jkClientCommonMessage =new JKMessage0001();
jkClientCommonMessage.setMessageLen(5);
- jkClientCommonMessage.messageId = 0x8100;
- jkClientCommonMessage.protocalVer = 235;
-// jkClientCommonMessage.phone = "13021245";
jkClientCommonMessage.respMessageId = "8001";
jkClientCommonMessage.respNo = 15;
jkClientCommonMessage.result =1;
@@ -197,8 +161,6 @@
case R.id.btn_register:
JKMessage0100 jkRegisterMessage = new JKMessage0100();
-// jkRegisterMessage.setMessageLen(55);
- jkRegisterMessage.phone = "0314200100000004";
jkRegisterMessage.proviceid = 23;
jkRegisterMessage.cityid = 1;
jkRegisterMessage.imei = "460123874561";
@@ -212,7 +174,6 @@
break;
case R.id.btn_auth:
JKMessage0101 jkMessage0101 = new JKMessage0101();
- jkMessage0101.phone = "0314200100000004";
jkMessage0101.des ="0102030405060708";
jkMessage0101.timestamp = (int) System.currentTimeMillis();
byte[] jjk0101 = jkMessage0101.toBytes();
@@ -220,7 +181,6 @@
break;
case R.id.btn_gain:
JKMessage0201 jkMessage0201 = new JKMessage0201();
- jkMessage0201.phone = "0314200100000004";
jkMessage0201.currentExam = 1;
jkMessage0201.id = "123456789";
MessageProcessor.getInstance().sendMessage(jkMessage0201.toBytes());
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
index 419799d..9f03415 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -27,27 +27,19 @@
private MessageProcessor(){
messageEscaper = new MessageEscaper();
- messageManager = new MessageManager();
}
private static class MessageProcessorInstance{
private static final IMessageProcessor INSTANCE = new MessageProcessor();
}
MessageEscaper messageEscaper;
- MessageManager messageManager;
public static IMessageProcessor getInstance(){
return MessageProcessorInstance.INSTANCE;
}
@Override
public void receiveMsg(byte[] message) {
-// byte[] datas = Utils.parseMsg(message);
-// Log.i(TAG, "receiveMsg: "+ ByteUtil.byte2HexStr(datas));
-// byte checkcolde=Utils.calCheckCode(ByteUtil.subArray(datas,0,datas.length-1));
-// if (checkcolde == datas[datas.length-1]){
-// Log.i(TAG, "receiveMsg: 娑堟伅姝ｇ‘");
-// parseMessage(datas);
-// }
+
//鍙嶈浆涔�
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/AuthMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/AuthMessage.java
deleted file mode 100644
index 55123fd..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/AuthMessage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-import android.util.Log;
-
-import com.anyun.im_lib.util.ByteUtil;
-
-public class AuthMessage extends DriveExamProtocol {
-
- private static final String TAG = "AuthMessage";
- private static final int BODY_LENGTH = 12;
- private long timeStamp;
- private String hexStrPwd;
-
- public String getHexStrPwd() {
- return hexStrPwd;
- }
-
- public void setHexStrPwd(String hexStrPwd) {
- this.hexStrPwd = hexStrPwd;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param msg_id 娑堟伅ID
- */
- public AuthMessage(short msg_id) {
- super(msg_id);
- }
-
- @Override
- protected byte[] createMessageBody() {
- byte[] messageBody = new byte[BODY_LENGTH];
- int pos = 0;
- timeStamp = System.currentTimeMillis();
- Log.i(TAG, "createMessageBody: timeStamp="+timeStamp);
- byte[] timeStampBytes = ByteUtil.intGetBytes((int)timeStamp);
- System.arraycopy(timeStampBytes,0,messageBody,pos,timeStampBytes.length);
- pos+= 4;
- byte [] hexPwdBytes = ByteUtil.hexStr2Bytes(hexStrPwd);
- System.arraycopy(hexPwdBytes,0,messageBody,pos,hexPwdBytes.length);
- return messageBody;
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/ClientCommonRsp.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/ClientCommonRsp.java
deleted file mode 100644
index 8fc2cac..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/ClientCommonRsp.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-import com.anyun.im_lib.util.ByteUtil;
-
-public class ClientCommonRsp extends DriveExamProtocol {
- private static final int BODY_LENGTH = 5;
-
- private short result;//缁撴灉
- private short msgId;//瀵瑰簲鐨勬湇鍔″櫒绔秷鎭痠d
- private short msg_serial;//鏈嶅姟鍣ㄦ秷鎭粰鐨勬祦姘村彿
-
- private int curPos = 0;
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- *
- */
- public ClientCommonRsp() {
- super((short) 0x0001);
- }
-
- @Override
- protected byte[] createMessageBody() {
- byte[] messageBody = new byte[BODY_LENGTH];
- byte[] msg_serialBytes= ByteUtil.shortGetBytes(msg_serial);
- byte[] msgidBytes = ByteUtil.shortGetBytes(msgId);
- System.arraycopy(msg_serialBytes,0,messageBody,curPos,2);
- curPos += 2;
- System.arraycopy(msgidBytes,0,messageBody,curPos,2);
- curPos += 2;
- System.arraycopy(ByteUtil.shortGetByte(result),0,messageBody,curPos,1);
- return messageBody;
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-
- public short getResult() {
- return result;
- }
-
- public void setResult(short result) {
- this.result = result;
- }
-
- public short getMsgId() {
- return msgId;
- }
-
- public void setMsgId(short msgId) {
- this.msgId = msgId;
- }
-
- public short getMsg_serial() {
- return msg_serial;
- }
-
- public void setMsg_serial(short msg_serial) {
- this.msg_serial = msg_serial;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/GainStuMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/GainStuMessage.java
deleted file mode 100644
index e40f0e0..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/GainStuMessage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-import android.text.TextUtils;
-
-import com.anyun.im_lib.util.ByteUtil;
-
-/**
- * 鑾峰彇瀛﹀憳淇℃伅娑堟伅锛堝彂閫佽韩浠借瘉ID涓婂幓缁欏钩鍙帮級
- * MyApplication2
- * Created by lzw on 2019/12/19. 18:26:35
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-public class GainStuMessage extends DriveExamProtocol {
-
- private static final int BODY_LENGTH = 17;
-
- private String id;//鍗D
- private short examaCourse = 0;
-
- public GainStuMessage(short msg_id) {
- super(msg_id);
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-
- @Override
- protected byte[] createMessageBody() {
- int pos = 0;
- byte[] messageBody = new byte[BODY_LENGTH];
- byte[] idBytes = !TextUtils.isEmpty(id)?id.getBytes():"".getBytes();
- System.arraycopy(idBytes,0,messageBody,pos,idBytes.length);
- pos+= 16;
- byte[] examBytes = ByteUtil.shortGetByte(examaCourse);
- System.arraycopy(examBytes,0,messageBody,pos,examBytes.length);
-
- return messageBody;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public short getExamaCourse() {
- return examaCourse;
- }
-
- public void setExamaCourse(short examaCourse) {
- this.examaCourse = examaCourse;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
index a8d061d..f10dc01 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
@@ -71,7 +71,6 @@
{
message_head_len+=4;
}
-// int len1 = this.getMessageLen();
int len2 = hex.length()/2-message_head_len;
this.setMessageLen(len2);
//璁＄畻鏍￠獙
@@ -97,7 +96,7 @@
public BitState props = new BitState((short) 0);
@Order(5)
@Phone
- public String phone;
+ public String phone="0314200100000004";
@Order(6)
@Int16
public int messageNo;
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKClientCommonMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0001.java
similarity index 89%
rename from app/src/main/java/safeluck/drive/evaluation/platformMessage/JKClientCommonMessage.java
rename to app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0001.java
index 007b2fc..94bee4d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKClientCommonMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0001.java
@@ -6,7 +6,7 @@
import com.safeluck.aykj.annotation.Length;
import com.safeluck.aykj.annotation.Order;
-public class JKClientCommonMessage extends JK2019MessageBase {
+public class JKMessage0001 extends JK2019MessageBase {
public static int SUCCESS=0;
public static int FAIL=1;
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/RegisterResp.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/RegisterResp.java
index 9651609..e110507 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/RegisterResp.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/RegisterResp.java
@@ -21,13 +21,6 @@
result = ByteUtil.getShort(ByteUtil.subArray(msgbodyData,currPos,1));
if (result == PlatFormConstant.SUCCESS){
MyLog.i(PlatFormConstant.TAG,"璁惧娉ㄥ唽鎴愬姛");
- AuthMessage authMessage = new AuthMessage((short) 0x101);
-
- currPos +=1;
- hexpwd = ByteUtil.byte2HexStr(ByteUtil.subArray(msgbodyData,currPos,msgBodyLength-3));
- MyLog.i(PlatFormConstant.TAG,"des pwd:"+hexpwd);
- authMessage.setHexStrPwd(hexpwd);
- MessageProcessor.getInstance().sendMessage(authMessage.toBytes());
}else{
MyLog.i(PlatFormConstant.TAG,"璁惧娉ㄥ唽澶辫触");
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExam2Server.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExam2Server.java
deleted file mode 100644
index 91341cd..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExam2Server.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-import android.text.TextUtils;
-
-import com.anyun.im_lib.util.ByteUtil;
-
-/**
- * 涓婃姤寮�濮嬭�冭瘯
- */
-public class StartExam2Server extends DriveExamProtocol {
- private static final short BODY_LENGTH = 29;
-
- private String ID;//韬唤璇�
- private String BCDStr;//鏃堕棿BCD[6] YYMMDDhhmmss
- private int exam_id;// DWORD 4瀛楄妭 鍞竴鑰冭瘯ID鏍囧織
- private short examaCourse = 0;
- private int currPos = 0;
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param msg_id 娑堟伅ID
- */
- public StartExam2Server(short msg_id) {
- super(msg_id);
- }
-
- @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[] examBytes = ByteUtil.shortGetByte(examaCourse);
-
- 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(examBytes,0,messageBody,currPos,examBytes.length);
- return messageBody;
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-
- public String getID() {
- return ID;
- }
-
- public void setID(String ID) {
- this.ID = ID;
- }
-
- public String getBCDStr() {
- return BCDStr;
- }
-
- public void setBCDStr(String BCDStr) {
- this.BCDStr = BCDStr;
- }
-
- public int getExam_id() {
- return exam_id;
- }
-
- public void setExam_id(int exam_id) {
- this.exam_id = exam_id;
- }
-
- public short getExamaCourse() {
- return examaCourse;
- }
-
- public void setExamaCourse(short examaCourse) {
- this.examaCourse = examaCourse;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java
deleted file mode 100644
index 176e7db..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-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 = 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;
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param msg_id 娑堟伅ID
- */
- public StopExamMessage(short msg_id) {
- super(msg_id);
- }
-
- @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;
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StuInfoResp.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/StuInfoResp.java
deleted file mode 100644
index 679b0a9..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/StuInfoResp.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-import com.anyun.exam.lib.MyLog;
-import com.anyun.im_lib.util.ByteUtil;
-
-public class StuInfoResp extends ServerProtocol {
-
- private int currPos = 0;
-
- private short result;
- private String ID;//韬唤璇佸彿鐮�
- private String name;//濮撳悕
- private String url;
-
- public StuInfoResp(byte[] rspBytes) {
- super(rspBytes);
- }
-
- @Override
- protected void parseMsgBody(byte[] msgbodyData) {
- result = ByteUtil.getShort(ByteUtil.subArray(msgbodyData,currPos,1));
- currPos +=1;
- MyLog.i(PlatFormConstant.TAG,"鑰冭瘯浜哄憳淇℃伅搴旂瓟锛�"+result);
- if (result == PlatFormConstant.STU_INFO_SUCC){
- ID = ByteUtil.getString(ByteUtil.subArray(msgbodyData,currPos,18));
- currPos+=18;
- name = ByteUtil.getString(ByteUtil.subArray(msgbodyData,currPos,20));
- currPos+=20;
-
- url = ByteUtil.getString(ByteUtil.subArray(msgbodyData,currPos,msgBodyLength-currPos));
-
- MyLog.i(PlatFormConstant.TAG,"韬唤璇侊細"+ID);
- MyLog.i(PlatFormConstant.TAG,"澶村儚url锛�"+url);
- MyLog.i(PlatFormConstant.TAG,"濮撳悕锛�"+name);
-
- }
-
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadPosMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadPosMessage.java
deleted file mode 100644
index da92e22..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadPosMessage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-/**
- * 浣嶇疆涓婃姤
- */
-public class UploadPosMessage extends DriveExamProtocol {
- private static final short BODY_LENGTH = 29;
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param msg_id 娑堟伅ID
- */
- public UploadPosMessage(short msg_id) {
- super(msg_id);
- }
-
- @Override
- protected byte[] createMessageBody() {
- byte [] messageBody = new byte[BODY_LENGTH];
- return messageBody;
- }
-
- @Override
- protected short msgBodyLength() {
- return BODY_LENGTH;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java
deleted file mode 100644
index 980352e..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package safeluck.drive.evaluation.platformMessage;
-
-import android.text.TextUtils;
-
-import com.anyun.im_lib.util.ByteUtil;
-
-
-/**
- * 涓婃姤瀛﹀憳鍗曢」鎵ｅ垎椤圭洰
- */
-public class UploadStuItem extends DriveExamProtocol {
- private static final short BODY_LENGTH = 30;
-
- private short reasonLength = 0;
- private int currPos = 0;
-
- private String ID;//韬唤璇�
- private String BCDStr;//鏃堕棿BCD[6] YYMMDDhhmmss
- private int exam_id;// DWORD 4瀛楄妭 鍞竴鑰冭瘯ID鏍囧織
- private short fail_item_id;//鎵ｅ垎椤圭洰缂栧彿 1瀛楄妭
- private short score;//鎵ｅ垎鍒嗘暟 涓�瀛楄妭
- private String reason;//鎵ｅ垎鍘熷洜
-
- public String getID() {
- return ID;
- }
-
- public void setID(String ID) {
- this.ID = ID;
- }
-
-
-
- public int getExam_id() {
- return exam_id;
- }
-
- public void setExam_id(int exam_id) {
- this.exam_id = exam_id;
- }
-
- public short getFail_item_id() {
- return fail_item_id;
- }
-
- public void setFail_item_id(short fail_item_id) {
- this.fail_item_id = fail_item_id;
- }
-
- public short getScore() {
- return score;
- }
-
- public void setScore(short score) {
- this.score = score;
- }
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public String getBCDStr() {
- return BCDStr;
- }
-
- /**
- * 璁剧疆鏃堕棿
- * 褰㈠"200217020618"瀛楃涓�
- * @param BCDStr
- */
- public void setBCDStr(String BCDStr) {
- this.BCDStr = BCDStr;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param msg_id 娑堟伅ID
- */
- public UploadStuItem(short msg_id) {
- super(msg_id);
- }
-
- @Override
- protected byte[] createMessageBody() {
- byte [] messageBody = new byte[BODY_LENGTH+reasonLength];
- byte[] idBytes = !TextUtils.isEmpty(ID)?ID.getBytes():"".getBytes();
- byte[] timeStampBCD = ByteUtil.str2Bcd(BCDStr);
- byte[] examIdBytes = ByteUtil.intGetBytes(exam_id);
- byte[] fail_item_idBytes = ByteUtil.shortGetByte(fail_item_id);
- byte[] score_bytes = ByteUtil.shortGetByte(score);
- byte[] reasonBytes = !TextUtils.isEmpty(reason)?reason.getBytes():"".getBytes();
-
- reasonLength = (short) reasonBytes.length;
-
- 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(fail_item_idBytes,0,messageBody,currPos,fail_item_idBytes.length);
- currPos += 1;
-
- System.arraycopy(score_bytes,0,messageBody,currPos,score_bytes.length);
- currPos += 1;
-
- System.arraycopy(reasonBytes,0,messageBody,currPos,reasonLength);
-
-
-
- return messageBody;
- }
-
- @Override
- protected short msgBodyLength() {
- return (short) (BODY_LENGTH+reasonLength);
- }
-}
diff --git a/im_lib/src/main/java/com/safeluck/aykj/decoder/Int16Coder.java b/im_lib/src/main/java/com/safeluck/aykj/decoder/Int16Coder.java
index 3675d30..51beaa0 100644
--- a/im_lib/src/main/java/com/safeluck/aykj/decoder/Int16Coder.java
+++ b/im_lib/src/main/java/com/safeluck/aykj/decoder/Int16Coder.java
@@ -3,9 +3,7 @@
import com.safeluck.aykj.annotation.Int16;
import com.safeluck.aykj.utils.BytesUtils;
-/**
- * Created by zhouwei on 2016/12/1.
- */
+
public class Int16Coder extends BaseDecoder<Integer> {
public static Int16Coder instance = new Int16Coder();
diff --git a/im_lib/src/main/java/com/safeluck/aykj/message/BinMessageBase.java b/im_lib/src/main/java/com/safeluck/aykj/message/BinMessageBase.java
index 5fca7e5..84be1d7 100644
--- a/im_lib/src/main/java/com/safeluck/aykj/message/BinMessageBase.java
+++ b/im_lib/src/main/java/com/safeluck/aykj/message/BinMessageBase.java
@@ -238,7 +238,6 @@
{
Field[] fields = this.getClass().getFields();
List<FieldDefine> fieldDefineList = new ArrayList<>();
-// int sort = 0;
List<Class> baseClassList = new ArrayList<>();
for (Field field:fields)
{
--
Gitblit v1.8.0