diff --git a/src/platforms/app-plus/service/framework/safe-area-insets.js b/src/platforms/app-plus/service/framework/safe-area-insets.js deleted file mode 100644 index 938f511864c16ffc1aba4275be62957ba7839f84..0000000000000000000000000000000000000000 --- a/src/platforms/app-plus/service/framework/safe-area-insets.js +++ /dev/null @@ -1,9 +0,0 @@ -export default { - get bottom () { - if (plus.os.name === 'iOS') { - const safeArea = plus.navigator.getSafeAreaInsets() - return safeArea ? safeArea.bottom : 0 - } - return 0 - } -} diff --git a/src/platforms/app-plus/service/framework/tab-bar.js b/src/platforms/app-plus/service/framework/tab-bar.js index 3d1182db6b1033359483d49811936ca92b1be3b3..bc602f5f6ff19a2b1758423ca9f0de182442156e 100644 --- a/src/platforms/app-plus/service/framework/tab-bar.js +++ b/src/platforms/app-plus/service/framework/tab-bar.js @@ -7,8 +7,6 @@ import { requireNativePlugin } from '../bridge' -import safeAreaInsets from './safe-area-insets' - const TABBAR_HEIGHT = 50 const isIOS = plus.os.name === 'iOS' let config @@ -92,8 +90,8 @@ function showTabBar (animation) { tabBar && tabBar.showTabBar({ animation }) -} - +} + let maskClickCallback = [] export default { @@ -106,11 +104,11 @@ export default { tabBar = requireNativePlugin('uni-tabview') } catch (error) { console.log(`uni.requireNativePlugin("uni-tabview") error ${error}`) - } - tabBar.onMaskClick(() => { - maskClickCallback.forEach((callback) => { - callback() - }) + } + tabBar.onMaskClick(() => { + maskClickCallback.forEach((callback) => { + callback() + }) }) tabBar && tabBar.onClick(({ index }) => { clickCallback(config.list[index], index) @@ -164,7 +162,7 @@ export default { return visible }, get height () { - return (config && config.height ? parseFloat(config.height) : TABBAR_HEIGHT) + safeAreaInsets.bottom + return (config && config.height ? parseFloat(config.height) : TABBAR_HEIGHT) + plus.navigator.getSafeAreaInsets().deviceBottom }, // tabBar是否遮挡内容区域 get cover () { @@ -177,11 +175,11 @@ export default { color: mask }) }, - addEventListener (name, callback) { + addEventListener (name, callback) { maskClickCallback.push(callback) }, - removeEventListener (name, callback) { - let callbackIndex = maskClickCallback.indexOf(callback) + removeEventListener (name, callback) { + let callbackIndex = maskClickCallback.indexOf(callback) maskClickCallback.splice(callbackIndex, 1) } }