连续五次结束项目;就发送结束训练命令给平台(训练模式下,目前没有区分路口场考)
3个文件已修改
139 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/app.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -52,7 +52,9 @@
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.AttachInfo;
import safeluck.drive.evaluation.platformMessage.AttachInfo2;
import safeluck.drive.evaluation.platformMessage.JKMessage0202;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.platformMessage.JKMessage0206;
import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
@@ -452,7 +454,13 @@
                        if (EXIT_EXAM_COUNT==5){
                            Log.i(TAG,"全局设置退出---");
                            ExamPlatformData.getInstance().setExitExam(Constant.EXIT_EXAM);
                            EXIT_EXAM_COUNT = 0;
                            if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE){
                                sendStopExam();
                                sendstartExam();
                            }
                        }
                    }
                    String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
@@ -696,6 +704,31 @@
        return false;
    }
private void sendStopExam(){
    JKMessage0204 jkMessage0204 = new JKMessage0204();
    jkMessage0204.timeBCD = new Date();
    jkMessage0204.score = ExamPlatformData.getInstance().getCurTotalScore();
    jkMessage0204.stop = JKMessage0204.SUCC_STOP;
    jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
    MessageProcessor.getInstance().sendMessage(jkMessage0204);
}
private void sendstartExam(){
    final JKMessage0202 jkMessage0202 = new JKMessage0202();
    Date date = new Date();
    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 = 1;//  跟移动站服务定义的场考是2  ,平台是0 ;  移动站路考是3 ,平台是1
        jkMessage0202.curr_exam = 0;//  跟移动站服务定义的场考是2  ,平台是0 ;  移动站路考是3 ,平台是1
    jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
    MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
}
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -637,4 +637,13 @@
    public int getExitExamFlag(){
        return exit_Exam_flag;
    }
    //连续训练五个项目 给平台发送结束训练,使用的分数
    private int totalScore=0;
    public void setCurTotalScore(int currTotalScore) {
        this.totalScore = currTotalScore;
    }
    public int getCurTotalScore(){
        return totalScore;
    }
}
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -47,6 +47,9 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
@@ -93,6 +96,7 @@
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.ExitExamViewModel;
import safeluck.drive.evaluation.widget.StatusDialog;
/**单机训练UI
@@ -401,6 +405,8 @@
       view = inflater.inflate(R.layout.layout_train_fragment, container, false);
        initView(view);
        failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
        routeLineViewModel = ViewModelProviders.of(this).get(RouteLineViewModel.class);
        routeLineViewModel.getRouteBeans().observe(this, new Observer<List<RouteBean>>() {
@@ -426,92 +432,6 @@
            }
        });
//        failedProjViewModel.getFailedProjectsForIII(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
//            @Override
//            public void onChanged(List<FailedProj_select> failedProj_selects) {
//                if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
//                    MyLog.i("现在是路考状态,监视路考数据失败项目");
//                    if (failedProj_selects != null && failedProj_selects.size()>0){
//
//                        item_id = 0;
//                        currTotalScore = 100;
//                        mArrayList.clear();
//                        item_conents.clear();
//                        for (FailedProj_select f :
//                                failedProj_selects) {
//                            item_id += f.getScore_deducting();
//                            Log.i(TAG, "onChanged: " + f.toString());
//                            mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
//                            item_conents.add(f.getItem_content());
//                            Collections.sort(mArrayList);
//                            mScoreAdapter.addDatas(mArrayList);
//                            MyLog.i("item_score="+item_id);
//                        }
//                        MyLog.i("没扣分之前得分:"+currTotalScore);
//                        currTotalScore -=item_id;
//                        MyLog.i("路考当前得分:"+currTotalScore);
//                        if (currTotalScore < Constant.PASSING_SCORE){
//                            MyLog.i("路考低于80,不合格"+currTotalScore);
//                        }
//                        MyLog.i("路考监测到有失败项目加入,通知UI更新颜色");
//                        mHandler.obtainMessage(ADD_DATA).sendToTarget();
//                    }else{
//                        MyLog.i(TAG,"路考失败项目数据表被清空更新UI");
//                        item_id = 0;
//                        mArrayList.clear();
//                        item_conents.clear();
//                        Collections.sort(mArrayList);
//                        mScoreAdapter.addDatas(mArrayList);
//                        mHandler.obtainMessage(ADD_DATA).sendToTarget();
//                    }
//                }
//
//            }
//        });
//
//
//
//        failedProjViewModel.getFailedProjectsForI(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
//            @Override
//            public void onChanged(List<FailedProj_select> failedProj_selects) {
//                if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
//                    if (failedProj_selects != null && failedProj_selects.size()>0){
//
//                        item_id = 0;
//                        currTotalScore = 100;
//                        mArrayList.clear();
//                        item_conents.clear();
//                        for (FailedProj_select f :
//                                failedProj_selects) {
//                            item_id += f.getScore_deducting();
//                            Log.i(TAG, "onChanged: " + f.toString());
//                            mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
//                            item_conents.add(f.getItem_content());
//                            Collections.sort(mArrayList);
//                            mScoreAdapter.addDatas(mArrayList);
//                            MyLog.i("item_score="+item_id);
//                        }
//                        MyLog.i("没扣分之前得分:"+currTotalScore);
//                        currTotalScore -=item_id;
//                        MyLog.i("当前得分:"+currTotalScore);
//                        if (currTotalScore < Constant.PASSING_SCORE){
//                            MyLog.i("低于80,不合格"+currTotalScore);
//                        }
//                        MyLog.i("监测到有失败项目加入,通知UI更新颜色");
//                        mHandler.obtainMessage(ADD_DATA).sendToTarget();
//                    }else{
//                        MyLog.i(TAG,"失败项目数据表被清空更新UI");
//                        item_id = 0;
//                        mArrayList.clear();
//                        item_conents.clear();
//                        Collections.sort(mArrayList);
//                        mScoreAdapter.addDatas(mArrayList);
//                        mHandler.obtainMessage(ADD_DATA).sendToTarget();
//                    }
//                }
//
//            }
//        });
@@ -545,6 +465,11 @@
                        if (currTotalScore < Constant.PASSING_SCORE){
                            MyLog.i("低于80,不合格"+currTotalScore);
                        }
                        if (currTotalScore<0){
                            ExamPlatformData.getInstance().setCurTotalScore(0);
                        }else{
                            ExamPlatformData.getInstance().setCurTotalScore(currTotalScore);
                        }
                        MyLog.i("监测到有失败项目加入,通知UI更新颜色");
                        mHandler.obtainMessage(ADD_DATA).sendToTarget();
                    }else{