fctom1215
2020-03-27 6de6a028d1ad94f1f0481e0f81a09e63e314fb5a
Merge branch 'master' of https://gitee.com/endian11/DriveJudge
2个文件已修改
35 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/app.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -249,11 +249,22 @@
                    String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
                    MyLog.i(PlatFormConstant.LUKAO,String.format("%s",itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"结束":"开始")));
                    if (ExamPlatformData.getInstance().getTrainingMode()== ExamPlatformData.TRAINING_MODE){
                        if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
                            MyLog.i("路考不报项目开始结束语音");
                        }else{
                        ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"结束":"开始"));
                            ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"结束":"开始"));
                        }
                    }else{
                        if (enter_status!=Constant.EXIT_CURRENT_ITEM){
                            ExamPlatformData.getInstance().getTTS().speak(itemstr+"开始");
                            if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
                                MyLog.i("路考不报项目开始结束语音");
                            }else{
                                ExamPlatformData.getInstance().getTTS().speak(itemstr+"开始");
                            }
                        }
                    }
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -88,6 +88,7 @@
    private HouseView houseView;
    private List<ExamStatus> examStatusList = new ArrayList<>();
    private List<String> item_conents = new ArrayList<>();//坡道定点停车和起步
    private int changKaoCount=0;
    private int item_id;//扣分分数总和
    private ExamStatusViewModel examStatusViewModel;
@@ -362,8 +363,8 @@
                            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,8 @@
                        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();
@@ -438,6 +439,17 @@
                Log.i(TAG, "ExamStatus onChanged: ");
                if (examStatus!=null && examStatus.size()>0){
                    MyLog.i(TAG,"考试状态更新");
                    if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
                        for (ExamStatus e:examStatus){
                            if (changKaoCount>=5){
                                MyLog.i("正常的考试结束,五个项目全考完");
                                changKaoCount=0;
                            }
                            if(e.getEnter()== safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
                                changKaoCount++;
                            }
                        }
                    }
                    showChangKaoOrLukao(examStatus.get(0).getStartExam());
                    examStatusList.clear();
                    examStatusList.addAll(examStatus);