@@ -14,9 +14,9 @@ | |||||
<AssemblyVersion>1.0.0.0</AssemblyVersion> | <AssemblyVersion>1.0.0.0</AssemblyVersion> | ||||
<Platforms>AnyCPU;x86</Platforms> | <Platforms>AnyCPU;x86</Platforms> | ||||
</PropertyGroup> | </PropertyGroup> | ||||
<!--<PropertyGroup> | |||||
<PropertyGroup> | |||||
<ApplicationManifest>App.manifest</ApplicationManifest> | <ApplicationManifest>App.manifest</ApplicationManifest> | ||||
</PropertyGroup>--> | |||||
</PropertyGroup> | |||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||||
<DefineConstants>TRACE;Core</DefineConstants> | <DefineConstants>TRACE;Core</DefineConstants> | ||||
</PropertyGroup> | </PropertyGroup> | ||||
@@ -236,17 +236,6 @@ namespace HKCardOUT.ViewModels | |||||
ThreadManage.GetInstance().StartLong(() => | ThreadManage.GetInstance().StartLong(() => | ||||
{ | { | ||||
//DataBus.saleLogDtos.Enqueue(new SaleLogDto | |||||
//{ | |||||
// Location = "5", | |||||
// CardNo = "1585836138202009600" | |||||
//}); | |||||
//DataBus.saleLogDtos.Enqueue(new SaleLogDto | |||||
//{ | |||||
// Location = "6", | |||||
// CardNo = "1585828985667981312" | |||||
//}); | |||||
if (0 < Stacks.Count && Stacks.TryDequeue(out SaleLogDto Info)) | if (0 < Stacks.Count && Stacks.TryDequeue(out SaleLogDto Info)) | ||||
{ | { | ||||
if (Info != null) | if (Info != null) | ||||
@@ -41,8 +41,8 @@ namespace HKCardOUT.Views | |||||
if (BindScreen != -1) | if (BindScreen != -1) | ||||
{ | { | ||||
int[] NotchNum = new int[2]; | int[] NotchNum = new int[2]; | ||||
if (bindScreen == 0) { NotchNum[0] = 1; NotchNum[1] = 2; } | |||||
if (bindScreen == 1) { NotchNum[0] = 5; NotchNum[1] = 6; } | |||||
if (bindScreen == 1) { NotchNum[0] = 1; NotchNum[1] = 2; } | |||||
if (bindScreen == 0) { NotchNum[0] = 5; NotchNum[1] = 6; } | |||||
if (bindScreen == 2) { NotchNum[0] = 3; NotchNum[1] = 4; } | if (bindScreen == 2) { NotchNum[0] = 3; NotchNum[1] = 4; } | ||||
(this.DataContext as AdWindowViewModel).InitData(NotchNum); | (this.DataContext as AdWindowViewModel).InitData(NotchNum); | ||||
@@ -62,7 +62,7 @@ namespace HKCardOUT.Views | |||||
} | } | ||||
InitView2(input); | InitView2(input); | ||||
InitControl(); | |||||
//InitControl(); | |||||
}; | }; | ||||
this.Closed += (sender, ev) => | this.Closed += (sender, ev) => | ||||
{ | { | ||||