删除一些无用的包

MV485/MV485.csproj

@@ -65,21 +65,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\WPF.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">

MV485/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Extended.Wpf.Toolkit" version="4.7.25104.5739" targetFramework="net461" />
   <package id="NModbus4" version="2.1.0" targetFramework="net461" />
 </packages>

MV485/uc/UCRunConfig.xaml

@@ -283,13 +283,16 @@
                             </Grid.ColumnDefinitions>
                             <TextBlock Grid.Column="0" Text="读数时间" VerticalAlignment="Center" FontSize="14" />
                             <!--<ComboBox Grid.Column="1" x:Name="cmbLastUnit" Height="26" FontSize="14px"/>-->
-                            <wpftoolkit:DateTimePicker Grid.Column="1" x:Name="dtpLastValueTime" Height="26"
-                                             TextAlignment="Left" FontSize="14" Format="Custom" FormatString="yyyy-MM-dd HH:mm"/>
+                            <!--<wpftoolkit:DateTimePicker Grid.Column="1" x:Name="dtpLastValueTime" Height="26"
+                                             TextAlignment="Left" FontSize="14" Format="Custom" FormatString="yyyy-MM-dd HH:mm"/>-->
+                            <zdfflatui:DateTimePicker x:Name="dtpLastValueTime"  Grid.Column="1" 
+                                                      Height="26" FontSize="14" DateFormat="yyyy-MM-dd HH:mm"/>
                             <Button x:Name="btnLastValueTime" Click="BtnLastValueTime_Click" 
                                     Grid.Column="2" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
                                         Height="20" Width="60" Background="Transparent" Foreground="Blue" FontSize="14" />
                         </Grid>
 
+
                         <Grid Height="40" Margin="10 0 10 0">
                             <Button x:Name="btnMarkMeter" Click="BtnMarkMeter_Click" 
                                     Grid.Column="2" Content="根据水表照片标定位置" BorderThickness="0 0 0 1" BorderBrush="Blue" HorizontalAlignment="Left"

MV485/uc/UCRunConfig.xaml.cs

@@ -30,7 +30,7 @@ namespace MV485.uc
             Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Documents", "runConfig_log.txt");
 
         private static readonly string ImageFilePath =
-            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Documents", "runConfig_read.jpg");
+            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Documents", "runConfig_readImage.jpg");
 
 
         private RWRunConfig _rwRunConfig;   // = new RWRunConfig();
@@ -215,6 +215,10 @@ namespace MV485.uc
                 return;
             }
             imgMeter.Source = null;
+            if (File.Exists(ImageFilePath))
+            {
+                File.Delete(ImageFilePath);
+            }
 
             ushort imageSize = _rwRunConfig.ReadImageSize(portName, baudrate, devId);
 
@@ -261,9 +265,19 @@ namespace MV485.uc
                 {
                     return receiver.StartReceiveFile(portName, baudrate, ImageFilePath, imageSize);
                 });
-                if (blRecv)
+                if (blRecv && File.Exists(ImageFilePath))
                 {
-                    imgMeter.Source = new BitmapImage(new Uri(ImageFilePath, UriKind.RelativeOrAbsolute));
+                    //imgMeter.Source = new BitmapImage(new Uri(ImageFilePath, UriKind.RelativeOrAbsolute));
+                    using (FileStream fs = new FileStream(ImageFilePath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    {
+                        BitmapImage bitmap = new BitmapImage();
+                        bitmap.BeginInit();
+                        bitmap.CacheOption = BitmapCacheOption.OnLoad;
+                        bitmap.StreamSource = fs;
+                        bitmap.EndInit();
+                        bitmap.Freeze(); // 线程安全
+                        imgMeter.Source = bitmap;
+                    }
                 }
             }
             catch { }
@@ -500,8 +514,8 @@ namespace MV485.uc
             if(runConfig.LatestValueWRFlag && runConfig.LatestTimeWRFlag && runConfig.LatestTime != null)
             {
                 txtLastValue.Text = ((int)(runConfig.LatestValue / Constant.CUBE_VALUE)).ToString();
-                dtpLastValueTime.Text = runConfig.LatestTime.ToString("yyyy-MM-dd HH:mm");
-                    //runConfig.LatestTimeStr;
+                //dtpLastValueTime.Text = runConfig.LatestTime.ToString("yyyy-MM-dd HH:mm");
+                dtpLastValueTime.Value = runConfig.LatestTime;
             }
 
             if (runConfig.MeterRegion != null)