|
@@ -193,7 +193,7 @@ namespace CarMeterSystem
|
|
|
// 20221011 By BourneCao
|
|
// 20221011 By BourneCao
|
|
|
// 增加双摄像头支持
|
|
// 增加双摄像头支持
|
|
|
// 1. 如果不为视觉识别，则正常赋值
|
|
// 1. 如果不为视觉识别，则正常赋值
|
|
|
- if (PbCache.collect.licType != 0)
|
|
|
|
|
|
|
+ if (PbCache.carNoSource != 1)
|
|
|
{
|
|
{
|
|
|
PbCache.lockCarNo = PbCache.collect.carno;
|
|
PbCache.lockCarNo = PbCache.collect.carno;
|
|
|
}
|
|
}
|
|
@@ -976,6 +976,21 @@ namespace CarMeterSystem
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}));
|
|
}));
|
|
|
|
|
+
|
|
|
|
|
+ #region 计量完成后，提交车号识别报警信息
|
|
|
|
|
+ // 如果车号识别方式为视觉识别;如果双摄像头识别类型为 1：只有一个识别，则正常赋值
|
|
|
|
|
+ if (PbCache.carNoSource == 1 && PbCache.collect.carnoAlert == "1")
|
|
|
|
|
+ {
|
|
|
|
|
+ MeterWorkScheduledHelp meterWorkScheduledHelp = new MeterWorkScheduledHelp();
|
|
|
|
|
+ meterWorkScheduledHelp.baseSpotNo = PbCache.sportInfo.baseSpotNo;
|
|
|
|
|
+ meterWorkScheduledHelp.baseSpotName = PbCache.sportInfo.baseSpotName;
|
|
|
|
|
+ meterWorkScheduledHelp.carNo = PbCache.collect.carno;
|
|
|
|
|
+ meterWorkScheduledHelp.helpContent = "双摄像头只有一个识别，请核查车号";
|
|
|
|
|
+ meterWorkScheduledHelp.warmType = "2";
|
|
|
|
|
+ meterWorkScheduledHelp.warmTypeName = "智能终端报警";
|
|
|
|
|
+ meterWorkScheduledHelpService.add(meterWorkScheduledHelp);
|
|
|
|
|
+ }
|
|
|
|
|
+ #endregion
|
|
|
}
|
|
}
|
|
|
catch (Exception ex)
|
|
catch (Exception ex)
|
|
|
{
|
|
{
|
|
@@ -1811,7 +1826,7 @@ namespace CarMeterSystem
|
|
|
// 20221011 By BourneCao
|
|
// 20221011 By BourneCao
|
|
|
// 增加双摄像头支持
|
|
// 增加双摄像头支持
|
|
|
// 1. 如果不为视觉识别，则正常赋值
|
|
// 1. 如果不为视觉识别，则正常赋值
|
|
|
- if (PbCache.collect.licType != 0)
|
|
|
|
|
|
|
+ if (PbCache.carNoSource != 1)
|
|
|
{
|
|
{
|
|
|
setMsgInfo(btnSave, "true", "2");
|
|
setMsgInfo(btnSave, "true", "2");
|
|
|
}
|
|
}
|
|
@@ -1826,6 +1841,12 @@ namespace CarMeterSystem
|
|
|
// 2.2 如果 2：都识别但不一致 3：都不识别，则不保存
|
|
// 2.2 如果 2：都识别但不一致 3：都不识别，则不保存
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
|
|
+ PbCache.isLockFrm = false;
|
|
|
|
|
+ //btnSave.Enabled = true;
|
|
|
|
|
+ setMsgInfo(btnSave, "false", "2");
|
|
|
|
|
+ setMsg("车号未识别，请扫码计量" + "");
|
|
|
|
|
+ vicPlayClass.GetVoicePlay("车号为空，请联系处理", PbCache.lockCarNo);
|
|
|
|
|
+ led_controler.setStaticLineMsg(PbCache.sportInfo.ledIp, "车号未识别，请扫码计量");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
BourneCao