lizhanwei
2020-03-31 7d2ab4d46ea7ff92b77070be18ead8376b0d71e9
提交0203 exam-id
6个文件已修改
27 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/app.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/util/Utils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -229,6 +229,7 @@
                                }
                                Date date = new Date(Utils.utc2NetWorkTime(utc));
                                jkMessage0203.timeBCD = date;
                                jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
                                MyLog.i(String.format("收到远程服务给的评判消息 timeBCD=%s",Utils.formatTimeYYMMDDHHmmSS(jkMessage0203.timeBCD.getTime())));
                                MessageProcessor.getInstance().sendMessage(jkMessage0203);
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -362,8 +362,9 @@
                            MyLog.i("路考当前得分:"+currTotalScore);
                            if (currTotalScore < Constant.PASSING_SCORE){
                                MyLog.i("路考低于80,不合格"+currTotalScore);
                                ExamPlatformData.getInstance().getTTS().speak("考试不合格");
                                stopExam();
                                        ExamPlatformData.getInstance().getTTS().speak("考试不合格");
                                        stopExam();
                            }
                            MyLog.i("路考监测到有失败项目加入,通知UI更新颜色");
                            mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -408,8 +409,9 @@
                        MyLog.i("当前得分:"+currTotalScore);
                        if (currTotalScore < Constant.PASSING_SCORE){
                            MyLog.i("场考低于80,不合格"+currTotalScore);
                            ExamPlatformData.getInstance().getTTS().speak("考试不合格");
                            stopExam();
                                    ExamPlatformData.getInstance().getTTS().speak("考试不合格");
                                    stopExam();
                        }
                        MyLog.i("场考监测到有失败项目加入,通知UI更新颜色");
                        mHandler.obtainMessage(ADD_DATA).sendToTarget();
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -32,6 +32,7 @@
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.AttachInfo;
import safeluck.drive.evaluation.platformMessage.JKMessage0001;
@@ -231,12 +232,12 @@
                jkMessage0202.timeBCD = new Date();
                jkMessage0202.curr_exam = 1;
                jkMessage0202.ID = "123456789";
                jkMessage0202.exam_id = 123456;
                jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
                MessageProcessor.getInstance().sendMessage(jkMessage0202);
                break;
            case R.id.btn_fail:
                JKMessage0203 jkMessage0203 = new JKMessage0203();
                jkMessage0203.timeBCD = new Date(utc2NetWorkTime("20200330101455"));
//                jkMessage0203.timeBCD = new Date(utc2NetWorkTime("20200330101455"));
                jkMessage0203.fail_item_id = 4;
                jkMessage0203.fail_score = 10;
                jkMessage0203.fail_reason = "发动机启动后,不及时松开启动开关";
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
@@ -15,6 +15,7 @@
    @Length(18)
    @Ascii
    public String ID;
    @Order(2)
    @BcdDateTime
    public Date timeBCD;
app/src/main/java/safeluck/drive/evaluation/util/Utils.java
@@ -484,7 +484,7 @@
        } catch (ParseException e) {
            e.printStackTrace();
        }
        long utcTime = date.getTime()+8*60*60*1000;
        long utcTime = date.getTime();
        return utcTime;
    }
app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
@@ -136,14 +136,14 @@
            if (!TextUtils.isEmpty(utc) && utc.length > 12) {
                utc = utc.substring(0, 12)
            if (!TextUtils.isEmpty(utc) && utc.length > 14) {
                utc = utc.substring(2, 14)
            }
            val date = Date(Utils.utc2NetWorkTime(utc))
            jkMessage0203.timeBCD = date
//            jkMessage0203.timeBCD = date
            MessageProcessor.getInstance().sendMessage(jkMessage0203)
//            MessageProcessor.getInstance().sendMessage(jkMessage0203)