From 8684255a998469c080e574c6e3dfd401f6c33345 Mon Sep 17 00:00:00 2001 From: qiang Date: Fri, 3 Jan 2020 20:54:46 +0800 Subject: [PATCH] feat: h5 getSystemInfo safeAreaInsets feat: h5 getSystemInfo safeAreaInsets --- .../h5/service/api/device/get-system-info.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/platforms/h5/service/api/device/get-system-info.js b/src/platforms/h5/service/api/device/get-system-info.js index 5988c9fe0..a63928500 100644 --- a/src/platforms/h5/service/api/device/get-system-info.js +++ b/src/platforms/h5/service/api/device/get-system-info.js @@ -21,7 +21,7 @@ export function getSystemInfoSync () { var screenWidth = screen.width var screenHeight = screen.height var language = navigator.language - var statusBarHeight = 0 + var statusBarHeight = safeAreaInsets.top var osname var osversion var model @@ -84,7 +84,7 @@ export function getSystemInfoSync () { const { top: windowTop, bottom: windowBottom - } = getWindowOffset(false, true) + } = getWindowOffset() windowHeight -= windowTop windowHeight -= windowBottom @@ -102,7 +102,13 @@ export function getSystemInfoSync () { system, platform, model, - safeArea + safeArea, + safeAreaInsets: { + top: safeAreaInsets.top, + right: safeAreaInsets.right, + bottom: safeAreaInsets.bottom, + left: safeAreaInsets.left + } } } /** -- GitLab