publish jdcloud-sdk-python 1.6.61

Tanc009 · Tanc009 · commit e8c171a2e77b · 2020-05-28T08:06:32.000Z
diff --git a/jdcloud_sdk/services/iotcore/ChangeLog.md b/jdcloud_sdk/services/iotcore/ChangeLog.md
@@ -3,6 +3,7 @@ API版本：1.1.15
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2020-05-14   |1.1.18   |增加朗锐接口      | *朗瑞查询接口加参数
 |2020-05-14   |1.1.15   |增加朗锐接口      | *增加朗锐的设备接口和电梯运行状态接口
 |2020-04-20   |1.1.5   |增加iotcore融合      | *增加实例列表、实例详情和实例删除接口
 |2020-01-10   |1.1.4   |增加Edge日志上报通知接口      | *增加Edge日志上报通知接口,增加自定义物模型模板接口，增加自定义topic功能
diff --git a/jdcloud_sdk/services/iotcore/apis/CollectorReadMessageRequest.py b/jdcloud_sdk/services/iotcore/apis/CollectorReadMessageRequest.py
@@ -32,26 +32,22 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class CollectorReadMessageParameters(object):
 
-    def __init__(self, instanceId, regionId, ):
+    def __init__(self, instanceId, regionId, identifier, protocol):
         """
         :param instanceId: Hub实例Id
         :param regionId: 区域Id
+        :param identifier: 当前的链接码
+        :param protocol: 当前的协议类型：
+语音播报控制器-输入端子,0X00000~X0007：inputTerminal
+语音播报控制器-播放信息,0X00024~X0027：playInfo
+LR001-516-5B边缘数据采集器-传感器管理：sensor
+LR001-516-5B边缘数据采集器-采集器属性：collectorProperty
+LR001-516-5B边缘数据采集器-电梯属性：elevatorProperty
+
         """
 
         self.instanceId = instanceId
         self.regionId = regionId
-        self.identifier = None
-        self.protocol = None
-
-    def setIdentifier(self, identifier):
-        """
-        :param identifier: (Optional) 当前的链接码
-        """
         self.identifier = identifier
-
-    def setProtocol(self, protocol):
-        """
-        :param protocol: (Optional) 当前的协议类型
-        """
         self.protocol = protocol
 
diff --git a/jdcloud_sdk/services/iotcore/apis/CollectorWriteMessageRequest.py b/jdcloud_sdk/services/iotcore/apis/CollectorWriteMessageRequest.py
@@ -32,33 +32,65 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class CollectorWriteMessageParameters(object):
 
-    def __init__(self, instanceId, regionId, ):
+    def __init__(self, instanceId, regionId, identifier, data):
         """
         :param instanceId: Hub实例Id
         :param regionId: 区域Id
+        :param identifier: 当前的链接码
+        :param data: 当前待写入的数据
+如指定播放设备，寄存地址：13对应16进制0x0D，寄存器值:2
+{
+  "13":2
+}
+如播放控制，寄存地址：14对应16进制0x0E，寄存器值:1
+{
+  "14": 1
+}
+如音量设置，寄存地址：15对应16进制0x0F，寄存器值:10，取值范围0~30
+{
+  "15": 10
+}
+如指定文件夹和文件播放,寄存地址：16对应16进制0x10，寄存器值:1
+寄存器值为两字节，第一个字节为文件夹，第二个字节为文件名
+如0x01文件夹,0x03文件名，0x0103换算为10进制为259
+{
+  "16": 259
+}
+如组合播放，寄存器地址：17、18和19，寄存器值：257、258和259，寄存器值的算法和指定文件夹和文件播放是一致的，如259可换算为0x01文件夹,0x03文件名
+{
+  "17": 257,
+  "18": 258,
+  "19": 259
+}
+如播放广告，寄存地址：32对应16进制0x20，寄存器值:259，寄存器值的算法和指定文件夹和文件播放是一致的，如259可换算为0x01文件夹,0x03文件名
+{
+  "32": 259
+}
+如指定文件夹循环播放，寄存地址：33对应16进制0x21，寄存器值:256，寄存器值的算法，如256可换算为0x0100文件夹
+{
+  "33": 256
+}
+如指定文件夹随机播放，寄存地址：34对应16进制0x22，寄存器值:256，寄存器值的算法，如256可换算为0x0100文件夹
+{
+  "34": 256
+}
+如指定曲目播放，寄存地址：35对应16进制0x23，寄存器值:13,歌曲选择范围为0~3000
+{
+  "35": 13
+}
+
         """
 
         self.instanceId = instanceId
         self.regionId = regionId
-        self.identifier = None
-        self.protocol = None
-        self.data = None
-
-    def setIdentifier(self, identifier):
-        """
-        :param identifier: (Optional) 当前的链接码
-        """
         self.identifier = identifier
