Merge branch 'master' of http://106.15.194.121:8083/zdl/ns200

DeviceLibrary/AutoScanAndLabel/Common.cs

@@ -868,7 +868,7 @@ namespace DeviceLibrary
                 {
                     Directory.CreateDirectory(filepath);
                 }
-                else if (Directory.GetFiles(filepath).Length > 100)
+                if (Directory.GetFiles(filepath).Length > 100)
                 {
                     try
                     {
@@ -882,9 +882,12 @@ namespace DeviceLibrary
                 }
 
                 Bitmap bitmaps = (Bitmap)bitmap.Clone();
-                bitmaps.Save(filepath + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + DateTime.Now.Millisecond + ".jpg");
+                filepath = filepath + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + DateTime.Now.Millisecond + ".jpg";
+                bitmaps.Save(filepath);
                 LabelResult?.Invoke(new LabelResult() { Bitmap = (Bitmap)bitmap.Clone() });
                 bitmap.Dispose();
+
+                LogUtil.info($"保存坐标图片: {filepath}");
             }
             catch (Exception ex)
             {