From 8f74125c817797128e1f82d7c5356eb2edcaa21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=BD=87=E9=98=B3?= <wanna_zxy@yeah.net>
Date: Fri, 17 May 2024 09:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E6=8B=8D=E4=BB=AA?=
 =?UTF-8?q?=E4=B8=8E=E7=AD=BE=E5=AD=97=E7=89=88=E8=8E=B7=E5=8F=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DevicesService/Commen/COMUtils.cs             | 3 +--
 DevicesService/Commen/ScriptCallbackObject.cs | 4 +++-
 DevicesService/Commen/Util.cs                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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 "";