+        self.protocol = None
+        self.data = data
 
     def setProtocol(self, protocol):
         """
-        :param protocol: (Optional) 当前的协议类型
-        """
-        self.protocol = protocol
+        :param protocol: (Optional) 当前的协议类型,非必填项
 
-    def setData(self, data):
         """
-        :param data: (Optional) 当前待写入的数据
-        """
-        self.data = data
+        self.protocol = protocol
 
diff --git a/jdcloud_sdk/services/iotcore/apis/LoongrayQueryPageRequest.py b/jdcloud_sdk/services/iotcore/apis/LoongrayQueryPageRequest.py
@@ -49,6 +49,8 @@ def __init__(self, instanceId, regionId, ):
         self.order = None
         self.direction = None
         self.parentId = None
+        self.orderId = None
+        self.deviceCollectorType = None
 
     def setDeviceName(self, deviceName):
         """
@@ -104,3 +106,15 @@ def setParentId(self, parentId):
         """
         self.parentId = parentId
 
+    def setOrderId(self, orderId):
+        """
+        :param orderId: (Optional) 订单号
+        """
+        self.orderId = orderId
+
+    def setDeviceCollectorType(self, deviceCollectorType):
+        """
+        :param deviceCollectorType: (Optional) 设备采集器类型
+        """
+        self.deviceCollectorType = deviceCollectorType
+
diff --git a/jdcloud_sdk/services/iotcore/apis/QueryDevicePageRequest.py b/jdcloud_sdk/services/iotcore/apis/QueryDevicePageRequest.py
@@ -49,6 +49,8 @@ def __init__(self, instanceId, regionId, ):
         self.order = None
         self.direction = None
         self.parentId = None
+        self.orderId = None
+        self.deviceCollectorType = None
 
     def setDeviceName(self, deviceName):
         """
@@ -104,3 +106,15 @@ def setParentId(self, parentId):
         """
         self.parentId = parentId
 
+    def setOrderId(self, orderId):
+        """
+        :param orderId: (Optional) 订单号
+        """
+        self.orderId = orderId
+
+    def setDeviceCollectorType(self, deviceCollectorType):
+        """
+        :param deviceCollectorType: (Optional) 设备采集器类型
+        """
+        self.deviceCollectorType = deviceCollectorType
+
diff --git a/jdcloud_sdk/services/iotcore/client/IotcoreClient.py b/jdcloud_sdk/services/iotcore/client/IotcoreClient.py
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('iotcore.jdcloud-api.com')
 
-        super(IotcoreClient, self).__init__(credential, config, 'iotcore', '1.1.17', logger)
+        super(IotcoreClient, self).__init__(credential, config, 'iotcore', '1.1.18', logger)
diff --git a/jdcloud_sdk/services/iotcore/models/DeviceVO.py b/jdcloud_sdk/services/iotcore/models/DeviceVO.py
@@ -19,7 +19,7 @@
 
 class DeviceVO(object):
 
-    def __init__(self, deviceId=None, deviceName=None, parentId=None, deviceType=None, status=None, identifier=None, secret=None, description=None, activatedTime=None, lastConnectedTime=None, createdTime=None, updatedTime=None, productKey=None, productName=None, productSecret=None, model=None, manufacturer=None, dynamicRegister=None, deviceCollectorType=None, lastDisconnectTime=None):
+    def __init__(self, deviceId=None, deviceName=None, parentId=None, deviceType=None, status=None, identifier=None, secret=None, description=None, activatedTime=None, lastConnectedTime=None, createdTime=None, updatedTime=None, productKey=None, productName=None, productSecret=None, model=None, manufacturer=None, dynamicRegister=None, deviceCollectorType=None, lastDisconnectTime=None, orderId=None):
         """
         :param deviceId: (Optional) 设备ID
         :param deviceName: (Optional) 设备名称
@@ -41,6 +41,7 @@ def __init__(self, deviceId=None, deviceName=None, parentId=None, deviceType=Non
         :param dynamicRegister: (Optional) 是否开启动态注册,0:关闭,1:开启，开启动态注册的设备认证类型为一型一密，否则为一机一密
         :param deviceCollectorType: (Optional) 设备采集器类型
         :param lastDisconnectTime: (Optional) 最后离线时间
+        :param orderId: (Optional) 订单号
         """
 
         self.deviceId = deviceId
@@ -63,3 +64,4 @@ def __init__(self, deviceId=None, deviceName=None, parentId=None, deviceType=Non
         self.dynamicRegister = dynamicRegister
         self.deviceCollectorType = deviceCollectorType
         self.lastDisconnectTime = lastDisconnectTime
+        self.orderId = orderId
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='jdcloud_sdk',
-    version="1.6.60",
+    version="1.6.61",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author='JDCloud API Gateway Team',
