diff --git a/DevicesService/Commen/COMUtils.cs b/DevicesService/Commen/COMUtils.cs index efc33e3..fcc02a8 100644 --- a/DevicesService/Commen/COMUtils.cs +++ b/DevicesService/Commen/COMUtils.cs @@ -189,8 +189,7 @@ namespace DevicesService.Common { FileStream fs1 = fileInfo.OpenRead(); fs1.Close(); - resultback = Util.ConvertImageToBase64(sourcepaht); - File.Delete(sourcepaht); + resultback = Util.ImgToBase64String(sourcepaht); int width = 800; int height = 394; using (Bitmap blankImage = new Bitmap(width, height)) diff --git a/DevicesService/Commen/ScriptCallbackObject.cs b/DevicesService/Commen/ScriptCallbackObject.cs index 039d566..75b6b66 100644 --- a/DevicesService/Commen/ScriptCallbackObject.cs +++ b/DevicesService/Commen/ScriptCallbackObject.cs @@ -202,8 +202,10 @@ namespace DevicesService.Common if (!string.IsNullOrEmpty(data)) { FileInfo fileInfo = new FileInfo(data); + //压缩 string newdata = Util.CompressPictures(fileInfo); - string base64 = Util.ImgToBase64String(data); + //转换 + string base64 = Util.ImgToBase64String(newdata); //Task.Run(async () => //{ // UploadInfoByFile(url, data); diff --git a/DevicesService/Commen/Util.cs b/DevicesService/Commen/Util.cs index bd7fd44..5b78f6f 100644 --- a/DevicesService/Commen/Util.cs +++ b/DevicesService/Commen/Util.cs @@ -56,7 +56,7 @@ namespace DevicesService.Common ms.Read(arr, 0, (int)ms.Length); ms.Close(); bmp.Dispose(); - //File.Delete(fileLocation); + File.Delete(fileLocation); return Convert.ToBase64String(arr); } return "";