修正Common库中图片资源的类型为Resource。
修改AITPump控件使用的图片位置,改为UI.Core中的图片。
This commit is contained in:
parent
122ca7f1a8
commit
b07b5a9077
|
@ -790,54 +790,54 @@
|
|||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources\barcode.png" />
|
||||
<EmbeddedResource Include="resources\blue.png" />
|
||||
<EmbeddedResource Include="resources\cb.png" />
|
||||
<EmbeddedResource Include="resources\closed.png" />
|
||||
<EmbeddedResource Include="resources\customdialoginformation.png" />
|
||||
<EmbeddedResource Include="resources\exit.png" />
|
||||
<EmbeddedResource Include="resources\gasbox.png" />
|
||||
<EmbeddedResource Include="resources\heater.png" />
|
||||
<EmbeddedResource Include="resources\heatershining.png" />
|
||||
<EmbeddedResource Include="resources\lights.png" />
|
||||
<EmbeddedResource Include="resources\lime.png" />
|
||||
<EmbeddedResource Include="resources\ll\lbbracket.png" />
|
||||
<EmbeddedResource Include="resources\ll\lbwheel_color.png" />
|
||||
<EmbeddedResource Include="resources\ll\loadlockdoor.png" />
|
||||
<EmbeddedResource Include="resources\ll\loadlockmain.png" />
|
||||
<EmbeddedResource Include="resources\ll\ltbracket.png" />
|
||||
<EmbeddedResource Include="resources\ll\ltwheel_color.png" />
|
||||
<EmbeddedResource Include="resources\ll\rbbracket.png" />
|
||||
<EmbeddedResource Include="resources\ll\rbwheel_color.png" />
|
||||
<EmbeddedResource Include="resources\ll\rtbracket.png" />
|
||||
<EmbeddedResource Include="resources\ll\rtwheel_color.png" />
|
||||
<EmbeddedResource Include="resources\loading1.gif" />
|
||||
<EmbeddedResource Include="resources\login\-e6-8c-89-e9-92-ae.png" />
|
||||
<EmbeddedResource Include="resources\login\-e6-8c-89-e9-92-ae_-e6-82-ac-e5-81-9c.png" />
|
||||
<EmbeddedResource Include="resources\login\-e6-8c-89-e9-92-ae_-e7-82-b9-e5-87-bb.png" />
|
||||
<EmbeddedResource Include="resources\login\-e8-be-93-e5-85-a5-e6-a1-86.png" />
|
||||
<EmbeddedResource Include="resources\login\-e8-be-93-e5-85-a5-e6-a1-86_-e9-80-89-e6-8b-a9.png" />
|
||||
<Resource Include="resources\barcode.png" />
|
||||
<Resource Include="resources\blue.png" />
|
||||
<Resource Include="resources\cb.png" />
|
||||
<Resource Include="resources\closed.png" />
|
||||
<Resource Include="resources\customdialoginformation.png" />
|
||||
<Resource Include="resources\exit.png" />
|
||||
<Resource Include="resources\gasbox.png" />
|
||||
<Resource Include="resources\heater.png" />
|
||||
<Resource Include="resources\heatershining.png" />
|
||||
<Resource Include="resources\lights.png" />
|
||||
<Resource Include="resources\lime.png" />
|
||||
<Resource Include="resources\ll\lbbracket.png" />
|
||||
<Resource Include="resources\ll\lbwheel_color.png" />
|
||||
<Resource Include="resources\ll\loadlockdoor.png" />
|
||||
<Resource Include="resources\ll\loadlockmain.png" />
|
||||
<Resource Include="resources\ll\ltbracket.png" />
|
||||
<Resource Include="resources\ll\ltwheel_color.png" />
|
||||
<Resource Include="resources\ll\rbbracket.png" />
|
||||
<Resource Include="resources\ll\rbwheel_color.png" />
|
||||
<Resource Include="resources\ll\rtbracket.png" />
|
||||
<Resource Include="resources\ll\rtwheel_color.png" />
|
||||
<Resource Include="resources\loading1.gif" />
|
||||
<Resource Include="resources\login\-e6-8c-89-e9-92-ae.png" />
|
||||
<Resource Include="resources\login\-e6-8c-89-e9-92-ae_-e6-82-ac-e5-81-9c.png" />
|
||||
<Resource Include="resources\login\-e6-8c-89-e9-92-ae_-e7-82-b9-e5-87-bb.png" />
|
||||
<Resource Include="resources\login\-e8-be-93-e5-85-a5-e6-a1-86.png" />
|
||||
<Resource Include="resources\login\-e8-be-93-e5-85-a5-e6-a1-86_-e9-80-89-e6-8b-a9.png" />
|
||||
<Resource Include="resources\logos\mylogotray.ico" />
|
||||
<EmbeddedResource Include="resources\opened.png" />
|
||||
<EmbeddedResource Include="resources\pump\boost_pump_enabled.png" />
|
||||
<EmbeddedResource Include="resources\pump\boost_pump_error.png" />
|
||||
<EmbeddedResource Include="resources\pump\boost_pump_off.png" />
|
||||
<EmbeddedResource Include="resources\pump\boost_pump_on.png" />
|
||||
<EmbeddedResource Include="resources\pump\boost_pump_warning.png" />
|
||||
<EmbeddedResource Include="resources\pump\pump_error.png" />
|
||||
<EmbeddedResource Include="resources\pump\pump_off.png" />
|
||||
<EmbeddedResource Include="resources\pump\pump_on.png" />
|
||||
<EmbeddedResource Include="resources\pump\pump_warning.png" />
|
||||
<EmbeddedResource Include="resources\recipefile.png" />
|
||||
<EmbeddedResource Include="resources\recipefolder.png" />
|
||||
<EmbeddedResource Include="resources\red.png" />
|
||||
<EmbeddedResource Include="resources\robot.png" />
|
||||
<EmbeddedResource Include="resources\systemlog\alarm.png" />
|
||||
<EmbeddedResource Include="resources\systemlog\equiplog.png" />
|
||||
<EmbeddedResource Include="resources\systemlog\information.png" />
|
||||
<EmbeddedResource Include="resources\systemlog\useroperation.png" />
|
||||
<EmbeddedResource Include="resources\systemlog\warning.png" />
|
||||
<EmbeddedResource Include="resources\unknown.png" />
|
||||
<Resource Include="resources\opened.png" />
|
||||
<Resource Include="resources\pump\boost_pump_enabled.png" />
|
||||
<Resource Include="resources\pump\boost_pump_error.png" />
|
||||
<Resource Include="resources\pump\boost_pump_off.png" />
|
||||
<Resource Include="resources\pump\boost_pump_on.png" />
|
||||
<Resource Include="resources\pump\boost_pump_warning.png" />
|
||||
<Resource Include="resources\pump\pump_error.png" />
|
||||
<Resource Include="resources\pump\pump_off.png" />
|
||||
<Resource Include="resources\pump\pump_on.png" />
|
||||
<Resource Include="resources\pump\pump_warning.png" />
|
||||
<Resource Include="resources\recipefile.png" />
|
||||
<Resource Include="resources\recipefolder.png" />
|
||||
<Resource Include="resources\red.png" />
|
||||
<Resource Include="resources\robot.png" />
|
||||
<Resource Include="resources\systemlog\alarm.png" />
|
||||
<Resource Include="resources\systemlog\equiplog.png" />
|
||||
<Resource Include="resources\systemlog\information.png" />
|
||||
<Resource Include="resources\systemlog\useroperation.png" />
|
||||
<Resource Include="resources\systemlog\warning.png" />
|
||||
<Resource Include="resources\unknown.png" />
|
||||
<Resource Include="resources\valve\fastpumpvalve.png" />
|
||||
<Resource Include="resources\valve\pumpblack.png" />
|
||||
<Resource Include="resources\valve\pumpgray.png" />
|
||||
|
@ -849,13 +849,13 @@
|
|||
<Resource Include="resources\valve\valveclosevertical.png" />
|
||||
<Resource Include="resources\valve\valveopenhorizontal.png" />
|
||||
<Resource Include="resources\valve\valveopenvertical.png" />
|
||||
<EmbeddedResource Include="resources\yellow.png" />
|
||||
<EmbeddedResource Include="resources\zoom_all.png" />
|
||||
<Resource Include="resources\yellow.png" />
|
||||
<Resource Include="resources\zoom_all.png" />
|
||||
<EmbeddedResource Include="stylablewindow\titlebarwindowstyle.xaml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="resources\language\stringresources.en-us.xaml" />
|
||||
<Page Include="resources\language\stringresources.zh-cn.xaml" />
|
||||
<Resource Include="resources\language\stringresources.en-us.xaml" />
|
||||
<Resource Include="resources\language\stringresources.zh-cn.xaml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="resources\Main\login.png" />
|
||||
|
|
|
@ -1,20 +1,11 @@
|
|||
using Aitex.Core.Common.DeviceData;
|
||||
using Aitex.Core.UI.ControlDataContext;
|
||||
using MECF.Framework.Common.OperationCenter;
|
||||
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 SicUI.Controls
|
||||
{
|
||||
|
@ -134,13 +125,13 @@ namespace SicUI.Controls
|
|||
return;
|
||||
|
||||
if (DeviceData.IsError || DeviceData.IsOverLoad)
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.Common;component/Resources/Pump/pump_error.png"));
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Pump/pump_error.png"));
|
||||
else if (DeviceData.IsWarning)
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.Common;component/Resources/Pump/pump_warning.png"));
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Pump/pump_warning.png"));
|
||||
else if (DeviceData.IsOn)
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.Common;component/Resources/Pump/pump_on.png"));
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Pump/pump_on.png"));
|
||||
else
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.Common;component/Resources/Pump/pump_off.png"));
|
||||
imagePicture.Source = new BitmapImage(new Uri("pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Pump/pump_off.png"));
|
||||
|
||||
StackPanelN2Pressure.Visibility = (DeviceData.IsN2PressureEnable && IsShowSensor) ? Visibility.Visible : Visibility.Hidden;
|
||||
StackPanelWaterFlow.Visibility = (DeviceData.IsWaterFlowEnable && IsShowSensor) ? Visibility.Visible : Visibility.Hidden;
|
||||
|
|
Loading…
Reference in New Issue