|
|
@@ -24,7 +24,6 @@ from AnsjerPush.config import JPUSH_CONFIG, FCM_CONFIG, APNS_CONFIG, BASE_DIR, A
|
|
|
from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
|
|
|
DeviceChannelUserPermission, UidSetModel
|
|
|
from Object.ETkObject import ETkObject
|
|
|
-from Object.RedisObject import RedisObject
|
|
|
from Object.UidTokenObject import UidTokenObject
|
|
|
from Object.utils import LocalDateTimeUtil
|
|
|
from Service.CommonService import CommonService
|
|
|
@@ -196,13 +195,15 @@ class DevicePushService:
|
|
|
"""
|
|
|
try:
|
|
|
types = []
|
|
|
- combo_types = list(DEVICE_EVENT_TYPE.values())
|
|
|
+ combo_types = [51, 57, 58, 59, 60, 61,
|
|
|
+ 62, 63, 64, 65, 66]
|
|
|
event_type = str(event_type)
|
|
|
len_type = len(event_type)
|
|
|
for i in range(0, len_type):
|
|
|
e_type = int(event_type[len_type - 1 - i])
|
|
|
if e_type == 1:
|
|
|
types.append(str(combo_types[i]))
|
|
|
+ LOGGING.info('算法对照打印：{}'.format(combo_types))
|
|
|
return types
|
|
|
except Exception as e:
|
|
|
print('推送错误异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
zhangdongming