From 2b65fc5a454645f7637e2b295cc793ada5b2cecf Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 01 四月 2020 11:26:44 +0800
Subject: [PATCH] 修改0206utc时间，修改三处科三评判文字
---
app/src/main/java/safeluck/drive/evaluation/util/Utils.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
index 94f2ded..4098c9f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
+++ b/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
--
Gitblit v1.8.0