修复手动控制是否启用ps

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

@@ -484,7 +484,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                             // 写入redis， 超时时回复
                             redisCatchStorage.updateSendRTPSever(sendRtpItem);
                             MediaServerItem finalMediaServerItem = mediaServerItem;
-                            playService.play(mediaServerItem, ssrcInfo, device, channelId, hookEvent, errorEvent, (code, msg) -> {
+                            playService.play(mediaServerItem, ssrcInfo, device, channelId,1, hookEvent, errorEvent, (code, msg) -> {
                                 logger.info("[上级点播]超时, 用户：{}， 通道：{}", username, channelId);
                                 redisCatchStorage.deleteSendRTPServer(platform.getServerGBId(), channelId, callIdHeader.getCallId(), null);
                             });

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -573,7 +573,7 @@ public class ZLMHttpHookListener {
             resultHolder.put(key, uuid, deferredResultEx);
 
             if (!exist) {
-                playService.play(mediaInfo, deviceId, channelId, null, eventResult -> {
+                playService.play(mediaInfo, deviceId, channelId,1, null, eventResult -> {
                     msg.setData(new HookResult(eventResult.statusCode, eventResult.msg));
                     resultHolder.invokeResult(msg);
                 }, null);

src/main/java/com/genersoft/iot/vmp/service/IPlayService.java

@@ -24,10 +24,21 @@ public interface IPlayService {
 
     void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId);
 
-    void play(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+    void play(MediaServerItem mediaServerItem,
+              SSRCInfo ssrcInfo,
+              Device device,
+              String channelId,
+              int isUsePs,
               ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
               InviteTimeOutCallback timeoutCallback);
-    void play(MediaServerItem mediaServerItem, String deviceId, String channelId, ZlmHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent, Runnable timeoutCallback);
+    void play(
+            MediaServerItem mediaServerItem,
+            String deviceId,
+            String channelId,
+            int isUsePs,
+            ZlmHttpHookSubscribe.Event event,
+            SipSubscribe.Event errorEvent,
+            Runnable timeoutCallback);
 
     void openBroadcast(MediaServerItem mediaServerItem,
                        String deviceId,

src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -115,7 +115,8 @@ public class PlayServiceImpl implements IPlayService {
 
 
     @Override
-    public void play(MediaServerItem mediaServerItem, String deviceId, String channelId,
+    public void play(MediaServerItem mediaServerItem, String deviceId,
+                                String channelId,int isUsePs,
                                  ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
                                  Runnable timeoutCallback) {
         if (mediaServerItem == null) {
@@ -200,7 +201,9 @@ public class PlayServiceImpl implements IPlayService {
                 resultHolder.invokeAllResult(msg);
                 return;
             }
-            play(mediaServerItem, ssrcInfo, device, channelId, (mediaServerItemInUse, response) -> {
+            play(mediaServerItem, ssrcInfo, device, channelId,
+                    isUsePs,
+                    (mediaServerItemInUse, response) -> {
                 if (hookEvent != null) {
                     hookEvent.response(mediaServerItem, response);
                 }
@@ -232,7 +235,9 @@ public class PlayServiceImpl implements IPlayService {
 
 
     @Override
-    public void play(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+    public void play(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo,
+                     Device device, String channelId,
+                     int isUsePs,
                      ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
                      InviteTimeOutCallback timeoutCallback) {
 
@@ -275,7 +280,7 @@ public class PlayServiceImpl implements IPlayService {
             return;
         }
         try {
-            cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId,1, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
+            cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId,isUsePs, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
                 logger.info("收到订阅消息： " + response.toJSONString());
                 logger.info("停止超时任务： " + timeOutTaskKey);
                 dynamicTask.stop(timeOutTaskKey);

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -146,7 +146,7 @@ public class PlayController {
 		resultHolder.put(key, uuid, deferredResultEx);
 
 		if (!exist) {
-			playService.play(newMediaServerItem, deviceId, channelId, null, null, null);
+			playService.play(newMediaServerItem, deviceId, channelId,isUsePs, null, null, null);
 		}
 		return result;
 	}

src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -112,7 +112,12 @@ public class ApiStreamController {
             return resultDeferredResult;
         }
         MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
-        playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
+        playService.play(
+                newMediaServerItem,
+                serial,
+                code,
+                1,
+                (mediaServerItem, response)->{
             StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
             JSONObject result = new JSONObject();
             result.put("StreamID", streamInfo.getStream());

web_src/alias.config.js

@@ -0,0 +1,8 @@
+const path = require('path');
+module.exports = {
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname, "src")
+    }
+  }
+};