bpa
/
BPASmartClient
2
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

hhh

reconfiguration
lyw 4 months ago
parent
cb56641d14 ab5caff4f1
commit
807ff0e9c3
12 changed files with 245 additions and 73 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      BPASmartClient.Academy/View/Device.xaml
  2. +1
    -1
      BPASmartClient.Business/BPASmartClient.Business.csproj
  3. +10
    -10
      BPASmartClient.CustomResource/RecDictionarys/BeveledRadioButtonStyle.xaml
  4. +211
    -42
      BPASmartClient.CustomResource/UserControls/Control/MotorHousing.xaml
  5. +11
    -11
      BPASmartClient.CustomResource/UserControls/Control/MotorTwo.xaml
  6. +1
    -1
      BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
  7. +1
    -1
      BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
  8. +4
    -2
      BPASmartClient.MorkCL/Server/OtherServer.cs
  9. +1
    -1
      BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
  10. +1
    -1
      DosingSystem/BPASmartClient.DosingSystem.csproj
  11. +1
    -1
      Test/Test.csproj
  12. +1
    -1
      阿里云IOT平台测试/阿里云IOT平台测试.csproj

+ 2
- 1
BPASmartClient.Academy/View/Device.xaml View File

@@ -42,7 +42,8 @@
<bpa:PipeLineTR
Width="30"
Margin="0,-1,-15,0"
Direction="0" />
Direction="1"
LineWidth="12" />
</StackPanel>

<StackPanel


+ 1
- 1
BPASmartClient.Business/BPASmartClient.Business.csproj View File

@@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
<PackageReference Include="BPA.Message" Version="1.0.86" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />


+ 10
- 10
BPASmartClient.CustomResource/RecDictionarys/BeveledRadioButtonStyle.xaml View File

@@ -65,16 +65,16 @@
StrokeThickness="1" />

<ContentPresenter
x:Name="contentPresenter"
Margin="0,0,10,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
x:Name="contentPresenter"
Margin="0,0,10,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="False">


+ 211
- 42
BPASmartClient.CustomResource/UserControls/Control/MotorHousing.xaml View File

