diff --git a/display/AppScope/app.json b/display/AppScope/app.json index aae3daefc31d8471a570b6283bb5ae07dfaf9db0..74c4badf4cee01879fe1aa3692f0a9a8f2087d90 100644 --- a/display/AppScope/app.json +++ b/display/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.devicemanagerui", "vendor": "example", - "versionCode": 1000049, - "versionName": "1.0.49", + "versionCode": 1000050, + "versionName": "1.0.50", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 10, diff --git a/display/entry/src/main/ets/pages/ConfirmDialogTv.ets b/display/entry/src/main/ets/pages/ConfirmDialogTv.ets index 165a2b203cf60960683c7eb3311d1b36109353d4..c1137b61b20e1bf05a53da4d14475e094c2de1f4 100644 --- a/display/entry/src/main/ets/pages/ConfirmDialogTv.ets +++ b/display/entry/src/main/ets/pages/ConfirmDialogTv.ets @@ -220,13 +220,13 @@ struct ConfirmCustomDialog { Shape() { Column() { SymbolGlyph(this.getImages(this.peerDeviceType)) - .fontSize('70vp') + .fontSize('74vp') .renderingStrategy(SymbolRenderingStrategy.MULTIPLE_OPACITY) .fontColor(['#E5FFFFFF']) } } .visibility(this.isAvailableType ? Visibility.Visible : Visibility.None) - .margin({ bottom: '24vp', top: '24vp' }) + .margin({ bottom: '32vp', top: '32vp' }) } private isTibetanLanguages(): boolean { @@ -248,7 +248,7 @@ struct ConfirmCustomDialog { Column() { Text(this.title) .textAlign(TextAlign.Center) - .fontSize('16fp') + .fontSize('22fp') .fontWeight(FontWeight.Regular) .fontColor('#E5FFFFFF') .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) @@ -261,7 +261,7 @@ struct ConfirmCustomDialog { .fontColor('#E5FFFFFF') .fontWeight(FontWeight.Regular) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize('16vp') + .fontSize('22vp') .maxLines(2) .width('auto') .lineHeight(this.isTibetanLanguages() ? '22vp' : 0) @@ -269,24 +269,24 @@ struct ConfirmCustomDialog { .visibility(this.peerCustomDescription === '' ? Visibility.None : Visibility.Visible) }.margin({ top: this.isAvailableType ? 0 : '24vp', - bottom: '24vp', left: '24vp', right: '24vp' }) + bottom: '32vp', left: '32vp', right: '32vp' }) Column() { Button($r('app.string.dm_allow_always')) - .margin({ bottom: '12vp' }) + .margin({ bottom: '16vp' }) .onClick(() => { this.onAllowAlways(); }) - .fontSize('18vp') + .fontSize('24vp') .fontColor('#E5FFFFFF') .fontWeight(FontWeight.Medium) - .height(this.isTibetanLanguages() ? 'auto' : '40vp') + .height(this.isTibetanLanguages() ? 'auto' : '54vp') .width('100%') .backgroundColor(this.btnColor) .scale({x: this.firstButtonWidth, y: this.firstButtonHeight}) .focusable(true) .border({ - width: '0.5vp', + width: '1vp', color: '#26ffffff' }) .onHover((isHover?: boolean, event?: HoverEvent): void => { @@ -295,7 +295,7 @@ struct ConfirmCustomDialog { this.firstButtonWidth = 1.05; this.firstButtonHeight = 1.05; } else { - this.btnColor = '#33F1F3F5'; + this.btnColor = $r('sys.color.comp_background_tertiary'); this.firstButtonWidth = 1; this.firstButtonHeight = 1; } @@ -309,24 +309,24 @@ struct ConfirmCustomDialog { .backgroundColor('#4DFFFFFF') }, normal: { - .backgroundColor('#33F1F3F5') + .backgroundColor($r('sys.color.comp_background_tertiary')) } }) Button($r('app.string.dm_allow_this_time')) - .margin({ bottom: '12vp' }) + .margin({ bottom: '16vp' }) .onClick(() => { this.onAllowOnce(); }) - .fontSize('18vp') + .fontSize('24vp') .fontColor('#E5FFFFFF') .fontWeight(FontWeight.Medium) .focusable(true) - .height(this.isTibetanLanguages() ? 'auto' : '40vp') + .height(this.isTibetanLanguages() ? 'auto' : '54vp') .width('100%') .backgroundColor(this.btnColor) .scale({x: this.secondButtonWidth, y: this.secondButtonHeight}) .border({ - width: '0.5vp', + width: '1vp', color: '#26ffffff' }) .onHover((isHover?: boolean, event?: HoverEvent): void => { @@ -335,7 +335,7 @@ struct ConfirmCustomDialog { this.secondButtonWidth = 1.05; this.secondButtonHeight = 1.05; } else { - this.btnColor = '#33F1F3F5'; + this.btnColor = $r('sys.color.comp_background_tertiary'); this.secondButtonWidth = 1; this.secondButtonHeight = 1; } @@ -349,12 +349,12 @@ struct ConfirmCustomDialog { .backgroundColor('#4DFFFFFF') }, normal: { - .backgroundColor('#33F1F3F5') + .backgroundColor($r('sys.color.comp_background_tertiary')) } }) Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) .margin({ left: '16vp', right: '16vp' }) - .fontSize('18vp') + .fontSize('24vp') .fontColor('#E5FFFFFF') .fontWeight(FontWeight.Medium) .focusable(true) @@ -371,12 +371,12 @@ struct ConfirmCustomDialog { .onClick(() => { this.onCancel(); }) - .height(this.isTibetanLanguages() ? 'auto' : '40vp') + .height(this.isTibetanLanguages() ? 'auto' : '54vp') .width('100%') .backgroundColor(this.btnColor) .scale({x: this.thirdButtonWidth, y: this.thirdButtonHeight}) .border({ - width: '0.5vp', + width: '1vp', color: '#26ffffff' }) .onHover((isHover?: boolean, event?: HoverEvent): void => { @@ -385,7 +385,7 @@ struct ConfirmCustomDialog { this.thirdButtonWidth = 1.05; this.thirdButtonHeight = 1.05; } else { - this.btnColor = '#33F1F3F5'; + this.btnColor = $r('sys.color.comp_background_tertiary'); this.thirdButtonWidth = 1; this.thirdButtonHeight = 1; } @@ -399,22 +399,23 @@ struct ConfirmCustomDialog { .backgroundColor('#4DFFFFFF') }, normal: { - .backgroundColor('#33F1F3F5') + .backgroundColor($r('sys.color.comp_background_tertiary')) } }) } .margin({ - left: '24vp', - right: '24vp', - bottom: '24vp' + left: '32vp', + right: '32vp', + bottom: '32vp' }) } - .backgroundColor('#3C3C3C') - .borderRadius(16) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + .shadow(ShadowStyle.OUTER_FLOATING_SM) + .borderRadius(32) .border({ - width: '0.5', + width: '1', color: '#26ffffff', - radius: '16vp' + radius: '32vp' }) .margin({ left: $r('sys.float.ohos_id_dialog_margin_start'), right: $r('sys.float.ohos_id_dialog_margin_end') }) .width(px2vp(this.mLocalWidth) * 0.36) diff --git a/display/entry/src/main/ets/pages/PinDialogTv.ets b/display/entry/src/main/ets/pages/PinDialogTv.ets index 59864ef96b9054c19bf70b58da4e5107a0ef79a5..077a1883fcead5ad75c754c1697892ee5be4a8dd 100644 --- a/display/entry/src/main/ets/pages/PinDialogTv.ets +++ b/display/entry/src/main/ets/pages/PinDialogTv.ets @@ -98,46 +98,46 @@ struct PinCustomDialog { Column() { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text($r('app.string.dm_connect_code')) - .fontSize('20fp') + .fontSize('32fp') .fontColor('#E5FFFFFF') .fontWeight(FontWeight.Medium) .lineHeight(this.isTibetanLanguages() ? '32.5vp' : 0) .margin({ - left: '24vp', - right: '24vp' + left: '32vp', + right: '32vp' }) } - .margin({ bottom: '24vp', top: '24vp' }) + .margin({ bottom: '32vp', top: '32vp' }) Row() { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { ForEach(this.pinCodeArr, (item: string, index: number) => { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Text(item) - .fontSize('30fp') + .fontSize('40fp') .fontColor('#E5FFFFFF') .fontWeight(FontWeight.Medium) - }.width('24vp') + }.width('32vp') .height('100%') - .margin(index === this.pinCodeArr.length - 1 ? {} : { right: '16vp' }) + .margin(index === this.pinCodeArr.length - 1 ? {} : { right: '22vp' }) }) } - .height('40vp') + .height('53vp') .accessibilityText('[n1]' + this.pinCode + '[n0]') } - .margin({ bottom: '24vp' }) + .margin({ bottom: '32vp' }) Flex({ justifyContent: FlexAlign.Center }) { Button($r('app.string.dm_cancel')) - .fontSize('18vp') + .fontSize('24vp') .fontWeight(FontWeight.Medium) .fontColor('#E5FFFFFF') .width('100%') - .height('40vp') + .height('54vp') .backgroundColor(this.btnColor) .scale({x: this.buttonWidth, y: this.buttonHeight}) .border({ - width: '0.5vp', + width: '1vp', color: '#26ffffff' }) .defaultFocus(true) @@ -176,7 +176,7 @@ struct PinCustomDialog { this.buttonWidth = 1.05; this.buttonHeight = 1.05; } else { - this.btnColor = '#33F1F3F5'; + this.btnColor = $r('sys.color.comp_background_tertiary'); this.buttonWidth = 1; this.buttonHeight = 1; } @@ -190,20 +190,21 @@ struct PinCustomDialog { .backgroundColor('#4DFFFFFF') }, normal: { - .backgroundColor('#33F1F3F5') + .backgroundColor($r('sys.color.comp_background_tertiary')) } }) }.margin({ - left: '24vp', - right: '24vp', - bottom: '24vp' }) + left: '32vp', + right: '32vp', + bottom: '32vp' }) } - .backgroundColor('#3C3C3C') - .borderRadius('16vp') + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + .shadow(ShadowStyle.OUTER_FLOATING_SM) + .borderRadius('32vp') .border({ - width: '0.5vp', + width: '1vp', color: '#26ffffff', - radius: '16vp' + radius: '32vp' }) .width(px2vp(this.mLocalWidth) * 0.36) .margin({ left: $r('sys.float.ohos_id_dialog_margin_start'), right: $r('sys.float.ohos_id_dialog_margin_end') })