|
@@ -338,7 +338,7 @@ class SmartSceneView(View):
|
|
|
thing_name = serial_number
|
|
|
topic_name = SMART_SCENE_TOPIC.format(serial_number)
|
|
|
|
|
|
- success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg, 0)
|
|
|
+ success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
|
|
|
try:
|
|
|
assert success
|
|
|
except AssertionError:
|
|
@@ -486,7 +486,7 @@ class SmartSceneView(View):
|
|
|
with transaction.atomic():
|
|
|
SmartScene.objects.filter(id=smart_scene_id).update(is_enable=is_enable)
|
|
|
# 通过mqtt发送设备数据
|
|
|
- success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
|
|
|
+ success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
try:
|
|
|
assert success
|
|
|
except AssertionError:
|
|
@@ -695,7 +695,7 @@ class SmartSceneView(View):
|
|
|
# 通过mqtt发送设备数据
|
|
|
thing_name = serial_number
|
|
|
topic_name = SMART_SCENE_TOPIC.format(serial_number)
|
|
|
- success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg, 0)
|
|
|
+ success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
|
|
|
try:
|
|
|
assert success
|
|
|
except AssertionError:
|
|
@@ -739,7 +739,7 @@ class SmartSceneView(View):
|
|
|
msg = {
|
|
|
'smart_scene_delete': int(smart_scene_id)
|
|
|
}
|
|
|
- success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
|
|
|
+ success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
try:
|
|
|
assert success
|
|
|
except AssertionError:
|
|
@@ -889,7 +889,7 @@ class SmartSceneView(View):
|
|
|
topic_name = SMART_SCENE_TOPIC.format(serial_number)
|
|
|
for smart_scene in smart_scene_qs:
|
|
|
msg = eval(smart_scene['device_data'])
|
|
|
- success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
|
|
|
+ success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
try:
|
|
|
assert success
|
|
|
except AssertionError:
|
|
@@ -909,7 +909,7 @@ class SmartSceneView(View):
|
|
|
'sensor_src': int(smart_button['src_addr'], 16),
|
|
|
'sos_select': smart_button['is_tampered']
|
|
|
}
|
|
|
- success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
|
|
|
+ success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
try:
|
|
|
assert success
|
|
|
except AssertionError:
|