~yy/smart_train.git

parent: 78fe2825 | 补丁 | 提交 | ignore whitespace

修改0202（开始考试） 0203（评判消息） 0204（结束考试平台协议（去掉身份证字段）

lizhanwei

2020-04-10 2f7e9461424d815b3aaabe27a17eade8198b2bf4

修改0202（开始考试） 0203（评判消息）  0204（结束考试 平台协议（去掉身份证字段）

1个文件已删除

7个文件已修改

	app/src/main/java/safeluck/drive/evaluation/app.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt	179 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/safeluck/drive/evaluation/app.java

@@ -35,53 +35,32 @@
import org.json.JSONException;
import org.json.JSONObject;

import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.Random;

import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusWoker;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
import safeluck.drive.evaluation.DB.failitems.LuKaoFailedProj;
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigUpdateWorker;
import safeluck.drive.evaluation.DB.rtktb.RTKWorkRepository;
import safeluck.drive.evaluation.bean.ExamMap;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.cEventCenter.CEvent;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.httpmodule.HttpRequetBean;
import safeluck.drive.evaluation.httpmodule.RetrofitCreator;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
import safeluck.drive.evaluation.im.IMSConnectStatusListener;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.AttachInfo;
import safeluck.drive.evaluation.platformMessage.JKMessage0100;
import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0206;
import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.SystemUtil;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.TimeViewModel;
import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
import safeluck.drive.evaluation.worker.TTSWorker;

/**
 * MyApplication2
@@ -92,9 +71,6 @@
public class app extends Application implements IAYExamListener  {

    private static final String TAG = "app";
    private Gson gson;
    RTKConfig rtkConfig;
    Random random = new Random();
    private static Context appContext=null;
    @Override
    public void onCreate() {

 app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java

@@ -618,11 +618,11 @@
                        wokViewModel.updateBeginTime(date.getTime());
                        jkMessage0202.timeBCD = date;
                        ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
                        jkMessage0202.ID = ExamPlatformData.getInstance().getID();

                        jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();

                        jkMessage0202.curr_exam = 0;
                        jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
                        MessageProcessor.getInstance().sendMessage(jkMessage0202);
                    }

@@ -639,11 +639,11 @@
                        wokViewModel.updateBeginTime(date.getTime());
                        jkMessage0202.timeBCD = date;
                        ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
                        jkMessage0202.ID = ExamPlatformData.getInstance().getID();

                        jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();

                        jkMessage0202.curr_exam = 1;
                        jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
                        MessageProcessor.getInstance().sendMessage(jkMessage0202);

                    }
@@ -711,7 +711,6 @@
        jkMessage0204.timeBCD = new Date();
        jkMessage0204.score = currTotalScore<0?0:currTotalScore;
        jkMessage0204.stop = JKMessage0204.SUCC_STOP;
        jkMessage0204.ID = ExamPlatformData.getInstance().getID();
        jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
        MessageProcessor.getInstance().sendMessage(jkMessage0204);
        //设置模式为NONE 0

 app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java

@@ -265,8 +265,8 @@
                JKMessage0202 jkMessage0202 = new JKMessage0202();
                jkMessage0202.timeBCD = new Date();
                jkMessage0202.curr_exam = 1;
                jkMessage0202.ID = "123456789";
                jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
                jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
                MessageProcessor.getInstance().sendMessage(jkMessage0202);
                break;
            case R.id.btn_fail:
@@ -275,7 +275,6 @@
                jkMessage0203.fail_item_id = 4;
                jkMessage0203.fail_score = 10;
                jkMessage0203.fail_reason = "发动机启动后，不及时松开启动开关";
                jkMessage0203.ID = "123456789";
                jkMessage0203.exam_id = 123456;
                MessageProcessor.getInstance().sendMessage(jkMessage0203);
                break;
@@ -309,7 +308,6 @@
                jkMessage0204.timeBCD = new Date();
                jkMessage0204.score = 10;
                jkMessage0204.stop = JKMessage0204.SUCC_STOP;
                jkMessage0204.ID = "123456789";
                jkMessage0204.exam_id = 123456;
                MessageProcessor.getInstance().sendMessage(jkMessage0204);
                break;

 app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java

@@ -598,7 +598,6 @@
                wokViewModel.updateBeginTime(date.getTime());
                jkMessage0202.timeBCD = date;
                ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
                jkMessage0202.ID = ExamPlatformData.getInstance().getID();
                if (myDialogFragment == null){
                    myDialogFragment = new MyDialogFragment();
                }
@@ -608,14 +607,14 @@
                    public void changKao() {

                        exam_type = 2;
                        ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
                        ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//设置为训练模式
                        ExamPlatformData.getInstance().setExamType(exam_type);
                        examStatusViewModel.updateStartExam(exam_type);
                        sendExamJson(1,exam_type);
                        ExamPlatformData.getInstance().getTTS().speak("开始训练");
                        jkMessage0202.curr_exam = 0;

                        ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//设置为训练模式
                        jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;

                        MessageProcessor.getInstance().sendMessage(jkMessage0202);
                    }
@@ -629,7 +628,7 @@
                        sendExamJson(1,exam_type);
                        ExamPlatformData.getInstance().getTTS().speak("开始训练");
                        jkMessage0202.curr_exam = 1;

                        jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
                        MessageProcessor.getInstance().sendMessage(jkMessage0202);



 app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java

@@ -6,36 +6,46 @@

public class JKMessage0202 extends JK2019MessageBase {


    @Order(1)
    @Length(18)
    @Ascii
    public String ID;
    @Order(2)
    @BcdDateTime
    public Date timeBCD;
    @Order(3)
    @Order(2)
    @Int32
    public int exam_id;
    @Order(4)
    @Order(3)
    @Int8
    public int curr_exam;
    @Order(3)
    @Int8
    public int mode;

    /**
     * 身份证号码
     * BYTE[18]
     * 身份证号码
     *
     * 考试开始时间
     * BCD[6]
     * YYMMDDhhmmss
     *
     * 考试ID
     * DWORD
     * 唯一考试ID标志

     *
     *
     * 考试科目
     * BYTE
     * 0-场考，1-路考
     * 起始字节
     * 字段
     * 数据类型
     * 描述及要求
     * 0
     * 时间
     * BCD[6]
     * YYMMDDhhmmss，考试/训练开始时间，北京时间
     * 6
     * 唯一ID
     * DWORD
     * 唯一考试/训练ID标志
     * 10
     * 科目
     * BYTE
     * 0-场考，1-路考
     * 11
     * 模式
     * BYTE
     * 0-考试，1-训练
     */
}

 app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java

