diff --git a/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.es.js b/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.es.js index 6b8ec3148a102c295ff78af956b9314bde8457ad..e0f491cb0829cb8f83e2ce29852943e6a5c45353 100644 --- a/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.es.js +++ b/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.es.js @@ -103,6 +103,10 @@ var GtPush = /*@__PURE__*/getDefaultExportFromCjs(gtpushMin); // if (process.env.UNI_PUSH_DEBUG) { // GtPush.setDebugMode(true) // } +// @ts-expect-error +uni.invokePushCallback({ + type: 'enabled', +}); const appid = process.env.UNI_APP_ID; if (!appid) { Promise.resolve().then(() => { diff --git a/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js b/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js index c321f73f998a8ab3cdc1ac181f5bdb226378917e..bcdc4a988560dd7052847f9bba00c859a6588d3f 100644 --- a/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js +++ b/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js @@ -1,3 +1,7 @@ +// @ts-expect-error +uni.invokePushCallback({ + type: 'enabled', +}); Promise.resolve().then(() => { plus.push.setAutoNotification && plus.push.setAutoNotification(false); const info = plus.push.getClientInfo(); diff --git a/src/core/service/api/plugin/push.js b/src/core/service/api/plugin/push.js index 7d5aa5d4dc866675da78a7665a7d01a314d514b9..133ad49e4f51a207c76a4eb081ee40fbab542c4f 100644 --- a/src/core/service/api/plugin/push.js +++ b/src/core/service/api/plugin/push.js @@ -8,6 +8,7 @@ import { let cid let cidErrMsg +let enabled function normalizePushMessage (message) { try { @@ -19,7 +20,9 @@ function normalizePushMessage (message) { export function invokePushCallback ( args ) { - if (args.type === 'clientId') { + if (args.type === 'enabled') { + enabled = true + } else if (args.type === 'clientId') { cid = args.cid cidErrMsg = args.errMsg invokeGetPushCidCallbacks(cid, args.errMsg) @@ -61,25 +64,32 @@ export function getPushClientId (args) { const hasSuccess = isFn(success) const hasFail = isFn(fail) const hasComplete = isFn(complete) - getPushCidCallbacks.push((cid, errMsg) => { - let res - if (cid) { - res = { - errMsg: 'getPushClientId:ok', - cid - } - hasSuccess && success(res) - } else { - res = { - errMsg: 'getPushClientId:fail' + (errMsg ? ' ' + errMsg : '') + Promise.resolve().then(() => { + if (typeof enabled === 'undefined') { + enabled = false + cid = '' + cidErrMsg = 'unipush is not enabled' + } + getPushCidCallbacks.push((cid, errMsg) => { + let res + if (cid) { + res = { + errMsg: 'getPushClientId:ok', + cid + } + hasSuccess && success(res) + } else { + res = { + errMsg: 'getPushClientId:fail' + (errMsg ? ' ' + errMsg : '') + } + hasFail && fail(res) } - hasFail && fail(res) + hasComplete && complete(res) + }) + if (typeof cid !== 'undefined') { + invokeGetPushCidCallbacks(cid, cidErrMsg) } - hasComplete && complete(res) }) - if (typeof cid !== 'undefined') { - Promise.resolve().then(() => invokeGetPushCidCallbacks(cid, cidErrMsg)) - } } const onPushMessageCallbacks = [] @@ -99,4 +109,4 @@ export const offPushMessage = (fn) => { onPushMessageCallbacks.splice(index, 1) } } -} +}