@@ -8,102 +8,271 @@
d:DesignHeight="64"
d:DesignWidth="64"
mc:Ignorable="d">
<Viewbox Stretch="Uniform" ToolTip="Oxygen transmitter" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:s="clr-namespace:System;assembly=mscorlib">
<Viewbox
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:s="clr-namespace:System;assembly=mscorlib"
Stretch="Uniform"
ToolTip="Oxygen transmitter">
<Viewbox.Tag>
<s:Int64>1349210213</s:Int64>
</Viewbox.Tag>
<Canvas UseLayoutRounding="False" Name="Group_Oxygen_transmitter" Tag="#00000000,#FF0080FF,Original,0,None" LayoutTransform="Identity" Width="56.195" Height="112.5" HorizontalAlignment="Left" VerticalAlignment="Top">
<Canvas Name="Group_Bolts" Tag="#00000000,#FF0080FF,Original,0,None" Width="56.444" Height="8.246" Canvas.Left="-0.124" Canvas.Top="40.592">
<Path Data="M52.5908,43.5322L52.5908,40.7172 48.0868,40.7172 48.0868,48.7132 56.1948,48.7132 56.1948,40.7172 52.5898,40.7172 52.5898,43.5322 53.7158,43.7572 54.5048,44.7712 54.1668,46.0092 53.3778,46.6852 52.2518,46.7982 51.4638,46.2352 50.9018,45.1092 51.4638,44.0962 52.2518,43.5332 52.5908,43.5332 52.5908,43.5322z" Stretch="Fill" Fill="#FF7F7F7F" Stroke="#FF7F7F7F" StrokeThickness="0.25" Width="8.358" Height="8.246" Canvas.Left="48.086" />
<Path Data="F1M3.4922,43.5322L3.4922,40.7172 7.9962,40.7172 7.9962,48.7132 0.00119999999999987,48.7132 0.00119999999999987,40.7172 3.4922,40.7172 3.4922,43.5322 2.3662,43.7572 1.6902,44.7712 1.9152,46.0092 2.8162,46.6852 3.8302,46.7982 4.7302,46.2352 5.1802,45.1092 4.7302,44.0962 3.8302,43.5332 3.4922,43.5332z" Stretch="Fill" Fill="#FF7F7F7F" Width="7.995" Height="7.996" Canvas.Left="0.125" Canvas.Top="0.125" />
<Path Data="M3.4922,43.5322L3.4922,40.7172 7.9962,40.7172 7.9962,48.7132 0.00119999999999987,48.7132 0.00119999999999987,40.7172 3.4922,40.7172 3.4922,43.5322 2.3662,43.7572 1.6902,44.7712 1.9152,46.0092 2.8162,46.6852 3.8302,46.7982 4.7302,46.2352 5.1802,45.1092 4.7302,44.0962 3.8302,43.5332 3.4922,43.5332 3.4922,43.5322z" Stretch="Fill" Stroke="#FF7F7F7F" StrokeThickness="0.25" Width="8.245" Height="8.246">
<Canvas
Name="Group_Oxygen_transmitter"
Width="56.195"
Height="112.5"
HorizontalAlignment="Left"
VerticalAlignment="Top"
LayoutTransform="Identity"
Tag="#00000000,#FF0080FF,Original,0,None"
UseLayoutRounding="False">
<Canvas
Name="Group_Bolts"
Canvas.Left="-0.124"
Canvas.Top="40.592"
Width="56.444"
Height="8.246"
Tag="#00000000,#FF0080FF,Original,0,None">
<Path
Canvas.Left="48.086"
Width="8.358"
Height="8.246"
Data="M52.5908,43.5322L52.5908,40.7172 48.0868,40.7172 48.0868,48.7132 56.1948,48.7132 56.1948,40.7172 52.5898,40.7172 52.5898,43.5322 53.7158,43.7572 54.5048,44.7712 54.1668,46.0092 53.3778,46.6852 52.2518,46.7982 51.4638,46.2352 50.9018,45.1092 51.4638,44.0962 52.2518,43.5332 52.5908,43.5332 52.5908,43.5322z"
Fill="#FF7F7F7F"
Stretch="Fill"
Stroke="#FF7F7F7F"
StrokeThickness="0.25" />
<Path
Canvas.Left="0.125"
Canvas.Top="0.125"
Width="7.995"
Height="7.996"
Data="F1M3.4922,43.5322L3.4922,40.7172 7.9962,40.7172 7.9962,48.7132 0.00119999999999987,48.7132 0.00119999999999987,40.7172 3.4922,40.7172 3.4922,43.5322 2.3662,43.7572 1.6902,44.7712 1.9152,46.0092 2.8162,46.6852 3.8302,46.7982 4.7302,46.2352 5.1802,45.1092 4.7302,44.0962 3.8302,43.5332 3.4922,43.5332z"
Fill="#FF7F7F7F"
Stretch="Fill" />
<Path
Width="8.245"
Height="8.246"
Data="M3.4922,43.5322L3.4922,40.7172 7.9962,40.7172 7.9962,48.7132 0.00119999999999987,48.7132 0.00119999999999987,40.7172 3.4922,40.7172 3.4922,43.5322 2.3662,43.7572 1.6902,44.7712 1.9152,46.0092 2.8162,46.6852 3.8302,46.7982 4.7302,46.2352 5.1802,45.1092 4.7302,44.0962 3.8302,43.5332 3.4922,43.5332 3.4922,43.5322z"
Stretch="Fill"
Stroke="#FF7F7F7F"
StrokeThickness="0.25">
<Path.Clip>
<PathGeometry Figures="M0,-0.5L56.195,-0.5 56.195,112 0,112z" Transform="1,0,0,1,0.123800002038479,-40.5922012329102" />
</Path.Clip>
</Path>
</Canvas>
<Canvas Name="Group_Transmitter" Tag="#00000000,#FF0080FF,Original,0,None" Width="56.192" Height="42.118" Canvas.Left="0.001" Canvas.Top="-0.5">
<Path Data="F1M3.492,41.617L0.339,40.378 0.001,39.14 0.001,38.239 0.001,37.113 0.001,2.991 1.127,-0.162000000000006 2.591,-0.5 3.492,-0.5 5.068,-0.5 52.59,-0.5 55.743,0.626000000000005 56.193,2.09 56.193,2.991 56.193,4.117 56.193,38.239 54.955,41.167 53.491,41.505 52.59,41.618 51.015,41.618 3.492,41.618z" Stretch="Fill" Width="56.192" Height="42.118" Canvas.Left="0" Canvas.Top="0">
<Canvas
Name="Group_Transmitter"
Canvas.Left="0.001"
Canvas.Top="-0.5"
Width="56.192"
Height="42.118"
Tag="#00000000,#FF0080FF,Original,0,None">
<Path
Canvas.Left="0"
Canvas.Top="0"
Width="56.192"
Height="42.118"
Data="F1M3.492,41.617L0.339,40.378 0.001,39.14 0.001,38.239 0.001,37.113 0.001,2.991 1.127,-0.162000000000006 2.591,-0.5 3.492,-0.5 5.068,-0.5 52.59,-0.5 55.743,0.626000000000005 56.193,2.09 56.193,2.991 56.193,4.117 56.193,38.239 54.955,41.167 53.491,41.505 52.59,41.618 51.015,41.618 3.492,41.618z"
Stretch="Fill">
<Path.Fill>
<LinearGradientBrush StartPoint="0.922,1.063" EndPoint="0.076,-0.066">
<LinearGradientBrush.GradientStops>
<GradientStop Color="#FF494A4B" Offset="0.01" />
<GradientStop Color="#FFC7C8CA" Offset="0.51" />
<GradientStop Color="#FF494A4B" Offset="1" />
<GradientStop Offset="0.01" Color="#FF494A4B" />
<GradientStop Offset="0.51" Color="#FFC7C8CA" />
<GradientStop Offset="1" Color="#FF494A4B" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Path.Fill>
</Path>
<Path Data="M3.4922,41.6172L0.3392,40.3782 0.00119999999999987,39.1402 0.00119999999999987,38.2392 0.00119999999999987,37.1132 0.00119999999999987,2.9912 1.1272,-0.161800000000007 2.5912,-0.4998 3.4922,-0.4998 5.0682,-0.4998 52.5902,-0.4998 55.7432,0.626199999999997 56.1932,2.0902 56.1932,2.9912 56.1932,4.1172 56.1932,38.2392 54.9552,41.1672 53.4912,41.5052 52.5902,41.6182 51.0142,41.6182 3.4922,41.6182 3.4922,41.6172z" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="56.442" Height="42.368" Canvas.Left="-0.125" Canvas.Top="-0.125" />
<Path Data="M0.001,2.99120000000001L56.194,2.99120000000001" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="56.443" Height="0.25" Canvas.Left="-0.125" Canvas.Top="3.366" />
<Path Data="M56.1953,8.2842L0.00130000000000052,8.2842" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="56.444" Height="0.25" Canvas.Left="-0.125" Canvas.Top="8.659" />
<Path
Canvas.Left="-0.125"
Canvas.Top="-0.125"
Width="56.442"
Height="42.368"
Data="M3.4922,41.6172L0.3392,40.3782 0.00119999999999987,39.1402 0.00119999999999987,38.2392 0.00119999999999987,37.1132 0.00119999999999987,2.9912 1.1272,-0.161800000000007 2.5912,-0.4998 3.4922,-0.4998 5.0682,-0.4998 52.5902,-0.4998 55.7432,0.626199999999997 56.1932,2.0902 56.1932,2.9912 56.1932,4.1172 56.1932,38.2392 54.9552,41.1672 53.4912,41.5052 52.5902,41.6182 51.0142,41.6182 3.4922,41.6182 3.4922,41.6172z"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
<Path
Canvas.Left="-0.125"
Canvas.Top="3.366"
Width="56.443"
Height="0.25"
Data="M0.001,2.99120000000001L56.194,2.99120000000001"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
<Path
Canvas.Left="-0.125"
Canvas.Top="8.659"
Width="56.444"
Height="0.25"
Data="M56.1953,8.2842L0.00130000000000052,8.2842"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
</Canvas>
<Canvas Name="Group_Meter" Tag="#00000000,#FF0080FF,Original,0,None" Width="52.929" Height="24.662" Canvas.Left="1.577" Canvas.Top="13.577">
<Path Data="M1.577,13.577L54.506,13.577 54.506,38.239 1.577,38.239z" Stretch="Fill" Fill="#FF666666" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="53.179" Height="24.912" Canvas.Left="-0.125" Canvas.Top="-0.125" />
<Canvas
Name="Group_Meter"
Canvas.Left="1.577"
Canvas.Top="13.577"
Width="52.929"
Height="24.662"
Tag="#00000000,#FF0080FF,Original,0,None">
<Path
Canvas.Left="-0.125"
Canvas.Top="-0.125"
Width="53.179"
Height="24.912"
Data="M1.577,13.577L54.506,13.577 54.506,38.239 1.577,38.239z"
Fill="#FF666666"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
</Canvas>
<Canvas Name="Group_Oxygen_Box" Tag="#00000000,#FF0080FF,Original,0,None" Width="42.343" Height="45.721" Canvas.Left="6.87" Canvas.Top="41.617">
<Path Data="M6.87,41.617L49.213,41.617 49.213,87.338 6.87,87.338z" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="42.593" Height="45.971" Canvas.Left="-0.125" Canvas.Top="-0.125">
<Canvas
Name="Group_Oxygen_Box"
Canvas.Left="6.87"
Canvas.Top="41.617"
Width="42.343"
Height="45.721"
Tag="#00000000,#FF0080FF,Original,0,None">
<Path
Canvas.Left="-0.125"
Canvas.Top="-0.125"
Width="42.593"
Height="45.971"
Data="M6.87,41.617L49.213,41.617 49.213,87.338 6.87,87.338z"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25">
<Path.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<LinearGradientBrush.GradientStops>
<GradientStop Color="#FF76777A" Offset="0.01" />
<GradientStop Color="#FFE2E3E4" Offset="0.51" />
<GradientStop Color="#FF76777A" Offset="1" />
<GradientStop Offset="0.01" Color="#FF76777A" />
<GradientStop Offset="0.51" Color="#FFE2E3E4" />
<GradientStop Offset="1" Color="#FF76777A" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Path.Fill>
</Path>
</Canvas>
<Canvas Name="Group_Plate" Tag="#00000000,#FF0080FF,Original,0,None" Width="24.662" Height="6.982" Canvas.Left="15.768" Canvas.Top="76.752">
<Path Data="M15.768,76.752L40.43,76.752 40.43,83.734 15.768,83.734z" Stretch="Fill" Fill="#FF999999" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="24.912" Height="7.232" Canvas.Left="-0.125" Canvas.Top="-0.125" />
<Canvas
Name="Group_Plate"
Canvas.Left="15.768"
Canvas.Top="76.752"
Width="24.662"
Height="6.982"
Tag="#00000000,#FF0080FF,Original,0,None">
<Path
Canvas.Left="-0.125"
Canvas.Top="-0.125"
Width="24.912"
Height="7.232"
Data="M15.768,76.752L40.43,76.752 40.43,83.734 15.768,83.734z"
Fill="#FF999999"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
</Canvas>
<Canvas Name="Group_Oxygen_Cylinder_Support" Tag="#00000000,#FF0080FF,Original,0,None" Width="28.041" Height="24.662" Canvas.Left="14.077" Canvas.Top="87.338">
<Path Data="M14.979,87.338L20.159,87.338 20.159,92.518 14.979,92.518z" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="5.43" Height="5.43" Canvas.Left="0.777" Canvas.Top="-0.125">
<Canvas
Name="Group_Oxygen_Cylinder_Support"
Canvas.Left="14.077"
Canvas.Top="87.338"
Width="28.041"
Height="24.662"
Tag="#00000000,#FF0080FF,Original,0,None">
<Path
Canvas.Left="0.777"
Canvas.Top="-0.125"
Width="5.43"
Height="5.43"
Data="M14.979,87.338L20.159,87.338 20.159,92.518 14.979,92.518z"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25">
<Path.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<LinearGradientBrush.GradientStops>
<GradientStop Color="#FF76777A" Offset="0.01" />
<GradientStop Color="#FFE2E3E4" Offset="0.51" />
<GradientStop Color="#FF76777A" Offset="1" />
<GradientStop Offset="0.01" Color="#FF76777A" />
<GradientStop Offset="0.51" Color="#FFE2E3E4" />
<GradientStop Offset="1" Color="#FF76777A" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Path.Fill>
</Path>
<Path Data="M35.925,87.338L41.217,87.338 41.217,92.518 35.925,92.518z" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="5.542" Height="5.43" Canvas.Left="21.723" Canvas.Top="-0.125">
<Path
Canvas.Left="21.723"
Canvas.Top="-0.125"
Width="5.542"
Height="5.43"
Data="M35.925,87.338L41.217,87.338 41.217,92.518 35.925,92.518z"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25">
<Path.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<LinearGradientBrush.GradientStops>
<GradientStop Color="#FF76777A" Offset="0.01" />
<GradientStop Color="#FFE2E3E4" Offset="0.51" />
<GradientStop Color="#FF76777A" Offset="1" />
<GradientStop Offset="0.01" Color="#FF76777A" />
<GradientStop Offset="0.51" Color="#FFE2E3E4" />
<GradientStop Offset="1" Color="#FF76777A" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Path.Fill>
</Path>
<Path Data="M14.077,112L21.06,112 21.06,92.518 14.077,92.518z" Stretch="Fill" Width="6.983" Height="19.482" Canvas.Left="0" Canvas.Top="5.18">
<Path
Canvas.Left="0"
Canvas.Top="5.18"
Width="6.983"
Height="19.482"
Data="M14.077,112L21.06,112 21.06,92.518 14.077,92.518z"
Stretch="Fill">
<Path.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<LinearGradientBrush.GradientStops>
<GradientStop Color="#FF494A4B" Offset="0.01" />
<GradientStop Color="#FFC7C8CA" Offset="0.51" />
<GradientStop Color="#FF494A4B" Offset="1" />
<GradientStop Offset="0.01" Color="#FF494A4B" />
<GradientStop Offset="0.51" Color="#FFC7C8CA" />
<GradientStop Offset="1" Color="#FF494A4B" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Path.Fill>
</Path>
<Path Data="M14.077,92.518L21.059,92.518 21.059,112 14.077,112z" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="7.232" Height="19.732" Canvas.Left="-0.125" Canvas.Top="5.055" />
<Path Data="M35.137,112L42.118,112 42.118,92.518 35.137,92.518z" Stretch="Fill" Width="6.981" Height="19.482" Canvas.Left="21.06" Canvas.Top="5.18">
<Path
Canvas.Left="-0.125"
Canvas.Top="5.055"
Width="7.232"
Height="19.732"
Data="M14.077,92.518L21.059,92.518 21.059,112 14.077,112z"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
<Path
Canvas.Left="21.06"
Canvas.Top="5.18"
Width="6.981"
Height="19.482"
Data="M35.137,112L42.118,112 42.118,92.518 35.137,92.518z"
Stretch="Fill">
<Path.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<LinearGradientBrush.GradientStops>
<GradientStop Color="#FF494A4B" Offset="0.01" />
<GradientStop Color="#FFC7C8CA" Offset="0.51" />
<GradientStop Color="#FF494A4B" Offset="1" />
<GradientStop Offset="0.01" Color="#FF494A4B" />
<GradientStop Offset="0.51" Color="#FFC7C8CA" />
<GradientStop Offset="1" Color="#FF494A4B" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Path.Fill>
</Path>
<Path Data="M35.137,92.518L42.118,92.518 42.118,112 35.137,112z" Stretch="Fill" Stroke="#FF4C4C4C" StrokeThickness="0.25" Width="7.231" Height="19.732" Canvas.Left="20.935" Canvas.Top="5.055" />
<Path
Canvas.Left="20.935"
Canvas.Top="5.055"
Width="7.231"
Height="19.732"
Data="M35.137,92.518L42.118,92.518 42.118,112 35.137,112z"
Stretch="Fill"
Stroke="#FF4C4C4C"
StrokeThickness="0.25" />
</Canvas>
</Canvas>
</Viewbox>


