From eba654cc8397a7ce6c444aec28a530584e0d15a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 25 May 2022 11:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=BA=93=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkD/BPASmartClient.MorkD.csproj |  4 +++-
 BPASmartClient.MorkF/BPASmartClient.MorkF.csproj |  3 ++-
 BPASmartClient.MorkS/BPASmartClient.MorkS.csproj |  4 +++-
 BPASmartClient.MorkS/Control_Morks.cs            | 15 ---------------
 BPASmartClient.MorkT/BPASmartClient.MorkT.csproj |  4 +++-
 WpfLibrary1/Class1.cs                            |  8 ++++++++
 WpfLibrary1/WpfLibrary1.csproj                   |  9 +++++++++
 7 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 WpfLibrary1/Class1.cs
 create mode 100644 WpfLibrary1/WpfLibrary1.csproj

diff --git a/BPASmartClient.MorkD/BPASmartClient.MorkD.csproj b/BPASmartClient.MorkD/BPASmartClient.MorkD.csproj
index b4b46ffa..9a6ccc24 100644
--- a/BPASmartClient.MorkD/BPASmartClient.MorkD.csproj
+++ b/BPASmartClient.MorkD/BPASmartClient.MorkD.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
     <BaseOutputPath>bin\</BaseOutputPath>
     <DebugType>portable</DebugType>
   </PropertyGroup>
diff --git a/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj b/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
index 09946d55..feae8a16 100644
--- a/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
+++ b/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <BaseOutputPath>bin\</BaseOutputPath>
diff --git a/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj b/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
index 11f083b1..3e35c37d 100644
--- a/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
+++ b/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
     <BaseOutputPath>bin\</BaseOutputPath>
     <DebugType>portable</DebugType>
   </PropertyGroup>
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index c2a1d244..986ed962 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -73,17 +73,6 @@ namespace BPASmartClient.MorkS
             EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
         }
 
-        //private void ReadData(string address, ushort len = 1, Action<bool[]> action = null)
-        //{
-        //    EventBus.EventBus.GetInstance().Publish(new ReadModel() { DeviceId = DeviceId, Address = address, Length = len }, (o) =>
-        //    {
-        //        if (o != null && o.Length > 0 && o[0] is bool[] bools)
-        //        {
-        //            action(bools);
-        //        }
-        //    });
-        //}
-
         private void GetStatus(string key, Action<object> action)
         {
             if (peripheralStatus.ContainsKey(key))
@@ -92,10 +81,6 @@ namespace BPASmartClient.MorkS
                 {
                     action?.Invoke(peripheralStatus[key]);
                 }
-                //if (peripheralStatus[key] is bool[] bools)
-                //{
-                //    action?.Invoke(bools);
-                //}
             }
         }
 
diff --git a/BPASmartClient.MorkT/BPASmartClient.MorkT.csproj b/BPASmartClient.MorkT/BPASmartClient.MorkT.csproj
index 256ad966..721133d2 100644
--- a/BPASmartClient.MorkT/BPASmartClient.MorkT.csproj
+++ b/BPASmartClient.MorkT/BPASmartClient.MorkT.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
     <BaseOutputPath>D:\HBL\Porgram\BPASmartClient\BPASmartClient\bin\Debug\net6.0-windows\Devices</BaseOutputPath>
   </PropertyGroup>
 
diff --git a/WpfLibrary1/Class1.cs b/WpfLibrary1/Class1.cs
new file mode 100644
index 00000000..ee7f48bf
--- /dev/null
+++ b/WpfLibrary1/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace WpfLibrary1
+{
+    public class Class1
+    {
+    }
+}
diff --git a/WpfLibrary1/WpfLibrary1.csproj b/WpfLibrary1/WpfLibrary1.csproj
new file mode 100644
index 00000000..9a7c06f1
--- /dev/null
+++ b/WpfLibrary1/WpfLibrary1.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+</Project>