From c551164c89f70e664b498c3a09e615928261e01a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 01 七月 2023 18:33:42 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 28 +++-------------------------
1 files changed, 3 insertions(+), 25 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 9b57fb0..8a62182 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,11 +39,13 @@
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";
@@ -153,30 +155,6 @@
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