From 70b4f9dae30672315898c658947f04a774111f75 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 20 Mar 2020 18:25:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DtabBar=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BD=BF=E7=94=A8=E5=8E=9F=E7=94=9F=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=8C=BA=E5=8D=A0=E4=BD=8D=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=E7=AA=97=E5=8F=A3=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/framework/safe-area-insets.js     |  9 -------
 .../app-plus/service/framework/tab-bar.js     | 24 +++++++++----------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 src/platforms/app-plus/service/framework/safe-area-insets.js

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 938f51186..000000000
--- 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 3d1182db6..bc602f5f6 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)
   }
 }
-- 
GitLab