修改0206utc时间，修改三处科三评判文字

lizhanwei

2020-04-01 2b65fc5a454645f7637e2b295cc793ada5b2cecf

修改0206utc时间，修改三处科三评判文字

 app/src/main/assets/criteria_I.json

@@ -100,7 +100,7 @@
  {
    "item_id":15,
    "item_content": "坡道定点停车和起步",
    "deducting_reason": "车辆停止后,起步时间超过30s",
    "deducting_reason": "车辆停止后,起步时间超过30秒",
    "score_deducting":100,
    "required_precision":""
  },

 app/src/main/assets/criteria_III.json

@@ -72,7 +72,7 @@
  {
    "item_id":11,
    "item_content": "通用要求",
    "deducting_reason": "车辆行驶中骑轧车道中心实线或者车道边缘实线",
    "deducting_reason": "车辆行驶中骑轧实线",
    "score_deducting":100,
    "required_precision":""
  },
@@ -86,14 +86,14 @@
  {
    "item_id":13,
    "item_content": "通用要求",
    "deducting_reason": "起步、转向、变更车道、超车、靠边停车前不使用或错误使用转向灯",
    "deducting_reason": "不能正确使用转向灯",
    "score_deducting":100,
    "required_precision":""
  },
  {
    "item_id":14,
    "item_content": "通用要求",
    "deducting_reason": "起步、转向、变更车道、超车、靠边停车前,开转 向灯少于3 s即转向",
    "deducting_reason": "开转向灯少于3秒即转向",
    "score_deducting":100,
    "required_precision":""
  },

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

@@ -390,10 +390,17 @@
                break;
            case Constant.RTK_INFO:
                JSONObject jsonObject = null;
                String utc=null;
                try {
                    jsonObject = new JSONObject(json);
                    int qf = jsonObject.getInt("qf");
                    int satNum = jsonObject.getInt("sat_num");

                    //需要将utc时间取出来，然后+8个小时为北京时间，再修改json字符串，然后发给服务器
                     utc = jsonObject.getString("utc");
                    //移动站服务给的是.40 的话 代表是400毫秒
                    utc=Utils.utc2NetWorkTimeMillSeconds(utc+"0");

                    if (lastSatEqualNow(satNum)&&lastQfEqualNow(qf)){
                    }else{
                        ExamPlatformData.getInstance().setQfAndSatNum(qf,satNum);
@@ -413,6 +420,10 @@
                        jkMessage0206.alert = 0;
                        jkMessage0206.status = 0;



                        utc = utc.substring(0,utc.length()-1);
                        json=json.replaceFirst("[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*",utc);
                        jkMessage0206.json =json;
                        jkMessage0206.length = jkMessage0206.json.length();
                        AttachInfo attachInfo = new AttachInfo();

 app/src/main/java/safeluck/drive/evaluation/util/Utils.java

@@ -337,24 +337,7 @@
        int unsignedTime=  parseUnsignedInt(String.valueOf(longCurrTIme),10);
        System.out.println("unsigned int time = "+unsignedTime);

        double[] map={






//                16579.3086, -7626.9764,16579.8354, -7627.7888, 16580.3393, -7628.4316, 16581.181, -7629.2701,16582.0667, -7629.9052,
//                16583.1605, -7630.4413,16584.3072, -7630.818, 16585.5416,
//                -7630.993,   16586.918, -7630.9599, 16588.0948, -7630.7205,16589.1489, -7630.3119,   16590.3826, -7629.6211, 16591.2856, -7628.8977,16592.0383, -7628.0128,
//
//                16592.8408, -7626.7007, 16593.3354, -7625.4394,16593.886, -7624.4265, 16594.9656, -7623.4808,16596.0498, -7623.0286, 16597.3348, -7622.955,16598.4564, -7623.2286,
//                16599.4254, -7623.7931,16600.1166, -7624.5026,
        };

        for (int i = 0; i < map.length; i++) {
            Arrays.asList(map[i]);
        }

Point p1 = new Point(2.55,1.0);
Point p2 = new Point(1.55,1.0);
@@ -368,6 +351,12 @@
        System.out.println("date="+formatTimeYYMMDDHHmmSS(date.getTime()) );

        System.out.println(        formatTimeYYMMDDHHmmSS(1585578372000L));
        System.out.println(        "============================");
        String utc =utc2NetWorkTimeMillSeconds("20200401014101.400");
        System.out.println(utc );
        String sss ="{\"utc\":\"20200401014101.40\",\"qf\":3,\"coord_x\":-7630.0,\"coord_x_dir\":\"N\",\"coord_y\":16570.0,\"coord_y_dir\":\"E\",\"heading\":90.0,\"pitch\":0.0,\"roll\":0.0,\"sat_num\":14,\"latitude\":33.26948983333333,\"longitude\":120.78270283333333,\"altitude\":58.9666,\"speed\":1.72591488,\"track_ture\":90.0}";
               sss= sss.replaceFirst("[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*",utc);
        System.out.println(String.format("ssss=%s",sss));



@@ -484,9 +473,21 @@
        } catch (ParseException e) {
            e.printStackTrace();
        }
        long utcTime = date.getTime();
        long utcTime = date.getTime()+8*60*60*1000;
        return utcTime;
    }
    public static String  utc2NetWorkTimeMillSeconds(String utcMillSeconds){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss.SSS");
        Date date = null;
        try {
            date = simpleDateFormat.parse(utcMillSeconds);
        } catch (ParseException e) {
            e.printStackTrace();
        }
        long utcTime = date.getTime()+8*60*60*1000;
        date.setTime(utcTime);
        return simpleDateFormat.format(date);
    }

    public static void zipFolder(String srcFileString,String zipFileString) throws Exception{
        //创建zip