Sfoglia il codice sorgente

update

git-svn-id: http://10.4.3.168:50001/svn/Furnace@99 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Jiangjinyuan 1 mese fa
parent
commit
91fc02faa6

+ 0 - 8
Furnace/FurnaceUI/FurnaceUI.csproj

@@ -2202,14 +2202,6 @@
       <Project>{1333f7c8-3db2-4783-8a37-3840f1be0cb0}</Project>
       <Name>UICore</Name>
     </ProjectReference>
-    <ProjectReference Include="..\FurnaceGasPanelUI\FurnaceGasPanelUI.csproj">
-      <Project>{72B10AB5-2B01-438F-9AE3-57163ECFB818}</Project>
-      <Name>FurnaceGasPanelUI</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FurnaceRT\FurnaceRT.csproj">
-      <Project>{5EAFA05F-C2C0-40B3-9C8F-46D8559148D0}</Project>
-      <Name>FurnaceRT</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Images\Temp\PressureStabilize.png" />

+ 4 - 4
Furnace/FurnaceUI/Views/Maintenances/IO1ViewModel.cs

@@ -102,7 +102,7 @@ namespace FurnaceUI.Models.Maintenances.IO1
         {
             base.InvokeAfterUpdateProperty(data);
 
-            if (data[_aiKey] != null)
+            if (data.ContainsKey(_aiKey)&&data[_aiKey] != null)
             {
                 List<NotifiableIoItem> lstData = (List<NotifiableIoItem>)data[_aiKey];
                 Dictionary<string, float> dicValues = new Dictionary<string, float>();
@@ -118,7 +118,7 @@ namespace FurnaceUI.Models.Maintenances.IO1
                         item.Value = dicValues[item.Name];
                 }
             }
-            if (data[_aoKey] != null)
+            if (data.ContainsKey(_aoKey) && data[_aoKey] != null)
             {
                 List<NotifiableIoItem> lstData = (List<NotifiableIoItem>)data[_aoKey];
                 Dictionary<string, float> dicValues = new Dictionary<string, float>();
@@ -135,7 +135,7 @@ namespace FurnaceUI.Models.Maintenances.IO1
                 }
             }
 
-            if (data[_diKey] != null)
+            if (data.ContainsKey(_diKey) && data[_diKey] != null)
             {
                 List<NotifiableIoItem> lstData = (List<NotifiableIoItem>)data[_diKey];
                 Dictionary<string, bool> dicValues = new Dictionary<string, bool>();
@@ -151,7 +151,7 @@ namespace FurnaceUI.Models.Maintenances.IO1
                         item.Value = dicValues[item.Name];
                 }
             }
-            if (data[_doKey] != null)
+            if (data.ContainsKey(_doKey) && data[_doKey] != null)
             {
                 List<NotifiableIoItem> lstData = (List<NotifiableIoItem>)data[_doKey];
                 Dictionary<string, bool> dicValues = new Dictionary<string, bool>();