From 92421b46cc3dd019ab6943ada8c4145f751e5926 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: Fri, 22 Apr 2022 16:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=85=B3=E9=97=AD=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                   | 2 ++
 .../com/genersoft/iot/vmp/common/VideoManagerConstants.java | 5 ++++-
 web_src/index.html                                          | 2 +-
 web_src/src/components/devicePosition.vue                   | 6 +++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index aec9555c..ee030127 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,8 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
 QQ群: 901799015, ZLM使用文档[https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit)  
 QQ私信一般不回, 精力有限.欢迎大家在群里讨论.觉得项目对你有帮助，欢迎star和提交pr。
 
+# 授权协议
+本项目自有代码使用宽松的MIT协议，在保留版权信息的情况下可以自由应用于各自商用、非商业的项目。 但是本项目也零碎的使用了一些其他的开源代码，在商用的情况下请自行替代或剔除； 由于使用本项目而产生的商业纠纷或侵权行为一概与本项目及开发者无关，请自行承担法律风险。 在使用本项目代码时，也应该在授权协议中同时表明本项目依赖的第三方库的协议
 
 # 致谢
 感谢作者[夏楚](https://github.com/xia-chu) 提供这么棒的开源流媒体服务框架,并在开发过程中给予支持与帮助。     
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index e1d7c495..ef4492f8 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -87,9 +87,12 @@ public class VideoManagerConstants {
 	// 移动位置订阅通知
 	public static final String VM_MSG_SUBSCRIBE_MOBILE_POSITION = "mobileposition";
 
-	// 报警订阅的通知
+	// 报警订阅的通知（收到报警向redis发出通知）
 	public static final String VM_MSG_SUBSCRIBE_ALARM = "alarm";
 
+	// 报警通知的发送 （收到redis发出的通知，转发给其他平台）
+	public static final String VM_MSG_SUBSCRIBE_ALARM_RECEIVE= "alarm_receive";
+
 	// 设备状态订阅的通知
 	public static final String VM_MSG_SUBSCRIBE_DEVICE_STATUS = "device";
 
diff --git a/web_src/index.html b/web_src/index.html
index 24d5ee24..1ce43e00 100644
--- a/web_src/index.html
+++ b/web_src/index.html
@@ -17,7 +17,7 @@
     <script>
       // map组件全局参数
       window.mapParam = {
-        // 坐标系 GCJ-02 WGS-84, 默认WGS-84
+        // 坐标系 GCJ-02 WGS-84,
         coordinateSystem: "GCJ-02",
         // 地图瓦片地址
         tilesUrl: "http://webrd0{1-4}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8",
diff --git a/web_src/src/components/devicePosition.vue b/web_src/src/components/devicePosition.vue
index cc74dc1f..a8073638 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="devicePosition" style="width: 100vw; height: 91vh;">
-      <el-container style="height: 91vh;" v-loading="isLoging">
+      <el-container v-if="onOff" style="height: 91vh;" v-loading="isLoging">
         <el-aside width="auto" style="background-color: #ffffff">
           <DeviceTree ref="deviceTree" :clickEvent="clickEvent" :contextMenuEvent="contextmenuEventHandler" ></DeviceTree>
         </el-aside>
@@ -8,6 +8,9 @@
           <MapComponent ref="map"></MapComponent>
         </el-main>
       </el-container>
+      <div v-if="!onOff" style="width: 100%; height:100%; text-align: center; line-height: 5rem">
+        <p>地图功能已关闭</p>
+      </div>
       <div ref="infobox" v-if="channel != null " >
         <div v-if="channel != null" class="infobox-content">
           <el-descriptions class="margin-top" :title="channel.name" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
@@ -55,6 +58,7 @@ export default {
   },
   data() {
     return {
+      onOff: typeof window.mapParam !== "undefined",
       deviceService: new DeviceService(),
       layer: null,
       lineLayer: null,