默认含有音频通道，改为播放时判断音频编码

Lawrence

2020-10-19 5ab432856deb79c26a3b4ea05e8582acf9e80cdc

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

@@ -37,6 +37,7 @@
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import com.genersoft.iot.vmp.utils.redis.RedisUtil;

import org.springframework.util.StringUtils;



/**    

 * @Description:MESSAGE请求处理器

@@ -125,6 +126,9 @@
         device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));

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

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

         if (StringUtils.isEmpty(device.getStreamMode())){

            device.setStreamMode("UDP");

         }

         storager.updateDevice(device);

         

         RequestMessage msg = new RequestMessage();

@@ -199,11 +203,9 @@
               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")));

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

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

               deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC

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

            }

            // 更新

            storager.updateDevice(device);



            RequestMessage msg = new RequestMessage();

            msg.setDeviceId(deviceId);

@@ -243,6 +245,9 @@
         device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));

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

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

         if (StringUtils.isEmpty(device.getStreamMode())){

            device.setStreamMode("UDP");

         }

         storager.updateDevice(device);

         cmder.catalogQuery(device);

      } catch (DocumentException e) {

@@ -308,7 +313,7 @@
               record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord,"EndTime")));

               record.setSecrecy(itemRecord.element("Secrecy") == null? 0:Integer.parseInt(XmlUtil.getText(itemRecord,"Secrecy")));

               record.setType(XmlUtil.getText(itemRecord,"Type"));

               record.setRecordId(XmlUtil.getText(itemRecord,"RecorderID"));

               record.setRecorderId(XmlUtil.getText(itemRecord,"RecorderID"));

               recordList.add(record);

            }

            recordInfo.setRecordList(recordList);

@@ -362,7 +367,7 @@
   private Element getRootElement(RequestEvent evt) throws DocumentException {

      Request request = evt.getRequest();

      SAXReader reader = new SAXReader();

//      reader.setEncoding("GB2312");

      reader.setEncoding("gbk");

      Document xml = reader.read(new ByteArrayInputStream(request.getRawContent()));

      return xml.getRootElement();

   }