|
@@ -22,12 +22,13 @@ from obs import ObsClient
|
|
|
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
|
|
|
+ HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, JPUSH_UID_LIST
|
|
|
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
|
|
|
from Object.OCIObjectStorage import OCIObjectStorage
|
|
|
+from Object.RedisObject import RedisObject
|
|
|
from Object.UidTokenObject import UidTokenObject
|
|
|
from Object.enums.ConstantEnum import ConstantEnum
|
|
|
from Object.enums.EventTypeEnum import EventTypeEnumObj
|
|
@@ -460,9 +461,11 @@ class DevicePushService:
|
|
|
elif push_type == 1: # android gcm
|
|
|
push_result = PushObject.android_fcm_push_v1(**kwargs)
|
|
|
elif push_type == 2: # android jpush
|
|
|
- kwargs.pop('uid')
|
|
|
- push_result = PushObject.android_jpush(**kwargs)
|
|
|
-
|
|
|
+ uid = kwargs.pop('uid')
|
|
|
+ redis_obj = RedisObject()
|
|
|
+ jpush_uid_list = redis_obj.lrange(JPUSH_UID_LIST, 0, -1)
|
|
|
+ if uid in jpush_uid_list:
|
|
|
+ push_result = PushObject.jpush(**kwargs)
|
|
|
elif push_type == 3:
|
|
|
if kwargs["appBundleId"] == ConstantEnum.ZOSI_APP_BUNDLE_ID.value:
|
|
|
huawei_push_object = HuaweiPushObject()
|