update

futrime · Feb 17, 2023 · e45b95d · e45b95d
1 parent 40a716d
commit e45b95d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/src/LipUI/LipUI.csproj b/src/LipUI/LipUI.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<Version>0.2.0</Version>
+		<Version>0.2.1</Version>
 		<TargetFrameworks>net462;net7.0-windows</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<LangVersion>11.0</LangVersion>

diff --git a/src/LipUI/ViewModels/ToothItemViewModel.cs b/src/LipUI/ViewModels/ToothItemViewModel.cs
@@ -9,10 +9,12 @@ namespace LipUI.ViewModels;
 public partial class ToothItemViewModel : ObservableObject
 {
     private Func<ToothItemViewModel, Task> _showInfo;
-    public ToothItemViewModel(
-        Func<ToothItemViewModel, Task> showInfo)
+    public ToothItemViewModel(Func<ToothItemViewModel, Task> showInfo, LipPackageSimple package)
     {
         _showInfo = showInfo;
+        Version = package.Version;
+        Tooth = package.Tooth;
+        Information=package.Information;
     }
     public ToothItemViewModel(
         Func<ToothItemViewModel, Task> showInfo, LipRegistry.LipRegistryItem item)
@@ -25,6 +27,7 @@ public ToothItemViewModel(
     #region Detailed
     [ObservableProperty] bool _detailed = false;//是否有具体细节 
     [ObservableProperty] LipRegistry.LipRegistryItem? _registryItem;
+    [ObservableProperty] LipPackageSimple.LipPackageSimpleInformation? _Information;
     #endregion
     [RelayCommand(CanExecute = nameof(ExecutingShowInfo))]
     async Task ShowInfo() => await _showInfo(this);

diff --git a/src/LipUI/ViewModels/ToothLocalModel.cs b/src/LipUI/ViewModels/ToothLocalModel.cs
@@ -43,11 +43,7 @@ protected async Task LoadAllPackages()
                 var (packages, message) = await Global.Lip.GetAllPackagesAsync();
                 foreach (var package in packages)
                 {
-                    await Global.DispatcherInvokeAsync(() => ToothItems.Add(new ToothItemViewModel(ShowInfo)
-                    {
-                        Version = package.Version,
-                        Tooth = package.Tooth
-                    }));
+                    await Global.DispatcherInvokeAsync(() => ToothItems.Add(new ToothItemViewModel(ShowInfo,package) ));
                     await Task.Delay(100);//100毫秒显示一个，假装很丝滑
                 }
             }

diff --git a/src/LipUI/Views/Controls/ToothItem.xaml b/src/LipUI/Views/Controls/ToothItem.xaml
@@ -35,7 +35,6 @@
                 </ui:Button>
             </DockPanel>
             <Grid  DockPanel.Dock="Top" Visibility="{Binding Detailed,Mode=OneTime,Converter={StaticResource BooleanToVisibilityConverter}}">
-                <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="3*"/>
                         <ColumnDefinition Width="*"/>
@@ -54,18 +53,36 @@
                             <TextBlock Text="{Binding RegistryItem.License}"/>
                         </DockPanel>
                     </DockPanel>
-                </Grid>
             </Grid>
             <Grid Visibility="{Binding Detailed,Mode=OneTime,Converter={StaticResource InvBooleanToVisibilityConverter}}">
-                <DockPanel>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <DockPanel >
+                    <TextBlock DockPanel.Dock="Bottom" Text="{Binding Information.Description}" TextWrapping="WrapWithOverflow"/>
+                    <TextBlock Text="{Binding Information.Name}" Style="{StaticResource Title}"/>
+                </DockPanel>
+                <DockPanel Grid.Column="1" Margin="20,0,0,0" VerticalAlignment="Center">
+                    <DockPanel DockPanel.Dock="Top">
+                        <TextBlock Text="作者："/>
+                        <TextBlock Text="{Binding Information.Author}"/>
+                    </DockPanel>
+                    <DockPanel DockPanel.Dock="Top" Visibility="{Binding Information.License,Converter={StaticResource StringNotEmptyToVisibilityConverter}}">
+                        <TextBlock Text="协议："/>
+                        <TextBlock Text="{Binding Information.License}"/>
+                    </DockPanel>
+                </DockPanel>
+
+                <!--<DockPanel>
                     <DockPanel DockPanel.Dock="Top">
                         <TextBlock Text="{Binding Tooth}" Style="{StaticResource Title}"/>
                     </DockPanel>
                     <DockPanel DockPanel.Dock="Top">
                         <TextBlock Text="版本："/>
                         <TextBlock Text="{Binding Version}"/>
                     </DockPanel>
-                </DockPanel>
+                </DockPanel>-->
             </Grid>
         </DockPanel>
     </ui:Card>