+ 11
- 11
BPASmartClient.CustomResource/UserControls/Control/MotorTwo.xaml View File

@@ -1,12 +1,12 @@
<UserControl x:Class="BPASmartClient.CustomResource.UserControls.MotorTwo"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
</Grid>
<UserControl
x:Class="BPASmartClient.CustomResource.UserControls.MotorTwo"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<Grid />
</UserControl>

+ 1
- 1
BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj View File

@@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
</ItemGroup>

<ItemGroup>


+ 1
- 1
BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj View File

@@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
</ItemGroup>

<ItemGroup>


+ 4
- 2
BPASmartClient.MorkCL/Server/OtherServer.cs View File

@@ -31,7 +31,7 @@ namespace BPASmartClient.MorkCL.Server
//{
// for (byte i = 0; i < s.Length; i++) BoxDetection[i] = s[i];
//});
MyModbus.SlaveAddress = 1;
MyModbus.Read<ushort>("LW630".ToModbusAdd()).OnSuccess(s =>
{
for (byte i = 0; i < 4; i++)
@@ -41,7 +41,7 @@ namespace BPASmartClient.MorkCL.Server
});
Thread.Sleep(250);
//myDevice.SlaveAddress = 2;
MyModbus.SlaveAddress = 2;
MyModbus.Read<float>("LW6".ToModbusAdd()).OnSuccess(s => { CurrentWeight = s.Content; });

