使用某些截图工具截图复制后，无法触发上传

Jeric-X · Jun 11, 2024 · 3b72a34 · 3b72a34
1 parent e64ee30
commit 3b72a34
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/SyncClipboard.Core/Models/ClipboardMetaInfomation.cs b/src/SyncClipboard.Core/Models/ClipboardMetaInfomation.cs
@@ -33,7 +33,7 @@ public virtual bool Equals(ClipboardMetaInfomation? other)
             && EqualityContract == other.EqualityContract
             && EqualityComparer<string>.Default.Equals(Text, other.Text)
             && EqualityComparer<string>.Default.Equals(Html, other.Html)
-            //&& EqualityComparer<IClipboardImage>.Default.Equals(Image, other.Image)
+            && EqualityComparer<IClipboardImage>.Default.Equals(Image, other.Image)
             && SameFIles(other.Files)
             && EqualityComparer<DragDropEffects?>.Default.Equals(Effects, other.Effects)
             && EqualityComparer<string>.Default.Equals(OriginalType, other.OriginalType));
@@ -55,6 +55,7 @@ public override int GetHashCode()
             Files?.ListHashCode() ?? 0,
             Effects?.GetHashCode() ?? 0,
             OriginalType?.GetHashCode() ?? 0,
+            Image?.GetHashCode() ?? 0,
         };
 
         return hashList.ListHashCode();

diff --git a/src/SyncClipboard.Core/Utilities/ClipboardImage.cs b/src/SyncClipboard.Core/Utilities/ClipboardImage.cs
@@ -52,4 +52,19 @@ private static void WriteToFile(string file)
         Cache.Seek(0, SeekOrigin.Begin);
         Cache.CopyTo(fileStream);
     }
+
+    public override bool Equals(object? obj)
+    {
+        if (obj == null || GetType() != obj.GetType())
+        {
+            return false;
+        }
+
+        return _imageBytes.SequenceEqual(((ClipboardImage)obj)._imageBytes);
+    }
+
+    public override int GetHashCode()
+    {
+        return _imageBytes.ListHashCode();
+    }
 }
diff --git a/src/SyncClipboard.Desktop/AppConfig.cs b/src/SyncClipboard.Desktop/AppConfig.cs
@@ -6,7 +6,7 @@ internal class AppConfig : IAppConfig
 {
     public string AppId => Env.AppId;
     public string AppStringId => "SyncClipboard.Desktop";
-    public string AppVersion => "0.7.3.1";
+    public string AppVersion => "0.7.3.2";
     public string UpdateApiUrl => "https://api.github.com/repos/Jeric-X/SyncClipboard.Desktop/releases";
     public string UpdateUrl => "https://github.com/Jeric-X/SyncClipboard.Desktop/releases/latest";
 }
diff --git a/src/SyncClipboard.Desktop/Changes.md b/src/SyncClipboard.Desktop/Changes.md
@@ -1,5 +1,6 @@
-0.7.3.1
+0.7.3.2
 - 修复：不设置hash上传图片/文件到服务器后，桌面客户端会无限重复设置剪贴板
+- 修复：使用某些截图工具截图复制后，无法触发上传(https://github.com/Jeric-X/SyncClipboard/issues/88)
 
 0.7.3
 - 修复：macOS Menu Bar图标在同步关闭状态下被裁切、颜色错误