|
@@ -237,7 +237,6 @@ class SmartSceneView(View):
|
|
|
if not device_info_qs.exists():
|
|
|
return response.json(173)
|
|
|
serial_number = device_info_qs[0]['serial_number']
|
|
|
- msg['sensor_delay'] = tasks_list[0]['delay_time']
|
|
|
else: # 子设备设置场景
|
|
|
if not sub_device_id:
|
|
|
return response.json(444, {'error param': 'subDeviceId'})
|
|
@@ -320,6 +319,11 @@ class SmartSceneView(View):
|
|
|
'sensor_type': int(task['device_type']),
|
|
|
'sensor_action': int(task['event_type'])
|
|
|
}
|
|
|
+
|
|
|
+ # 延时
|
|
|
+ if 'delay_time' in task and task['delay_time'] != 0:
|
|
|
+ task_temp['sensor_delay'] = task['delay_time']
|
|
|
+
|
|
|
sub_device_id = task.get('subDeviceId', None)
|
|
|
if sub_device_id:
|
|
|
sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('src_addr').first()
|
|
@@ -608,7 +612,6 @@ class SmartSceneView(View):
|
|
|
if not device_qs.exists():
|
|
|
return response.json(173)
|
|
|
serial_number = device_qs[0]['serial_number']
|
|
|
- msg['sensor_delay'] = tasks_list[0]['delay_time']
|
|
|
|
|
|
task_list = []
|
|
|
for task in tasks_list:
|
|
@@ -616,6 +619,11 @@ class SmartSceneView(View):
|
|
|
'sensor_type': int(task['device_type']),
|
|
|
'sensor_action': int(task['event_type'])
|
|
|
}
|
|
|
+
|
|
|
+ # 延时
|
|
|
+ if 'delay_time' in task and task['delay_time'] != 0:
|
|
|
+ task_temp['sensor_delay'] = task['delay_time']
|
|
|
+
|
|
|
task_sub_device_id = task.get('subDeviceId', None)
|
|
|
if task_sub_device_id:
|
|
|
sub_device_qs = GatewaySubDevice.objects.filter(id=task_sub_device_id).values('src_addr').first()
|