Merge pull request #121 from Tanc009/master

publish jdcloud-sdk-python 1.6.87

Author: Tanc009

jdcloud_sdk/services/live/ChangeLog.md

@@ -1,8 +1,9 @@
 # 更新历史 #
-API 版本：1.0.18
+API 版本：1.0.19
 
 |发布时间|版本号|更新|说明|
 |------------|-------|------|-------|
+|2020-12-31|1.0.19| 添加接口| 添加查询推流、播放信息分页接口|
 |2020-10-12|1.0.18| 添加接口| 添加oss录制文件删除接口|
 |2020-02-23|1.0.17| 接口更新| 查询流分组统计数据接口更新查询条件为非必填|
 |2020-01-14|1.0.16| 添加接口| 添加直播账单管理相关接口|

jdcloud_sdk/services/live/apis/DescribeLiveSnapshotDataRequest.py

@@ -45,6 +45,7 @@ def __init__(self, startTime, ):
         self.publishDomain = None
         self.appName = None
         self.streamName = None
+        self.shotMode = None
         self.startTime = startTime
         self.endTime = None
 
@@ -66,6 +67,12 @@ def setStreamName(self, streamName):
         """
         self.streamName = streamName
 
+    def setShotMode(self, shotMode):
+        """
+        :param shotMode: (Optional) 截图模式：1表示采样截图；2表示关键帧截图(默认为2)
+        """
+        self.shotMode = shotMode
+
     def setEndTime(self, endTime):
         """
         :param endTime: (Optional) 结束时间:

jdcloud_sdk/services/live/apis/DescribeLiveStreamPlayInfoByPageRequest.py

