Browse Source

调试

master
xxe 2 years ago
parent
commit
e29eaf4e9d
5 changed files with 6 additions and 4 deletions
  1. +1
    -1
      HKCardOUT/Bootstrapper.cs
  2. +1
    -1
      HKCardOUT/HKCardOUT.csproj
  3. +1
    -0
      HKCardOUT/Helper/DataBus.cs
  4. +2
    -2
      HKCardOUT/ViewModels/AdWindowViewModel.cs
  5. +1
    -0
      HKControl/Main.cs

+ 1
- 1
HKCardOUT/Bootstrapper.cs View File

@@ -95,7 +95,7 @@ namespace HKCardOUT
DataBus.saleLogDtos = new System.Collections.Concurrent.ConcurrentQueue<DTO.SaleLogDto>();
RemoteService.GetFoodMenus();
RemoteService.GetRangeCtrl();
MQTTCon.Connection();
//MQTTCon.Connection();
base.Configure();
}



+ 1
- 1
HKCardOUT/HKCardOUT.csproj View File

@@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BPA.Communication" Version="1.0.42" />
<PackageReference Include="BPA.Helper" Version="1.0.28" />
<PackageReference Include="BPA.Helper" Version="1.0.32" />
<PackageReference Include="BPA.Message" Version="1.0.78" />
<PackageReference Include="CalcBinding" Version="2.5.2" />
<PackageReference Include="HandyControls" Version="3.4.1" />


+ 1
- 0
HKCardOUT/Helper/DataBus.cs View File

@@ -148,6 +148,7 @@ namespace HKCardOUT.Helper

public static void Send(ScreenModelSplitMeals screenModel)
{
if (!IsRunningMqtt) return;
SendScreenDataModel sendScreenData = new SendScreenDataModel();
sendScreenData.Name = ScreenDeviceType.分餐机;
sendScreenData.Value = screenModel;


+ 2
- 2
HKCardOUT/ViewModels/AdWindowViewModel.cs View File

@@ -116,7 +116,7 @@ namespace HKCardOUT.ViewModels
data.UserName = DataBus.UserListDto
.Where(t => t.Cards.Select(x => x.CardNum).Contains(data.CardNo))
.Select(x => x.Name).FirstOrDefault();
HKLog.HKLogImport.WriteInfo("取出刷卡信息" + data.ToJsonString());
HKLog.HKLogImport.WriteInfo("取出刷卡信息" + data.ToJson());
App.Current.Dispatcher.Invoke(() =>
{
if (LAdInfo.Info != null && !string.IsNullOrEmpty(LAdInfo.Info.UserName))
@@ -131,7 +131,7 @@ namespace HKCardOUT.ViewModels
}
else
{
HKLog.HKLogImport.WriteInfo("未包含屏幕" + BindScreen[i]);
//HKLog.HKLogImport.WriteInfo("未包含屏幕" + BindScreen[i]);
}
}
Thread.Sleep(10);


+ 1
- 0
HKControl/Main.cs View File

@@ -198,6 +198,7 @@ namespace HKControl
HKLog.HKLogImport.WriteInfo(ex.ToString());
}
Thread.Sleep(100);
//}), $"号设备监听", true);
}), $"{item.DeviceNum} 号设备监听", true);

//ThreadManage.GetInstance().StartLong(new Action(() =>


Loading…
Cancel
Save