Sfoglia il codice sorgente

类库类型修改

样式分支
pry 2 anni fa
parent
commit
eba654cc83
7 ha cambiato i file con 28 aggiunte e 19 eliminazioni
  1. +3
    -1
      BPASmartClient.MorkD/BPASmartClient.MorkD.csproj
  2. +2
    -1
      BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
  3. +3
    -1
      BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
  4. +0
    -15
      BPASmartClient.MorkS/Control_Morks.cs
  5. +3
    -1
      BPASmartClient.MorkT/BPASmartClient.MorkT.csproj
  6. +8
    -0
      WpfLibrary1/Class1.cs
  7. +9
    -0
      WpfLibrary1/WpfLibrary1.csproj

+ 3
- 1
BPASmartClient.MorkD/BPASmartClient.MorkD.csproj Vedi File

@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">


<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<BaseOutputPath>bin\</BaseOutputPath> <BaseOutputPath>bin\</BaseOutputPath>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
</PropertyGroup> </PropertyGroup>


+ 2
- 1
BPASmartClient.MorkF/BPASmartClient.MorkF.csproj Vedi File

@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">


<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<BaseOutputPath>bin\</BaseOutputPath> <BaseOutputPath>bin\</BaseOutputPath>


+ 3
- 1
BPASmartClient.MorkS/BPASmartClient.MorkS.csproj Vedi File

@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">


<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<BaseOutputPath>bin\</BaseOutputPath> <BaseOutputPath>bin\</BaseOutputPath>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
</PropertyGroup> </PropertyGroup>


+ 0
- 15
BPASmartClient.MorkS/Control_Morks.cs Vedi File

@@ -73,17 +73,6 @@ namespace BPASmartClient.MorkS
EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType }); 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) private void GetStatus(string key, Action<object> action)
{ {
if (peripheralStatus.ContainsKey(key)) if (peripheralStatus.ContainsKey(key))
@@ -92,10 +81,6 @@ namespace BPASmartClient.MorkS
{ {
action?.Invoke(peripheralStatus[key]); action?.Invoke(peripheralStatus[key]);
} }
//if (peripheralStatus[key] is bool[] bools)
//{
// action?.Invoke(bools);
//}
} }
} }




+ 3
- 1
BPASmartClient.MorkT/BPASmartClient.MorkT.csproj Vedi File

@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">


<PropertyGroup> <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> <BaseOutputPath>D:\HBL\Porgram\BPASmartClient\BPASmartClient\bin\Debug\net6.0-windows\Devices</BaseOutputPath>
</PropertyGroup> </PropertyGroup>




+ 8
- 0
WpfLibrary1/Class1.cs Vedi File

@@ -0,0 +1,8 @@
using System;

namespace WpfLibrary1
{
public class Class1
{
}
}

+ 9
- 0
WpfLibrary1/WpfLibrary1.csproj Vedi File

@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
</PropertyGroup>

</Project>

Caricamento…
Annulla
Salva