update sysccfg

FrameworkLocal/Common/Common.csproj

@@ -614,6 +614,11 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\EventDefine.Core.xml" />
+    <Resource Include="Resources\Valve\autoClose.png" />
+    <Resource Include="Resources\Valve\autoOpen.png" />
+    <Resource Include="Resources\Valve\awayClose.png" />
+    <Resource Include="Resources\Valve\shoudongClose.png" />
+    <Resource Include="Resources\Valve\shoudongOpen.png" />
     <Resource Include="Resources\LoadPort.png" />
     <Content Include="Resources\Logos\MyLogoNormal.ico" />
     <Content Include="Resources\Logos\MyLogoPurple.ico" />

FrameworkLocal/UICore/DeviceControl/AITGasIIIValve.xaml.cs

@@ -1,6 +1,7 @@
 using Aitex.Core.Common.DeviceData;
 using Aitex.Core.UI.Control;
 using Aitex.Core.Util;
+using MECF.Framework.Common.DataCenter;
 using MECF.Framework.Common.OperationCenter;
 using MECF.Framework.UI.Core.Control;
 using MECF.Framework.UI.Core.ExtendedControls;
@@ -428,8 +429,52 @@ namespace Aitex.Core.UI.DeviceControl
 
         private void AITGasValve_OnLoaded(object sender, RoutedEventArgs e)
         {
-            imgValveOpen.Source = GetImage(ValveOpenOrientation == LineOrientation.Horizontal ? "ValveOpenVerticalJet.png" : "ValveOpenHorizontalJet.png");
-            imgValveClose.Source = GetImage(ValveOpenOrientation == LineOrientation.Vertical ? "ValveCloseVerticalJet.png" : "ValveCloseHorizontalJet.png");
+            var isShowJetValve = (bool)QueryDataClient.Instance.Service.GetConfig("System.IsShowJetValve");
+            if (isShowJetValve)
+            {
+                if (IsDisableMode)
+                {
+                    if (IsEnabled)
+                    {
+                        if (ValveOpenOrientation == LineOrientation.Vertical)
+                        {
+                            imgValveOpen.Source = GetImage("autoOpen.png");
+                            imgValveClose.Source = GetImage("awayClose.png");
+                        }
+                    }
+                    else
+                    {
+
+                        if (ValveOpenOrientation == LineOrientation.Vertical)
+                        {
+                            imgValveOpen.Source = GetImage("autoOpen.png");
+                            imgValveClose.Source = GetImage("autoClose.png");
+                        }
+                    }
+
+                }
+                else
+                {
+
+                    if (ValveOpenOrientation == LineOrientation.Vertical)
+                    {
+                        imgValveOpen.Source = GetImage("shoudongOpen.png");
+                        imgValveClose.Source = GetImage("shoudongClose.png");
+                    }
+
+                }
+            }
+            else
+            {
+                imgValveOpen.Source = GetImage(ValveOpenOrientation == LineOrientation.Horizontal ? "ValveOpenVerticalJet.png" : "ValveOpenHorizontalJet.png");
+                imgValveClose.Source = GetImage(ValveOpenOrientation == LineOrientation.Vertical ? "ValveCloseVerticalJet.png" : "ValveCloseHorizontalJet.png");
+            }
+
+
+
+
+
+
             if (DeviceData == null || DeviceData.IsOpen)
             {
                 Application.Current.Dispatcher.BeginInvoke(new Action(() =>

Furnace/FurnaceRT/Config/System.sccfg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root system="Furnace">
 	<configs name="System" display="System Parameter">
-		<config default="false" name="IsSimulatorMode" description="Is Simulator Mode" max="" min="" paramter="" tag="" unit="" type="Bool" />
+		<config default="true" name="IsSimulatorMode" description="Is Simulator Mode" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="120" name="BackUpFileMaxNumber" description="BackUpFileMaxNumber" max="1000" min="0" paramter="" tag="" unit="" type="Integer"   />
 		<!--主界面MFC setpoint 是否大于零才展示-->
 		<config default="true" name="ShowMFCBySetPoint" description="MFC setpoint greater than 0 display" max="" min="" paramter="" tag="" unit="" type="Bool"  />
@@ -9,7 +9,9 @@
 		<config default="true" name="IsATMMode" description="Is ATM Mode" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"  />
 		<config default="false" name="IsCycleMode" description="Is Cycle Mode" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="false" name="AxisMonShowKey" description="" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
-		
+
+		<!--Valve是否展示新版图标-->
+		<config default="false" name="IsShowJetValve" description="" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
 		<config default="false" name="EnableUpdateWafersNotify" description="" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
 		<config default="3" name="CycleCount" description="Cycle Count" max="999999" min="1" paramter="" tag="" unit="" type="Integer" />
 		<config default="true" name="EnableWarningWaferProcessState" description="Enable Warning Wafer Process State" max="" min="" paramter="" tag="" unit="" type="Bool" />
@@ -496,7 +498,7 @@
 		<config default="10" name="PickTimeout" description="Pick Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="10" name="HomeTimeout" description="Home Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="10" name="MotionTimeout" description="Motion Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
-		<config default="192.168.250.35:13000" name="Address" description="Robot ip,default 192.168.250.35:13000" max="" min="" paramter="" tag="" unit="" type="String" />
+		<config default="127.0.0.1:10002" name="Address" description="Robot ip,default 192.168.250.35:13000" max="" min="" paramter="" tag="" unit="" type="String" />
 		<config default="10" name="PlaceTimeout" description="Place Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="10" name="ExtendTimeout" description="Extend Time Out" max="60" min="1" paramter="" tag="" unit="s" type="Integer"  visible="false"/>
 		<config default="10" name="RetractTimeout" description="Retract Time Out" max="60" min="1" paramter="" tag="" unit="s" type="Integer"  visible="false"/>
@@ -514,7 +516,7 @@
 		<config default="true" name="BypassFIMSMap" description="Bypass FIMS Map" max="0" min="0" paramter="" tag="" unit="" type="Bool"/>
 		<config default="false" name="TransferMode" description="Transfer Mode" max="" min="" paramter="" tag="" unit=""  type="Bool" />
 		<config default="10" name="TransferModeNumber" description="Transfer Mode Number" max="10000" min="1" paramter="" tag="" unit="次" type="Integer" />
-		<configs name="WaferRobotParameter">
+		<configs name="WaferRobotParameter" visible="false">
 			<configs name="Parameter">
 				<configs name="P000">
 					<config default="Z轴TP用点动速度"            name="SettingItem"		description=""			max=""				min=""		paramter=""			type="String" />
@@ -2339,12 +2341,12 @@
 
 	</configs>
 
-	<configs name="CarrierRobot">
+	<configs name="CarrierRobot" visible="false">
 		<config default="Sunway" name="RobotType" description="Robot Type" max="" min="" paramter="Sunway"  tag="ReadOnlySelection" unit="" type="String" />
 		<config default="10" name="PickTimeout" description="Pick Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="10" name="HomeTimeout" description="Home Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="10" name="MotionTimeout" description="Motion Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
-		<config default="192.168.250.32:13000" name="Address" description="Robot ip,default 192.168.250.32:13000" max="" min="" paramter="" tag="" unit="" type="String" />
+		<config default="127.0.0.1:10001" name="Address" description="Robot ip,default 192.168.250.32:13000" max="" min="" paramter="" tag="" unit="" type="String" />
 		<config default="10" name="PlaceTimeout" description="Place Time Out" max="360" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="10" name="ExtendTimeout" description="Extend Time Out" max="60" min="1" paramter="" tag="" unit="s" type="Integer"  visible="false"/>
 		<config default="10" name="RetractTimeout" description="Retract Time Out" max="60" min="1" paramter="" tag="" unit="s" type="Integer"  visible="false"/>