Skip to content

Commit 7fb5002

Browse files
committed
add: 页面切换效果
1 parent 176304e commit 7fb5002

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

llcomNext/LLCOM/ViewModels/DataViews/PacketDataViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public PacketDataViewModel(Func<Type, ViewModelBase> getService)
2323
private ObservableCollection<PacketData> _packetData = [
2424
new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
2525
new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
26-
new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Unknown, "串口1"),
26+
new PacketData("已连接"u8.ToArray(), MessageWay.Unknown, "MQTT1"),
2727
new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),
2828
new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Send, "串口1"),
2929
new PacketData([0x30, 0x31, 0x32, 0x33], MessageWay.Receive, "串口1"),

llcomNext/LLCOM/Views/MainView.axaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,15 @@
7676
</Panel>
7777
</Panel>
7878
</Border>
79-
<UserControl Grid.Column="1" Content="{Binding CurrentPage}" />
79+
<TransitioningContentControl Grid.Column="1" Content="{Binding CurrentPage}">
80+
<TransitioningContentControl.PageTransition>
81+
<PageSlide
82+
Orientation="Vertical"
83+
SlideInEasing="ExponentialEaseInOut"
84+
SlideOutEasing="ExponentialEaseInOut"
85+
Duration="0:00:00.2" />
86+
</TransitioningContentControl.PageTransition>
87+
</TransitioningContentControl>
8088
<GridSplitter Grid.Column="2" ResizeDirection="Columns" />
8189
<Grid Grid.Column="3" RowDefinitions="Auto,*">
8290
<Border BorderBrush="{DynamicResource SemiColorBorder}" BorderThickness="0,0,0,1">
@@ -123,7 +131,15 @@
123131
</Button>
124132
</StackPanel>
125133
</Border>
126-
<UserControl Grid.Row="1" Content="{Binding CurrentDataPage}" />
134+
<TransitioningContentControl Grid.Row="1" Content="{Binding CurrentDataPage}">
135+
<TransitioningContentControl.PageTransition>
136+
<PageSlide
137+
Orientation="Horizontal"
138+
SlideInEasing="ExponentialEaseInOut"
139+
SlideOutEasing="ExponentialEaseInOut"
140+
Duration="0:00:00.2" />
141+
</TransitioningContentControl.PageTransition>
142+
</TransitioningContentControl>
127143
</Grid>
128144
</Grid>
129145
</UserControl>

0 commit comments

Comments
 (0)