diff --git a/entry/src/main/ets/liveview/LockScreenPage.ets b/entry/src/main/ets/liveview/LockScreenPage.ets index c2f52155181b4863f1301c441c081de54d8d6d96..6ba174d2a5127b7c980892ee65246b2a7bc5bd45 100644 --- a/entry/src/main/ets/liveview/LockScreenPage.ets +++ b/entry/src/main/ets/liveview/LockScreenPage.ets @@ -15,9 +15,6 @@ import { Constants } from '../constant/Constant'; import { LaneData } from '../model/RouteDataModel'; -import { BreakpointType } from '../utils/BreakpointUtil'; -import { RoadView } from '../view/RoadView'; -import json from '@ohos.util.json'; @Entry struct Index { diff --git a/entry/src/main/ets/view/RoadView.ets b/entry/src/main/ets/view/RoadView.ets deleted file mode 100644 index 8f6c76ff2dd02a8ac6344b6060896cd77fa1ea02..0000000000000000000000000000000000000000 --- a/entry/src/main/ets/view/RoadView.ets +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@Component -export struct RoadView { - @Prop laneNum: number = 1; - - build() { - Stack() { - Row() { - if (this.laneNum === 1) { - Image($r('app.media.traffic_left')) - .objectFit(ImageFit.Contain) - } else { - Image($r('app.media.traffic_right')) - .objectFit(ImageFit.Contain) - } - } - .width('80%') - .height('80%') - } - .backgroundImage($r('app.media.traffic_background')) - .backgroundImageSize(ImageSize.Cover) - .backgroundImagePosition(Alignment.Center) - .height('101%') - .width('101%') - } -} \ No newline at end of file diff --git a/entry/src/main/ets/view/TrafficInfoView.ets b/entry/src/main/ets/view/TrafficInfoView.ets index 06439234029c08de6ba6f38761e100e218b63804..9b994a4057709b29d33a06875f1cd3e039418739 100644 --- a/entry/src/main/ets/view/TrafficInfoView.ets +++ b/entry/src/main/ets/view/TrafficInfoView.ets @@ -39,7 +39,7 @@ export struct TrafficInfoView { .alignSelf(ItemAlign.Start) .fontSize($r('sys.float.padding_level8')) Image($r('app.media.traffic_light')) - .height($r('sys.float.padding_level8')) + .height(32) Text($r('app.string.traffic_info_third')) .fontColor(Color.Grey) .fontWeight(FontWeight.Bold) diff --git a/entry/src/main/ets/view/TrafficView.ets b/entry/src/main/ets/view/TrafficView.ets index 62f623d1cc1bd408956f1e366239b3418adb3421..c303f5b484da289f19bbd2a62248eb0d97d3194a 100644 --- a/entry/src/main/ets/view/TrafficView.ets +++ b/entry/src/main/ets/view/TrafficView.ets @@ -229,60 +229,65 @@ export struct TrafficView { left: 16, }) - Column() { - Image($r('app.media.turn_right_light_rectangle')) - .objectFit(ImageFit.Contain) - .width(40) - .height(25) - .margin({ - top: 8, - }) + Column({ space: 10 }) { + Column() { + Image($r('app.media.turn_right_light_rectangle')) + .objectFit(ImageFit.Contain) + .width(40) + .height(25) + .margin({ + top: 8, + }) - Text($r('app.string.traffic_info_smmd_first')) - .fontColor(Color.Black) - .alignSelf(ItemAlign.Start) - .fontSize(20) - .fontWeight(FontWeight.Bold) - .margin({ - left: 16, - right: 16, - top: 8, - bottom: 8, - }) - Text($r('app.string.traffic_info_smmd_second')) - .fontColor(Color.Black) - .alignSelf(ItemAlign.Start) - .fontSize(20) - .fontWeight(FontWeight.Bold) - .margin({ - left: 16, - right: 16, - bottom: 8, - }) + Text($r('app.string.traffic_info_smmd_first')) + .fontColor(Color.Black) + .alignSelf(ItemAlign.Start) + .fontSize(20) + .fontWeight(FontWeight.Bold) + .margin({ + left: 16, + right: 16, + top: 8, + bottom: 8, + }) + Text($r('app.string.traffic_info_smmd_second')) + .fontColor(Color.Black) + .alignSelf(ItemAlign.Start) + .fontSize(20) + .fontWeight(FontWeight.Bold) + .margin({ + left: 16, + right: 16, + bottom: 8, + }) + } + .justifyContent(FlexAlign.Center) + .borderRadius(16) + .backgroundColor($r('sys.color.ohos_id_blur_style_component_thick_color')) + .backgroundBlurStyle(BlurStyle.Thick) + + Row() { + Stack() { + Image($r('app.media.ic_light')) + .width(106) + .height(52) + Text(this.lightTime + '') + .fontColor($r('sys.color.white')) + .fontSize(30) + .margin({ right: 16 }) + } + .alignContent(Alignment.End) + } + .padding({ + right: 16 + }) } - .justifyContent(FlexAlign.Center) - .borderRadius(16) - .backgroundColor($r('sys.color.ohos_id_blur_style_component_thick_color')) .position({ top: 16, right: 16 }) - Row() { - Stack() { - Image($r('app.media.ic_light')) - .width(106) - .height(52) - Text(this.lightTime + '') - .fontColor($r('sys.color.white')) - .fontSize(30) - .margin({ right: 16 }) - } - .alignContent(Alignment.End) - } - .padding({ - right: 16 - }) + } .width('100%') diff --git a/entry/src/main/resources/base/media/traffic_background.png b/entry/src/main/resources/base/media/traffic_background.png deleted file mode 100644 index 3cc57185978f8e630c99f80c057e75cbbfa486a8..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/traffic_background.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/traffic_left.png b/entry/src/main/resources/base/media/traffic_left.png deleted file mode 100644 index 94ee73c185d6ff34abcee535077ca802b1911ce1..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/traffic_left.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/traffic_right.png b/entry/src/main/resources/base/media/traffic_right.png deleted file mode 100644 index 36c2a5f3ea1d534921d5dcd48a38981d8e343115..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/traffic_right.png and /dev/null differ