From 47d87a4cd9ec58d44d93a73d0bf52613566cb261 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 27 Apr 2023 17:41:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
index 7db553d..e8ebc61 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
@@ -298,7 +298,7 @@
// //e2cb261e14144f53a300769839d54753
// //根据子节点编号获取设备播放地址
// String result3 = GetCameraPreviewURL(HkConstant.previewURLs,
-// "ff1f050afd1c47829dec1ec14575c9e3", ProtocolConstant.HLS);
+// "0113d3498d2e41caaf9e5355d1575da3", ProtocolConstant.WS);
// JSONObject jsonObject = JSONObject.parseObject(result3);
// Map map = (Map) jsonObject.get("data");
// //根据子节点编号获取音频对讲地址
--
Gitblit v1.9.3