lizhanwei
2020-03-23 8db39e85a21a5ccf5325172025b5aabf970c64fe
训练模式科三
5个文件已修改
122 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/app.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_road_train.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -247,6 +247,7 @@
                    type = rtkConfigUpdtea.getInt("type");
                    enter_status = rtkConfigUpdtea.getInt("enter");
                    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){
                        ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"结束":"开始"));
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -79,12 +79,12 @@
        enter_exit_item_tts.put(5,"直角转弯");
        enter_exit_item_tts.put(101,"直线行驶");
        enter_exit_item_tts.put(102,"加减档");
        enter_exit_item_tts.put(102,"加减挡位操作");
        enter_exit_item_tts.put(103,"靠边停车");
        enter_exit_item_tts.put(104,"直行通过路口");
        enter_exit_item_tts.put(105,"左转弯");
        enter_exit_item_tts.put(106,"右转弯");
        enter_exit_item_tts.put(107,"通过人行横道");
        enter_exit_item_tts.put(105,"路口左转弯");
        enter_exit_item_tts.put(106,"路口右转弯");
        enter_exit_item_tts.put(107,"通过人行道横线");
        enter_exit_item_tts.put(108,"通过学校区域");
        enter_exit_item_tts.put(109,"通过公共汽车站");
        enter_exit_item_tts.put(110,"掉头");
@@ -260,7 +260,8 @@
     * @return
     */
    public String getItemStatusStr(int item) {
        if (item<1 || item>enter_exit_item_tts.size()){
        if (enter_exit_item_tts.get(item)==null){
            return "未知项目";
        }
        return enter_exit_item_tts.get(item);
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -124,6 +124,8 @@
    private List<SimulateNightBean.QuestionBean> tempQs=  new ArrayList<>();
    private TableRow tableRow1,tableRow2,tableRow3;
    private Button btn_1,btn_2;
private List<Integer> btn_ids = new ArrayList<Integer>();
    private Handler mHandler = new Handler(new Handler.Callback() {
        @Override
@@ -136,6 +138,11 @@
                av_park.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
                av_curve.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
                av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
                for (int i = 0; i < btn_ids.size(); i++) {
                    int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
                    ((Button) view.findViewById(viewId)).setBackgroundColor(100+i+1);
                }
            }
            if (msg.what == SPEED_DATA){
                tv_speed.setText(_mActivity.getApplicationContext().getResources().getString(R.string.speed,speed));
@@ -276,6 +283,58 @@
        return getResources().getColor(R.color.examing);
    }
    /**
     * 路考项目 每个项目的颜色变化
     * @param type
     * @return
     */
    private int bbb(int type) {
        if (examStatusList!=null &&examStatusList.size()>0){
            for (ExamStatus examStatus:
                    examStatusList) {
                if (type == examStatus.getMap_item()){
                    if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.BEGIN_ITEM){
                        //进入考场
                        if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
                            //结束考试了
                            MyLog.i("进入考场结束考试,startexam="+examStatus.getStartExam());
                            return getResources().getColor(R.color.colorAccent);
                        }else{
                            MyLog.i("进入考场,type="+type);
                            return getResources().getColor(R.color.pink);
                        }
                    }else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
                        if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
                            return getResources().getColor(R.color.examing);
                        }
                        String ss=ExamPlatformData.getInstance().getItemStatusStr(type);
                        if (item_conents.contains(ss)) {
                            MyLog.i("该项考试失败,type="+type);
                            return getResources().getColor(R.color.colorAccent);
                        }else{
                            if (examStatus.getResult() ==1){
                                MyLog.i(String.format("已经播放过%s合格",ss));
                            }else{
                                ExamPlatformData.getInstance().getTTS().speak(String.format("%s合格",ss));
                                examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                            }
                            return getResources().getColor(R.color.train_btn_return);
                        }
                    }else{
                        return getResources().getColor(R.color.examing);
                    }
                }
            }
        }
        return getResources().getColor(R.color.examing);
    }
    private void showChangKaoOrLukao(int exam_type){
        if (exam_type > ExamPlatformData.EXAM_TYPE_ChangKAO){
@@ -363,8 +422,6 @@
                            mScoreAdapter.addDatas(mArrayList);
                            MyLog.i("item_score="+item_id);
                        }
                        //TODO 发送JKMessage0203 给平台,这儿有点复杂,看怎么处理
//                    sendJKMessage0203(failedProj_selects);
                        MyLog.i("没扣分之前得分:"+currTotalScore);
                        currTotalScore -=item_id;
                        MyLog.i("当前得分:"+currTotalScore);
@@ -459,8 +516,18 @@
    private void initView(View view) {
        btn_ids.add(R.id.btn_1);
        btn_ids.add(R.id.btn_2);
        btn_ids.add(R.id.btn_3);
        btn_ids.add(R.id.btn_4);
        btn_ids.add(R.id.btn_5);
        btn_ids.add(R.id.btn_6);
        btn_ids.add(R.id.btn_7);
        btn_ids.add(R.id.btn_8);
        btn_ids.add(R.id.btn_9);
        btn_ids.add(R.id.btn_10);
        view.findViewById(R.id.iv_head).setOnClickListener(this);
        av_curve = view.findViewById(R.id.av3);
app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java
@@ -12,4 +12,5 @@
    public static final short STU_INFO_SUCC = 1;
    @Nullable
    public static final String RTK = "RTK_Config";
    public static final String LUKAO = "LuKao";
}
app/src/main/res/layout/layout_road_train.xml
@@ -21,65 +21,71 @@
    <Button android:id="@+id/btn_1"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/start_vehicle"/>
        android:text="@string/straight_line"/>
    <Button android:id="@+id/btn_2"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/straight_line"/>
        android:text="@string/add_subtract"/>
    <Button android:id="@+id/btn_3"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/crosswalk"/>
        android:text="@string/pull_over"/>
    <Button android:id="@+id/btn_4"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/side_by_side"/>
        android:text="@string/by_crossing"/>
    <Button android:id="@+id/btn_5"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/school_area"/>
        android:text="@string/junction_left"/>
    <Button android:id="@+id/btn_6"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/junction_left"/>
        android:text="@string/junction_right"/>
</TableRow>
    <TableRow android:layout_width="wrap_content"
        android:id="@+id/second"
        android:layout_height="35dp">
    <Button android:id="@+id/btn_7"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/side_by_side"/>
        android:text="@string/crosswalk"/>
    <Button android:id="@+id/btn_8"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/add_subtract"/>
        android:text="@string/school_area"/>
    <Button android:id="@+id/btn_9"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/over_take"/>
        android:text="@string/bus_area"/>
    <Button android:id="@+id/btn_10"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/by_crossing"/>
        android:text="@string/turn_around"/>
    <Button android:id="@+id/btn_11"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/bus_area"/>
        android:visibility="gone"
        android:text="@string/turn_around"/>
    <Button android:id="@+id/btn_12"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:visibility="gone"
        android:text="@string/lane_change"/>
    </TableRow>
    <TableRow android:layout_width="wrap_content"
        android:id="@+id/third"
        android:layout_height="35dp">
    <Button android:id="@+id/btn_13"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
            android:visibility="gone"
        android:text="@string/night_driving"/>
    </TableRow>
    <TableRow android:layout_width="wrap_content"
        android:visibility="gone"
        android:id="@+id/third"
        android:layout_height="35dp">
    <Button android:id="@+id/btn_14"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"