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