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()); 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); // } //反转义 app/src/main/java/safeluck/drive/evaluation/platformMessage/AuthMessage.java
File was deleted app/src/main/java/safeluck/drive/evaluation/platformMessage/ClientCommonRsp.java
File was deleted app/src/main/java/safeluck/drive/evaluation/platformMessage/GainStuMessage.java
File was deleted 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; app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0001.java
File was renamed from app/src/main/java/safeluck/drive/evaluation/platformMessage/JKClientCommonMessage.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; 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,"设备注册失败"); } app/src/main/java/safeluck/drive/evaluation/platformMessage/StartExam2Server.java
File was deleted app/src/main/java/safeluck/drive/evaluation/platformMessage/StopExamMessage.java
File was deleted app/src/main/java/safeluck/drive/evaluation/platformMessage/StuInfoResp.java
File was deleted app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadPosMessage.java
File was deleted app/src/main/java/safeluck/drive/evaluation/platformMessage/UploadStuItem.java
File was deleted 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(); 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) {
