结构调整

JmpServiceMgr/JmpServiceMgr.csproj

@@ -67,9 +67,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=12.1.0.0, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL" />
-    <Reference Include="Impinj.OctaneSdk, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OctaneSDK.3.4.0\lib\net461\Impinj.OctaneSdk.dll</HintPath>
-    </Reference>
     <Reference Include="JmpDehumidifierLib">
       <HintPath>..\Lib\JmpDehumidifierLib.dll</HintPath>
     </Reference>
@@ -79,24 +76,9 @@
     <Reference Include="LitJSON">
       <HintPath>..\Lib\LitJSON.dll</HintPath>
     </Reference>
-    <Reference Include="LLRP, Version=10.40.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\libltknet-sdk.10.40.0\lib\net461\LLRP.dll</HintPath>
-    </Reference>
-    <Reference Include="LLRP.Impinj, Version=10.40.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\libltknet-sdk.10.40.0\lib\net461\LLRP.Impinj.dll</HintPath>
-    </Reference>
     <Reference Include="MercuryAPI">
       <HintPath>..\Lib\MercuryAPI.dll</HintPath>
     </Reference>
-    <Reference Include="MQTTnet, Version=3.1.2.0, Culture=neutral, PublicKeyToken=b69712f52770c0a7, processorArchitecture=MSIL">
-      <HintPath>..\packages\MQTTnet.3.1.2\lib\net461\MQTTnet.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
-    </Reference>
     <Reference Include="SReaderAPI">
       <HintPath>..\Lib\SReaderAPI.dll</HintPath>
     </Reference>
@@ -181,7 +163,6 @@
       <DependentUpon>RfidConfig.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="config.json" />
-    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -275,6 +256,20 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MQTTnet">
+      <Version>3.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="OctaneSDK">
+      <Version>3.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Management">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy $(ProjectDir)ThirdPackages\* $(TargetDir) /S /Y

JmpServiceMgr/packages.config

-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="libltknet-sdk" version="10.40.0" targetFramework="net461" />
-  <package id="MQTTnet" version="3.1.2" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="OctaneSDK" version="3.4.0" targetFramework="net461" />
-  <package id="SSH.NET" version="2016.1.0" targetFramework="net461" />
-  <package id="System.Management" version="5.0.0" targetFramework="net461" />
-</packages>
\ No newline at end of file

LiteChannelCore/App.xaml.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-using System.Data;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;

LiteChannelCore/LiteChannelCore.csproj

@@ -72,7 +72,6 @@
     <Content Include="ThirdPackages\USBUHFPlatform.dll" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommonServiceLocator" Version="2.0.5" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     <PackageReference Include="MaterialDesignColors" Version="1.2.6" />
     <PackageReference Include="MaterialDesignThemes" Version="3.1.3" />

LiteChannelCore/MainWindow2.xaml

@@ -62,13 +62,13 @@
             </DataGrid.Columns>
         </DataGrid>
 
-        <!--<usControl:PageControl IsEnabled="{Binding BindButton}" x:Name="d_pager" Margin="0,0,0,0" Grid.Row="2" TotalRecord="{Binding TotalRecord,Mode=TwoWay}"  TotalPage="{Binding PageTotal,Mode=TwoWay}" PageSize="{Binding PageSize,Mode=TwoWay}" PageIndex="{Binding PageIndex,Mode=TwoWay}" Grid.ColumnSpan="4"
+        <usControl:PageControl IsEnabled="{Binding BindButton}" x:Name="d_pager" Margin="0,0,0,0" Grid.Row="2" TotalRecord="{Binding TotalRecord,Mode=TwoWay}"  TotalPage="{Binding PageTotal,Mode=TwoWay}" PageSize="{Binding PageSize,Mode=TwoWay}" PageIndex="{Binding PageIndex,Mode=TwoWay}" Grid.ColumnSpan="4"
                                Grid.Column="0">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="OnPageChanged">
                     <b:InvokeCommandAction Command="{Binding OnPageChangeCmd}"   />
                 </b:EventTrigger>
             </b:Interaction.Triggers>
-        </usControl:PageControl>-->
+        </usControl:PageControl>
     </Grid>
 </pu:WindowX>