x1ongzhu 7 лет назад
Родитель
Сommit
cfc09548fc

+ 1 - 1
src/main/java/com/izouma/awesomeadmin/util/VideoProcessToolNew.java

@@ -383,7 +383,7 @@ public class VideoProcessToolNew {
         filtered.release();
         roi.release();
         if (Pattern.matches("((^([0-9]+[.][0-9]*))|(^\\d{1,2}))分钟", map.get("参赛时间")) &&
-                Pattern.matches("((^([0-9]+[.][0-9]*))|(^\\d{1,2}))", map.get("评分"))) {
+                Pattern.matches("((^([0-9]+[.][0-9]+)$)|(^\\d{1,2})$)", map.get("评分"))) {
             try {
                 double score = Double.parseDouble(map.get("评分"));
                 double time = Double.parseDouble(map.get("参赛时间").replace("分钟", ""));

+ 1 - 1
src/test/java/VideoProcessTest.java

@@ -27,7 +27,7 @@ public class VideoProcessTest {
     public void testVideoNew() {
         try {
             long ts = System.currentTimeMillis();
-            Map<String, String> result = videoProcessToolNew.processVideo("/Users/drew/Downloads/2019-06-10-06-05-35-8hkctotg.mp4", 0);
+            Map<String, String> result = videoProcessToolNew.processVideo("/Users/drew/Downloads/2019-06-10-06-13-45-tv8d8zxr.mp4", 0);
             System.out.println(result);
             System.out.println((System.currentTimeMillis() - ts) / 1000f / 60);
         } catch (FrameGrabber.Exception e) {