diff --git a/src/platforms/app-plus/helpers/uuid.js b/src/platforms/app-plus/helpers/uuid.js deleted file mode 100644 index 57b0437178d6fbe7a42e9f1b4df648d4154ba0a9..0000000000000000000000000000000000000000 --- a/src/platforms/app-plus/helpers/uuid.js +++ /dev/null @@ -1,6 +0,0 @@ -let deviceId - -export default function () { - deviceId = deviceId || plus.device.uuid - return deviceId -} diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js index e9c322ba05f80398451fd3bb25a9eb34a64b3cce..f9241a59819f8ff9cce8322df3deb1399949a4e8 100644 --- a/src/platforms/app-plus/service/api/device/system.js +++ b/src/platforms/app-plus/service/api/device/system.js @@ -1,6 +1,5 @@ import { callApiSync } from '../util' import { getWindowInfo } from './get-window-info' -import deviceId from 'uni-platform/helpers/uuid' import { sortObject } from 'uni-shared' let systemInfo = {} @@ -21,7 +20,8 @@ export function getDeviceInfo () { weexGetSystemInfoSync() const { deviceBrand = '', deviceModel, osName, - osVersion, deviceOrientation, deviceType + osVersion, deviceOrientation, deviceType, + deviceId } = systemInfo const brand = deviceBrand.toLowerCase() @@ -32,7 +32,7 @@ export function getDeviceInfo () { deviceBrand: brand, deviceModel, devicePixelRatio: plus.screen.scale, - deviceId: deviceId(), + deviceId, deviceOrientation, deviceType, model: deviceModel,