调整一些配置

MV485/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3")]
-[assembly: AssemblyFileVersion("1.0.0.3")]
+[assembly: AssemblyVersion("125.0.0.1")]
+[assembly: AssemblyFileVersion("125.0.0.1")]

MV485/helper/Tools.cs

@@ -256,12 +256,14 @@ namespace MV485.helper
                     return "2: 全指针表";
                 case 3:
                     return "3: 全数字表";
+                case 87:
+                    return "87: 没有配置基本信息";
                 case 88:
-                    return "88: 没有配置";
+                    return "88: 非水表或没有配置";
                 case 89:
                     return "89: 角度变化";
                 case 90:
-                    return "90: 概率太低";
+                    return "90: 概率太低，结果不可靠";
                 case 91:
                     return "91: 不符合最大水流";
                 case 92:

MV485/uc/UCRunConfig.xaml

@@ -286,7 +286,7 @@
                                             Height="20" Width="60" Background="Transparent" Foreground="Blue" FontSize="14" />
                             </Grid>
 
-                            <Grid Height="50" Margin="10 0 10 0">
+                            <Grid Height="50" Margin="10 0 10 0" x:Name="grdRedInd">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="90" />
                                     <ColumnDefinition Width="*" />
@@ -332,11 +332,17 @@
                                             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"
+                            <StackPanel Height="1" Background="#D3D3D3" Margin="10 0 10 0" />
+                            <Grid Height="50" Margin="10 0 10 0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="30" />
+                                    <RowDefinition Height="30" />
+                                </Grid.RowDefinitions>
+                                <Button  x:Name="btnMarkMeter" Click="BtnMarkMeter_Click" 
+                                        Grid.Row="0" Content="根据水表照片标定位置(可选)" BorderThickness="0 0 0 1" BorderBrush="Blue" HorizontalAlignment="Left"
                                             Height="20"  Background="Transparent" Foreground="Blue" FontSize="14" />
+                                <TextBlock Text="*配置以上参数后，识别结果类型为88时,需要配置。" Foreground="Red" FontSize="13"
+                                           Grid.Row="1"  Margin="0 0 0 0" />
                             </Grid>
 
                             <Grid Height="50" Margin="10 0 10 0">
@@ -345,7 +351,8 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="80" />
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0" Text="表盘范围" VerticalAlignment="Center" FontSize="14" />
+                                <!--<TextBlock Grid.Column="0" Text="表盘范围" VerticalAlignment="Center" FontSize="14" />-->
+                                <CheckBox x:Name="chkMeterRegion" Grid.Column="0" Content="表盘范围" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center" />
                                 <TextBox Grid.Column="1" x:Name="txtMeterRegion" Height="26" Padding="2" FontSize="14px" IsReadOnly="True" />
                                 <Button x:Name="btnMeterRegion" Click="BtnMeterRegion_Click" 
                                         Grid.Column="3" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
@@ -357,7 +364,10 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="80" />
                                 </Grid.ColumnDefinitions>
-                                <TextBlock x:Name="txtFeatureRegionTitle" Grid.Column="0" Text="数字范围" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />
+                                <!--<TextBlock x:Name="txtFeatureRegionTitle" Grid.Column="0" Text="数字范围" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
+                                <CheckBox x:Name="chkFeatureRegion" Grid.Column="0"  VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center">
+                                    <TextBlock x:Name="txtFeatureRegionTitle" Text="数字范围" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />
+                                </CheckBox>
                                 <TextBox Grid.Column="1" x:Name="txtFeatureRegion" Height="26" Padding="2" FontSize="14px" IsReadOnly="True" />
                                 <Button x:Name="btnFeatureRegion" Click="BtnFeatureRegion_Click" 
                                         Grid.Column="3" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
@@ -373,6 +383,11 @@
                                 <TextBlock Text="采样频率项:" VerticalAlignment="Center" Foreground="Blue" FontSize="14" />
                             </Grid>
 
+                            <Grid Height="30" Margin="10 0 10 0" >
+                                <TextBlock Text="需要改变采样间隔时，配置以下选项。" Foreground="DarkBlue" FontSize="14"
+                                           Grid.Row="1"  Margin="0 0 0 0"  VerticalAlignment="Center" FontWeight="Bold"/>
+                            </Grid>
+
                             <Grid Height="50" Margin="10 0 10 0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="90" />
@@ -381,7 +396,7 @@
                                     <ColumnDefinition Width="80" />
                                 </Grid.ColumnDefinitions>
                                 <!--<TextBlock Grid.Column="0" Text="采样周期" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
-                                <CheckBox x:Name="chkSampleInterval" Grid.Column="0" Content="采样周期" VerticalAlignment="Center" FontSize="14" />
+                                <CheckBox x:Name="chkSampleInterval" Grid.Column="0" Content="采样周期" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center" />
                                 <TextBox Visibility="Collapsed" Grid.Column="1" x:Name="txtSampleInterval1" Height="26" Padding="2" FontSize="14px" IsReadOnly="False" />
                                 <!--<ComboBox Grid.Column="1" x:Name="cmbFlowRate"  Height="26" FontSize="14px"
                                           IsEditable="True" PreviewTextInput="TextBox_PreviewTextInput"                              
@@ -407,11 +422,11 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="90" />
                                     <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="40" />
