From 60bd85ffc9339eabf4269ab0e8451c380832e3ad Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Thu, 26 May 2022 22:11:31 +0800 Subject: [PATCH] feat(push): getPushCid => getPushClientid --- .../android/src/io/dcloud/uniplugin/log.kt.map | 2 +- .../test-uniplugin/android/src/test.kt.map | 2 +- packages/uni-api/src/service/plugin/push.ts | 6 +++--- packages/uni-app-plus/dist/uni.runtime.esm.js | 8 ++++---- packages/uni-app-plus/src/service/api/index.ts | 2 +- packages/uni-h5-vite/lib/api.json | 2 +- packages/uni-h5/dist/uni-h5.es.js | 10 +++++----- packages/uni-h5/src/service/api/index.ts | 2 +- packages/uni-mp-alipay/dist/uni.api.esm.js | 8 ++++---- packages/uni-mp-baidu/dist/uni.api.esm.js | 8 ++++---- packages/uni-mp-core/src/api/index.ts | 4 ++-- packages/uni-mp-kuaishou/dist/uni.api.esm.js | 8 ++++---- packages/uni-mp-lark/dist/uni.api.esm.js | 8 ++++---- packages/uni-mp-qq/dist/uni.api.esm.js | 8 ++++---- packages/uni-mp-toutiao/dist/uni.api.esm.js | 8 ++++---- packages/uni-mp-weixin/dist/uni.api.esm.js | 8 ++++---- packages/uni-quickapp-webview/dist/uni.api.esm.js | 8 ++++---- 17 files changed, 51 insertions(+), 51 deletions(-) diff --git a/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.kt.map b/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.kt.map index 21d478e0c..a6da1cd11 100644 --- a/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.kt.map +++ b/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.kt.map @@ -1 +1 @@ -{"version":3,"sources":["/Users/fxy/Documents/projects/GitHub/uni-app/uni-app-next/packages/playground/uts/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.uts"],"names":["log","tag","msg","Log","e"],"mappings":"AAAA;AAAA,OAAgB,gBAAkB,CAAC;AACpB,IAASA,GAAG,CAACC,GAAW,EAAN,MAAM,EAAEC,GAAW,EAAN,MAAM,EAAE;IACpDC,GAAG,CAACC,CAAC,CAACH,GAAG,EAAEC,GAAG,CAAC,CAAC"} \ No newline at end of file +{"version":3,"sources":["/Users/fxy/Documents/projects/GitHub/uni-app/uni-app-next/packages/playground/uts/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.uts"],"names":["log","tag","msg","Log","e"],"mappings":";AAAA,OAAgB,gBAAkB,CAAC;AACpB,IAASA,GAAG,CAACC,GAAW,EAAN,MAAM,EAAEC,GAAW,EAAN,MAAM,EAAE;IACpDC,GAAG,CAACC,CAAC,CAACH,GAAG,EAAEC,GAAG,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/test.kt.map b/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/test.kt.map index e3ca742c4..15274d8a7 100644 --- a/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/test.kt.map +++ b/packages/playground/uts/unpackage/nativeplugins/test-uniplugin/android/src/test.kt.map @@ -1 +1 @@ -{"version":3,"sources":["/Users/fxy/Documents/projects/GitHub/uni-app/uni-app-next/packages/playground/uts/nativeplugins/test-uniplugin/android/src/test.uts"],"names":["log","tag","msg","Log","e"],"mappings":";AAAA,OAAgB,gBAAkB,CAAC;AACpB,IAASA,GAAG,CAACC,GAAW,EAAN,MAAM,EAAEC,GAAW,EAAN,MAAM,EAAE;IACpDC,GAAG,CAACC,CAAC,CAACH,GAAG,EAAEC,GAAG,CAAC,CAAC"} \ No newline at end of file +{"version":3,"sources":["/Users/fxy/Documents/projects/GitHub/uni-app/uni-app-next/packages/playground/uts/nativeplugins/test-uniplugin/android/src/test.uts"],"names":["log","tag","msg","Log","e"],"mappings":"AAAA;AAAA,OAAgB,gBAAkB,CAAC;AACpB,IAASA,GAAG,CAACC,GAAW,EAAN,MAAM,EAAEC,GAAW,EAAN,MAAM,EAAE;IACpDC,GAAG,CAACC,CAAC,CAACH,GAAG,EAAEC,GAAG,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/uni-api/src/service/plugin/push.ts b/packages/uni-api/src/service/plugin/push.ts index 5da52856f..1b7ab1fad 100644 --- a/packages/uni-api/src/service/plugin/push.ts +++ b/packages/uni-api/src/service/plugin/push.ts @@ -75,7 +75,7 @@ function invokeGetPushCidCallbacks(cid?: string, errMsg?: string) { getPushCidCallbacks.length = 0 } -export function getPushCid(args: GetPushCidOptions) { +export function getPushClientid(args: GetPushCidOptions) { if (!isPlainObject(args)) { args = {} } @@ -86,10 +86,10 @@ export function getPushCid(args: GetPushCidOptions) { getPushCidCallbacks.push((cid?: string, errMsg?: string) => { let res: Record if (cid) { - res = { errMsg: 'getPushCid:ok', cid } + res = { errMsg: 'getPushClientid:ok', cid } hasSuccess && success(res) } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') } + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') } hasFail && fail(res) } hasComplete && complete(res) diff --git a/packages/uni-app-plus/dist/uni.runtime.esm.js b/packages/uni-app-plus/dist/uni.runtime.esm.js index 5300467e5..2d99c29be 100644 --- a/packages/uni-app-plus/dist/uni.runtime.esm.js +++ b/packages/uni-app-plus/dist/uni.runtime.esm.js @@ -11098,7 +11098,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -11109,11 +11109,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -19054,7 +19054,7 @@ var uni$1 = { setPageMeta: setPageMeta, getEnterOptionsSync: getEnterOptionsSync, getLaunchOptionsSync: getLaunchOptionsSync, - getPushCid: getPushCid, + getPushClientid: getPushClientid, onPushMessage: onPushMessage, offPushMessage: offPushMessage, onAppHide: onAppHide, diff --git a/packages/uni-app-plus/src/service/api/index.ts b/packages/uni-app-plus/src/service/api/index.ts index 64c6f3058..51e0ba766 100644 --- a/packages/uni-app-plus/src/service/api/index.ts +++ b/packages/uni-app-plus/src/service/api/index.ts @@ -121,7 +121,7 @@ export { setPageMeta, getEnterOptionsSync, getLaunchOptionsSync, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, onAppHide, diff --git a/packages/uni-h5-vite/lib/api.json b/packages/uni-h5-vite/lib/api.json index a303ff285..55fc7937c 100644 --- a/packages/uni-h5-vite/lib/api.json +++ b/packages/uni-h5-vite/lib/api.json @@ -44,7 +44,7 @@ "getLocation", "getNetworkType", "getProvider", - "getPushCid", + "getPushClientid", "getRealPath", "getRecorderManager", "getRightWindowStyle", diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 48f165e45..7022145b2 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -4599,7 +4599,7 @@ function invokeGetPushCidCallbacks(cid2, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -4610,10 +4610,10 @@ function getPushCid(args) { getPushCidCallbacks.push((cid2, errMsg) => { let res; if (cid2) { - res = { errMsg: "getPushCid:ok", cid: cid2 }; + res = { errMsg: "getPushClientid:ok", cid: cid2 }; hasSuccess && success(res); } else { - res = { errMsg: "getPushCid:fail" + (errMsg ? " " + errMsg : "") }; + res = { errMsg: "getPushClientid:fail" + (errMsg ? " " + errMsg : "") }; hasFail && fail(res); } hasComplete && complete(res); @@ -20282,7 +20282,7 @@ var api = /* @__PURE__ */ Object.defineProperty({ setPageMeta, getEnterOptionsSync, getLaunchOptionsSync, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, onAppHide, @@ -22528,4 +22528,4 @@ var index = /* @__PURE__ */ defineSystemComponent({ return openBlock(), createBlock("div", clazz, [loadingVNode]); } }); -export { $emit, $off, $on, $once, index$8 as Ad, index$7 as AdContentPage, index$6 as AdDraw, index$1 as AsyncErrorComponent, index as AsyncLoadingComponent, index$y as Button, index$5 as Camera, index$w as Canvas, index$u as Checkbox, index$v as CheckboxGroup, index$a as CoverImage, index$b as CoverView, index$t as Editor, index$A as Form, index$s as Icon, index$r as Image, Input, index$z as Label, LayoutComponent, index$4 as LivePlayer, index$3 as LivePusher, Map$1 as Map, MovableArea, MovableView, index$q as Navigator, index$2 as PageComponent, index$9 as Picker, PickerView, PickerViewColumn, index$p as Progress, index$n as Radio, index$o as RadioGroup, ResizeSensor, index$m as RichText, ScrollView, index$l as Slider, Swiper, SwiperItem, index$k as Switch, index$j as Text, index$i as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, index$e as Video, index$h as View, index$d as WebView, addInterceptor, addPhoneContact, arrayBufferToBase64, base64ToArrayBuffer, canIUse, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, chooseFile, chooseImage, chooseLocation, chooseVideo, clearStorage, clearStorageSync, closePreviewImage, closeSocket, connectSocket, createAnimation$1 as createAnimation, createCameraContext, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createLivePlayerContext, createMapContext, createMediaQueryObserver, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, downloadFile, getApp$1 as getApp, getAppBaseInfo, getClipboardData, getCurrentPages$1 as getCurrentPages, getDeviceInfo, getEnterOptionsSync, getFileInfo, getImageInfo, getLaunchOptionsSync, getLeftWindowStyle, getLocale, getLocation, getNetworkType, getProvider, getPushCid, getRealPath, getRecorderManager, getRightWindowStyle, getSavedFileInfo, getSavedFileList, getScreenBrightness, getSelectedTextRange$1 as getSelectedTextRange, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getTopWindowStyle, getVideoInfo, getWindowInfo, hideKeyboard, hideLeftWindow, hideLoading, hideNavigationBarLoading, hideRightWindow, hideTabBar, hideTabBarRedDot, hideToast, hideTopWindow, interceptors, invokePushCallback, loadFontFace, login, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offAppHide, offAppShow, offCompassChange, offError, offNetworkStatusChange, offPageNotFound, offPushMessage, offUnhandledRejection, offWindowResize, onAccelerometerChange, onAppHide, onAppShow, onCompassChange, onError, onGyroscopeChange, onLocaleChange, onMemoryWarning, onNetworkStatusChange, onPageNotFound, onPushMessage, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, onUnhandledRejection, onUserCaptureScreen, onWindowResize, openDocument, openLocation, pageScrollTo, index$f as plugin, preloadPage, previewImage, reLaunch, redirectTo, removeInterceptor, removeSavedFileInfo, removeStorage, removeStorageSync, removeTabBarBadge, request, saveFile, saveImageToPhotosAlbum, saveVideoToPhotosAlbum, scanCode, sendSocketMessage, setClipboardData, setKeepScreenOn, setLeftWindowStyle, setLocale, setNavigationBarColor, setNavigationBarTitle, setPageMeta, setRightWindowStyle, setScreenBrightness, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setTopWindowStyle, setupApp, setupPage, setupWindow, showActionSheet, showLeftWindow, showLoading, showModal, showNavigationBarLoading, showRightWindow, showTabBar, showTabBarRedDot, showToast, showTopWindow, startAccelerometer, startCompass, startGyroscope, startPullDownRefresh, stopAccelerometer, stopCompass, stopGyroscope, stopPullDownRefresh, switchTab, uni$1 as uni, uploadFile, upx2px, useI18n, useTabBar, vibrateLong, vibrateShort }; +export { $emit, $off, $on, $once, index$8 as Ad, index$7 as AdContentPage, index$6 as AdDraw, index$1 as AsyncErrorComponent, index as AsyncLoadingComponent, index$y as Button, index$5 as Camera, index$w as Canvas, index$u as Checkbox, index$v as CheckboxGroup, index$a as CoverImage, index$b as CoverView, index$t as Editor, index$A as Form, index$s as Icon, index$r as Image, Input, index$z as Label, LayoutComponent, index$4 as LivePlayer, index$3 as LivePusher, Map$1 as Map, MovableArea, MovableView, index$q as Navigator, index$2 as PageComponent, index$9 as Picker, PickerView, PickerViewColumn, index$p as Progress, index$n as Radio, index$o as RadioGroup, ResizeSensor, index$m as RichText, ScrollView, index$l as Slider, Swiper, SwiperItem, index$k as Switch, index$j as Text, index$i as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, index$e as Video, index$h as View, index$d as WebView, addInterceptor, addPhoneContact, arrayBufferToBase64, base64ToArrayBuffer, canIUse, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, chooseFile, chooseImage, chooseLocation, chooseVideo, clearStorage, clearStorageSync, closePreviewImage, closeSocket, connectSocket, createAnimation$1 as createAnimation, createCameraContext, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createLivePlayerContext, createMapContext, createMediaQueryObserver, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, downloadFile, getApp$1 as getApp, getAppBaseInfo, getClipboardData, getCurrentPages$1 as getCurrentPages, getDeviceInfo, getEnterOptionsSync, getFileInfo, getImageInfo, getLaunchOptionsSync, getLeftWindowStyle, getLocale, getLocation, getNetworkType, getProvider, getPushClientid, getRealPath, getRecorderManager, getRightWindowStyle, getSavedFileInfo, getSavedFileList, getScreenBrightness, getSelectedTextRange$1 as getSelectedTextRange, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getTopWindowStyle, getVideoInfo, getWindowInfo, hideKeyboard, hideLeftWindow, hideLoading, hideNavigationBarLoading, hideRightWindow, hideTabBar, hideTabBarRedDot, hideToast, hideTopWindow, interceptors, invokePushCallback, loadFontFace, login, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offAppHide, offAppShow, offCompassChange, offError, offNetworkStatusChange, offPageNotFound, offPushMessage, offUnhandledRejection, offWindowResize, onAccelerometerChange, onAppHide, onAppShow, onCompassChange, onError, onGyroscopeChange, onLocaleChange, onMemoryWarning, onNetworkStatusChange, onPageNotFound, onPushMessage, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, onUnhandledRejection, onUserCaptureScreen, onWindowResize, openDocument, openLocation, pageScrollTo, index$f as plugin, preloadPage, previewImage, reLaunch, redirectTo, removeInterceptor, removeSavedFileInfo, removeStorage, removeStorageSync, removeTabBarBadge, request, saveFile, saveImageToPhotosAlbum, saveVideoToPhotosAlbum, scanCode, sendSocketMessage, setClipboardData, setKeepScreenOn, setLeftWindowStyle, setLocale, setNavigationBarColor, setNavigationBarTitle, setPageMeta, setRightWindowStyle, setScreenBrightness, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setTopWindowStyle, setupApp, setupPage, setupWindow, showActionSheet, showLeftWindow, showLoading, showModal, showNavigationBarLoading, showRightWindow, showTabBar, showTabBarRedDot, showToast, showTopWindow, startAccelerometer, startCompass, startGyroscope, startPullDownRefresh, stopAccelerometer, stopCompass, stopGyroscope, stopPullDownRefresh, switchTab, uni$1 as uni, uploadFile, upx2px, useI18n, useTabBar, vibrateLong, vibrateShort }; diff --git a/packages/uni-h5/src/service/api/index.ts b/packages/uni-h5/src/service/api/index.ts index 15fa1b647..b34c8ac1b 100644 --- a/packages/uni-h5/src/service/api/index.ts +++ b/packages/uni-h5/src/service/api/index.ts @@ -98,7 +98,7 @@ export { setPageMeta, getEnterOptionsSync, getLaunchOptionsSync, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, onAppHide, diff --git a/packages/uni-mp-alipay/dist/uni.api.esm.js b/packages/uni-mp-alipay/dist/uni.api.esm.js index a6a3ab744..c04c9f67c 100644 --- a/packages/uni-mp-alipay/dist/uni.api.esm.js +++ b/packages/uni-mp-alipay/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-baidu/dist/uni.api.esm.js b/packages/uni-mp-baidu/dist/uni.api.esm.js index 68eba20c2..f2bad3182 100644 --- a/packages/uni-mp-baidu/dist/uni.api.esm.js +++ b/packages/uni-mp-baidu/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-core/src/api/index.ts b/packages/uni-mp-core/src/api/index.ts index 9b2e3debd..e13ec1105 100644 --- a/packages/uni-mp-core/src/api/index.ts +++ b/packages/uni-mp-core/src/api/index.ts @@ -13,7 +13,7 @@ import { $emit, } from '@dcloudio/uni-api/src/service/base/eventBus' import { - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, @@ -40,7 +40,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-kuaishou/dist/uni.api.esm.js b/packages/uni-mp-kuaishou/dist/uni.api.esm.js index cb5e8c4c8..d992370db 100644 --- a/packages/uni-mp-kuaishou/dist/uni.api.esm.js +++ b/packages/uni-mp-kuaishou/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-lark/dist/uni.api.esm.js b/packages/uni-mp-lark/dist/uni.api.esm.js index 4047e95c0..483729163 100644 --- a/packages/uni-mp-lark/dist/uni.api.esm.js +++ b/packages/uni-mp-lark/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-qq/dist/uni.api.esm.js b/packages/uni-mp-qq/dist/uni.api.esm.js index d108f2609..428669001 100644 --- a/packages/uni-mp-qq/dist/uni.api.esm.js +++ b/packages/uni-mp-qq/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-toutiao/dist/uni.api.esm.js b/packages/uni-mp-toutiao/dist/uni.api.esm.js index b7a511276..fa72bf4d1 100644 --- a/packages/uni-mp-toutiao/dist/uni.api.esm.js +++ b/packages/uni-mp-toutiao/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js index 270eba3fb..d6f32558b 100644 --- a/packages/uni-mp-weixin/dist/uni.api.esm.js +++ b/packages/uni-mp-weixin/dist/uni.api.esm.js @@ -545,7 +545,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -556,11 +556,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -777,7 +777,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, diff --git a/packages/uni-quickapp-webview/dist/uni.api.esm.js b/packages/uni-quickapp-webview/dist/uni.api.esm.js index 5d61fcb4f..ee92bf998 100644 --- a/packages/uni-quickapp-webview/dist/uni.api.esm.js +++ b/packages/uni-quickapp-webview/dist/uni.api.esm.js @@ -581,7 +581,7 @@ function invokeGetPushCidCallbacks(cid, errMsg) { }); getPushCidCallbacks.length = 0; } -function getPushCid(args) { +function getPushClientid(args) { if (!isPlainObject(args)) { args = {}; } @@ -592,11 +592,11 @@ function getPushCid(args) { getPushCidCallbacks.push((cid, errMsg) => { let res; if (cid) { - res = { errMsg: 'getPushCid:ok', cid }; + res = { errMsg: 'getPushClientid:ok', cid }; hasSuccess && success(res); } else { - res = { errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '') }; + res = { errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') }; hasFail && fail(res); } hasComplete && complete(res); @@ -813,7 +813,7 @@ const baseApis = { getLocale, setLocale, onLocaleChange, - getPushCid, + getPushClientid, onPushMessage, offPushMessage, invokePushCallback, -- GitLab