Merge branch 'master' of https://gitee.com/endian11/DriveJudge

yy1717

2020-03-21 8a237469ec680603b1c662dc7e67bd3ff0bbfd2a

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

@@ -303,7 +303,7 @@
                        MyLog.i("item_score="+item_id);
                    }
                    //TODO 发送JKMessage0203 给平台，这儿有点复杂，看怎么处理
                    sendJKMessage0203(failedProj_selects);
//                    sendJKMessage0203(failedProj_selects);
                    MyLog.i("没扣分之前得分："+currTotalScore);
                    currTotalScore -=item_id;
                    MyLog.i("当前得分："+currTotalScore);
@@ -395,59 +395,53 @@
        return view;
    }

    private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
        JKMessage0203 jkMessage0203 = new JKMessage0203();
        jkMessage0203.phone =  ExamPlatformData.getInstance().getPhone();
        jkMessage0203.ID = ExamPlatformData.getInstance().getID();
        jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
//    private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
//        JKMessage0203 jkMessage0203 = new JKMessage0203();
//        jkMessage0203.phone =  ExamPlatformData.getInstance().getPhone();
//        jkMessage0203.ID = ExamPlatformData.getInstance().getID();
//        jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
//
//        for (int i = 0; i < failedProj_selects.size(); i++) {
//            if (hasSnEqulas(failedProj_selects.get(i).getSn())){
//                MyLog.i("sn相同"+failedProj_selects.get(i).getSn());
//            }else{
//                ExamPlatformData.getInstance().getTTS().speak(failedProj_selects.get(i).getDeducting_reason()+(
//                        failedProj_selects.get(i).getScore_deducting()==100?"不合格":"扣"+
//                                failedProj_selects.get(i).getScore_deducting()+"分"));
//                MyLog.i("没有相同的sn，发送"+failedProj_selects.get(i).getSn());
//                ExamPlatformData.getInstance().addSn(failedProj_selects.get(i).getSn());
//                String utc =   failedProj_selects.get(i).getUtc();
//                if (!TextUtils.isEmpty(utc)&&utc.length()>12){
//                    utc =utc.substring(0,12);
//                }
//                jkMessage0203.timeBCD = utc ;
//
//                jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
//                jkMessage0203.fail_score = failedProj_selects.get(i).getScore_deducting();
//                jkMessage0203.fail_reason = failedProj_selects.get(i).getDeducting_reason();
//            }
//
//        }

        for (int i = 0; i < failedProj_selects.size(); i++) {
            if (hasSnEqulas(failedProj_selects.get(i).getSn())){
                MyLog.i("sn相同"+failedProj_selects.get(i).getSn());
            }else{
                ExamPlatformData.getInstance().getTTS().speak(failedProj_selects.get(i).getDeducting_reason()+(
                        failedProj_selects.get(i).getScore_deducting()==100?"不合格":"扣"+
                                failedProj_selects.get(i).getScore_deducting()+"分"));
                MyLog.i("没有相同的sn，发送"+failedProj_selects.get(i).getSn());
                ExamPlatformData.getInstance().addSn(failedProj_selects.get(i).getSn());
                String utc =   failedProj_selects.get(i).getUtc();
                if (!TextUtils.isEmpty(utc)&&utc.length()>12){
                    utc =utc.substring(0,12);
                }
                jkMessage0203.timeBCD = utc ;
//        MessageProcessor.getInstance().sendMessage(jkMessage0203);
//    }

                jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
                jkMessage0203.fail_score = failedProj_selects.get(i).getScore_deducting();
                jkMessage0203.fail_reason = failedProj_selects.get(i).getDeducting_reason();
            }

        }







        MessageProcessor.getInstance().sendMessage(jkMessage0203);
    }

    private boolean hasSnEqulas(int failedProjSn){
        if (ExamPlatformData.getInstance().getSns().size() > 0){
            for (int j = 0; j < ExamPlatformData.getInstance().getSns().size(); j++) {
                MyLog.i("已存在的sn"+ExamPlatformData.getInstance().getSns().get(j));
                if (ExamPlatformData.getInstance().getSns().get(j) == failedProjSn){
                    MyLog.i("sn相同，不发"+ExamPlatformData.getInstance().getSns().get(j));
                    return true;
                }else{
                    continue;
                }
            }

        }
        return false;

    }
//    private boolean hasSnEqulas(int failedProjSn){
//        if (ExamPlatformData.getInstance().getSns().size() > 0){
//            for (int j = 0; j < ExamPlatformData.getInstance().getSns().size(); j++) {
//                MyLog.i("已存在的sn"+ExamPlatformData.getInstance().getSns().get(j));
//                if (ExamPlatformData.getInstance().getSns().get(j) == failedProjSn){
//                    MyLog.i("sn相同，不发"+ExamPlatformData.getInstance().getSns().get(j));
//                    return true;
//                }else{
//                    continue;
//                }
//            }
//
//        }
//        return false;
//
//    }



@@ -538,6 +532,7 @@
                    public void changKao() {
                        exam_type = 2;
                        iv_head.getDrawable().setLevel(1);
                        ExamPlatformData.getInstance().setExamType(exam_type);
                        examStatusViewModel.updateStartExam(exam_type);
                        sendExamJson(1,exam_type);
                        ExamPlatformData.getInstance().getTTS().speak("开始训练");
@@ -551,36 +546,14 @@
                    @Override
                    public void luKao() {
                        exam_type = 3;
                        ExamPlatformData.getInstance().setExamType(exam_type);
                        examStatusViewModel.updateStartExam(exam_type);
                        sendExamJson(1,exam_type);
                        if (simulateNightBean == null){
                            simulateNightBean = new SimulateNightBean();
                        }
                        iv_head.getDrawable().setLevel(1);
                        simulateNightBean.setExam(0);
                        ExamPlatformData.getInstance().getTTS().speak("开始训练");
                        ExamPlatformData.getInstance().setTrainingMode(true);//设置为训练模式
                        final List<SimulateNightBean.QuestionBean> list = ExamPlatformData.getInstance().getSimulate_light_tips();
                        simulateNightBean.setQuestion(list.subList(list.size()-2,list.size()-1));
                        AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
                        jkMessage0202.curr_exam = 1;

                        MessageProcessor.getInstance().sendMessage(jkMessage0202);

                        tempQs.add(list.get(0));
                        int [] a =Utils.getRandomInts(4,12);
                        for (int i = 0; i < a.length; i++) {
                            tempQs.add(list.get(a[i]));
                        }

                        simulateNightBean.setQuestion(tempQs);
                        mHandler.postDelayed(new Runnable() {
                            @Override
                            public void run() {
                                AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
                                tempQs.clear();
                            }
                        },10*1000);

                    }
                });