|
@@ -604,7 +604,7 @@ class AiView(View):
|
|
msg_title = self.get_msg_title(appBundleId=appBundleId, nickname=nickname)
|
|
msg_title = self.get_msg_title(appBundleId=appBundleId, nickname=nickname)
|
|
# 推送内容
|
|
# 推送内容
|
|
msg_id = CommonService.createOrderID()
|
|
msg_id = CommonService.createOrderID()
|
|
- msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz, label_list=label_list, msg_id = msg_id)
|
|
|
|
|
|
+ msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz, label_list=label_list)
|
|
kwargs = {
|
|
kwargs = {
|
|
'uid': uid,
|
|
'uid': uid,
|
|
'channel': channel,
|
|
'channel': channel,
|
|
@@ -614,6 +614,7 @@ class AiView(View):
|
|
'token_val': token_val,
|
|
'token_val': token_val,
|
|
'msg_title': msg_title,
|
|
'msg_title': msg_title,
|
|
'msg_text': msg_text,
|
|
'msg_text': msg_text,
|
|
|
|
+ 'msg_id' : msg_id,
|
|
}
|
|
}
|
|
# 推送消息
|
|
# 推送消息
|
|
if push_type == 0: # ios apns
|
|
if push_type == 0: # ios apns
|
|
@@ -730,7 +731,7 @@ class AiView(View):
|
|
else:
|
|
else:
|
|
return nickname
|
|
return nickname
|
|
|
|
|
|
- def get_msg_text(self, channel, n_time, lang, tz, label_list):
|
|
|
|
|
|
+ def get_msg_text(self, channel, n_time, lang, tz, label_list, msg_id):
|
|
n_date = CommonService.get_now_time_str(n_time=n_time, tz=tz,lang=lang)
|
|
n_date = CommonService.get_now_time_str(n_time=n_time, tz=tz,lang=lang)
|
|
if lang == 'cn':
|
|
if lang == 'cn':
|
|
msg = '摄像头AI识别到了{}'.format(label_list)
|
|
msg = '摄像头AI识别到了{}'.format(label_list)
|