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/app.java | 11 +++++++++++
app/src/main/assets/criteria_I.json | 2 +-
app/src/main/java/safeluck/drive/evaluation/util/Utils.java | 37 +++++++++++++++++++------------------
app/src/main/assets/criteria_III.json | 6 +++---
4 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/app/src/main/assets/criteria_I.json b/app/src/main/assets/criteria_I.json
index b9ce307..e917f9e 100644
--- a/app/src/main/assets/criteria_I.json
+++ b/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":""
},
diff --git a/app/src/main/assets/criteria_III.json b/app/src/main/assets/criteria_III.json
index 2057db3..f2a4ebb 100644
--- a/app/src/main/assets/criteria_III.json
+++ b/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":""
},
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 6cfdaf9..54f88f9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/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();
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