Merge pull request #169 from jdcloud-apigateway/master

openjrtc 1.1.8

Author: jdcloud-apigateway

jdcloud_sdk/services/openjrtc/ChangeLog.md

@@ -1,9 +1,9 @@
 # 更新历史 #
-API版本：1.1.7
+API版本：1.1.8
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
-|2020-11-30   |1.0.0   |初始版本       |* 音视频融合rtc openApi |
+|2020-11-30   |1.0.0   |初始版本       |* 视音频通信JRTC OpenApi |
 |2021-01-28   |1.1.0   |增加接口       |* 查询应用appKey;<br>* 查询应用信息;<br>* 查询用户应用列表;<br>* 修改房间;<br>* 查询房间信息;<br>* 删除房间;<br>* 查询应用下的房间列表;<br> |
 |2021-02-19   |1.1.1   |增加接口       |* 移除房间内人员;<br>* 移除房间内所有人员;<br>* 发送自定义信令给房间内的人员;<br>* 发送自定义信令给房间 ;<br> |
 |2021-07-16   |1.1.2   |增加接口       |* 注册用户;<br>* 查询注册用户;<br>* 查询注册用户列表;<br>* 注册用户房间号;<br>* 查询注册房间号;<br>* 查询注册房间号列表;<br>* 修改房间;<br>* 查询房间内人员列表;<br>* 统计房间内人数;<br>* 移除房间内所有人员;<br>* 移除房间内指定人员;<br>* 发送自定义信令给房间内的人员;<br>* 发送自定义信令给房间;<br>* 生成token;<br> |
@@ -12,3 +12,4 @@ API版本：1.1.7
 |2022-03-09   |1.1.5   |新增接口       |* 获取近7天通讯时长;<br>* 获取历史音频、视频区分码率通讯时长;<br>* 查询房间人数、通讯时长;<br>* 查询房间用户记录;<br>* 查询用户端到端推流码率|
 |2022-03-24   |1.1.6   |新增接口       |* 开启语音识别功能;<br>* 关闭语音识别功能;|
 |2022-04-20   |1.1.7   |新增接口       |* 查询房间内推流信息列表;<br>* 查询指定用户在房间内的推流信息;<br>* 根据流ID查询推流信息;<br>* 查询指定用户在房间内的推流历史记录;<br>* 根据流ID查询推流历史记录;|
+|2022-05-09   |1.1.8   |新增接口       |* 查询房间内的人员信息;|

jdcloud_sdk/services/openjrtc/apis/CreateRoomRequest.py

@@ -40,6 +40,7 @@ def __init__(self, ):
         self.roomName = None
         self.appId = None
         self.roomType = None
+        self.meetingType = None
         self.peerId = None
 
     def setRoomName(self, roomName):
@@ -60,6 +61,12 @@ def setRoomType(self, roomType):
         """
         self.roomType = roomType
 
+    def setMeetingType(self, meetingType):
+        """
+        :param meetingType: (Optional) 会议类型 0-即时会议 1-预约会议
+        """
+        self.meetingType = meetingType
+
     def setPeerId(self, peerId):
         """
         :param peerId: (Optional) 用户ID(创建者ID)

jdcloud_sdk/services/openjrtc/apis/DescribeRoomUserRequest.py

@@ -0,0 +1,46 @@
+# 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 DescribeRoomUserRequest(JDCloudRequest):
+    """
+    查询房间内的人员信息
+
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeRoomUserRequest, self).__init__(
+            '/describeRoomUser/{appId}', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeRoomUserParameters(object):
+
+    def __init__(self, appId,userRoomId, userId):
+        """
+        :param appId: 应用ID
+        :param userRoomId: 业务接入方定义的且在JRTC系统内注册过的房间号
+        :param userId: 业务接入方用户体系定义的且在JRTC系统内注册过的userId
+        """
+
+        self.appId = appId
+        self.userRoomId = userRoomId
+        self.userId = userId
+

jdcloud_sdk/services/openjrtc/client/OpenjrtcClient.py

@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('openjrtc.jdcloud-api.com')
 
-        super(OpenjrtcClient, self).__init__(credential, config, 'openjrtc', '1.1.7', logger)
+        super(OpenjrtcClient, self).__init__(credential, config, 'openjrtc', '1.1.8', logger)

jdcloud_sdk/services/openjrtc/models/CreateRoomRequestObj.py

@@ -19,15 +19,17 @@
 
 class CreateRoomRequestObj(object):
 
-    def __init__(self, roomName=None, appId=None, roomType=None, peerId=None):
+    def __init__(self, roomName=None, appId=None, roomType=None, meetingType=None, peerId=None):
         """
         :param roomName: (Optional) 房间名称
         :param appId: (Optional) 应用ID
         :param roomType: (Optional) 房间类型 1-小房间(音频单流订阅) 2-大房间(音频固定订阅)
+        :param meetingType: (Optional) 会议类型 0-即时会议 1-预约会议
         :param peerId: (Optional) 用户ID(创建者ID)
         """
 
         self.roomName = roomName
         self.appId = appId
         self.roomType = roomType
+        self.meetingType = meetingType
         self.peerId = peerId

setup.py

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