+                                    <ColumnDefinition Width="30" />
                                     <ColumnDefinition Width="80" />
                                 </Grid.ColumnDefinitions>
                                 <!--<TextBlock Grid.Column="0" Text="采样周期" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
-                                <CheckBox x:Name="chkFirstHour" Grid.Column="0" Content="首采时间" VerticalAlignment="Center" FontSize="14" />
+                                <CheckBox x:Name="chkFirstHour" Grid.Column="0" Content="首采时间" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center" />
                                 <!--<TextBox Grid.Column="1" x:Name="txtFirstHour" Height="26" Padding="2" FontSize="14px" IsReadOnly="False" />-->
                                 <ComboBox Grid.Column="1" x:Name="cmbFirstHour"  Height="26" FontSize="14px"
                                            IsTextSearchEnabled="False"

MV485/uc/UCRunConfig.xaml.cs

@@ -413,11 +413,13 @@ namespace MV485.uc
                 {
                     grdIndCount.Visibility = Visibility.Visible;
                     grdNumCount.Visibility = Visibility.Visible;
+                    grdRedInd.Visibility = Visibility.Visible;
                 }
                 else
                 {
                     grdIndCount.Visibility = Visibility.Collapsed;
                     grdNumCount.Visibility = Visibility.Visible;
+                    grdRedInd.Visibility = Visibility.Collapsed;
                 }
             }
             else if (meterType == Constant.METER_TYPE_IND)
@@ -957,14 +959,17 @@ namespace MV485.uc
             runConfig.LastUnitLevelWRFlag = true;
             runConfig.LastUnitLevel = (byte)cmbLastUnit.SelectedValue;
 
-            if(cmbUploadRedind.SelectedItem == null)
+            if (runConfig.MeterType == 1 || runConfig.MeterType == 3)
             {
-                MessageBox.Show(Application.Current.MainWindow, "请选择是否上传红色指针的读数", "提示",
-                    MessageBoxButton.OK, MessageBoxImage.Warning);
-                return;
+                if (cmbUploadRedind.SelectedItem == null)
+                {
+                    MessageBox.Show(Application.Current.MainWindow, "请选择是否上传红色指针的读数", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+                runConfig.UploadRedindWRFlag = true;
+                runConfig.UploadRedind = (byte)cmbUploadRedind.SelectedValue;
             }
-            runConfig.UploadRedindWRFlag = true;
-            runConfig.UploadRedind = (byte)cmbUploadRedind.SelectedValue;
 
             if (string.IsNullOrWhiteSpace(txtLastValue.Text) || 
                 !ulong.TryParse(txtLastValue.Text,out ulong latestValue))
@@ -987,34 +992,43 @@ namespace MV485.uc
             runConfig.LatestTimeWRFlag = true;
             runConfig.LatestTime = dtpLastValueTime.Value.GetValueOrDefault();
 
-            if (string.IsNullOrWhiteSpace(txtMeterRegion.Text))
-            {
-                MessageBox.Show(Application.Current.MainWindow, "请输入表盘范围坐标", "提示",
-                    MessageBoxButton.OK, MessageBoxImage.Warning);
-                return;
-            }
-            runConfig.MeterRegionWRFlag = true;
-            runConfig.MeterRegion = txtMeterRegion.Text;
 
-            string featureTitle = (runConfig.MeterType == Constant.METER_TYPE_IND) ?
-                "首尾指针同刻度坐标" : "数字区域范围坐标";
-            if (string.IsNullOrEmpty(txtFeatureRegion.Text))
-            {
-                MessageBox.Show(Application.Current.MainWindow, $"请输入{featureTitle}", "提示",
-                    MessageBoxButton.OK, MessageBoxImage.Warning);
-                return;
-            }
-            if(runConfig.MeterType == Constant.METER_TYPE_IND)
+            if (chkMeterRegion.IsChecked == true)
             {
-                runConfig.FTIndRegionWRFlag = true;
-                runConfig.FTIndRegion = txtFeatureRegion.Text.Trim();
+                if (string.IsNullOrWhiteSpace(txtMeterRegion.Text))
+                {
+                    MessageBox.Show(Application.Current.MainWindow, "请输入表盘范围坐标", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+                runConfig.MeterRegionWRFlag = true;
+                runConfig.MeterRegion = txtMeterRegion.Text;
             }
-            else
+
+            if (chkFeatureRegion.IsChecked == true)
             {
-                runConfig.DigitRegionWRFlag = true;
-                runConfig.DigitRegion = txtFeatureRegion.Text.Trim();
+                string featureTitle = (runConfig.MeterType == Constant.METER_TYPE_IND) ?
+                    "首尾指针同刻度坐标" : "数字区域范围坐标";
+                if (string.IsNullOrEmpty(txtFeatureRegion.Text))
+                {
+                    MessageBox.Show(Application.Current.MainWindow, $"请输入{featureTitle}", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+                if (runConfig.MeterType == Constant.METER_TYPE_IND)
+                {
+                    runConfig.FTIndRegionWRFlag = true;
+                    runConfig.FTIndRegion = txtFeatureRegion.Text.Trim();
+                }
+                else
+                {
+                    runConfig.DigitRegionWRFlag = true;
+                    runConfig.DigitRegion = txtFeatureRegion.Text.Trim();
+                }
             }
 
+
+
             if (chkSampleInterval.IsChecked == true)
             {
                 //if(string.IsNullOrWhiteSpace(cmbSampleInterval.Text) ||