|
|
@@ -16,7 +16,7 @@ from Ansjer.Config.gatewaySensorConfig import SMART_SCENE_TOPIC, SENSOR_TYPE, EV
|
|
|
SCENE_EVENT_EDIT, SCENE_EVENT_DELETE, SCENE_STATUS_ON, SCENE_STATUS_OFF, SCENE_EVENT_EDIT_STATUS, \
|
|
|
VOICE_AUDITION_TOPIC, SMART_SOCKET_TOPIC, DEVICE_TYPE
|
|
|
from Model.models import FamilyRoomDevice, GatewaySubDevice, FamilyRoom, SmartScene, EffectiveTime, Device_Info, \
|
|
|
- SceneLog, GatewayPush
|
|
|
+ SceneLog
|
|
|
from Object.ApschedulerObject import ApschedulerObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Service.CommonService import CommonService
|
|
|
@@ -631,7 +631,8 @@ class SmartSceneView(View):
|
|
|
return response.json(173)
|
|
|
|
|
|
tz = smart_scene_qs[0].tz
|
|
|
- mqtt_tasks_list = eval(smart_scene_qs[0].mqtt_tasks)
|
|
|
+ mqtt_tasks = smart_scene_qs[0].mqtt_tasks
|
|
|
+ mqtt_tasks_list = eval(mqtt_tasks) if mqtt_tasks else None
|
|
|
scene_status = 1 if smart_scene_qs[0].is_enable else 0
|
|
|
msg = {
|
|
|
'scene_id': smart_scene_id,
|
