修复无音频通道开启通道音频后无法播放的bug 修复点播接口真的收到视频后回复

648540858

2020-10-13 fbdad00cdb294a857f55e33b2dd92c61dc37475c

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -76,8 +76,6 @@
    * 处理MESSAGE请求

    *  

    * @param evt

    * @param layer

    * @param transaction  
    */  

   @Override

   public void process(RequestEvent evt) {

@@ -127,7 +125,7 @@
         device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));

         device.setModel(XmlUtil.getText(rootElement,"Model"));

         device.setFirmware(XmlUtil.getText(rootElement,"Firmware"));

         storager.update(device);

         storager.updateDevice(device);

         

         RequestMessage msg = new RequestMessage();

         msg.setDeviceId(deviceId);

@@ -146,6 +144,7 @@
   private void processMessageCatalogList(RequestEvent evt) {

      try {

         Element rootElement = getRootElement(evt);

         String s = rootElement.toString();

         Element deviceIdElement = rootElement.element("DeviceID");

         String deviceId = deviceIdElement.getText().toString();

         Element deviceListElement = rootElement.element("DeviceList");

@@ -157,11 +156,6 @@
            Device device = storager.queryVideoDevice(deviceId);

            if (device == null) {

               return;

            }

            Map<String, DeviceChannel> channelMap = device.getChannelMap();

            if (channelMap == null) {

               channelMap = new HashMap<String, DeviceChannel>(5);

               device.setChannelMap(channelMap);

            }

            // 遍历DeviceList

            while (deviceListIterator.hasNext()) {

@@ -175,13 +169,13 @@
               String channelName = channdelNameElement != null ? channdelNameElement.getText().toString() : "";

               Element statusElement = itemDevice.element("Status");

               String status = statusElement != null ? statusElement.getText().toString() : "ON";

               DeviceChannel deviceChannel = channelMap.containsKey(channelDeviceId) ? channelMap.get(channelDeviceId) : new DeviceChannel();

               DeviceChannel deviceChannel = new DeviceChannel();

               deviceChannel.setName(channelName);

               deviceChannel.setChannelId(channelDeviceId);

               if(status.equals("ON")) {

               if(status.equals("ON") || status.equals("On")) {

                  deviceChannel.setStatus(1);

               }

               if(status.equals("OFF")) {

               if(status.equals("OFF") || status.equals("Off")) {

                  deviceChannel.setStatus(0);

               }



@@ -192,7 +186,7 @@
               deviceChannel.setBlock(XmlUtil.getText(itemDevice,"Block"));

               deviceChannel.setAddress(XmlUtil.getText(itemDevice,"Address"));

               deviceChannel.setParental(itemDevice.element("Parental") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Parental")));

               deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentId"));

               deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentID"));

               deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"SafetyWay")));

               deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null? 1:Integer.parseInt(XmlUtil.getText(itemDevice,"RegisterWay")));

               deviceChannel.setCertNum(XmlUtil.getText(itemDevice,"CertNum"));

@@ -205,17 +199,23 @@
               deviceChannel.setPassword(XmlUtil.getText(itemDevice,"Password"));

               deviceChannel.setLongitude(itemDevice.element("Longitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Longitude")));

               deviceChannel.setLatitude(itemDevice.element("Latitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Latitude")));

               channelMap.put(channelDeviceId, deviceChannel);

               deviceChannel.setPTZType(itemDevice.element("PTZType") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"PTZType")));

               deviceChannel.setHasAudio(false); // 默认含有音频为false

               storager.updateChannel(device.getDeviceId(), deviceChannel);

            }

            // 更新

            storager.update(device);

            storager.updateDevice(device);



            RequestMessage msg = new RequestMessage();

            msg.setDeviceId(deviceId);

            msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);

            msg.setData(device);

            deferredResultHolder.invokeResult(msg);



            // 回复200

            responseAck(evt);

         }

      } catch (DocumentException e) {

      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {

         e.printStackTrace();

      }

   }

@@ -232,13 +232,15 @@
         

         Device device = storager.queryVideoDevice(deviceId);

         if (device == null) {

            // TODO 也可能是通道

//            storager.queryChannel(deviceId)

            return;

         }

         device.setName(XmlUtil.getText(rootElement,"DeviceName"));

         device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));

         device.setModel(XmlUtil.getText(rootElement,"Model"));

         device.setFirmware(XmlUtil.getText(rootElement,"Firmware"));

         storager.update(device);

         storager.updateDevice(device);

         cmder.catalogQuery(device);

      } catch (DocumentException e) {

         e.printStackTrace();