Merge remote-tracking branch 'origin/master'

yy1717

2020-03-09 0dba99e6293810fd3baae971d9137ed6151c5157

Merge remote-tracking branch 'origin/master'

 app/src/main/assets/criteria_I.json

@@ -65,14 +65,14 @@
  {
    "item_id":10,
    "item_content": "倒车入库",
    "deducting_reason": "项目完成时间超过210s",
    "deducting_reason": "项目完成时间超过210秒",
    "score_deducting":100,
    "required_precision":""
  },
  {
    "item_id":11,
    "item_content": "倒车入库",
    "deducting_reason": "中途停车时间超过2s",
    "deducting_reason": "中途停车时间超过2秒",
    "score_deducting":5,
    "required_precision":""
  },

 app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java

@@ -32,7 +32,11 @@
                jsonObject = new JSONObject(str);
                int mapId = jsonObject.getInt("map_id");
                int enter = jsonObject.getInt("enter");
                WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().updateEnter(enter,mapId);
                ExamStatus examStatus = new ExamStatus();
                examStatus.setEnter(enter);
                examStatus.setMap_id(mapId);
                examStatus.setMap_item(1);
                WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().insert(examStatus);
                return Result.success();
            } catch (JSONException e) {
                e.printStackTrace();

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

@@ -292,7 +292,9 @@

                canvas2.drawColor(Color.WHITE);


                if (paint == null || canvas2==null){
                    return;
                }
                paint.setStyle(Paint.Style.FILL_AND_STROKE);
                paint.setColor(Color.BLUE);


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

@@ -160,8 +160,9 @@
                    //TODO 发送JKMessage0203 给平台，这儿有点复杂，看怎么处理
                    sendJKMessage0203(failedProj_selects);
                    currTotalScore -=item_id;
                    MyLog.i("当前得分："+currTotalScore);
                    if (currTotalScore < Constant.PASSING_SCORE){
                        MyLog.i(TAG,"低于80，不合格");
                        MyLog.i(TAG,"低于80，不合格"+currTotalScore);
                        ExamPlatformData.getInstance().getTTS().speak("考试不合格");
                        stopExam();
                    }
@@ -246,13 +247,13 @@
        jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();

        for (int i = 0; i < failedProj_selects.size(); i++) {
            if (hasSnEqulas(failedProj_selects)){

            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，发送");
                MyLog.i("没有相同的sn，发送"+failedProj_selects.get(i).getSn());
                sns.add(failedProj_selects.get(i).getSn());
                jkMessage0203.timeBCD = failedProj_selects.get(i).getUtc();
                jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
@@ -271,16 +272,15 @@
        MessageProcessor.getInstance().sendMessage(jkMessage0203);
    }

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

@@ -296,7 +296,7 @@
        switch (status) {
            case 0://考试完成
                switch (map_id) {
                    case 1://倒库
                    case 863://倒库
                        if (item_conents.contains("倒车入库")) {
                            return getResources().getColor(R.color.colorAccent);
                        }else{
@@ -329,6 +329,7 @@

                }
            case 1://进入考场项目
                MyLog.i("pink 进入某个考场项目");
                return getResources().getColor(R.color.pink);
            case 2://待考
                return getResources().getColor(R.color.examing);
@@ -396,6 +397,8 @@
                failedProjViewModel.deleteAll();
                sendExamJson(1);
                iv_head.getDrawable().setLevel(1);
                //清空sns
                sns.clear();
                //TODO 发送JKMessage0202 给平台，开始考试
                JKMessage0202 jkMessage0202 = new JKMessage0202();
                jkMessage0202.phone = "0314200100000004";
@@ -445,6 +448,8 @@

    private void stopExam() {
        MyLog.i(TAG,"结束考试");
        //清空已经存在的sns
        sns.clear();
        item_id = 0;
        currTotalScore = 100;
        tv_total_score.setText(String.valueOf(currTotalScore));