From 6757cf09107ec010b7047b6f804236b981e9c4e4 Mon Sep 17 00:00:00 2001 From: l30054665 Date: Thu, 24 Apr 2025 19:52:09 +0800 Subject: [PATCH 1/7] ux Signed-off-by: l30054665 --- display/AppScope/app.json | 4 ++-- display/entry/src/main/ets/pages/InputPinDialog.ets | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/display/AppScope/app.json b/display/AppScope/app.json index 61b3ac15f..efdc65945 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 5677f78aa..a38f806c6 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -52,6 +52,7 @@ struct InputCustomDialog { private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { + if (mediaQueryResult.matches as boolean) { this.heightNum = 300; } else { -- Gitee From fa1f529d15a5c2e22a3913d0866bb96b14a31b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Thu, 24 Apr 2025 11:57:56 +0000 Subject: [PATCH 2/7] update display/entry/src/main/ets/pages/InputPinDialog.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- .../entry/src/main/ets/pages/InputPinDialog.ets | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index a38f806c6..2bc31115b 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -52,10 +52,19 @@ 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; - } else { + 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; } } -- Gitee From b619bf1f33602652a54f0863e90895f4b0113076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Fri, 25 Apr 2025 08:01:45 +0000 Subject: [PATCH 3/7] update display/entry/src/main/ets/pages/InputPinDialog.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- display/entry/src/main/ets/pages/InputPinDialog.ets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 2bc31115b..300af9edd 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -61,10 +61,10 @@ struct InputCustomDialog { } else if (!display.isFoldable()) { this.heightNum = heightRatio; } + } else { + this.heightNum = 300; } - else {this.heightNum = 300;} - } - else { + } else { this.heightNum = 800; } } -- Gitee From f4d4dbeae33e5ecc04292a4021272e83a0115d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Fri, 25 Apr 2025 08:11:27 +0000 Subject: [PATCH 4/7] update display/entry/src/main/ets/pages/InputPinDialog.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- .../src/main/ets/pages/InputPinDialog.ets | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 300af9edd..047e5c14b 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -52,20 +52,22 @@ struct InputCustomDialog { private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { + this.mLocalHeight = display.getDefaultDisplaySync().height; + let heightRatio = px2vp(this.mLocalHeight) * 0.2; this.mLocalHeight = display.getDefaultDisplaySync().height; let heightRatio = px2vp(this.mLocalHeight) * 0.2; if (mediaQueryResult.matches as boolean) { - if (this.isPhone) { - if (display.isFoldable() && display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { - this.heightNum = heightRatio; - } else if (!display.isFoldable()) { - this.heightNum = heightRatio; + 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 = 300; - } } else { - this.heightNum = 800; + this.heightNum = 800; } } -- Gitee From c2bcc8ea692f328e5cd2c8e0d71593d948749118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Fri, 25 Apr 2025 08:16:24 +0000 Subject: [PATCH 5/7] update display/entry/src/main/ets/pages/InputPinDialog.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- display/entry/src/main/ets/pages/InputPinDialog.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 047e5c14b..1db70e2ef 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -58,7 +58,7 @@ struct InputCustomDialog { let heightRatio = px2vp(this.mLocalHeight) * 0.2; if (mediaQueryResult.matches as boolean) { if (this.isPhone) { - if (display.isFoldable() && display.getFoldDisplayMode() == = display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { + if (display.isFoldable() && display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { this.heightNum = heightRatio; } else if (!display.isFoldable()) { this.heightNum = heightRatio; -- Gitee From 193ebfc8da3b25af7636f19f6c26110eda5b305e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Fri, 25 Apr 2025 08:17:04 +0000 Subject: [PATCH 6/7] update display/entry/src/main/ets/pages/InputPinDialog.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- display/entry/src/main/ets/pages/InputPinDialog.ets | 2 -- 1 file changed, 2 deletions(-) diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 1db70e2ef..2ac87f75a 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -52,8 +52,6 @@ struct InputCustomDialog { private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { - this.mLocalHeight = display.getDefaultDisplaySync().height; - let heightRatio = px2vp(this.mLocalHeight) * 0.2; this.mLocalHeight = display.getDefaultDisplaySync().height; let heightRatio = px2vp(this.mLocalHeight) * 0.2; if (mediaQueryResult.matches as boolean) { -- Gitee From 7ac74d438dab3b03ccc12118447271fe46319467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Fri, 25 Apr 2025 10:19:29 +0000 Subject: [PATCH 7/7] update display/entry/src/main/ets/pages/InputPinDialog.ets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- display/entry/src/main/ets/pages/InputPinDialog.ets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 2ac87f75a..d3e58ec9e 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -56,7 +56,8 @@ struct InputCustomDialog { let heightRatio = px2vp(this.mLocalHeight) * 0.2; if (mediaQueryResult.matches as boolean) { if (this.isPhone) { - if (display.isFoldable() && display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { + if (display.isFoldable() && + display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { this.heightNum = heightRatio; } else if (!display.isFoldable()) { this.heightNum = heightRatio; -- Gitee