|
|
@@ -126,7 +126,8 @@ class DevicePushService:
|
|
|
# 发送内容
|
|
|
msg_text = cls.get_msg_text(channel=params['channel'], n_time=params['n_time'], lang=lang,
|
|
|
tz=tz, event_type=params['event_type'],
|
|
|
- electricity=params['electricity'], dealings_type=params['dealings_type'])
|
|
|
+ electricity=params['electricity'], dealings_type=params['dealings_type'],
|
|
|
+ ai_type=params['ai_type'])
|
|
|
kwag_args['appBundleId'] = appBundleId
|
|
|
kwag_args['token_val'] = token_val
|
|
|
kwag_args['msg_title'] = msg_title
|
|
|
@@ -313,7 +314,8 @@ class DevicePushService:
|
|
|
return nickname
|
|
|
|
|
|
@staticmethod
|
|
|
- def get_msg_text(channel, n_time, lang, tz, event_type, electricity='', is_sys=0, dealings_type=0):
|
|
|
+ def get_msg_text(channel, n_time, lang, tz, event_type, electricity='', is_sys=0, dealings_type=0,
|
|
|
+ ai_type=0):
|
|
|
"""
|
|
|
获取消息文本
|
|
|
"""
|
|
|
@@ -328,13 +330,21 @@ class DevicePushService:
|
|
|
msg_type = '摄像头唤醒'
|
|
|
elif etype == 606:
|
|
|
msg_type = '有人呼叫，请点击查看'
|
|
|
- elif etype == 1024:
|
|
|
- if int(dealings_type) == 1:
|
|
|
+ elif ai_type > 0:
|
|
|
+ if etype == 1024 and int(dealings_type) == 1:
|
|
|
msg_type = '有人进入'
|
|
|
- elif int(dealings_type) == 2:
|
|
|
+ elif etype == 1024 and int(dealings_type) == 2:
|
|
|
msg_type = '有人离开'
|
|
|
+ elif etype == 512:
|
|
|
+ msg_type = '长时间无人出现'
|
|
|
+ elif etype == 256:
|
|
|
+ msg_type = '有人徘徊'
|
|
|
+ elif etype == 128:
|
|
|
+ msg_type = '区域离开'
|
|
|
+ elif etype == 64:
|
|
|
+ msg_type = '区域闯入'
|
|
|
else:
|
|
|
- msg_type = '往来检测'
|
|
|
+ msg_type = ''
|
|
|
else:
|
|
|
msg_type = ''
|
|
|
if is_sys:
|
|
|
@@ -350,13 +360,21 @@ class DevicePushService:
|
|
|
msg_type = 'Camera wake'
|
|
|
elif etype == 606:
|
|
|
msg_type = 'Someone is calling, please click to view'
|
|
|
- elif etype == 1024:
|
|
|
- if dealings_type == 1:
|
|
|
- msg_type = 'Someone comes in'
|
|
|
- elif dealings_type == 2:
|
|
|
+ elif ai_type > 0:
|
|
|
+ if etype == 1024 and int(dealings_type) == 1:
|
|
|
+ msg_type = 'Someone entered'
|
|
|
+ elif etype == 1024 and int(dealings_type) == 2:
|
|
|
msg_type = 'Someone left'
|
|
|
+ elif etype == 512:
|
|
|
+ msg_type = 'No one shows up for a long time'
|
|
|
+ elif etype == 256:
|
|
|
+ msg_type = 'Someone wanders'
|
|
|
+ elif etype == 128:
|
|
|
+ msg_type = 'Area departure'
|
|
|
+ elif etype == 64:
|
|
|
+ msg_type = 'Area break-in'
|
|
|
else:
|
|
|
- msg_type = 'Incoming and outgoing detection'
|
|
|
+ msg_type = ''
|
|
|
else:
|
|
|
msg_type = ''
|
|
|
if is_sys:
|
zhangdongming