diff --git a/AIParkingApplication/AIParkingApplicationForm.cs b/AIParkingApplication/AIParkingApplicationForm.cs index 849a7e1..b20113f 100644 --- a/AIParkingApplication/AIParkingApplicationForm.cs +++ b/AIParkingApplication/AIParkingApplicationForm.cs @@ -32,7 +32,7 @@ namespace AIParkingApplication StartLanes(); } - private void btnStopLaneIn_Click(object sender, System.EventArgs e) + private void btnStopLaneIn_Click(object sender, EventArgs e) { laneIn.Stop(); laneOut.Stop(); @@ -44,7 +44,7 @@ namespace AIParkingApplication laneOut.Start(); } - private void btnStartLaneIn_Click(object sender, System.EventArgs e) + private void btnStartLaneIn_Click(object sender, EventArgs e) { StartLanes(); } diff --git a/AIParkingApplication/LaneOut.cs b/AIParkingApplication/LaneOut.cs index c8c2f91..0d3df7d 100644 --- a/AIParkingApplication/LaneOut.cs +++ b/AIParkingApplication/LaneOut.cs @@ -95,7 +95,7 @@ namespace AIParkingApplication var saveLogResult = await apiController.SaveLog(LaneDirection.Out, cardInformation.CardRealID.ToString(), "1", result.PlateType, DateTime.Now.GetTimeFormatted(), result.PlateString, result.PlateImage, result.PlateImage, result.PlateImage, overviewVideoFrame, cardInformation.LogID.ToString()); - ShowCardInfoOnUI(cardNumber, result.PlateString, cardInformation.CardType, cardInformation.TimeIn, DateTime.Now.GetTimeFormatted(), saveLogResult.Cost); + ShowCardInfoOnUI(cardNumber, result.PlateString, cardInformation.PlateString, cardInformation.CardType, cardInformation.TimeIn, DateTime.Now.GetTimeFormatted(), saveLogResult.Cost); if (saveLogResult.Status) { @@ -180,10 +180,10 @@ namespace AIParkingApplication overviewCamera.Start(); } - private void ShowCardInfoOnUI(string cardNumber, string plateString, string cardType, string cardTimeIn, string cardTimeOut, string money) + private void ShowCardInfoOnUI(string cardNumber, string plateStringEngine, string plateInString, string cardType, string cardTimeIn, string cardTimeOut, string money) { lblCardNumber.UpdateLabel($"Số thẻ: {cardNumber}"); - lblPlateString.UpdateLabel($"Biển số: {plateString}"); + lblPlateString.UpdateLabel($"Biển số: {plateStringEngine}"); lblCardType.UpdateLabel($"Loại thẻ: {cardType}"); lblCardTime.UpdateLabel($"Vào: {cardTimeIn}"); lblCardTimeOut.UpdateLabel($"Ra: {cardTimeOut}"); @@ -191,7 +191,21 @@ namespace AIParkingApplication int.TryParse(money, out int moneyAmount); lblMoneyAmount.UpdateLabel($"Số tiền: {string.Format("{0:n0}", moneyAmount)} vnđ"); - lblStatusInfo.UpdateLabel(string.IsNullOrEmpty(plateString) ? "KHÔNG NHẬN DIỆN ĐƯỢC BIỂN SỐ" : $"MỜI XE {plateString} QUA", string.IsNullOrEmpty(plateString) ? Color.Red : Color.Green); + if (string.IsNullOrEmpty(plateStringEngine)) + { + lblStatusInfo.UpdateLabel("KHÔNG NHẬN DIỆN ĐƯỢC BIỂN SỐ", Color.Red); + } + else + { + if (plateStringEngine != plateInString) + { + lblStatusInfo.UpdateLabel("SO KHỚP BIỂN SỐ KHÔNG CHÍNH XÁC", Color.Red); + } + else + { + lblStatusInfo.UpdateLabel($"MỜI XE {plateStringEngine} QUA", Color.Red); + } + } } private void OverviewCameraOnVideoFrameReceived(Mat videoFrame)