Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
一把秋刀鱼
uni-app
提交
c028d252
U
uni-app
项目概览
一把秋刀鱼
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c028d252
编写于
1月 02, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: app-v3 windowTop
fix: app-v3 --window-top fix: app-v3 windowTop
上级
cddc9e83
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
82 addition
and
46 deletion
+82
-46
packages/uni-cli-shared/lib/platform.js
packages/uni-cli-shared/lib/platform.js
+1
-3
src/platforms/app-plus/service/api/device/system.js
src/platforms/app-plus/service/api/device/system.js
+50
-35
src/platforms/app-plus/service/api/util.js
src/platforms/app-plus/service/api/util.js
+23
-5
src/platforms/app-plus/service/framework/plugins/lifecycle.js
...platforms/app-plus/service/framework/plugins/lifecycle.js
+8
-3
未找到文件。
packages/uni-cli-shared/lib/platform.js
浏览文件 @
c028d252
...
...
@@ -152,9 +152,7 @@ const PLATFORMS = {
megalo
:
false
,
filterTag
:
'
wxs
'
,
subPackages
:
false
,
cssVars
:
{
'
--window-top
'
:
'
0px
'
},
cssVars
:
{},
copyWebpackOptions
({
assetsDir
,
vueOptions
...
...
src/platforms/app-plus/service/api/device/system.js
浏览文件 @
c028d252
import
{
callApiSync
,
isTabBarPage
,
getLastWebview
getLastWebview
,
getStatusbarHeight
,
getScreenInfo
}
from
'
../util
'
import
{
...
...
@@ -17,48 +19,55 @@ export function getSystemInfoSync () {
export
function
getSystemInfo
()
{
const
platform
=
plus
.
os
.
name
.
toLowerCase
()
const
ios
=
platform
===
'
ios
'
// 安卓 plus 接口获取的屏幕大小值不为整数,iOS js 获取的屏幕大小横屏时颠倒
const
screenWidth
=
plus
.
screen
.
resolutionWidth
const
screenHeight
=
plus
.
screen
.
resolutionHeight
// 横屏时 iOS 获取的状态栏高度错误,进行纠正
var
landscape
=
Math
.
abs
(
plus
.
navigator
.
getOrientation
())
===
90
var
statusBarHeight
=
Math
.
round
(
plus
.
navigator
.
getStatusbarHeight
())
if
(
ios
&&
landscape
)
{
statusBarHeight
=
Math
.
min
(
20
,
statusBarHeight
)
}
var
safeAreaInsets
function
getSafeAreaInsets
()
{
return
{
left
:
0
,
right
:
0
,
top
:
titleNView
?
0
:
statusBarHeight
,
bottom
:
0
}
const
{
screenWidth
,
screenHeight
}
=
getScreenInfo
()
const
statusBarHeight
=
getStatusbarHeight
()
let
safeAreaInsets
const
titleNView
=
{
height
:
0
,
cover
:
false
}
// 判断是否存在 titleNView
var
titleNView
var
webview
=
getLastWebview
()
const
webview
=
getLastWebview
()
if
(
webview
)
{
let
style
=
webview
.
getStyle
()
if
(
style
)
{
titleNView
=
style
&&
style
.
titleNView
titleNView
=
titleNView
&&
titleNView
.
type
===
'
default
'
style
=
style
&&
style
.
titleNView
if
(
style
&&
style
.
type
&&
style
.
type
!==
'
none
'
)
{
titleNView
.
height
=
style
.
type
===
'
transparent
'
?
0
:
(
statusBarHeight
+
TITLEBAR_HEIGHT
)
titleNView
.
cover
=
style
.
type
===
'
transparent
'
||
style
.
type
===
'
float
'
}
safeAreaInsets
=
ios
?
webview
.
getSafeAreaInsets
()
:
getSafeAreaInsets
()
safeAreaInsets
=
webview
.
getSafeAreaInsets
()
}
else
{
safeAreaInsets
=
ios
?
plus
.
navigator
.
getSafeAreaInsets
()
:
getSafeAreaInsets
()
safeAreaInsets
=
plus
.
navigator
.
getSafeAreaInsets
()
}
var
windowBottom
=
isTabBarPage
()
&&
tabBar
.
visible
&&
tabBar
.
cover
?
tabBar
.
height
:
0
var
windowHeight
=
Math
.
min
(
screenHeight
-
(
titleNView
?
(
statusBarHeight
+
TITLEBAR_HEIGHT
)
:
0
)
-
windowBottom
,
screenHeight
)
var
windowWidth
=
screenWidth
var
safeArea
=
{
const
tabBarView
=
{
height
:
0
,
cover
:
false
}
if
(
isTabBarPage
())
{
tabBarView
.
height
=
tabBar
.
visible
?
tabBar
.
height
:
0
tabBarView
.
cover
=
tabBar
.
cover
}
const
windowTop
=
titleNView
.
cover
?
titleNView
.
height
:
0
const
windowBottom
=
tabBarView
.
cover
?
tabBarView
.
height
:
0
const
windowHeight
=
screenHeight
-
titleNView
.
height
-
tabBarView
.
height
const
windowHeightReal
=
screenHeight
-
(
titleNView
.
cover
?
0
:
titleNView
.
height
)
-
(
tabBarView
.
cover
?
0
:
tabBarView
.
height
)
const
windowWidth
=
screenWidth
safeAreaInsets
=
ios
?
safeAreaInsets
:
{
left
:
0
,
right
:
0
,
top
:
titleNView
.
height
&&
!
titleNView
.
cover
?
0
:
statusBarHeight
,
bottom
:
0
}
const
safeArea
=
{
left
:
safeAreaInsets
.
left
,
right
:
windowWidth
-
safeAreaInsets
.
right
,
top
:
safeAreaInsets
.
top
,
bottom
:
windowHeight
-
safeAreaInsets
.
bottom
,
bottom
:
windowHeight
Real
-
safeAreaInsets
.
bottom
,
width
:
windowWidth
-
safeAreaInsets
.
left
-
safeAreaInsets
.
right
,
height
:
windowHeight
-
safeAreaInsets
.
top
-
safeAreaInsets
.
bottom
height
:
windowHeight
Real
-
safeAreaInsets
.
top
-
safeAreaInsets
.
bottom
}
return
{
...
...
@@ -77,8 +86,14 @@ export function getSystemInfo () {
fontSizeSetting
:
''
,
platform
,
SDKVersion
:
''
,
windowTop
:
0
,
windowTop
,
windowBottom
,
safeArea
safeArea
,
safeAreaInsets
:
{
top
:
safeAreaInsets
.
top
,
right
:
safeAreaInsets
.
right
,
bottom
:
safeAreaInsets
.
bottom
,
left
:
safeAreaInsets
.
left
}
}
}
src/platforms/app-plus/service/api/util.js
浏览文件 @
c028d252
...
...
@@ -149,3 +149,21 @@ const _transformlng = function (lng, lat) {
const
outOfChina
=
function
(
lng
,
lat
)
{
return
(
lng
<
72.004
||
lng
>
137.8347
)
||
((
lat
<
0.8293
||
lat
>
55.8271
)
||
false
)
}
export
function
getStatusbarHeight
()
{
// 横屏时 iOS 获取的状态栏高度错误,进行纠正
return
plus
.
navigator
.
isImmersedStatusbar
()
?
Math
.
round
(
plus
.
os
.
name
===
'
iOS
'
?
plus
.
navigator
.
getSafeAreaInsets
().
top
:
plus
.
navigator
.
getStatusbarHeight
())
:
0
}
export
function
getScreenInfo
()
{
const
orientation
=
plus
.
navigator
.
getOrientation
()
const
landscape
=
Math
.
abs
(
orientation
)
===
90
// 安卓 plus 接口获取的屏幕大小值不为整数
const
width
=
plus
.
screen
.
resolutionWidth
const
height
=
plus
.
screen
.
resolutionHeight
// 根据方向纠正宽高
return
{
screenWidth
:
Math
[
landscape
?
'
max
'
:
'
min
'
](
width
,
height
),
screenHeight
:
Math
[
landscape
?
'
min
'
:
'
max
'
](
width
,
height
)
}
}
src/platforms/app-plus/service/framework/plugins/lifecycle.js
浏览文件 @
c028d252
...
...
@@ -16,12 +16,17 @@ import {
from
'
uni-core/service/plugins/lifecycle
'
import
{
ON_REACH_BOTTOM_DISTANCE
ON_REACH_BOTTOM_DISTANCE
,
TITLEBAR_HEIGHT
}
from
'
../../constants
'
import
tabBar
from
'
../tab-bar
'
import
{
getStatusbarHeight
}
from
'
../../api/util
'
function
parsePageCreateOptions
(
vm
,
route
)
{
const
pagePath
=
'
/
'
+
route
const
routeOptions
=
__uniRoutes
.
find
(
route
=>
route
.
path
===
pagePath
)
...
...
@@ -40,7 +45,7 @@ function parsePageCreateOptions (vm, route) {
onPageScroll
,
onPageReachBottom
,
onReachBottomDistance
,
windowTop
:
0
,
// TODO
windowTop
:
windowOptions
.
titleNView
&&
windowOptions
.
titleNView
.
type
===
'
float
'
?
(
getStatusbarHeight
()
+
TITLEBAR_HEIGHT
)
:
0
,
windowBottom
:
(
tabBar
.
indexOf
(
route
)
>=
0
&&
tabBar
.
cover
)
?
tabBar
.
height
:
0
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录