LED和视频上传

CarMeterSystem/Form1.cs

@@ -610,7 +610,7 @@ namespace CarMeterSystem
 
                                 if (string.IsNullOrEmpty(ledTxt))
                                 {
-                                    ledTxt = "欢迎使用九钢汽车衡智能计量系统！";
+                                    ledTxt = "车号甘A12345，重量98.76吨，计量完成";
                                 }
                             }
                         }
@@ -695,7 +695,7 @@ namespace CarMeterSystem
                         {
                             if (PbCache.monitor == null || string.IsNullOrEmpty(PbCache.monitor.ledWriter))
                             {
-                                PbCache.ledInfo = "未选择称重类型，请选择后开始计量";
+                                PbCache.ledInfo = "车号甘A12345，重量98.76吨，计量完成";
                             }
                             else
                             {

MeterPlugInLibrary/LED/LED_Control.cs

@@ -95,7 +95,7 @@ namespace MeterPlugInLibrary
             }
         }
 
-        public void setTwoLineMsg(string Ip) 
+        public void setTwoLineMsg(string Ip, string msg1, string msg2) 
         {
             int nResult;
             LedDll.COMMUNICATIONINFO CommunicationInfo = new LedDll.COMMUNICATIONINFO();//定义一通讯参数结构体变量用于对设定的LED通讯，具体对此结构体元素赋值说明见COMMUNICATIONINFO结构体定义部份注示
@@ -145,7 +145,7 @@ namespace MeterPlugInLibrary
             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, 4);//快速通过字符添加一个单行文本区域，函数见函数声明注示
+            nResult = LedDll.LV_QuickAddSingleLineTextArea(hProgram, 1, 2, ref AreaRect, LedDll.ADDTYPE_STRING, msg1, ref FontProp, 4);//快速通过字符添加一个单行文本区域，函数见函数声明注示
 
 
             AreaRect.left = 0;

MeterPlugInLibrary/图片处理/ImageControl.cs

@@ -88,7 +88,7 @@ namespace MeterPlugInLibrary
                     //删除正式目录文件
                     if (Directory.Exists(sPath))//如果不存在就不用删
                     {
-                        RemoveRedundantDir(Path.Combine(sPath, "formalImg"), 0);
+                        //RemoveRedundantDir(Path.Combine(sPath, "formalImg"), 0);
                     }
                     i = 7;
                 }

MeterPlugInLibrary/图片处理/ImageCurlControl.cs

@@ -75,7 +75,7 @@ namespace MeterPlugInLibrary
                     //删除正式目录文件
                     if (Directory.Exists(sPath))//如果不存在就不用删
                     {
-                        RemoveRedundantDir(Path.Combine(sPath, "formalImg"), 0);
+                        //RemoveRedundantDir(Path.Combine(sPath, "formalImg"), 0);
                     }
                     i = 7;
                 }
@@ -134,7 +134,7 @@ namespace MeterPlugInLibrary
                     //验证文件名是否合法
                     string filename = Path.GetFileName(_filepath);
                     //filename :  计量作业编号_序号.jpg   计量作业编号：计量点编号+年月日时分秒
-                    MeterWorkImage ci = ParseFileName(filename, ftpdir);
+                    MeterWorkImage ci = ParseFileName(filename, ftpdir.Replace("upload", "download"));
 
                     if (ci == null) continue;