Merge branch 'master' into resume-check-ctx-expire

xwen-winnie · web-flow · commit d81fa09f673b · 2022-10-17T13:31:28.000+08:00
diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java
@@ -5,6 +5,7 @@
 import com.qiniu.qvs.model.PatchOperation;
 import com.qiniu.http.Client;
 import com.qiniu.http.Response;
+import com.qiniu.qvs.model.PlayContral;
 import com.qiniu.qvs.model.VoiceChat;
 import com.qiniu.util.Auth;
 import com.qiniu.util.StringMap;
@@ -138,22 +139,24 @@ public Response queryGBRecordHistories(String namespaceId, String gbId, String c
         return QvsResponse.get(url, client, auth);
     }
 
-    public Response getVoiceChatUrl(String namespaceId, String gbId, VoiceChat voiceChat)  throws QiniuException {
+    public Response getVoiceChatUrl(String namespaceId, String gbId, VoiceChat voiceChat) throws QiniuException {
         String url = String.format("%s/v1/namespaces/%s/devices/%s/talk", apiServer, namespaceId, gbId);
-        StringMap params = getStringMap(voiceChat);
+        StringMap params = QvsMap.getVoiceChatMap(voiceChat);
         return com.qiniu.qvs.QvsResponse.post(url, params, client, auth);
     }
 
-    private StringMap getStringMap(VoiceChat voiceChat) {
-        StringMap params = new StringMap().putNotNull("isV2", voiceChat.getLatency());
-        params.put("channels", voiceChat.getChannels());
-        params.put("version", voiceChat.getVersion());
-        params.put("transProtocol", voiceChat.getTransProtocol());
-        return params;
+    public Response sendVoiceChatData(String url, String base64_pcm) throws QiniuException {
+        StringMap params = new StringMap().putNotNull("base64_pcm", base64_pcm);
+        return QvsResponse.post(url, params, client, auth);
     }
 
-    public Response sendVoiceChatData(String url, String base64_pcm)  throws QiniuException {
-        StringMap params = new StringMap().putNotNull("base64_pcm", base64_pcm);
+    /*
+     * 本地录像回放控制
+     * streamId 流ID可以从查询本地录像列表接口queryGBRecordHistories获取的streamId
+     */
+    public Response controlGBRecord(String namespaceId, String streamId, PlayContral playContral) throws QiniuException {
+        String url = String.format("%s/v1/namespaces/%s/streams/%s/playback/control", apiServer, namespaceId, streamId);
+        StringMap params = QvsMap.getPlayContralMap(playContral);
         return QvsResponse.post(url, params, client, auth);
     }
 }
diff --git a/src/main/java/com/qiniu/qvs/QvsMap.java b/src/main/java/com/qiniu/qvs/QvsMap.java
@@ -0,0 +1,25 @@
+package com.qiniu.qvs;
+
+import com.qiniu.qvs.model.PlayContral;
+import com.qiniu.qvs.model.VoiceChat;
+import com.qiniu.util.StringMap;
+
+public class QvsMap {
+    private QvsMap() {
+    }
+
+    public static StringMap getVoiceChatMap(VoiceChat voiceChat) {
+        StringMap params = new StringMap().putNotNull("isV2", voiceChat.getLatency());
+        params.put("channels", voiceChat.getChannels());
+        params.put("version", voiceChat.getVersion());
+        params.put("transProtocol", voiceChat.getTransProtocol());
+        return params;
+    }
+
+    public static StringMap getPlayContralMap(PlayContral playContral) {
+        StringMap params = new StringMap().putNotNull("command", playContral.getCommand());
+        params.put("range", playContral.getRange());
+        params.put("scale", playContral.getScale());
+        return params;
+    }
+}
diff --git a/src/main/java/com/qiniu/qvs/model/PlayContral.java b/src/main/java/com/qiniu/qvs/model/PlayContral.java
@@ -0,0 +1,37 @@
+package com.qiniu.qvs.model;
+
+public class PlayContral {
+    private String command;
+    private String range;
+    private Float scale;
+
+    public PlayContral(String command, String range, Float scale) {
+        this.command = command;
+        this.range = range;
+        this.scale = scale;
+    }
+
+    public String getCommand() {
+        return command;
+    }
+
+    public void setCommand(String command) {
+        this.command = command;
+    }
+
+    public String getRange() {
+        return range;
+    }
+
+    public void setRange(String range) {
+        this.range = range;
+    }
+
+    public Float getScale() {
+        return scale;
+    }
+
+    public void setScale(Float scale) {
+        this.scale = scale;
+    }
+}
diff --git a/src/main/java/com/qiniu/qvs/model/VoiceChat.java b/src/main/java/com/qiniu/qvs/model/VoiceChat.java
@@ -6,6 +6,13 @@ public class VoiceChat {
     private String version; // 对讲国标协议版本，取值"2014"或"2016"，默认为2014，例如大部分大华摄像头为GBT 28181-2014版本对讲模式
     private String transProtocol; // 取值"tcp"或"udp"，流传输模式，默认udp
 
+    public VoiceChat(Boolean latency, String[] channels, String version, String transProtocol) {
+        this.latency = latency;
+        this.channels = channels;
+        this.version = version;
+        this.transProtocol = transProtocol;
+    }
+
     public Boolean getLatency() {
         return latency;
     }
diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java
@@ -201,5 +201,39 @@ public void testQueryGBRecordHistories() {
             }
         }
     }
+
+    @Test
+    @Tag("IntegrationTest")
+    public void testQueryGBRecordHistories() {
+        try {
+            res = deviceManager.queryGBRecordHistories("qiniu", "31011500991180013385", "34020000001310000001",
+                    1665190800, 1665192093);
+            assertNotNull(res);
+            System.out.println(res.bodyString());
+        } catch (QiniuException e) {
+            e.printStackTrace();
+        } finally {
+            if (res != null) {
+                res.close();
+            }
+        }
+    }
+
+     @Test
+     @Tag("IntegrationTest")
+     public void controlGBRecord() {
+        try {
+            PlayContral playContral = new PlayContral("play","5",2.0F);
+            res = deviceManager.controlGBRecord("qiniu", "31011500991180013385_34020000001310000001_history_1665190800_1665192092", playContral);
+            assertNotNull(res);
+            System.out.println(res.bodyString());
+        } catch (QiniuException e) {
+            e.printStackTrace();
+        } finally {
+            if (res != null) {
+                res.close();
+            }
+        }
+    }
 */
 }
diff --git a/src/test/java/test/com/qiniu/streaming/StreamingTest.java b/src/test/java/test/com/qiniu/streaming/StreamingTest.java
@@ -5,15 +5,19 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
 import com.qiniu.common.QiniuException;
 import com.qiniu.streaming.StreamingManager;
 import com.qiniu.streaming.model.ActivityRecords;
 import com.qiniu.streaming.model.StreamAttribute;
 import com.qiniu.streaming.model.StreamListing;
+import com.qiniu.streaming.model.StreamStatus;
 import com.qiniu.util.Auth;
+
 import test.com.qiniu.TestConfig;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
 
 /**
  * Created by bailong on 16/9/22 Updated by panyuan on 19/3/12
@@ -88,12 +92,8 @@ public void testStreamOperation() throws QiniuException {
         assertEquals(0, attr.disabledTill);
         assertNotEquals(0, attr.updatedAt);
 
-        try {
-            manager.status(stream);
-            fail();
-        } catch (QiniuException e) {
-            assertEquals(619, e.code());
-        }
+        StreamStatus status = manager.status(stream);
+        assertEquals(0, status.startAt);
 
         try {
             manager.saveAs(stream, null, 0, 0);
