Merge branch 'master' of https://git.steerinfo.com/caol/jisco_winform_wzjl.git

CarMeterSystem/Form1.cs

@@ -279,7 +279,7 @@ namespace CarMeterSystem
         private string firstCode = "";//上次扫码的信息
 
         private string ledTxt = "";
-        private bool isLedWrite = false;//是否写入一次LED
+        private bool isLedWrite = true;//是否写入一次LED
 
         private string sCarNo = "";
         private string editCarNo = "";
@@ -695,14 +695,15 @@ namespace CarMeterSystem
                         {
                             if (PbCache.monitor == null || string.IsNullOrEmpty(PbCache.monitor.ledWriter))
                             {
-                                PbCache.ledInfo = "欢迎使用酒钢汽车衡智能计量系统";
+                                PbCache.ledInfo = "未选择称重类型，请选择后开始计量";
                             }
                             else
                             {
                                 PbCache.ledInfo = PbCache.monitor == null ? "" : PbCache.monitor.ledWriter;
                             }
 
-                            //led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.ledInfo);
+                            //led_controler.setStaticLineMsg(PbCache.sportInfo.ledIp, PbCache.ledInfo);
+                            led_controler.setStaticLineMsg(PbCache.sportInfo.ledIp, PbCache.ledInfo);
 
                             isLedWrite = false;
 

MeterPlugInLibrary/LED/LED_Control.cs

@@ -140,12 +140,12 @@ namespace MeterPlugInLibrary
 
             LedDll.FONTPROP FontProp = new LedDll.FONTPROP();//文字属性
             FontProp.FontName = "宋体";
-            FontProp.FontSize = 18;
+            FontProp.FontSize = 12;
             FontProp.FontColor = LedDll.COLOR_RED;
             FontProp.FontBold = 0;
             //int nsize = System.Runtime.InteropServices.Marshal.SizeOf(typeof(LedDll.FONTPROP));
 
-            nResult = LedDll.LV_QuickAddSingleLineTextArea(hProgram, 1, 2, ref AreaRect, LedDll.ADDTYPE_STRING, "湖南视拓信息技术", ref FontProp, 1);//快速通过字符添加一个单行文本区域，函数见函数声明注示
+            nResult = LedDll.LV_QuickAddSingleLineTextArea(hProgram, 1, 2, ref AreaRect, LedDll.ADDTYPE_STRING, "湖南视拓信息技术", ref FontProp, 4);//快速通过字符添加一个单行文本区域，函数见函数声明注示
 
 
             AreaRect.left = 0;
@@ -153,7 +153,7 @@ namespace MeterPlugInLibrary
             AreaRect.width = 128;
             AreaRect.height = 20;
 
-            nResult = LedDll.LV_QuickAddSingleLineTextArea(hProgram, 1, 3, ref AreaRect, LedDll.ADDTYPE_STRING, "智能计量系统", ref FontProp, 1);//快速通过字符添加一个单行文本区域，函数见函数声明注示
+            nResult = LedDll.LV_QuickAddSingleLineTextArea(hProgram, 1, 3, ref AreaRect, LedDll.ADDTYPE_STRING, "智能计量系统", ref FontProp, 4);//快速通过字符添加一个单行文本区域，函数见函数声明注示
 
 
 
@@ -257,7 +257,7 @@ namespace MeterPlugInLibrary
 
             LedDll.FONTPROP FontProp = new LedDll.FONTPROP();//文字属性
             FontProp.FontName = "宋体";
-            FontProp.FontSize = 18;
+            FontProp.FontSize = 10;
             FontProp.FontColor = LedDll.COLOR_RED;
             FontProp.FontBold = 0;
             //int nsize = System.Runtime.InteropServices.Marshal.SizeOf(typeof(LedDll.FONTPROP));