|
|
@@ -23,7 +23,7 @@ from AnsjerPush.Config.aiConfig import DEVICE_EVENT_TYPE, ALGORITHM_COMBO_TYPES
|
|
|
from AnsjerPush.config import CONFIG_INFO, CONFIG_CN, MULTI_CHANNEL_TYPE_LIST, SYS_EVENT_TYPE_LIST, AWS_ACCESS_KEY_ID, \
|
|
|
AWS_SECRET_ACCESS_KEY, EVENT_DICT, EVENT_DICT_CN, CONFIG_TEST, HUAWEICLOUD_AK, HUAWEICLOUD_SK, \
|
|
|
HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
|
|
|
-from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID
|
|
|
+from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID, XM_PUSH_CHANNEL_DICT
|
|
|
from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
|
|
|
DeviceChannelUserPermission, UidSetModel, Device_Info, UserAudioVideoPush, PushLog
|
|
|
from Object.ETkObject import ETkObject
|
|
|
@@ -462,7 +462,7 @@ class DevicePushService:
|
|
|
push_channel = 'push_to_talk'
|
|
|
else:
|
|
|
push_channel = 'device_reminder'
|
|
|
- channel_id = XM_PUSH_CHANNEL_ID[push_channel]
|
|
|
+ channel_id = XM_PUSH_CHANNEL_DICT[kwargs['appBundleId']][push_channel]
|
|
|
push_result = cls.do_xmpush(channel_id=channel_id, **push_kwargs)
|
|
|
elif push_type == 5: # android vivopush
|
|
|
push_result = PushObject.android_vivopush(**push_kwargs)
|
zhangdongming