diff --git a/packages/uni-mp-alipay/dist/uni.api.esm.js b/packages/uni-mp-alipay/dist/uni.api.esm.js index 02a6f1cdbbdf8fc47298a3579e55ab75232f4e36..5a318c0b67aafa07d2b9c9cd073d4e7033554140 100644 --- a/packages/uni-mp-alipay/dist/uni.api.esm.js +++ b/packages/uni-mp-alipay/dist/uni.api.esm.js @@ -920,6 +920,22 @@ function addSafeAreaInsets(fromRes, toRes) { } } +const UUID_KEY = '__DC_STAT_UUID'; +let deviceId; +function useDeviceId(global = my) { + return function addDeviceId(_, toRes) { + deviceId = deviceId || global.getStorageSync(UUID_KEY); + if (!deviceId) { + deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7); + my.setStorage({ + key: UUID_KEY, + data: deviceId, + }); + } + toRes.deviceId = deviceId; + }; +} + const redirectTo = {}; const getProvider = initGetProvider({ @@ -1052,6 +1068,9 @@ function handleNetworkInfo(fromRes, toRes) { } function handleSystemInfo(fromRes, toRes) { addSafeAreaInsets(fromRes, toRes); + useDeviceId({ + getStorageSync, + })(fromRes, toRes); let platform = fromRes.platform ? fromRes.platform.toLowerCase() : 'devtools'; if (!~['android', 'ios'].indexOf(platform)) { platform = 'devtools'; diff --git a/packages/uni-mp-baidu/dist/uni.api.esm.js b/packages/uni-mp-baidu/dist/uni.api.esm.js index 6e65dd43d9ba510e6e55c41acddeea6b211b8d2a..01bd409fa9287c8a80ba1d1cff26ea78fd323521 100644 --- a/packages/uni-mp-baidu/dist/uni.api.esm.js +++ b/packages/uni-mp-baidu/dist/uni.api.esm.js @@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) { } } +const UUID_KEY = '__DC_STAT_UUID'; +let deviceId; +function useDeviceId(global = swan) { + return function addDeviceId(_, toRes) { + deviceId = deviceId || global.getStorageSync(UUID_KEY); + if (!deviceId) { + deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7); + swan.setStorage({ + key: UUID_KEY, + data: deviceId, + }); + } + toRes.deviceId = deviceId; + }; +} + const getSystemInfo = { - returnValue: addSafeAreaInsets, + returnValue: (fromRes, toRes) => { + addSafeAreaInsets(fromRes, toRes); + useDeviceId()(fromRes, toRes); + }, }; const getSystemInfoSync = getSystemInfo; diff --git a/packages/uni-mp-kuaishou/dist/uni.api.esm.js b/packages/uni-mp-kuaishou/dist/uni.api.esm.js index 3cd1910f8d181c583c83ad92f030f498225d49da..5dd40ea0973cd925c8eb02eeacc83bb85e9ae7ed 100644 --- a/packages/uni-mp-kuaishou/dist/uni.api.esm.js +++ b/packages/uni-mp-kuaishou/dist/uni.api.esm.js @@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) { } } +const UUID_KEY = '__DC_STAT_UUID'; +let deviceId; +function useDeviceId(global = ks) { + return function addDeviceId(_, toRes) { + deviceId = deviceId || global.getStorageSync(UUID_KEY); + if (!deviceId) { + deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7); + ks.setStorage({ + key: UUID_KEY, + data: deviceId, + }); + } + toRes.deviceId = deviceId; + }; +} + const getSystemInfo = { - returnValue: addSafeAreaInsets, + returnValue: (fromRes, toRes) => { + addSafeAreaInsets(fromRes, toRes); + useDeviceId()(fromRes, toRes); + }, }; const getSystemInfoSync = getSystemInfo; diff --git a/packages/uni-mp-qq/dist/uni.api.esm.js b/packages/uni-mp-qq/dist/uni.api.esm.js index 4b7efbb2829521d84063cd487bcc0cb952b99aa9..5b1217c35435cc81b09e025af69f77cfe9d57f80 100644 --- a/packages/uni-mp-qq/dist/uni.api.esm.js +++ b/packages/uni-mp-qq/dist/uni.api.esm.js @@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) { } } +const UUID_KEY = '__DC_STAT_UUID'; +let deviceId; +function useDeviceId(global = qq) { + return function addDeviceId(_, toRes) { + deviceId = deviceId || global.getStorageSync(UUID_KEY); + if (!deviceId) { + deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7); + qq.setStorage({ + key: UUID_KEY, + data: deviceId, + }); + } + toRes.deviceId = deviceId; + }; +} + const getSystemInfo = { - returnValue: addSafeAreaInsets, + returnValue: (fromRes, toRes) => { + addSafeAreaInsets(fromRes, toRes); + useDeviceId()(fromRes, toRes); + }, }; const getSystemInfoSync = getSystemInfo; diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js index b97ef8afab7f6b9efa8cd6a0069259674aefdc26..e7d37ece52e806d66ebe9856ab766d7870f2f82f 100644 --- a/packages/uni-mp-weixin/dist/uni.api.esm.js +++ b/packages/uni-mp-weixin/dist/uni.api.esm.js @@ -884,8 +884,27 @@ function addSafeAreaInsets(fromRes, toRes) { } } +const UUID_KEY = '__DC_STAT_UUID'; +let deviceId; +function useDeviceId(global = wx) { + return function addDeviceId(_, toRes) { + deviceId = deviceId || global.getStorageSync(UUID_KEY); + if (!deviceId) { + deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7); + wx.setStorage({ + key: UUID_KEY, + data: deviceId, + }); + } + toRes.deviceId = deviceId; + }; +} + const getSystemInfo = { - returnValue: addSafeAreaInsets, + returnValue: (fromRes, toRes) => { + addSafeAreaInsets(fromRes, toRes); + useDeviceId()(fromRes, toRes); + }, }; const getSystemInfoSync = getSystemInfo; diff --git a/packages/uni-quickapp-webview/dist/uni.api.esm.js b/packages/uni-quickapp-webview/dist/uni.api.esm.js index 175d5bc04282a19e1cc5f30eff9e37f3eed9d615..a62e0aa716102edf71067252de663bdd40d6c561 100644 --- a/packages/uni-quickapp-webview/dist/uni.api.esm.js +++ b/packages/uni-quickapp-webview/dist/uni.api.esm.js @@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) { } } +const UUID_KEY = '__DC_STAT_UUID'; +let deviceId; +function useDeviceId(global = qa) { + return function addDeviceId(_, toRes) { + deviceId = deviceId || global.getStorageSync(UUID_KEY); + if (!deviceId) { + deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7); + qa.setStorage({ + key: UUID_KEY, + data: deviceId, + }); + } + toRes.deviceId = deviceId; + }; +} + const getSystemInfo = { - returnValue: addSafeAreaInsets, + returnValue: (fromRes, toRes) => { + addSafeAreaInsets(fromRes, toRes); + useDeviceId()(fromRes, toRes); + }, }; const getSystemInfoSync = getSystemInfo;