wenjy
/
RFID.Exhibition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 添加Icon

Browse Source
master
wenjy 1 week ago
parent 20b64c7611
commit ebca204459
7 changed files with 108 additions and 52 deletions
Show Stats Download Patch File Download Diff File

4
SlnMesnac.WPF/App.xaml.cs
Unescape Escape View File

@ -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}");

BIN
SlnMesnac.WPF/Icon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

4
SlnMesnac.WPF/MainWindow.xaml
Unescape Escape View File

@ -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"
WindowState="Maximized" Topmost="False" Background="#ECF5F8">
Title="工业高频RFID" Height="1080" Width="1920"
WindowState="Maximized" Topmost="False" Background="#ECF5F8" Icon="/Icon.png" >
<!--WindowStyle="None" ResizeMode="NoResize"-->
<Border Margin="5" Background="Transparent" CornerRadius="10">
<Grid>

6
SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml
Unescape Escape View File

@ -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>

3
SlnMesnac.WPF/SlnMesnac.WPF.csproj
Unescape Escape View File

@ -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>

BIN
SlnMesnac.WPF/Templates/icon/Icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

141
SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs
Unescape Escape View File

@ -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
@ -150,62 +153,108 @@ namespace SlnMesnac.WPF.ViewModel.ProductDetails
[RelayCommand]
private void SavePrdouctInfo()
{
var info = ProductInfo;
if(info != null)
NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
{
info.productImage = productImage;
info.featureImage = featureImage;
info.analyzeImage = analyzeImage;
info.sizeLeftImage = sizeLeftImage;
info.sizeRightImage = sizeRightImage;
_product_infoServices.Update(info);
Title = "通知",
Content = $"保存产品信息",
NotifiactionType = EnumPromptType.Success
});
var productFeatureInfo = ProductFeature.ToList();
//productFeatureInfo.ToList().ForEach(x => x.productCode = info.productCode);
foreach(var item in productFeatureInfo)
try
{
Task.Run(() =>
{
item.productCode = info.productCode;
if (item.objid != 0)
var info = ProductInfo;
if (info != null)
{
_product_featureServices.Update(item);
info.productImage = productImage;
info.featureImage = featureImage;
info.analyzeImage = analyzeImage;
info.sizeLeftImage = sizeLeftImage;
info.sizeRightImage = sizeRightImage;
_product_infoServices.Update(info);
var productFeatureInfo = ProductFeature.ToList();
//productFeatureInfo.ToList().ForEach(x => x.productCode = info.productCode);
foreach (var item in productFeatureInfo)
{
item.productCode = info.productCode;
if (item.objid != 0)
{
_product_featureServices.Update(item);
}
else
{
_product_featureServices.Insert(item);
}
}
var productDescribeInfo = ProductDescribe.ToList();
//productDescribeInfo.ToList().ForEach(x => x.productCode = info.productCode);
foreach (var item in productDescribeInfo)
{
item.productCode = info.productCode;
if (item.objid != 0)
{
_product_describeServices.Update(item);
}
else
{
_product_describeServices.Insert(item);
}
}
var productParamsInfo = ProductParams.ToList();
//productParamsInfo.ToList().ForEach(x => x.productCode = info.productCode);
foreach (var item in productParamsInfo)
{
item.productCode = info.productCode;
if (item.objid != 0)
{
_product_paramServices.Update(item);
}
else
{
_product_paramServices.Insert(item);
}
}
App.Current.Dispatcher.Invoke(() =>
{
NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
{
Title = "通知",
Content = $"{info.productName}产品信息更新完成",
NotifiactionType = EnumPromptType.Success
});
});
}
else
{
_product_featureServices.Insert(item);
App.Current.Dispatcher.Invoke(() =>
{
NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
{
Title = "通知",
Content = $"产品信息保存失败，基本信息为空",
NotifiactionType = EnumPromptType.Error
});
});
}
}
});
var productDescribeInfo = ProductDescribe.ToList();
//productDescribeInfo.ToList().ForEach(x => x.productCode = info.productCode);
foreach (var item in productDescribeInfo)
{
item.productCode = info.productCode;
if (item.objid != 0)
{
_product_describeServices.Update(item);
}
else
{
_product_describeServices.Insert(item);
}
}
var productParamsInfo = ProductParams.ToList();
//productParamsInfo.ToList().ForEach(x => x.productCode = info.productCode);
foreach (var item in productParamsInfo)
}catch(Exception ex)
{
NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
{
item.productCode = info.productCode;
if (item.objid != 0)
{
_product_paramServices.Update(item);
}
else
{
_product_paramServices.Insert(item);
}
}
Title = "通知",
Content = $"产品信息保存异常：{ex.Message}",
NotifiactionType = EnumPromptType.Error
});
}

Write Preview
Loading…
Cancel
Save