Browse Source

双扫码优化

BourneCao 3 years ago
parent
commit
324c3653f0

+ 3 - 2
CarMeterSystem/frmMain.cs

@@ -94,7 +94,7 @@ namespace CarMeterSystem
         private List<ucBusinessType> lu = new List<ucBusinessType>();
 
         private bool isVoiceDownCar = false;//车上人员请下车播放一次
-        private bool isShowFrmWelcome = true; //是否显示欢迎界面
+        private bool isShowFrmWelcome = false; //是否显示欢迎界面
 
         private bool isOpened = false;//是否已经打开了扫码计量界面
 
@@ -842,7 +842,8 @@ namespace CarMeterSystem
 
                         #region RFID识别车号信息
                         mwUpdate.rfidCar = "";
-                        mwUpdate.photoCar = e.vdioCarNos;
+                        mwUpdate.photoCar = e.videoCarNo1;
+                        mwUpdate.photoCar2 = e.videoCarNo2;
                         mwUpdate.scanCar = "";
                         if (codeFlag)
                         {

+ 5 - 0
Common/vo/work/MeterWorkMonitor.cs

@@ -145,6 +145,11 @@ namespace Common
         /// </summary>
         public string photoCar { get; set; }
 
+        /// <summary>
+        /// 抓拍车号2
+        /// </summary>
+        public string photoCar2 { get; set; }
+
         /// <summary>
         /// 扫描车号
         /// </summary>

+ 9 - 10
MeterPlugInLibrary/实时库数据采集/DataCollectionControl.cs

@@ -96,20 +96,19 @@ namespace MeterPlugInLibrary
                             WriteThreadLog("jArray:"+jArray.ToString());
                         }
 
+                        // 20221011 By BourneCao 
+                        // 增加双摄像头支持
+                        // 1. 获取双摄像头车号
+                        string carNo1 = jArray[8].ToString();
+                        string carNo2 = jArray[14].ToString();
+
+                        arg.videoCarNo1 = carNo1;
+                        arg.videoCarNo2 = carNo2;
+
                         if (arg.licType == 0) //摄像头的数据
                         {
                             //arg.carno = jArray[2].ToString();
 
-                            
-                            // 20221011 By BourneCao 
-                            // 增加双摄像头支持
-                            // 1. 获取双摄像头车号
-                            string carNo1 = jArray[8].ToString();
-                            string carNo2 = jArray[14].ToString();
-
-                            arg.videoCarNo1 = carNo1;
-                            arg.videoCarNo2 = carNo2;
-
                             // 2. 判断逻辑:
                             //  a.A车号识别,B车号不识别;B车号识别,A车号不识别,正常计量,标记只有1个车号识别
                             if (carNo1 != "" && carNo2 == "")