diff --git a/HKCardOUT/Logic/RemoteService.cs b/HKCardOUT/Logic/RemoteService.cs index bee2c0b..4501795 100644 --- a/HKCardOUT/Logic/RemoteService.cs +++ b/HKCardOUT/Logic/RemoteService.cs @@ -147,14 +147,39 @@ namespace HKCardOUT.Logic { GateFood = new List() }; + //5号档口和6号档口显示的菜品 SubFoodDto dto1 = new SubFoodDto { GateId = "2edbe98d-019c-4c3c-87d8-6876aa866233", Foods = new List { - "红烧狮子头","蒜苔肉丝","回锅肉","蒜泥白肉","炒白菜","炒茄子" + "红烧狮子头","蒜苔肉丝","回锅肉","泥白肉","炒白菜","炒茄子" } }; dtos.GateFood.Add(dto1); + + //3号档口和4号档口显示的菜品 + SubFoodDto dto12 = new SubFoodDto + { + GateId = "6ff37c6a-5151-4032-8eca-073a0a900090", + Foods = new List { + "红烧狮子头","蒜苔肉丝","回锅肉","蒜泥白肉","炒白菜","炒茄子" + } + }; + dtos.GateFood.Add(dto12); + + //5号档口和6号档口显示的菜品 + SubFoodDto dto123 = new SubFoodDto + { + GateId = "39eb5b22-98b4-46f6-9c7e-5f0d3bc61058", + Foods = new List { + "红烧狮子头","蒜苔肉丝","回锅肉","蒜泥白肉","炒白菜","炒茄子" + } + }; + dtos.GateFood.Add(dto123); + + //6ff37c6a-5151-4032-8eca-073a0a900090 + //6ff37c6a-5151-4032-8eca-073a0a900090 + //dtos.GateFood.Add(dto1); DataBus.Menu = dtos; } public static void GetRangeCtrl() diff --git a/HKCardOUT/Views/AdWindow.xaml.cs b/HKCardOUT/Views/AdWindow.xaml.cs index c4defe6..00b09fe 100644 --- a/HKCardOUT/Views/AdWindow.xaml.cs +++ b/HKCardOUT/Views/AdWindow.xaml.cs @@ -41,9 +41,9 @@ namespace HKCardOUT.Views if (BindScreen != -1) { int[] NotchNum = new int[2]; - if (bindScreen == 1) { NotchNum[0] = 1; NotchNum[1] = 2; } - if (bindScreen == 2) { NotchNum[0] = 5; NotchNum[1] = 6; } - if (bindScreen == 0) { NotchNum[0] = 3; NotchNum[1] = 4; } + if (bindScreen == 0) { NotchNum[0] = 1; NotchNum[1] = 2; } + if (bindScreen == 1) { NotchNum[0] = 5; NotchNum[1] = 6; } + if (bindScreen == 2) { NotchNum[0] = 3; NotchNum[1] = 4; } (this.DataContext as AdWindowViewModel).InitData(NotchNum); ThreadManage.GetInstance().StartLong(new Action(() => diff --git a/HKControl/Main.cs b/HKControl/Main.cs index 4676220..edbc425 100644 --- a/HKControl/Main.cs +++ b/HKControl/Main.cs @@ -25,6 +25,7 @@ namespace HKControl /// public bool GetIsSwipe(int CarNum) { + if (!DataModels.ContainsKey(CarNum)) return false; switch (CarNum) { case 1: @@ -52,6 +53,7 @@ namespace HKControl /// public bool GetIsComplete(int CarNum) { + if (!DataModels.ContainsKey(CarNum)) return false; switch (CarNum) { case 1: