|
@@ -325,7 +325,7 @@ class PushObject:
|
|
|
rec = sender_send.send(message)
|
|
|
logger.info('vivo推送结果:{}, 设备uid:{}'.format(rec, uid))
|
|
|
if rec['result'] == 0 and (event_type == 606 or event_type == '606'):
|
|
|
- PushObject.jpush_transparent_transmission(msg_title, msg_text, app_bundle_id, jg_token_val)
|
|
|
+ PushObject.jpush_transparent_transmission(msg_title, msg_text, app_bundle_id, jg_token_val, push_data)
|
|
|
return rec
|
|
|
except Exception as e:
|
|
|
logger.info('vivo推送异常:{}'.format(e))
|
|
@@ -400,7 +400,7 @@ class PushObject:
|
|
|
response = requests.post(push_url, data=push_data, headers=headers)
|
|
|
logger.info("oppo推送返回值:{}".format(response.json()))
|
|
|
if response.status_code == 200 and (event_type == 606 or event_type == '606'):
|
|
|
- PushObject.jpush_transparent_transmission(msg_title, msg_text, app_bundle_id, jg_token_val)
|
|
|
+ PushObject.jpush_transparent_transmission(msg_title, msg_text, app_bundle_id, jg_token_val, extra_data)
|
|
|
except Exception as e:
|
|
|
return repr(e)
|
|
|
|
|
@@ -467,13 +467,14 @@ class PushObject:
|
|
|
return repr(e)
|
|
|
|
|
|
@staticmethod
|
|
|
- def jpush_transparent_transmission(msg_title, msg_text, app_bundle_id, token_val):
|
|
|
+ def jpush_transparent_transmission(msg_title, msg_text, app_bundle_id, token_val, extra_data):
|
|
|
"""
|
|
|
android 极光透传
|
|
|
@param msg_title: 推送标题
|
|
|
@param msg_text: 推送内容
|
|
|
@param token_val: 推送token
|
|
|
@param app_bundle_id: app包id
|
|
|
+ @param extra_data: 额外数据
|
|
|
@return: None
|
|
|
"""
|
|
|
try:
|
|
@@ -483,7 +484,7 @@ class PushObject:
|
|
|
_jpush = jpush.JPush(app_key, master_secret)
|
|
|
push = _jpush.create_push()
|
|
|
push.audience = jpush.registration_id(token_val)
|
|
|
- push.message = jpush.message(msg_content=msg_text, title=msg_title)
|
|
|
+ push.message = jpush.message(msg_content=msg_text, title=msg_title, extras=extra_data)
|
|
|
push.platform = jpush.all_
|
|
|
res = push.send()
|
|
|
assert res.status_code == 200
|