From 40e5354d874c416661681cb2715d5adf8f1b128e Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 30 三月 2020 12:17:37 +0800
Subject: [PATCH] 增加正则判断一个字符串是否全为数字;不再TTSWorker里面执行插入数据库操作和语音播报工作;训练模式和考试模式评判信息按时间排序;收到评判消息在线程里面进行语音播报和数据库操作

---
 app/src/main/java/safeluck/drive/evaluation/util/Utils.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 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 23bbbb3..04b5ae8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
@@ -12,13 +12,17 @@
 
 import java.math.BigDecimal;
 import java.security.SecureRandom;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
@@ -125,10 +129,10 @@
         return temp;
     }
 
-    public static boolean isDigital(String str) {
-        String regx= "^\\d+";
-        return str.matches(regx);
-    }
+//    public static boolean isDigital(String str) {
+//        String regx= "^\\d+";
+//        return str.matches(regx);
+//    }
 
 //    public static void main(String []args){
 //        String str   = "EB00020000031420010000000400A5";
@@ -349,6 +353,13 @@
 Point p1 = new Point(2.55,1.0);
 Point p2 = new Point(1.55,1.0);
         System.out.println(Calc3Point(p1,p2,1.0).toString());
+        System.out.println( isDigital("2003233d"));
+        System.out.println( isDigital("d2003233"));
+        System.out.println( dateToLongSec("20200330101455"));
+
+
+
+       ;
     }
 
     public static Point Calc3Point(Point p1,Point p2,double L ){
@@ -429,4 +440,23 @@
 
         return  simpleDateFormat.format(begin_time);
     }
+
+    public static boolean isDigital(String str){
+        String regx = "^[0-9]*$";
+        Pattern pattern = Pattern.compile(regx);
+        Matcher matcher = pattern.matcher(str);
+        return matcher.matches();
+    }
+
+    public static long dateToLongSec(String utc) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+        Date date = null;
+        try {
+            date = simpleDateFormat.parse(utc);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date.getTime()/1000;
+    }
 }

--
Gitblit v1.8.0