Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Velpro187
uni-app
提交
b27d3a7c
U
uni-app
项目概览
Velpro187
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b27d3a7c
编写于
7月 19, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(app): onPushMessage
上级
6bdd4972
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
174 addition
and
83 deletion
+174
-83
.gitignore
.gitignore
+1
-0
packages/uni-api/src/service/plugin/push.ts
packages/uni-api/src/service/plugin/push.ts
+13
-6
packages/uni-app-plus/dist/uni.runtime.esm.js
packages/uni-app-plus/dist/uni.runtime.esm.js
+12
-6
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+11
-6
packages/uni-mp-alipay/dist/uni.api.esm.js
packages/uni-mp-alipay/dist/uni.api.esm.js
+12
-6
packages/uni-mp-baidu/dist/uni.api.esm.js
packages/uni-mp-baidu/dist/uni.api.esm.js
+12
-6
packages/uni-mp-kuaishou/dist/uni.api.esm.js
packages/uni-mp-kuaishou/dist/uni.api.esm.js
+12
-6
packages/uni-mp-lark/dist/uni.api.esm.js
packages/uni-mp-lark/dist/uni.api.esm.js
+12
-6
packages/uni-mp-qq/dist/uni.api.esm.js
packages/uni-mp-qq/dist/uni.api.esm.js
+12
-6
packages/uni-mp-toutiao/dist/uni.api.esm.js
packages/uni-mp-toutiao/dist/uni.api.esm.js
+12
-6
packages/uni-mp-weixin/dist/uni.api.esm.js
packages/uni-mp-weixin/dist/uni.api.esm.js
+12
-6
packages/uni-push/dist/uni-push.es.js
packages/uni-push/dist/uni-push.es.js
+21
-0
packages/uni-push/src/index.ts
packages/uni-push/src/index.ts
+2
-0
packages/uni-push/src/route.ts
packages/uni-push/src/route.ts
+18
-17
packages/uni-quickapp-webview/dist/uni.api.esm.js
packages/uni-quickapp-webview/dist/uni.api.esm.js
+12
-6
未找到文件。
.gitignore
浏览文件 @
b27d3a7c
...
...
@@ -8,6 +8,7 @@ packages/uni-mp-compiler/dist
packages/uni-nvue-styler/dist
packages/vite-plugin-uni/dist
packages/uts/dist
packages/uni-uts-vite/dist
.DS_Store
node_modules
...
...
packages/uni-api/src/service/plugin/push.ts
浏览文件 @
b27d3a7c
...
...
@@ -54,12 +54,18 @@ export function invokePushCallback(
cidErrMsg
=
args
.
errMsg
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
)
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
})
})
const
message
:
OnPushMessageSuccess
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
}
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
]
callback
(
message
)
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
...
...
@@ -106,6 +112,7 @@ export const getPushClientId = defineAsyncApi(
interface
OnPushMessageSuccess
{
type
:
'
click
'
|
'
receive
'
data
:
unknown
stopped
?:
boolean
}
type
OnPushMessageCallback
=
(
result
:
OnPushMessageSuccess
)
=>
void
...
...
packages/uni-app-plus/dist/uni.runtime.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -11096,12 +11096,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks(cid, args.errMsg);
}
else if (args.type === 'pushMsg') {
onPushMessageCallbacks.forEach((callback) => {
callback({
type: 'receive',
data: normalizePushMessage(args.message),
});
});
const message = {
type: 'receive',
data: normalizePushMessage(args.message),
};
for (let i = 0; i < onPushMessageCallbacks.length; i++) {
const callback = onPushMessageCallbacks[i];
callback(message);
// 该消息已被阻止
if (message.stopped) {
break;
}
}
}
else if (args.type === 'click') {
onPushMessageCallbacks.forEach((callback) => {
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
b27d3a7c
...
...
@@ -4625,12 +4625,17 @@ function invokePushCallback(args) {
cidErrMsg = args.errMsg;
invokeGetPushCidCallbacks(cid, args.errMsg);
} else if (args.type === "pushMsg") {
onPushMessageCallbacks.forEach((callback) => {
callback({
type: "receive",
data: normalizePushMessage(args.message)
});
});
const message = {
type: "receive",
data: normalizePushMessage(args.message)
};
for (let i = 0; i < onPushMessageCallbacks.length; i++) {
const callback = onPushMessageCallbacks[i];
callback(message);
if (message.stopped) {
break;
}
}
} else if (args.type === "click") {
onPushMessageCallbacks.forEach((callback) => {
callback({
...
...
packages/uni-mp-alipay/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-mp-baidu/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-mp-kuaishou/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-mp-lark/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-mp-qq/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-mp-toutiao/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-mp-weixin/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -635,12 +635,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
packages/uni-push/dist/uni-push.es.js
浏览文件 @
b27d3a7c
...
...
@@ -100,6 +100,26 @@ e?.onClose(t);
var
GtPush
=
/*@__PURE__*/
getDefaultExportFromCjs
(
gtpushMin
);
function
initPushNotification
()
{
// 仅 App 端
if
(
typeof
plus
!==
'
undefined
'
&&
plus
.
push
)
{
plus
.
push
.
addEventListener
(
'
click
'
,
(
result
)
=>
{
// @ts-expect-error
uni
.
invokePushCallback
({
type
:
'
click
'
,
message
:
result
,
});
});
uni
.
onPushMessage
((
res
)
=>
{
if
(
res
.
type
===
'
receive
'
&&
res
.
data
&&
res
.
data
.
force_notification
)
{
// 创建通知栏
uni
.
createPushMessage
(
res
.
data
);
res
.
stopped
=
true
;
}
});
}
}
// if (process.env.UNI_PUSH_DEBUG) {
// GtPush.setDebugMode(true)
// }
...
...
@@ -119,6 +139,7 @@ if (!appid) {
});
}
else
{
initPushNotification
();
GtPush
.
init
({
appid
,
onError
:
(
res
)
=>
{
...
...
packages/uni-push/src/index.ts
浏览文件 @
b27d3a7c
import
GtPush
from
'
../lib/gtpush-min
'
import
{
initPushNotification
}
from
'
./route
'
// if (process.env.UNI_PUSH_DEBUG) {
// GtPush.setDebugMode(true)
...
...
@@ -20,6 +21,7 @@ if (!appid) {
})
})
}
else
{
initPushNotification
()
GtPush
.
init
({
appid
,
onError
:
(
res
)
=>
{
...
...
packages/uni-push/src/route.ts
浏览文件 @
b27d3a7c
export
function
initPushRoute
()
{
uni
.
onPushMessage
((
res
)
=>
{
if
(
res
.
data
&&
res
.
data
.
path
&&
res
.
type
===
'
receive
'
)
{
// 仅 App 端
if
(
typeof
plus
!==
'
undefined
'
&&
plus
.
push
)
{
// 创建通知栏,并屏蔽消息的继续传递
plus
.
push
.
createMessage
(
res
.
data
.
content
,
JSON
.
stringify
(
res
.
data
.
payload
),
{
title
:
res
.
data
.
title
,
forceNotification
:
true
,
path
:
res
.
data
.
path
,
}
as
any
)
export
function
initPushNotification
()
{
// 仅 App 端
if
(
typeof
plus
!==
'
undefined
'
&&
plus
.
push
)
{
plus
.
push
.
addEventListener
(
'
click
'
,
(
result
)
=>
{
// @ts-expect-error
uni
.
invokePushCallback
({
type
:
'
click
'
,
message
:
result
,
})
})
uni
.
onPushMessage
((
res
)
=>
{
if
(
res
.
type
===
'
receive
'
&&
res
.
data
&&
res
.
data
.
force_notification
)
{
// 创建通知栏
uni
.
createPushMessage
(
res
.
data
)
// 阻止其他监听器继续监听
;(
res
as
any
).
stopped
=
true
}
}
}
)
}
)
}
}
packages/uni-quickapp-webview/dist/uni.api.esm.js
浏览文件 @
b27d3a7c
...
...
@@ -671,12 +671,18 @@ function invokePushCallback(args) {
invokeGetPushCidCallbacks
(
cid
,
args
.
errMsg
);
}
else
if
(
args
.
type
===
'
pushMsg
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
callback
({
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
});
});
const
message
=
{
type
:
'
receive
'
,
data
:
normalizePushMessage
(
args
.
message
),
};
for
(
let
i
=
0
;
i
<
onPushMessageCallbacks
.
length
;
i
++
)
{
const
callback
=
onPushMessageCallbacks
[
i
];
callback
(
message
);
// 该消息已被阻止
if
(
message
.
stopped
)
{
break
;
}
}
}
else
if
(
args
.
type
===
'
click
'
)
{
onPushMessageCallbacks
.
forEach
((
callback
)
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录