From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
index a351445..5677c95 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
@@ -39,17 +39,21 @@
public static final String CALLBACK_CMD_DOWNLOAD = "CALLBACK_DOWNLOAD";
+ public static final String CALLBACK_CMD_PROXY = "CALLBACK_PROXY";
+
public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
public static final String UPLOAD_FILE_CHANNEL = "UPLOAD_FILE_CHANNEL";
- public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION";
+ public static final String CALLBACK_CMD_MOBILE_POSITION = "CALLBACK_CMD_MOBILE_POSITION";
public static final String CALLBACK_CMD_PRESETQUERY = "CALLBACK_PRESETQUERY";
public static final String CALLBACK_CMD_ALARM = "CALLBACK_ALARM";
public static final String CALLBACK_CMD_BROADCAST = "CALLBACK_BROADCAST";
+
+ public static final String CALLBACK_CMD_SNAP= "CALLBACK_SNAP";
private Map<String, Map<String, DeferredResultEx>> map = new ConcurrentHashMap<>();
@@ -151,4 +155,30 @@
map.remove(msg.getKey());
}
}
+
+ /*============================璁惧涓诲瓙鐮佹祦閫昏緫START========================*/
+ public static String getPlayKey(String deviceId,String channelId,boolean deviceSwitchSubStream,boolean isSubStream){
+ String key = null;
+ if(deviceSwitchSubStream){
+ key = CALLBACK_CMD_PLAY + isSubStream + deviceId + channelId;
+ }else {
+ key = CALLBACK_CMD_PLAY +deviceId + channelId;
+ }
+ return key;
+ }
+
+ public static String getSnapKey(String deviceId,String channelId,boolean deviceSwitchSubStream,boolean isSubStream){
+ String key = null;
+ if(deviceSwitchSubStream){
+ key = CALLBACK_CMD_SNAP + isSubStream + deviceId + channelId;
+ }else {
+ key = CALLBACK_CMD_SNAP +deviceId + channelId;
+ }
+ return key;
+ }
+
+
+ /*============================璁惧涓诲瓙鐮佹祦閫昏緫END========================*/
+
+
}
--
Gitblit v1.8.0