From 9ef1a0277b23c0302891d74648e0b559423dcbb8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 18 五月 2022 15:36:33 +0800
Subject: [PATCH] 更新jessibuca播放器
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
index d17920d..d714ee4 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
@@ -79,6 +79,11 @@
deviceChannel.setParental(1);
deviceChannel.setParentId(catalog.getParentId());
deviceChannel.setRegisterWay(1);
+ if (catalog.getParentId() != null && catalog.getParentId().length() <= 10) {
+ deviceChannel.setCivilCode(catalog.getParentId());
+ }else {
+ deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
+ }
deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
@@ -95,7 +100,12 @@
DeviceChannel deviceChannel = storage.queryChannel(channel.getDeviceId(), channel.getChannelId());
deviceChannel.setParental(0);
deviceChannel.setParentId(channel.getCatalogId());
- deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0, 6));
+ if (channel.getCatalogId() != null && channel.getCatalogId().length() <= 10) {
+ channel.setCivilCode(channel.getCatalogId());
+ }else {
+ deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
+ }
+
allChannels.add(deviceChannel);
}
}
@@ -116,7 +126,11 @@
deviceChannel.setStatus(1);
deviceChannel.setParentId(gbStream.getCatalogId());
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
+ if (gbStream.getCatalogId() != null && gbStream.getCatalogId().length() <= 10) {
+ deviceChannel.setCivilCode(gbStream.getCatalogId());
+ }else {
+ deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
+ }
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setParental(0);
--
Gitblit v1.8.0