Merge branch 'wvp-28181-2.0'

648540858

2022-09-26 2ff3cdb6a1550941dbd36585749499064db4f8d5

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

@@ -15,6 +15,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -68,6 +69,9 @@
   @Autowired
   private VideoStreamSessionManager streamSession;

   @Autowired
   private IPlayService playService;

   @Override
   public void afterPropertiesSet() throws Exception {
      // 添加消息处理的订阅
@@ -118,6 +122,9 @@
                     logger.error("[收到bye] {} 无其它观看者，通知设备停止推流， 发送BYE失败 {}",streamId, e.getMessage());
                  }
               }
               if (sendRtpItem.isOnlyAudio()) {
                  playService.stopAudioBroadcast(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
               }
               if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
                  MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
                        sendRtpItem.getApp(), sendRtpItem.getStreamId(), sendRtpItem.getChannelId(),