@@ -0,0 +1,89 @@
+# coding=utf8
+
+# Copyright 2018 JDCLOUD.COM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# NOTE: This class is auto generated by the jdcloud code generator program.
+
+from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
+
+
+class DescribeLiveStreamPlayInfoByPageRequest(JDCloudRequest):
+    """
+    查询观看人数
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeLiveStreamPlayInfoByPageRequest, self).__init__(
+            '/describeLiveStreamPlayInfoByPage', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeLiveStreamPlayInfoByPageParameters(object):
+
+    def __init__(self, domainName, startTime, ):
+        """
+        :param domainName: 推流域名
+        :param startTime: 起始时间
+- UTC时间
+  格式:yyyy-MM-dd'T'HH:mm:ss'Z'
+  示例:2018-10-21T10:00:00Z
+
+        """
+
+        self.domainName = domainName
+        self.appName = None
+        self.streamName = None
+        self.startTime = startTime
+        self.endTime = None
+        self.pageNumber = None
+        self.pageSize = None
+
+    def setAppName(self, appName):
+        """
+        :param appName: (Optional) 应用名称
+        """
+        self.appName = appName
+
+    def setStreamName(self, streamName):
+        """
+        :param streamName: (Optional) 流名称
+        """
+        self.streamName = streamName
+
+    def setEndTime(self, endTime):
+        """
+        :param endTime: (Optional) 结束时间:
+- UTC时间
+  格式:yyyy-MM-dd'T'HH:mm:ss'Z'
+  示例:2018-10-21T10:00:00Z
+- 为空,默认为当前时间
+
+        """
+        self.endTime = endTime
+
+    def setPageNumber(self, pageNumber):
+        """
+        :param pageNumber: (Optional) 页码，起始页码1
+
+        """
+        self.pageNumber = pageNumber
+
+    def setPageSize(self, pageSize):
+        """
+        :param pageSize: (Optional) 每页最大记录数，取值：[10,1000]，默认：100
+
+        """
+        self.pageSize = pageSize
+

jdcloud_sdk/services/live/apis/DescribeLiveStreamPublishInfoByPageRequest.py

@@ -0,0 +1,89 @@
+# coding=utf8
+
+# Copyright 2018 JDCLOUD.COM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# NOTE: This class is auto generated by the jdcloud code generator program.
+
+from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
+
+
+class DescribeLiveStreamPublishInfoByPageRequest(JDCloudRequest):
+    """
+    查询推流码率、帧率
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeLiveStreamPublishInfoByPageRequest, self).__init__(
+            '/describeLiveStreamPublishInfoByPage', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeLiveStreamPublishInfoByPageParameters(object):
+
+    def __init__(self, domainName, startTime, ):
+        """
+        :param domainName: 推流域名
+        :param startTime: 起始时间
+- UTC时间
+  格式:yyyy-MM-dd'T'HH:mm:ss'Z'
+  示例:2018-10-21T10:00:00Z
+
+        """
+
+        self.domainName = domainName
+        self.appName = None
+        self.streamName = None
+        self.startTime = startTime
+        self.endTime = None
+        self.pageNumber = None
+        self.pageSize = None
+
+    def setAppName(self, appName):
+        """
+        :param appName: (Optional) 应用名称
+        """
+        self.appName = appName
+
+    def setStreamName(self, streamName):
+        """
+        :param streamName: (Optional) 流名称
+        """
+        self.streamName = streamName
+
+    def setEndTime(self, endTime):
+        """
+        :param endTime: (Optional) 结束时间:
+- UTC时间
+  格式:yyyy-MM-dd'T'HH:mm:ss'Z'
+  示例:2018-10-21T10:00:00Z
+- 为空,默认为当前时间
+
+        """
+        self.endTime = endTime
+
+    def setPageNumber(self, pageNumber):
+        """
+        :param pageNumber: (Optional) 页码，起始页码1
+
+        """
+        self.pageNumber = pageNumber
+
+    def setPageSize(self, pageSize):
+        """
+        :param pageSize: (Optional) 每页最大记录数，取值：[10,1000]，默认：100
+
+        """
+        self.pageSize = pageSize
+

jdcloud_sdk/services/live/client/LiveClient.py

@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('live.jdcloud-api.com')
 
-        super(LiveClient, self).__init__(credential, config, 'live', '1.0.18', logger)
+        super(LiveClient, self).__init__(credential, config, 'live', '1.0.19', logger)

jdcloud_sdk/services/live/models/LiveStreamPlayInfo.py

@@ -0,0 +1,33 @@
+# coding=utf8
+
+# Copyright 2018 JDCLOUD.COM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# NOTE: This class is auto generated by the jdcloud code generator program.
+
+
+class LiveStreamPlayInfo(object):
+
+    def __init__(self, startTime=None, appName=None, streamName=None, playerCount=None):
+        """
+        :param startTime: (Optional) 流起始时间
+        :param appName: (Optional) 应用名称
+        :param streamName: (Optional) 流名称
+        :param playerCount: (Optional) 观看人数
+        """
+
+        self.startTime = startTime
+        self.appName = appName
+        self.streamName = streamName
+        self.playerCount = playerCount

jdcloud_sdk/services/live/models/LiveStreamPublishInfo.py

@@ -19,23 +19,17 @@
 
 class LiveStreamPublishInfo(object):
 
-    def __init__(self, publishDomain=None, appName=None, streamName=None, publishUpTime=None, publishDownTime=None):
+    def __init__(self, startTime=None, appName=None, streamName=None, bitrate=None, framerate=None):
         """
-        :param publishDomain: (Optional) 推流域名
+        :param startTime: (Optional) 流起始时间
         :param appName: (Optional) 应用名称
         :param streamName: (Optional) 流名称
-        :param publishUpTime: (Optional) 推流开始时间
-- UTC时间
-  格式:yyyy-MM-dd'T'HH:mm:ss'Z'
-
-        :param publishDownTime: (Optional) 推流结束时刻
-- UTC时间
-  格式:yyyy-MM-dd'T'HH:mm:ss'Z'
-
+        :param bitrate: (Optional) 码率
+        :param framerate: (Optional) 帧率
         """
 
-        self.publishDomain = publishDomain
+        self.startTime = startTime
         self.appName = appName
         self.streamName = streamName
-        self.publishUpTime = publishUpTime
-        self.publishDownTime = publishDownTime
+        self.bitrate = bitrate
+        self.framerate = framerate

jdcloud_sdk/services/live/models/RankingUrlResultRankData.py

@@ -28,6 +28,7 @@ def __init__(self, uv=None, bandwidth=None, pv=None, flow=None):
         :param pv: (Optional) 访问次数
 
         :param flow: (Optional) 流量，单位：Byte
+
         """
 
         self.uv = uv

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='jdcloud_sdk',
-    version="1.6.86",
+    version="1.6.87",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author='JDCloud API Gateway Team',