平台考试考试协议增加教练员身份证和学员身份证字段；优化场考和路考发送开始考试部分代码

lizhanwei

2020-04-14 69b7a12b0cdc7b6d8a5f3aa27d88b0ee962d9900

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

@@ -484,6 +484,8 @@
                        ExamPlatformData.getInstance().setId(student.getID());
                        tv_sex.setText(getString(R.string.sex)+(student.getSex()==2?"女":"男"));
                        tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
                    }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
                        ExamPlatformData.getInstance().setCoachID(student.getID());
                    }
                }
            }
@@ -594,8 +596,6 @@

                clearArrayListResetTotalScore();

                //TODO 发送JKMessage0202 给平台，开始考试
                final JKMessage0202 jkMessage0202 = new JKMessage0202();

                if (myDialogFragment == null){
                    myDialogFragment = new MyDialogFragment();
@@ -604,44 +604,12 @@
                myDialogFragment.setCallback(new MyDialogFragment.Callback() {
                    @Override
                    public void changKao() {
                        exam_type = 2;
                        ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.EXAMING_MODE);
                        ExamPlatformData.getInstance().setExamType(exam_type);
                        examStatusViewModel.updateStartExam(exam_type);
                        sendExamJson(1,exam_type);
                        ExamPlatformData.getInstance().getTTS().speak("开始考试");

                        Date date = new Date();
                        wokViewModel.updateBeginTime(date.getTime());
                        jkMessage0202.timeBCD = date;
                        ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));

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

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

                    @Override
                    public void luKao() {
                        ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.EXAMING_MODE);
                        exam_type = 3;
                        ExamPlatformData.getInstance().setExamType(exam_type);
                        examStatusViewModel.updateStartExam(exam_type);
                        sendExamJson(1,exam_type);
                        ExamPlatformData.getInstance().getTTS().speak("开始考试");

                        Date date = new Date();
                        wokViewModel.updateBeginTime(date.getTime());
                        jkMessage0202.timeBCD = date;
                        ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));

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

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

                    }
                });
@@ -685,6 +653,29 @@
        }
    }

    private void sendJK0202(int type) {

        final JKMessage0202 jkMessage0202 = new JKMessage0202();
        exam_type = type;
        ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.EXAMING_MODE);
        ExamPlatformData.getInstance().setExamType(exam_type);
        examStatusViewModel.updateStartExam(exam_type);
        sendExamJson(1,exam_type);
        ExamPlatformData.getInstance().getTTS().speak("开始考试");

        Date date = new Date();
        wokViewModel.updateBeginTime(date.getTime());
        jkMessage0202.timeBCD = date;
        ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
        jkMessage0202.stu_id = ExamPlatformData.getInstance().getID();
        jkMessage0202.coach_id = ExamPlatformData.getInstance().getCoachID();
        jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();

        jkMessage0202.curr_exam = (type-2);//  跟移动站服务定义的场考是2  ，平台是0 ；  移动站路考是3 ，平台是1
        jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
        MessageProcessor.getInstance().sendMessage(jkMessage0202);
    }

    private void sendExamJson(int i,int type) {
        try {