change - 添加Icon

SlnMesnac.WPF/App.xaml.cs

@@ -13,6 +13,7 @@ using SlnMesnac.WPF.Attribute;
 using SlnMesnac.WPF.Page.Login;
 using Prism.Events;
 using SlnMesnac.WPF.Event;
+using AduSkin.Controls.Metro;
 
 namespace SlnMesnac.WPF
 {
@@ -57,6 +58,9 @@ namespace SlnMesnac.WPF
             // 配置Serilog和其他扩展
             ServiceProvider.UseSerilogExtensions();
 
+            //通知弹窗
+            NoticeManager.Initialize();
+
             var appConfig = ServiceProvider.GetService<AppConfig>();
             Log.Information($"系统初始化完成,日志存放路径：{appConfig?.logPath}");
 

SlnMesnac.WPF/MainWindow.xaml

@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SlnMesnac.WPF"
         mc:Ignorable="d"
-        Title="MainWindow" Height="1080" Width="1920"
+        Title="工业高频RFID" Height="1080" Width="1920"
-        WindowState="Maximized"  Topmost="False" Background="#ECF5F8">
+        WindowState="Maximized"  Topmost="False" Background="#ECF5F8" Icon="/Icon.png" >
         <!--WindowStyle="None" ResizeMode="NoResize"-->
     <Border Margin="5" Background="Transparent" CornerRadius="10">
         <Grid>

SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml

@@ -94,7 +94,7 @@
                                     </Border.Background>
                                     <TextBlock Text="{Binding ProductDescribe[0].describeTitle}" Width="300" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
                                 </Border>
-                                <TextBlock  Grid.Row="1" Text="{Binding ProductDescribe[0].describeContent}" Width="800" TextWrapping="Wrap" FontSize="18"/>
+                                <TextBlock  Grid.Row="1" Text="{Binding ProductDescribe[0].describeContent}"  TextWrapping="Wrap" FontSize="18" Margin="0,10,0,0"/>
                             </Grid>
                         </Border>
 
@@ -113,7 +113,7 @@
                                     </Border.Background>
                                     <TextBlock Text="{Binding ProductDescribe[1].describeTitle}" Width="300" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
                                 </Border>
-                                <TextBlock  Grid.Row="1" Text="{Binding ProductDescribe[1].describeContent}" Width="800" TextWrapping="Wrap" FontSize="18" />
+                                <TextBlock  Grid.Row="1" Text="{Binding ProductDescribe[1].describeContent}" TextWrapping="Wrap" FontSize="18" Margin="0,10,0,0"/>
                             </Grid>
                         </Border>
 
@@ -132,7 +132,7 @@
                                     </Border.Background>
                                     <TextBlock Text="{Binding ProductDescribe[2].describeTitle}" Width="300" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
                                 </Border>
-                                <TextBlock  Grid.Row="1" Text="{Binding ProductDescribe[2].describeContent}" Width="800" TextWrapping="Wrap" FontSize="18"/>
+                                <TextBlock  Grid.Row="1" Text="{Binding ProductDescribe[2].describeContent}" TextWrapping="Wrap" FontSize="18" Margin="0,10,0,0"/>
                             </Grid>
                         </Border>
                     </Grid>

SlnMesnac.WPF/SlnMesnac.WPF.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <None Remove="appsettings.json" />
+    <None Remove="Icon.png" />
     <None Remove="Templates\fonts\font_5w2octy6l1q\iconfont.ttf" />
     <None Remove="Templates\gif\loading.gif" />
     <None Remove="Templates\image\background.jpg" />
@@ -40,6 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AduSkin" Version="1.1.1.9" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Lierda.WPFHelper" Version="1.0.3" />
     <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
@@ -52,6 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Icon.png" />
     <Resource Include="Templates\fonts\font_5w2octy6l1q\iconfont.ttf">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>

SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs

@@ -1,4 +1,6 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using AduSkin.Controls.Metro;
+using AduSkin.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Prism.Events;
 using SlnMesnac.Model.domain;
@@ -12,6 +14,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using static MaterialDesignThemes.Wpf.Theme.ToolBar;
 
 namespace SlnMesnac.WPF.ViewModel.ProductDetails
@@ -149,10 +152,21 @@ namespace SlnMesnac.WPF.ViewModel.ProductDetails
 
         [RelayCommand]
         private void SavePrdouctInfo()
+        {
+            NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
+            {
+                Title = "通知",
+                Content = $"保存产品信息",
+                NotifiactionType = EnumPromptType.Success
+            });
+
+            try
+            {
+                Task.Run(() =>
                 {
                     var info = ProductInfo;
 
-            if(info != null)
+                    if (info != null)
                     {
                         info.productImage = productImage;
                         info.featureImage = featureImage;
@@ -164,7 +178,7 @@ namespace SlnMesnac.WPF.ViewModel.ProductDetails
                         var productFeatureInfo = ProductFeature.ToList();
                         //productFeatureInfo.ToList().ForEach(x => x.productCode = info.productCode);
 
-                foreach(var item in productFeatureInfo)
+                        foreach (var item in productFeatureInfo)
                         {
                             item.productCode = info.productCode;
                             if (item.objid != 0)
@@ -206,6 +220,41 @@ namespace SlnMesnac.WPF.ViewModel.ProductDetails
                                 _product_paramServices.Insert(item);
                             }
                         }
+
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
+                            {
+                                Title = "通知",
+                                Content = $"{info.productName}产品信息更新完成",
+                                NotifiactionType = EnumPromptType.Success
+                            });
+                        });
+                        
+                    }
+                    else
+                    {
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
+                            {
+                                Title = "通知",
+                                Content = $"产品信息保存失败，基本信息为空",
+                                NotifiactionType = EnumPromptType.Error
+                            });
+                        });
+                    }
+                });
+
+                
+            }catch(Exception ex)
+            {
+                NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
+                {
+                    Title = "通知",
+                    Content = $"产品信息保存异常：{ex.Message}",
+                    NotifiactionType = EnumPromptType.Error
+                });
             }