Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yangkaifeng
uni-app
提交
71080cf1
U
uni-app
项目概览
yangkaifeng
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
3
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
71080cf1
编写于
5月 23, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(push): normalize message
上级
51fd8186
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
284 addition
and
44 deletion
+284
-44
packages/uni-api/src/service/plugin/push.ts
packages/uni-api/src/service/plugin/push.ts
+25
-4
packages/uni-app-plus/dist/uni.runtime.esm.js
packages/uni-app-plus/dist/uni.runtime.esm.js
+26
-4
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+25
-4
packages/uni-mp-alipay/dist/uni.api.esm.js
packages/uni-mp-alipay/dist/uni.api.esm.js
+26
-4
packages/uni-mp-baidu/dist/uni.api.esm.js
packages/uni-mp-baidu/dist/uni.api.esm.js
+26
-4
packages/uni-mp-kuaishou/dist/uni.api.esm.js
packages/uni-mp-kuaishou/dist/uni.api.esm.js
+26
-4
packages/uni-mp-lark/dist/uni.api.esm.js
packages/uni-mp-lark/dist/uni.api.esm.js
+26
-4
packages/uni-mp-qq/dist/uni.api.esm.js
packages/uni-mp-qq/dist/uni.api.esm.js
+26
-4
packages/uni-mp-toutiao/dist/uni.api.esm.js
packages/uni-mp-toutiao/dist/uni.api.esm.js
+26
-4
packages/uni-mp-weixin/dist/uni.api.esm.js
packages/uni-mp-weixin/dist/uni.api.esm.js
+26
-4
packages/uni-quickapp-webview/dist/uni.api.esm.js
packages/uni-quickapp-webview/dist/uni.api.esm.js
+26
-4
未找到文件。
packages/uni-api/src/service/plugin/push.ts
浏览文件 @
71080cf1
...
...
@@ -24,9 +24,24 @@ interface OnPushClickCallback {
let
cid
:
string
|
undefined
let
cidErrMsg
:
string
|
undefined
function
normalizePushMessage
(
message
:
unknown
)
{
function
normalizePushMessage
(
type
:
'
receive
'
|
'
click
'
,
message
:
unknown
)
{
try
{
return
JSON
.
parse
(
message
as
string
)
const
res
=
JSON
.
parse
(
message
as
string
)
as
Record
<
string
,
any
>
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
}
return
res
.
payload
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
delete
res
.
__UUID__
delete
res
.
appid
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
}
}
}
catch
(
e
:
any
)
{}
return
message
}
...
...
@@ -47,11 +62,17 @@ export function invokePushCallback(
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
)
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
})
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
})
})
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
})
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
})
})
}
}
...
...
packages/uni-app-plus/dist/uni.runtime.esm.js
浏览文件 @
71080cf1
...
...
@@ -11057,9 +11057,25 @@ const getLaunchOptionsSync = defineSyncApi(API_GET_LAUNCH_OPTIONS_SYNC, () => {
let cid;
let cidErrMsg;
function normalizePushMessage(message) {
function normalizePushMessage(
type,
message) {
try {
return JSON.parse(message);
const res = JSON.parse(message);
if (type === 'receive') {
if (res.payload) {
if (res.aps) {
res.payload.aps = res.aps;
}
return res.payload;
}
}
else if (type === 'click') {
delete res.type;
delete res.__UUID__;
delete res.appid;
if (res.aps && res.aps.alert) {
res.title = res.aps.alert.title;
}
}
}
catch (e) { }
return message;
...
...
@@ -11076,12 +11092,18 @@ function invokePushCallback(args) {
}
else if (args.type === 'pushMsg') {
onPushMessageCallbacks.forEach((callback) => {
callback({ type: 'receive', data: normalizePushMessage(args.message) });
callback({
type: 'receive',
data: normalizePushMessage('receive', args.message),
});
});
}
else if (args.type === 'click') {
onPushMessageCallbacks.forEach((callback) => {
callback({ type: 'click', data: normalizePushMessage(args.message) });
callback({
type: 'click',
data: normalizePushMessage('click', args.message),
});
});
}
}
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
71080cf1
...
...
@@ -4564,9 +4564,24 @@ const getLaunchOptionsSync = /* @__PURE__ */ defineSyncApi(API_GET_LAUNCH_OPTION
});
let cid;
let cidErrMsg;
function normalizePushMessage(message) {
function normalizePushMessage(
type,
message) {
try {
return JSON.parse(message);
const res = JSON.parse(message);
if (type === "receive") {
if (res.payload) {
if (res.aps) {
res.payload.aps = res.aps;
}
return res.payload;
}
} else if (type === "click") {
delete res.type;
delete res.__UUID__;
delete res.appid;
if (res.aps && res.aps.alert) {
res.title = res.aps.alert.title;
}
}
} catch (e2) {
}
return message;
...
...
@@ -4578,11 +4593,17 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks(cid, args.errMsg);
} else if (args.type === "pushMsg") {
onPushMessageCallbacks.forEach((callback) => {
callback({ type: "receive", data: normalizePushMessage(args.message) });
callback({
type: "receive",
data: normalizePushMessage("receive", args.message)
});
});
} else if (args.type === "click") {
onPushMessageCallbacks.forEach((callback) => {
callback({ type: "click", data: normalizePushMessage(args.message) });
callback({
type: "click",
data: normalizePushMessage("click", args.message)
});
});
}
}
...
...
packages/uni-mp-alipay/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-mp-baidu/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-mp-kuaishou/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-mp-lark/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-mp-qq/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-mp-toutiao/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-mp-weixin/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -504,9 +504,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -523,12 +539,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
packages/uni-quickapp-webview/dist/uni.api.esm.js
浏览文件 @
71080cf1
...
...
@@ -540,9 +540,25 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
let
cid
;
let
cidErrMsg
;
function
normalizePushMessage
(
message
)
{
function
normalizePushMessage
(
type
,
message
)
{
try
{
return
JSON
.
parse
(
message
);
const
res
=
JSON
.
parse
(
message
);
if
(
type
===
'
receive
'
)
{
if
(
res
.
payload
)
{
if
(
res
.
aps
)
{
res
.
payload
.
aps
=
res
.
aps
;
}
return
res
.
payload
;
}
}
else
if
(
type
===
'
click
'
)
{
delete
res
.
type
;
delete
res
.
__UUID__
;
delete
res
.
appid
;
if
(
res
.
aps
&&
res
.
aps
.
alert
)
{
res
.
title
=
res
.
aps
.
alert
.
title
;
}
}
}
catch
(
e
)
{
}
return
message
;
...
...
@@ -559,12 +575,18 @@ function invokePushCallback(args) {
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
'
receive
'
,
args
.
message
),
});
});
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
args
.
message
)
});
callback
({
type
:
'
click
'
,
data
:
normalizePushMessage
(
'
click
'
,
args
.
message
),
});
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录