添加资源及模拟页面修改

DyeingComputer.csproj

@@ -402,6 +402,8 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="Lmage\2001.png" />
+    <Resource Include="Lmage\2000.png" />
     <Resource Include="Lmage\guandao %2812%29.png" />
     <Resource Include="Lmage\guandao %2813%29.png" />
     <Resource Include="Lmage\guandao %2814%29.png" />

View/EquipmentSimulationView.xaml

@@ -11,11 +11,45 @@
         <Canvas>
             <Image Width="300" Height="300" Source="/Lmage/10000.png" 
                    HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.Left="100" Canvas.Top="125"/>
+            <Image Width="300" Height="300" gif:ImageBehavior.AnimatedSource="/Lmage/1000-1.png"        
+                   HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180"/>
             <Image Width="300" Height="300" gif:ImageBehavior.AnimatedSource="/Lmage/10001.gif"
-               gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180"/>
+               gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" Canvas.Left="20" 
+                   Canvas.Top="180" Visibility="Collapsed" x:Name="Swing_"/>
+
+            <Grid  Margin="800,86,0,0" Width="400" Height="400">
+                <Image Width="200" Height="200" gif:ImageBehavior.AnimatedSource="/Lmage/tong.png"
+                       HorizontalAlignment="Right" Canvas.Left="930" Canvas.Top="79" VerticalAlignment="Top"/>
+                <TextBlock x:Name="S1_T" HorizontalAlignment="Right" Height="30" TextWrapping="Wrap" Text="C" 
+                           TextAlignment="Right" VerticalAlignment="Top" Width="100" FontSize="20" Background="White" 
+                           Padding="5,0,5,0" Margin="20,10,20,0"/>
+                <TextBlock x:Name="S1_L" HorizontalAlignment="Right" Height="30" TextWrapping="Wrap" Text="L" 
+                           TextAlignment="Right" VerticalAlignment="Top" Width="100" FontSize="20" Background="White" 
+                           Padding="5,0,5,0" Margin="20,60,20,0" />
+                <Image Width="50" gif:ImageBehavior.AnimatedSource="/Lmage/2000.png"                
+                       HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" 
+                       Margin="0,20,0,0" VerticalAlignment="Top" Height="50"/>
+                <Image Width="50" gif:ImageBehavior.AnimatedSource="/Lmage/2000.png"                
+        HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" 
+        Margin="0,80,0,0" VerticalAlignment="Top" Height="50"/>
+                <Image Width="50" gif:ImageBehavior.AnimatedSource="/Lmage/2000.png"                
+        HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" 
+        Margin="120,20,0,0" VerticalAlignment="Top" Height="50"/>
+                <Image Width="50" gif:ImageBehavior.AnimatedSource="/Lmage/2001.png"                
+               HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" 
+               Margin="0,20,0,0" VerticalAlignment="Top" Height="50"/>
+                <Image Width="50" gif:ImageBehavior.AnimatedSource="/Lmage/2001.png"       
+                       HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" 
+                       Margin="0,80,0,0" VerticalAlignment="Top" Height="50"/>
+                <Image Width="50" gif:ImageBehavior.AnimatedSource="/Lmage/2001.png"                                       
+                       HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" 
+                       Margin="120,20,0,0" VerticalAlignment="Top" Height="50"/>
+
+                <Image Width="100" Height="100" gif:ImageBehavior.AnimatedSource="/Lmage/beng_stop.png"        
+        HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" Margin="284,159,0,141"/>
+
+            </Grid>
 
-            <Image Width="186" Height="154" gif:ImageBehavior.AnimatedSource="/Lmage/tong.png"
-               gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" Canvas.Left="930" Canvas.Top="79" VerticalAlignment="Top"/>
         </Canvas>
         <TextBlock x:Name="M_T" HorizontalAlignment="Left" Height="30" Margin="260,180,0,0" TextWrapping="Wrap" Text="C" TextAlignment="Right"
                    VerticalAlignment="Top" Width="100" FontSize="20" Background="White" Padding="5,0,5,0"/>

View/EquipmentSimulationView.xaml.cs

@@ -32,16 +32,18 @@ namespace DyeingComputer.View
 
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
-            M_T.Text = string.Format(" {0:###.#}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1010"))) + "°C";
+            M_T.Text = string.Format(" {0:###.#}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1010"))) + "°C";//主缸温度
-            M_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1015"))) + "L";
+            M_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1015"))) + "L";//主缸水
-
+            if (MainWindowViewModel.Selet_dtd("3023") || MainWindowViewModel.Selet_dtd("3024"))//摆动显示
+            { Swing_.Visibility = Visibility.Visible; }
+            else { Swing_.Visibility = Visibility.Collapsed; }
         }
 
         public void CountDown()
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
             {
-                Interval = TimeSpan.FromSeconds(1)//秒
+                Interval = TimeSpan.FromSeconds(2)//秒
             };
             timer1s.Tick += Tick_Event_1S;
             timer1s.Start();