From d9945dca4197d615cdeaff24a521c9c8ca6059f9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 28 Sep 2021 09:51:38 +0800
Subject: [PATCH] 语音对讲完善

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/hk/util/GetCameraPreviewURL.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/hk/util/GetCameraPreviewURL.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/hk/util/GetCameraPreviewURL.java
index 2e2ab22..55e0dc2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/hk/util/GetCameraPreviewURL.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/hk/util/GetCameraPreviewURL.java
@@ -58,12 +58,24 @@
 		 * STEP5:组装请求参数
 		 */
 		JSONObject jsonBody = new JSONObject();
-		jsonBody.put("cameraIndexCode", cameraIndexCode);
+		jsonBody.put("indexCode", cameraIndexCode);
 		jsonBody.put("streamType", 0);
+		jsonBody.put("netZoneCode", 0);
 		jsonBody.put("protocol", protocol);
 		jsonBody.put("transmode", 1);
-		jsonBody.put("expand", "streamform=ps");
+		jsonBody.put("expireTime", 300);
 		String body = jsonBody.toJSONString();
+
+
+//		JSONObject jsonBody = new JSONObject();
+//		jsonBody.put("cameraIndexCode", cameraIndexCode);
+//		jsonBody.put("streamType", 0);
+//		jsonBody.put("protocol", protocol);
+//		jsonBody.put("transmode", 1);
+//		jsonBody.put("expand", "streamform=ps");
+//		String body = jsonBody.toJSONString();
+
+
 		/**
 		 * STEP6:调用接口
 		 */
@@ -243,7 +255,7 @@
 
 		String result = GetCameraResourcePage(1, 1, HkConstant.cameras);
 		//根据设备id获取设备编号
-		String result1 = QueryCameraPreviewURL(HkConstant.camerasID, "111111", "encodeDevice", "deviceCode");
+		String result1 = QueryCameraPreviewURL(HkConstant.camerasID, "111111222", "encodeDevice", "deviceCode");
 
 		JSONObject jsonObject1 = JSONObject.parseObject(result1);
 		JSONObject res1 = (JSONObject) jsonObject1.get("data");
@@ -259,9 +271,8 @@
 		JSONArray arr2 = JSON.parseArray(res2.getString("list"));
 		JSONObject data2 = (JSONObject) arr2.get(0);
 		String code2 = data2.get("indexCode").toString();
-
 		//根据子节点编号获取设备播放地址
-		String result3 = GetCameraPreviewURL(HkConstant.previewURLs, code2, ProtocolConstant.HLS);
+		String result3 = GetCameraPreviewURL(HkConstant.previewURLshttps, code2, ProtocolConstant.HLSS);
 		//根据子节点编号获取音频对讲地址
 		String result4 = GetTalkURLs(HkConstant.talkURLs, code2);
 

--
Gitblit v1.9.3