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/media/zlm/dto/OriginType.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/OriginType.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/OriginType.java
index cb41c9a..630e825 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/OriginType.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/OriginType.java
@@ -1,15 +1,16 @@
 package com.genersoft.iot.vmp.media.zlm.dto;
 
 public enum OriginType {
+    // 涓嶅彲璋冩暣椤哄簭
     UNKNOWN("UNKNOWN"),
     RTMP_PUSH("PUSH"),
     RTSP_PUSH("PUSH"),
     RTP_PUSH("RTP"),
-    RTC_PUSH("PUSH"),
     PULL("PULL"),
     FFMPEG_PULL("PULL"),
     MP4_VOD("MP4_VOD"),
-    DEVICE_CHN("DEVICE_CHN");
+    DEVICE_CHN("DEVICE_CHN"),
+    RTC_PUSH("PUSH");
 
     private final String type;
     OriginType(String type) {

--
Gitblit v1.8.0