@@ -11,34 +11,28 @@
import java.util.Date;

public class JKMessage0203 extends JK2019MessageBase {
    @Order(1)
    @Length(18)
    @Ascii
    public String ID;

    @Order(2)
    @Order(1)
    @BcdDateTime
    public Date timeBCD;
    @Order(3)
    @Order(2)
    @Int32
    public int exam_id;

    @Order(4)
    @Order(3)
    @Int8
    public int fail_item_id;
    @Order(5)
    @Order(4)
    @Int8
    public int fail_score;
    //TODO Length 0 也可以完全显示字符串
    @Order(6)
    @Order(5)
    @Length(0)
    @Ascii
    public String fail_reason;

    /**
     * 身份证号码
     * BYTE[18]
     * 身份证号码

     *
     * 时间
     * BCD[6]

 app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java

@@ -16,19 +16,15 @@
    public static final int TERMIAL_STOP = 2;

    @Order(1)
    @Length(18)
    @Ascii
    public String ID;
    @Order(2)
    @BcdDateTime
    public Date timeBCD;
    @Order(3)
    @Order(2)
    @Int32
    public int exam_id;
    @Order(4)
    @Order(3)
    @Int8
    public int score;
    @Order(5)
    @Order(4)
    @Int8
    public int stop;


 app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt

File was deleted

			@@ -35,53 +35,32 @@
			import org.json.JSONException;
			import org.json.JSONObject;

			import java.io.File;
			import java.io.IOException;
			import java.util.Date;
			import java.util.Random;

			import okhttp3.ResponseBody;
			import retrofit2.Call;
			import retrofit2.Callback;
			import retrofit2.Response;
			import safeluck.drive.evaluation.DB.WorkRoomDataBase;
			import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
			import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
			import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
			import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
			import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
			import safeluck.drive.evaluation.DB.exam_status.ExamStatusWoker;
			import safeluck.drive.evaluation.DB.failitems.FailedProj;
			import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
			import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
			import safeluck.drive.evaluation.DB.failitems.LuKaoFailedProj;
			import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
			import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
			import safeluck.drive.evaluation.DB.rtktb.RTKConfigUpdateWorker;
			import safeluck.drive.evaluation.DB.rtktb.RTKWorkRepository;
			import safeluck.drive.evaluation.bean.ExamMap;
			import safeluck.drive.evaluation.bean.ExamPlatformData;
			import safeluck.drive.evaluation.cEventCenter.CEvent;
			import safeluck.drive.evaluation.cEventCenter.CEventCenter;
			import safeluck.drive.evaluation.httpmodule.HttpRequetBean;
			import safeluck.drive.evaluation.httpmodule.RetrofitCreator;
			import safeluck.drive.evaluation.im.IMSClientBootstrap;
			import safeluck.drive.evaluation.im.IMSConnectStatusListener;
			import safeluck.drive.evaluation.im.MessageProcessor;
			import safeluck.drive.evaluation.platformMessage.AttachInfo;
			import safeluck.drive.evaluation.platformMessage.JKMessage0100;
			import safeluck.drive.evaluation.platformMessage.JKMessage0101;
			import safeluck.drive.evaluation.platformMessage.JKMessage0203;
			import safeluck.drive.evaluation.platformMessage.JKMessage0206;
			import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
			import safeluck.drive.evaluation.util.CThreadPoolExecutor;
			import safeluck.drive.evaluation.util.FileUtil;
			import safeluck.drive.evaluation.util.SPUtils;
			import safeluck.drive.evaluation.util.SystemUtil;
			import safeluck.drive.evaluation.util.Utils;
			import safeluck.drive.evaluation.viewmodels.TimeViewModel;
			import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
			import safeluck.drive.evaluation.worker.TTSWorker;

			/**
			* MyApplication2
			@@ -92,9 +71,6 @@
			public class app extends Application implements IAYExamListener {

			private static final String TAG = "app";
			private Gson gson;
			RTKConfig rtkConfig;
			Random random = new Random();
			private static Context appContext=null;
			@Override
			public void onCreate() {

			@@ -618,11 +618,11 @@
			wokViewModel.updateBeginTime(date.getTime());
			jkMessage0202.timeBCD = date;
			ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
			jkMessage0202.ID = ExamPlatformData.getInstance().getID();

			jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();

			jkMessage0202.curr_exam = 0;
			jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
			MessageProcessor.getInstance().sendMessage(jkMessage0202);
			}

			@@ -639,11 +639,11 @@
			wokViewModel.updateBeginTime(date.getTime());
			jkMessage0202.timeBCD = date;
			ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
			jkMessage0202.ID = ExamPlatformData.getInstance().getID();

			jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();

			jkMessage0202.curr_exam = 1;
			jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
			MessageProcessor.getInstance().sendMessage(jkMessage0202);

			}
			@@ -711,7 +711,6 @@
			jkMessage0204.timeBCD = new Date();
			jkMessage0204.score = currTotalScore<0?0:currTotalScore;
			jkMessage0204.stop = JKMessage0204.SUCC_STOP;
			jkMessage0204.ID = ExamPlatformData.getInstance().getID();
			jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
			MessageProcessor.getInstance().sendMessage(jkMessage0204);
			//设置模式为NONE 0

			@@ -265,8 +265,8 @@
			JKMessage0202 jkMessage0202 = new JKMessage0202();
			jkMessage0202.timeBCD = new Date();
			jkMessage0202.curr_exam = 1;
			jkMessage0202.ID = "123456789";
			jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
			jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
			MessageProcessor.getInstance().sendMessage(jkMessage0202);
			break;
			case R.id.btn_fail:
			@@ -275,7 +275,6 @@
			jkMessage0203.fail_item_id = 4;
			jkMessage0203.fail_score = 10;
			jkMessage0203.fail_reason = "发动机启动后，不及时松开启动开关";
			jkMessage0203.ID = "123456789";
			jkMessage0203.exam_id = 123456;
			MessageProcessor.getInstance().sendMessage(jkMessage0203);
			break;
			@@ -309,7 +308,6 @@
			jkMessage0204.timeBCD = new Date();
			jkMessage0204.score = 10;
			jkMessage0204.stop = JKMessage0204.SUCC_STOP;
			jkMessage0204.ID = "123456789";
			jkMessage0204.exam_id = 123456;
			MessageProcessor.getInstance().sendMessage(jkMessage0204);
			break;

			@@ -598,7 +598,6 @@
			wokViewModel.updateBeginTime(date.getTime());
			jkMessage0202.timeBCD = date;
			ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
			jkMessage0202.ID = ExamPlatformData.getInstance().getID();
			if (myDialogFragment == null){
			myDialogFragment = new MyDialogFragment();
			}
			@@ -608,14 +607,14 @@
			public void changKao() {

			exam_type = 2;
			ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
			ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//设置为训练模式
			ExamPlatformData.getInstance().setExamType(exam_type);
			examStatusViewModel.updateStartExam(exam_type);
			sendExamJson(1,exam_type);
			ExamPlatformData.getInstance().getTTS().speak("开始训练");
			jkMessage0202.curr_exam = 0;

			ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//设置为训练模式
			jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;

			MessageProcessor.getInstance().sendMessage(jkMessage0202);
			}
			@@ -629,7 +628,7 @@
			sendExamJson(1,exam_type);
			ExamPlatformData.getInstance().getTTS().speak("开始训练");
			jkMessage0202.curr_exam = 1;

			jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
			MessageProcessor.getInstance().sendMessage(jkMessage0202);

			@@ -6,36 +6,46 @@

			public class JKMessage0202 extends JK2019MessageBase {


			@Order(1)
			@Length(18)
			@Ascii
			public String ID;
			@Order(2)
			@BcdDateTime
			public Date timeBCD;
			@Order(3)
			@Order(2)
			@Int32
			public int exam_id;
			@Order(4)
			@Order(3)
			@Int8
			public int curr_exam;
			@Order(3)
			@Int8
			public int mode;

			/**
			* 身份证号码
			* BYTE[18]
			* 身份证号码
			*
			* 考试开始时间
			* BCD[6]
			* YYMMDDhhmmss
			*
			* 考试ID
			* DWORD
			* 唯一考试ID标志

			*
			*
			* 考试科目
			* BYTE
			* 0-场考，1-路考
			* 起始字节
			* 字段
			* 数据类型
			* 描述及要求
			* 0
			* 时间
			* BCD[6]
			* YYMMDDhhmmss，考试/训练开始时间，北京时间
			* 6
			* 唯一ID
			* DWORD
			* 唯一考试/训练ID标志
			* 10
			* 科目
			* BYTE
			* 0-场考，1-路考
			* 11
			* 模式
			* BYTE
			* 0-考试，1-训练
			*/
			}

			@@ -11,34 +11,28 @@
			import java.util.Date;

			public class JKMessage0203 extends JK2019MessageBase {
			@Order(1)
			@Length(18)
			@Ascii
			public String ID;

			@Order(2)
			@Order(1)
			@BcdDateTime
			public Date timeBCD;
			@Order(3)
			@Order(2)
			@Int32
			public int exam_id;

			@Order(4)
			@Order(3)
			@Int8
			public int fail_item_id;
			@Order(5)
			@Order(4)
			@Int8
			public int fail_score;
			//TODO Length 0 也可以完全显示字符串
			@Order(6)
			@Order(5)
			@Length(0)
			@Ascii
			public String fail_reason;

			/**
			* 身份证号码
			* BYTE[18]
			* 身份证号码

			*
			* 时间
			* BCD[6]

			@@ -16,19 +16,15 @@
			public static final int TERMIAL_STOP = 2;

			@Order(1)
			@Length(18)
			@Ascii
			public String ID;
			@Order(2)
			@BcdDateTime
			public Date timeBCD;
			@Order(3)
			@Order(2)
			@Int32
			public int exam_id;
			@Order(4)
			@Order(3)
			@Int8
			public int score;
			@Order(5)
			@Order(4)
			@Int8
			public int stop;