From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java
index e241bd5..604c083 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java
@@ -2,16 +2,18 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Locale;
/**
- * @Description:鏃堕棿宸ュ叿绫伙紝涓昏澶勭悊ISO 8601鏍煎紡杞崲
- * @author: songww
+ * @description:鏃堕棿宸ュ叿绫伙紝涓昏澶勭悊ISO 8601鏍煎紡杞崲
+ * @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍3:24:42
*/
public class DateUtil {
- private static final String yyyy_MM_dd_T_HH_mm_ss_SSSXXX = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+ //private static final String yyyy_MM_dd_T_HH_mm_ss_SSSXXX = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+ private static final String yyyy_MM_dd_T_HH_mm_ss_SSSXXX = "yyyy-MM-dd'T'HH:mm:ss";
private static final String yyyy_MM_dd_HH_mm_ss = "yyyy-MM-dd HH:mm:ss";
public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
@@ -37,4 +39,19 @@
}
return "";
}
+
+ public static long yyyy_MM_dd_HH_mm_ssToTimestamp(String formatTime) {
+ SimpleDateFormat format=new SimpleDateFormat(yyyy_MM_dd_HH_mm_ss);
+ //璁剧疆瑕佽鍙栫殑鏃堕棿瀛楃涓叉牸寮�
+ Date date;
+ try {
+ date = format.parse(formatTime);
+ Long timestamp=date.getTime()/1000;
+ //杞崲涓篋ate绫�
+ return timestamp;
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return 0;
+ }
}
--
Gitblit v1.8.0