Merge pull request #580 from HugoLipeng/qvs/LINK-2757

LINK-2757 qvs add playExpireSec

Author: callmefisher

src/main/java/com/qiniu/qvs/StreamManager.java

@@ -91,8 +91,8 @@ public Response listStream(String namespaceId, int offset, int line, int qtype,
         静态模式获取流地址
      */
     public Response staticPublishPlayURL(String namespaceId, String streamId, StaticLiveRoute staticLiveRoute) throws QiniuException {
-        StringMap params = new StringMap().put("Domain", staticLiveRoute.getDomain()).
-                put("DomainType", staticLiveRoute.getDomainType()).putNotNull("UrlExpireSec", staticLiveRoute.getUrlExpireSec());
+        StringMap params = new StringMap().put("domain", staticLiveRoute.getDomain()).
+                put("domainType", staticLiveRoute.getDomainType()).putNotNull("urlExpireSec", staticLiveRoute.getUrlExpireSec()).putNotNull("playExpireSec", staticLiveRoute.getPlayExpireSec());
         String url = String.format("%s/v1/namespaces/%s/streams/%s/domain", apiServer, namespaceId, streamId);
         return QvsResponse.post(url, params, client, auth);
     }
@@ -102,9 +102,10 @@ public Response staticPublishPlayURL(String namespaceId, String streamId, Static
      */
     public Response dynamicPublishPlayURL(String namespaceId, String streamId, DynamicLiveRoute dynamicLiveRoute) throws QiniuException {
         StringMap params = new StringMap();
-        params.put("PublishIP", dynamicLiveRoute.getPublishIP());
-        params.put("PlayIP", dynamicLiveRoute.getPlayIP());
-        params.putNotNull("UrlExpireSec", dynamicLiveRoute.getUrlExpireSec());
+        params.put("publishIp", dynamicLiveRoute.getPublishIP());
+        params.put("playIp", dynamicLiveRoute.getPlayIP());
+        params.putNotNull("urlExpireSec", dynamicLiveRoute.getUrlExpireSec());
+        params.putNotNull("playExpireSec", dynamicLiveRoute.getPlayExpireSec());
 
         String url = String.format("%s/v1/namespaces/%s/streams/%s/urls", apiServer, namespaceId, streamId);
         return QvsResponse.post(url, params, client, auth);

src/main/java/com/qiniu/qvs/model/DynamicLiveRoute.java

@@ -4,6 +4,7 @@ public class DynamicLiveRoute {
     private String publishIP;    // 推流端对外IP地址
     private String playIP;   // 拉流端对外IP地址
     private int urlExpireSec; // 地址过期时间,urlExpireSec:100代表100秒后过期;  默认urlExpireSec:0,永不过期.
+    private int playExpireSec; // 播放过期时间(单位为秒)
 
     public DynamicLiveRoute(String publishIP, String playIP) {
         this.publishIP = publishIP;
@@ -16,6 +17,13 @@ public DynamicLiveRoute(String publishIP, String playIP, int urlExpireSec) {
         this.urlExpireSec = urlExpireSec;
     }
 
+    public DynamicLiveRoute(String publishIP, String playIP, int urlExpireSec, int playExpireSec) {
+        this.publishIP = publishIP;
+        this.playIP = playIP;
+        this.urlExpireSec = urlExpireSec;
+        this.playExpireSec = playExpireSec;
+    }
+
     public String getPublishIP() {
         return publishIP;
     }
@@ -39,4 +47,12 @@ public int getUrlExpireSec() {
     public void setUrlExpireSec(int urlExpireSec) {
         this.urlExpireSec = urlExpireSec;
     }
+
+    public int getPlayExpireSec() {
+        return playExpireSec;
+    }
+
+    public void setPlayExpireSec(int playExpireSec) {
+        this.playExpireSec = playExpireSec;
+    }
 }

src/main/java/com/qiniu/qvs/model/StaticLiveRoute.java

@@ -9,6 +9,7 @@ public class StaticLiveRoute {
     private String domain; // 域名
     private String domainType;   // 域名类型  publishRtmp | liveRtmp | liveHls | liveHdl
     private int urlExpireSec; // 地址过期时间,urlExpireSec:100代表100秒后过期;  默认urlExpireSec:0,永不过期.
+    private int playExpireSec; // 播放过期时间(单位为秒)
 
     public StaticLiveRoute(String domain, String domainType) {
         this.domain = domain;
@@ -21,6 +22,13 @@ public StaticLiveRoute(String domain, String domainType, int urlExpireSec) {
         this.urlExpireSec = urlExpireSec;
     }
 
+    public StaticLiveRoute(String domain, String domainType, int urlExpireSec, int playExpireSec) {
+        this.domain = domain;
+        this.domainType = domainType;
+        this.urlExpireSec = urlExpireSec;
+        this.playExpireSec = playExpireSec;
+    }
+
     public String getDomain() {
         return domain;
     }
@@ -45,6 +53,14 @@ public void setUrlExpireSec(int urlExpireSec) {
         this.urlExpireSec = urlExpireSec;
     }
 
+    public int getPlayExpireSec() {
+        return playExpireSec;
+    }
+
+    public void setPlayExpireSec(int playExpireSec) {
+        this.playExpireSec = playExpireSec;
+    }
+
     public String genStaticHLSFLVDomain(String nsId, String streamId, String key, boolean useHttps) {
         String path = "/" + nsId + "/" + streamId;
         String scheme = useHttps ? "https" : "http";