diff --git a/display/AppScope/app.json b/display/AppScope/app.json index 61b3ac15fb71c3a7ee3f59c40407990dc175b40b..efdc659459da42dac08f7572cc75390534c44b5c 100644 --- a/display/AppScope/app.json +++ b/display/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.devicemanagerui", "vendor": "example", - "versionCode": 1000042, - "versionName": "1.0.42", + "versionCode": 1000043, + "versionName": "1.0.43", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 10, diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 5677f78aad2e956657a991dc8a5c107011e718ae..d3e58ec9ed494de5e534b502f988847a4d489e78 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -52,10 +52,21 @@ struct InputCustomDialog { private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { + this.mLocalHeight = display.getDefaultDisplaySync().height; + let heightRatio = px2vp(this.mLocalHeight) * 0.2; if (mediaQueryResult.matches as boolean) { - this.heightNum = 300; + if (this.isPhone) { + if (display.isFoldable() && + display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { + this.heightNum = heightRatio; + } else if (!display.isFoldable()) { + this.heightNum = heightRatio; + } + } else { + this.heightNum = 300; + } } else { - this.heightNum = 800; + this.heightNum = 800; } }