Thread.Sleep(250);
@@ -95,6 +95,7 @@ namespace BPASmartClient.MorkCL.Server
{
//ModbusRtu weigher = (ModbusRtu)MyModbus;
//MyModbus.SlaveAddress = 2;
MyModbus.SlaveAddress = 2;
return MyModbus.Write<bool>("LB4".ToModbusAdd(), true).IsSuccess;
}
else
@@ -110,6 +111,7 @@ namespace BPASmartClient.MorkCL.Server
{
//ModbusRtu weigher = (ModbusRtu)MyModbus;
//weigher.SlaveAddress = 2;
MyModbus.SlaveAddress = 2;
return MyModbus.Write<bool>("LB3".ToModbusAdd(), true).IsSuccess;
}
else


+ 1
- 1
BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj View File

@@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
</ItemGroup>

<ItemGroup>


+ 1
- 1
DosingSystem/BPASmartClient.DosingSystem.csproj View File

@@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
<PackageReference Include="BPA.PahoMQ" Version="1.0.8">
<Aliases>aliyun</Aliases>
</PackageReference>


+ 1
- 1
Test/Test.csproj View File

@@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
<PackageReference Include="BPA.PahoMQ" Version="1.0.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>


+ 1
- 1
阿里云IOT平台测试/阿里云IOT平台测试.csproj View File

@@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.177" />
<PackageReference Include="BPA.Communication" Version="1.0.178" />
<PackageReference Include="BPA.PahoMQ" Version="1.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>


Write Preview
Loading…
Cancel
Save