@@ -84,7 +84,7 @@ namespace BPASmartClient.Business | |||||
IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()); | IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()); | ||||
configurationBuilder.AddApolloConfiguration(p => | configurationBuilder.AddApolloConfiguration(p => | ||||
{ | { | ||||
p.AppId = "HostComputer"; | |||||
p.AppId = apoid; | |||||
p.MetaServer = apolloUri; | p.MetaServer = apolloUri; | ||||
p.Namespaces = new List<string>() { "application", namespa }; | p.Namespaces = new List<string>() { "application", namespa }; | ||||
}); | }); | ||||
@@ -22,6 +22,9 @@ | |||||
<None Remove="Fonts\80号-萌趣小鱼体.ttf" /> | <None Remove="Fonts\80号-萌趣小鱼体.ttf" /> | ||||
<None Remove="Fonts\iconfont.ttf" /> | <None Remove="Fonts\iconfont.ttf" /> | ||||
<None Remove="Fonts\Quartz Regular.ttf" /> | <None Remove="Fonts\Quartz Regular.ttf" /> | ||||
<None Remove="Image\AGV\agv.png" /> | |||||
<None Remove="Image\AGV\AGV小车.png" /> | |||||
<None Remove="Image\AGV\AGV炒锅.png" /> | |||||
<None Remove="Image\AGV\停车位.png" /> | <None Remove="Image\AGV\停车位.png" /> | ||||
<None Remove="Image\AGV\充电桩.png" /> | <None Remove="Image\AGV\充电桩.png" /> | ||||
<None Remove="Image\AGV\墙.png" /> | <None Remove="Image\AGV\墙.png" /> | ||||
@@ -223,6 +226,9 @@ | |||||
<Resource Include="Fonts\80号-萌趣小鱼体.ttf" /> | <Resource Include="Fonts\80号-萌趣小鱼体.ttf" /> | ||||
<Resource Include="Fonts\iconfont.ttf" /> | <Resource Include="Fonts\iconfont.ttf" /> | ||||
<Resource Include="Fonts\Quartz Regular.ttf" /> | <Resource Include="Fonts\Quartz Regular.ttf" /> | ||||
<Resource Include="Image\AGV\agv.png" /> | |||||
<Resource Include="Image\AGV\AGV小车.png" /> | |||||
<Resource Include="Image\AGV\AGV炒锅.png" /> | |||||
<Resource Include="Image\AGV\停车位.png" /> | <Resource Include="Image\AGV\停车位.png" /> | ||||
<Resource Include="Image\AGV\充电桩.png" /> | <Resource Include="Image\AGV\充电桩.png" /> | ||||
<Resource Include="Image\AGV\墙.png" /> | <Resource Include="Image\AGV\墙.png" /> | ||||
@@ -172,6 +172,13 @@ | |||||
<ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png" /> | <ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png" /> | ||||
<ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png" /> | <ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png" /> | ||||
<ImageBrush x:Key="image2" ImageSource="/BPASmartClient.CustomResource;component/Image/shape1.png" /> | <ImageBrush x:Key="image2" ImageSource="/BPASmartClient.CustomResource;component/Image/shape1.png" /> | ||||
<Style x:Key="image完成" TargetType="Image"> | |||||
<Style.Setters> | |||||
<Setter Property="VerticalAlignment" Value="Stretch" /> | |||||
<Setter Property="HorizontalAlignment" Value="Stretch" /> | |||||
<Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png" /> | |||||
</Style.Setters> | |||||
</Style> | |||||
<Style x:Key="image墙" TargetType="Image"> | <Style x:Key="image墙" TargetType="Image"> | ||||
<Style.Setters> | <Style.Setters> | ||||
@@ -381,7 +388,7 @@ | |||||
</Setter> | </Setter> | ||||
<Setter Property="Background"> | <Setter Property="Background"> | ||||
<Setter.Value> | <Setter.Value> | ||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/AGV/物流车.png" /> | |||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/AGV/agv.png" /> | |||||
</Setter.Value> | </Setter.Value> | ||||
</Setter> | </Setter> | ||||
</Style.Setters> | </Style.Setters> | ||||
@@ -451,8 +458,9 @@ | |||||
<Style x:Key="border碗" TargetType="Border"> | <Style x:Key="border碗" TargetType="Border"> | ||||
<Style.Setters> | <Style.Setters> | ||||
<Setter Property="Height" Value="50"/> | |||||
<Setter Property="Height" Value="80"/> | |||||
<Setter Property="Width" Value="40"/> | <Setter Property="Width" Value="40"/> | ||||
<Setter Property="Margin" Value="0,-20,0,-20"/> | |||||
<Setter Property="VerticalAlignment" Value="Bottom"/> | <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||
<Setter Property="Background"> | <Setter Property="Background"> | ||||
<Setter.Value> | <Setter.Value> | ||||
@@ -464,9 +472,9 @@ | |||||
<Style x:Key="border菜" TargetType="Border"> | <Style x:Key="border菜" TargetType="Border"> | ||||
<Style.Setters> | <Style.Setters> | ||||
<Setter Property="Margin" Value="0,3,0,0"/> | |||||
<Setter Property="Height" Value="25"/> | |||||
<Setter Property="Width" Value="33"/> | |||||
<Setter Property="Margin" Value="0,-17,0,0"/> | |||||
<Setter Property="Height" Value="30"/> | |||||
<Setter Property="Width" Value="35"/> | |||||
<Setter Property="VerticalAlignment" Value="Top"/> | <Setter Property="VerticalAlignment" Value="Top"/> | ||||
<Setter Property="Background"> | <Setter Property="Background"> | ||||
<Setter.Value> | <Setter.Value> | ||||
@@ -1823,9 +1831,10 @@ | |||||
<!--#region TextBlock--> | <!--#region TextBlock--> | ||||
<Style x:Key="80号字体样式" TargetType="TextBlock"> | <Style x:Key="80号字体样式" TargetType="TextBlock"> | ||||
<Setter Property="FontSize" Value="16" /> | |||||
<Setter Property="TextWrapping" Value="Wrap" /> | <Setter Property="TextWrapping" Value="Wrap" /> | ||||
<Setter Property="FontFamily" Value="/BPASmartClient.CustomResource;Component/Fonts/#zihun80hao-mengquxiaoyuti"/> | <Setter Property="FontFamily" Value="/BPASmartClient.CustomResource;Component/Fonts/#zihun80hao-mengquxiaoyuti"/> | ||||
<Setter Property="Foreground" Value="#FFC6AE82" /> | |||||
<Setter Property="Foreground" Value="#FFFCD5B5" /> | |||||
</Style> | </Style> | ||||
@@ -0,0 +1,28 @@ | |||||
using System; | |||||
using System.Collections.Generic; | |||||
using System.Linq; | |||||
using System.Text; | |||||
using System.Threading.Tasks; | |||||
using System.Windows; | |||||
using System.Windows.Controls; | |||||
using System.Windows.Data; | |||||
using System.Windows.Documents; | |||||
using System.Windows.Input; | |||||
using System.Windows.Media; | |||||
using System.Windows.Media.Imaging; | |||||
using System.Windows.Navigation; | |||||
using System.Windows.Shapes; | |||||
namespace BPASmartClient.CustomResource.UserControls | |||||
{ | |||||
/// <summary> | |||||
/// DosingSystem.xaml 的交互逻辑 | |||||
/// </summary> | |||||
public partial class DosingSystem : UserControl | |||||
{ | |||||
public DosingSystem() | |||||
{ | |||||
InitializeComponent(); | |||||
} | |||||
} | |||||
} |
@@ -6,14 +6,19 @@ | |||||
<!--<add key="ClientId" value="43"/>--> | <!--<add key="ClientId" value="43"/>--> | ||||
<add key="IsEnableTest" value="false"/> | <add key="IsEnableTest" value="false"/> | ||||
<!--开发环境--> | |||||
<!--测试环境--> | |||||
<add key="apollouri" value="http://10.2.1.21:28080/"/> | <add key="apollouri" value="http://10.2.1.21:28080/"/> | ||||
<add key="AppId" value="test1_HostComputer"/> | |||||
<add key ="Namespaces" value="DEV.test1.Config"/> | |||||
<!--开发环境--> | |||||
<!--<add key="apollouri" value="http://10.2.1.21:28080/"/> | |||||
<add key="AppId" value="dev1_common"/> | <add key="AppId" value="dev1_common"/> | ||||
<add key ="Namespaces" value="DEV.Config"/> | |||||
<add key ="Namespaces" value="DEV.Config"/>--> | |||||
<!--正式环境--> | <!--正式环境--> | ||||
<!--<add key="apollouri" value="http://47.108.65.220:28080/"/> | <!--<add key="apollouri" value="http://47.108.65.220:28080/"/> | ||||
<add key="AppId" value="order"/> | |||||
<add key="AppId" value="HostComputer"/> | |||||
<add key ="Namespaces" value="TEST1.Config"/>--> | <add key ="Namespaces" value="TEST1.Config"/>--> | ||||
<!--阿里云上报启动方式:API 或者 LOCAL--> | <!--阿里云上报启动方式:API 或者 LOCAL--> | ||||
@@ -389,7 +389,7 @@ | |||||
Foreground="{StaticResource TextBlockForeground}" | Foreground="{StaticResource TextBlockForeground}" | ||||
IcoText="" | IcoText="" | ||||
MouseLeftButtonDown="IcoButton_MouseLeftButtonDown" | MouseLeftButtonDown="IcoButton_MouseLeftButtonDown" | ||||
Style="{StaticResource NewButtonStyle}" /> | |||||
Style="{StaticResource IcoButtonStyle}" /> | |||||
<pry:IcoButton | <pry:IcoButton | ||||
Grid.Column="5" | Grid.Column="5" | ||||
@@ -400,7 +400,7 @@ | |||||
FontSize="16" | FontSize="16" | ||||
Foreground="{StaticResource TextBlockForeground}" | Foreground="{StaticResource TextBlockForeground}" | ||||
IcoText="" | IcoText="" | ||||
Style="{StaticResource NewButtonStyle}" /> | |||||
Style="{StaticResource IcoButtonStyle}" /> | |||||
</Grid> | </Grid> | ||||
@@ -5,9 +5,10 @@ | |||||
<TargetFramework>net6.0-windows</TargetFramework> | <TargetFramework>net6.0-windows</TargetFramework> | ||||
<Nullable>enable</Nullable> | <Nullable>enable</Nullable> | ||||
<UseWPF>true</UseWPF> | <UseWPF>true</UseWPF> | ||||
<ApplicationManifest>app.manifest</ApplicationManifest> | |||||
<ApplicationManifest></ApplicationManifest> | |||||
<ApplicationIcon>hbl.ico</ApplicationIcon> | <ApplicationIcon>hbl.ico</ApplicationIcon> | ||||
<PlatformTarget>AnyCPU</PlatformTarget> | <PlatformTarget>AnyCPU</PlatformTarget> | ||||
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild> | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -17,11 +17,6 @@ | |||||
</UserControl.DataContext> | </UserControl.DataContext> | ||||
<Grid> | <Grid> | ||||
<TextBlock | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="40" | |||||
Foreground="Wheat" | |||||
Text="硬件状态" /> | |||||
<pry:DosingSystem/> | |||||
</Grid> | </Grid> | ||||
</UserControl> | </UserControl> |
@@ -1,79 +0,0 @@ | |||||
<?xml version="1.0" encoding="utf-8"?> | |||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"> | |||||
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/> | |||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> | |||||
<security> | |||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> | |||||
<!-- UAC 清单选项 | |||||
如果想要更改 Windows 用户帐户控制级别,请使用 | |||||
以下节点之一替换 requestedExecutionLevel 节点。 | |||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" /> | |||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> | |||||
<requestedExecutionLevel level="highestAvailable" uiAccess="false" /> | |||||
指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。 | |||||
如果你的应用程序需要此虚拟化来实现向后兼容性,则移除此 | |||||
元素。 | |||||
--> | |||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> | |||||
</requestedPrivileges> | |||||
</security> | |||||
</trustInfo> | |||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> | |||||
<application> | |||||
<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的 | |||||
Windows 版本的列表。取消评论适当的元素, | |||||
Windows 将自动选择最兼容的环境。 --> | |||||
<!-- Windows Vista --> | |||||
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />--> | |||||
<!-- Windows 7 --> | |||||
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />--> | |||||
<!-- Windows 8 --> | |||||
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />--> | |||||
<!-- Windows 8.1 --> | |||||
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />--> | |||||
<!-- Windows 10 --> | |||||
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />--> | |||||
</application> | |||||
</compatibility> | |||||
<!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行 | |||||
自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI,无需 | |||||
选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应 | |||||
在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。 | |||||
将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation --> | |||||
<!-- | |||||
<application xmlns="urn:schemas-microsoft-com:asm.v3"> | |||||
<windowsSettings> | |||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> | |||||
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware> | |||||
</windowsSettings> | |||||
</application> | |||||
--> | |||||
<!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) --> | |||||
<!-- | |||||
<dependency> | |||||
<dependentAssembly> | |||||
<assemblyIdentity | |||||
type="win32" | |||||
name="Microsoft.Windows.Common-Controls" | |||||
version="6.0.0.0" | |||||
processorArchitecture="*" | |||||
publicKeyToken="6595b64144ccf1df" | |||||
language="*" | |||||
/> | |||||
</dependentAssembly> | |||||
</dependency> | |||||
--> | |||||
</assembly> |
@@ -0,0 +1,74 @@ | |||||
using System; | |||||
using System.Collections.Generic; | |||||
using System.Linq; | |||||
using System.Text; | |||||
using System.Threading.Tasks; | |||||
namespace FryPot_DosingSystem.AGV | |||||
{ | |||||
/// <summary> | |||||
/// 控制车辆型号 | |||||
/// </summary> | |||||
public enum WhichCart | |||||
{ | |||||
一号车, | |||||
二号车, | |||||
三号车, | |||||
四号车, | |||||
} | |||||
/// <summary> | |||||
/// 控制车辆运动方式 | |||||
/// </summary> | |||||
public enum CartMotionTrajectory | |||||
{ | |||||
Stop,//停止 | |||||
qc_1,//取菜品 1号流水线取菜 | |||||
qc_2,//取菜品 2号流水线取菜 | |||||
qc_3,//取菜品 3号流水线取菜 | |||||
yc_1_1,//运输菜品 1号流水线-1号炒锅 | |||||
yc_1_2,//运输菜品 1号流水线-2号炒锅 | |||||
yc_1_3,//运输菜品 1号流水线-3号炒锅 | |||||
yc_1_4,//运输菜品 1号流水线-4号炒锅 | |||||
yc_1_5,//运输菜品 1号流水线-5号炒锅 | |||||
yc_2_1,//运输菜品 2号流水线-1号炒锅 | |||||
yc_2_2,//运输菜品 2号流水线-2号炒锅 | |||||
yc_2_3,//运输菜品 2号流水线-3号炒锅 | |||||
yc_2_4,//运输菜品 2号流水线-4号炒锅 | |||||
yc_2_5,//运输菜品 2号流水线-5号炒锅 | |||||
yc_3_1,//运输菜品 3号流水线-1号炒锅 | |||||
yc_3_2,//运输菜品 3号流水线-2号炒锅 | |||||
yc_3_3,//运输菜品 3号流水线-3号炒锅 | |||||
yc_3_4,//运输菜品 3号流水线-4号炒锅 | |||||
yc_3_5,//运输菜品 3号流水线-5号炒锅 | |||||
hs_1,//1号炒锅-运输空碗到-空碗流水线 | |||||
hs_2,//2号炒锅-运输空碗到-空碗流水线 | |||||
hs_3,//3号炒锅-运输空碗到-空碗流水线 | |||||
hs_4,//4号炒锅-运输空碗到-空碗流水线 | |||||
hj,//空碗流水线-回到充电桩或者停车桩 | |||||
} | |||||
/// <summary> | |||||
/// 是否 | |||||
/// </summary> | |||||
public enum IsBool | |||||
{ | |||||
Yes, | |||||
No, | |||||
OnllYes | |||||
} | |||||
/// <summary> | |||||
/// 是否运行 | |||||
/// </summary> | |||||
public enum IsRun | |||||
{ | |||||
Start, | |||||
Stop | |||||
} | |||||
} |
@@ -1,4 +1,5 @@ | |||||
using FryPot_DosingSystem.ViewModel; | |||||
using FryPot_DosingSystem.AGV; | |||||
using FryPot_DosingSystem.ViewModel; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -26,42 +27,147 @@ namespace FryPot_DosingSystem.View | |||||
{ | { | ||||
InitializeComponent(); | InitializeComponent(); | ||||
this.DataContext = AgvViewModel.GetInstance(); | this.DataContext = AgvViewModel.GetInstance(); | ||||
控制命令.ItemsSource = AgvViewModel.GetInstance().GetCommand(); | |||||
} | } | ||||
private void Button_Click(object sender, RoutedEventArgs e) | private void Button_Click(object sender, RoutedEventArgs e) | ||||
{ | { | ||||
AnimationByPath(yunshuche,qc_1); | |||||
} | |||||
/// <summary> | |||||
/// 路径动画 | |||||
/// </summary> | |||||
/// <param name="cvs">画板</param> | |||||
/// <param name="path">路径</param> | |||||
/// <param name="target">动画对象</param> | |||||
/// <param name="duration">时间</param> | |||||
private void AnimationByPath(TextBox target, Path path, int duration = 5) | |||||
{ | |||||
target.RenderTransformOrigin = new Point(0.5, 0.5); | |||||
int id = 1; | |||||
if (sender is Button) | |||||
{ | |||||
byte[] data; | |||||
bool istrue = false; | |||||
Button button = sender as Button; | |||||
if (button.Tag != null) | |||||
{ | |||||
switch (button.Tag.ToString()) | |||||
{ | |||||
case "设置有车": | |||||
try | |||||
{ | |||||
id=int.Parse(tcz_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-5 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set停车桩(id, IsBool.Yes); | |||||
break; | |||||
case "设置无车": | |||||
try | |||||
{ | |||||
id = int.Parse(tcz_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-5 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set停车桩(id, IsBool.No); | |||||
break; | |||||
case "启动": | |||||
try | |||||
{ | |||||
id = int.Parse(liaotong_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-5 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set滚筒线状态(id, IsRun.Start); | |||||
break; | |||||
case "停止": | |||||
try | |||||
{ | |||||
id = int.Parse(liaotong_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-5 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set滚筒线状态(id, IsRun.Stop); | |||||
break; | |||||
case "设置物料": | |||||
try | |||||
{ | |||||
id = int.Parse(liaotongwuliao_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-8 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set滚筒线上数量(id, liaotongwuliaoshuliang_text.Text); | |||||
break; | |||||
case "小车停止": | |||||
try | |||||
{ | |||||
id = int.Parse(xiaoche_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-4 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set小车停止(id); | |||||
break; | |||||
case "运行小车": | |||||
try | |||||
{ | |||||
id = int.Parse(xiaoche_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-4 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set小车运动(id, AgvViewModel.GetInstance().GetCommandValue(控制命令.Text)); | |||||
break; | |||||
case "有菜和碗": | |||||
try | |||||
{ | |||||
id = int.Parse(xiaochewuping_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-4 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.Yes); | |||||
break; | |||||
case "只有碗": | |||||
try | |||||
{ | |||||
id = int.Parse(xiaochewuping_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-4 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.OnllYes); | |||||
break; | |||||
case "无物品": | |||||
try | |||||
{ | |||||
id = int.Parse(xiaochewuping_text.Text.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
MessageBox.Show("只能输入 1-4 的数字!"); | |||||
return; | |||||
} | |||||
AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.No); | |||||
break; | |||||
MatrixTransform matrix = new MatrixTransform(); | |||||
TransformGroup groups = new TransformGroup(); | |||||
groups.Children.Add(matrix); | |||||
target.RenderTransform = groups; | |||||
string registname = "matrix" + Guid.NewGuid().ToString().Replace("-", ""); | |||||
this.RegisterName(registname, matrix); | |||||
MatrixAnimationUsingPath matrixAnimation = new MatrixAnimationUsingPath(); | |||||
matrixAnimation.PathGeometry = PathGeometry.CreateFromGeometry(Geometry.Parse(path.Data.ToString())); | |||||
matrixAnimation.Duration = new Duration(TimeSpan.FromSeconds(duration)); | |||||
matrixAnimation.DoesRotateWithTangent = true;//跟随路径旋转 | |||||
matrixAnimation.RepeatBehavior = RepeatBehavior.Forever;//循环 | |||||
Storyboard story = new Storyboard(); | |||||
story.Children.Add(matrixAnimation); | |||||
Storyboard.SetTargetName(matrixAnimation, registname); | |||||
Storyboard.SetTargetProperty(matrixAnimation, new PropertyPath(MatrixTransform.MatrixProperty)); | |||||
} | |||||
} | |||||
} | |||||
} | |||||
story.FillBehavior = FillBehavior.Stop; | |||||
story.Begin(target, true); | |||||
} | |||||
} | } | ||||
} | } |
@@ -1,6 +1,6 @@ | |||||
| | ||||
Microsoft Visual Studio Solution File, Format Version 12.00 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||||
# Visual Studio Version 17 | |||||
# Blend for Visual Studio Version 17 | |||||
VisualStudioVersion = 17.0.32002.185 | VisualStudioVersion = 17.0.32002.185 | ||||
MinimumVisualStudioVersion = 10.0.40219.1 | MinimumVisualStudioVersion = 10.0.40219.1 | ||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DRCoffee", "BPASmartClient.DRCoffee\BPASmartClient.DRCoffee.csproj", "{31E9DC70-5889-4BA5-A5BA-FFDE66AFF314}" | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DRCoffee", "BPASmartClient.DRCoffee\BPASmartClient.DRCoffee.csproj", "{31E9DC70-5889-4BA5-A5BA-FFDE66AFF314}" | ||||
@@ -116,6 +116,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDemo", "TestDemo\TestDe | |||||
EndProject | EndProject | ||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.HubHelper", "BPASmartClient.HubHelper\BPASmartClient.HubHelper.csproj", "{099E047C-F40E-47A3-A5BA-81FC1500D5E8}" | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.HubHelper", "BPASmartClient.HubHelper\BPASmartClient.HubHelper.csproj", "{099E047C-F40E-47A3-A5BA-81FC1500D5E8}" | ||||
EndProject | EndProject | ||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkTM", "BPASmartClient.MorkTM\BPASmartClient.MorkTM.csproj", "{76B6B333-0109-4EE8-A9B2-3E53A7421D92}" | |||||
EndProject | |||||
Global | Global | ||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||
Debug|Any CPU = Debug|Any CPU | Debug|Any CPU = Debug|Any CPU | ||||
@@ -1090,6 +1092,26 @@ Global | |||||
{099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x64.Build.0 = Release|Any CPU | {099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x64.Build.0 = Release|Any CPU | ||||
{099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x86.ActiveCfg = Release|Any CPU | {099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x86.ActiveCfg = Release|Any CPU | ||||
{099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x86.Build.0 = Release|Any CPU | {099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x86.Build.0 = Release|Any CPU | ||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|Any CPU.Build.0 = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM.ActiveCfg = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM.Build.0 = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM64.ActiveCfg = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM64.Build.0 = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x64.ActiveCfg = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x64.Build.0 = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x86.ActiveCfg = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x86.Build.0 = Debug|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|Any CPU.ActiveCfg = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|Any CPU.Build.0 = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM.ActiveCfg = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM.Build.0 = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM64.ActiveCfg = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM64.Build.0 = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x64.ActiveCfg = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x64.Build.0 = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x86.ActiveCfg = Release|Any CPU | |||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x86.Build.0 = Release|Any CPU | |||||
EndGlobalSection | EndGlobalSection | ||||
GlobalSection(SolutionProperties) = preSolution | GlobalSection(SolutionProperties) = preSolution | ||||
HideSolutionNode = FALSE | HideSolutionNode = FALSE | ||||
@@ -1143,6 +1165,7 @@ Global | |||||
{E7168B03-68E5-4285-BB95-5660F877577A} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} | {E7168B03-68E5-4285-BB95-5660F877577A} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} | ||||
{A49E1C5A-9489-451C-9CE6-CEA586234B84} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} | {A49E1C5A-9489-451C-9CE6-CEA586234B84} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} | ||||
{099E047C-F40E-47A3-A5BA-81FC1500D5E8} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625} | {099E047C-F40E-47A3-A5BA-81FC1500D5E8} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625} | ||||
{76B6B333-0109-4EE8-A9B2-3E53A7421D92} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} | |||||
EndGlobalSection | EndGlobalSection | ||||
GlobalSection(ExtensibilityGlobals) = postSolution | GlobalSection(ExtensibilityGlobals) = postSolution | ||||
SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC} | SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC} | ||||