工单 修复 微信复制图片上传不展示的bug
This commit is contained in:
1 parent
9c62e0c03d
commit
1d5b6ba0e4
2 files changed
+68
-9
No files matched your search
@@ -207,7 +207,7 @@ public sealed class PendingAttachmentViewModel : BindableBaseEx, IDisposable
|
|||||||
Path.GetTempPath(),
|
Path.GetTempPath(),
|
||||||
"WxOrder-Clipboard-" + Guid.NewGuid().ToString("N") + ".png");
|
"WxOrder-Clipboard-" + Guid.NewGuid().ToString("N") + ".png");
|
||||||
var encoder = new PngBitmapEncoder();
|
var encoder = new PngBitmapEncoder();
|
||||||
encoder.Frames.Add(BitmapFrame.Create(bitmap));
|
encoder.Frames.Add(BitmapFrame.Create(NormalizeClipboardBitmap(bitmap)));
|
||||||
using (var stream = File.Create(filePath))
|
using (var stream = File.Create(filePath))
|
||||||
encoder.Save(stream);
|
encoder.Save(stream);
|
||||||
|
|
||||||
@@ -236,6 +236,29 @@ public sealed class PendingAttachmentViewModel : BindableBaseEx, IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static BitmapSource NormalizeClipboardBitmap(BitmapSource bitmap)
|
||||||
|
{
|
||||||
|
if (bitmap.Format != PixelFormats.Bgra32 && bitmap.Format != PixelFormats.Pbgra32)
|
||||||
|
return bitmap;
|
||||||
|
|
||||||
|
var stride = checked(bitmap.PixelWidth * 4);
|
||||||
|
var pixels = new byte[checked(stride * bitmap.PixelHeight)];
|
||||||
|
bitmap.CopyPixels(pixels, stride, 0);
|
||||||
|
for (var i = 3; i < pixels.Length; i += 4)
|
||||||
|
{
|
||||||
|
if (pixels[i] != 0)
|
||||||
|
return bitmap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 微信等截图工具可能将 DIB 的保留字节全部置零,WPF 将其解释为 Alpha。
|
||||||
|
// 直接按 Bgr32 使用原始颜色,避免预乘 Alpha 转换时丢失 RGB;正常透明图保持原样。
|
||||||
|
var normalized = BitmapSource.Create(
|
||||||
|
bitmap.PixelWidth, bitmap.PixelHeight, bitmap.DpiX, bitmap.DpiY,
|
||||||
|
PixelFormats.Bgr32, null, pixels, stride);
|
||||||
|
normalized.Freeze();
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
if (_disposed)
|
if (_disposed)
|
||||||
|
|||||||
@@ -14,15 +14,51 @@ public partial class TicketComposerView : UserControl
|
|||||||
|
|
||||||
private void ChatTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
|
private void ChatTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
|
||||||
{
|
{
|
||||||
var isPaste = (e.Key == Key.V && Keyboard.Modifiers == ModifierKeys.Control) || (e.Key == Key.Insert && Keyboard.Modifiers == ModifierKeys.Shift);
|
var isPaste = (e.Key == Key.V && Keyboard.Modifiers == ModifierKeys.Control)
|
||||||
if (!isPaste || DataContext is not OrderSupportTicketViewModel viewModel) return;
|
|| (e.Key == Key.Insert && Keyboard.Modifiers == ModifierKeys.Shift);
|
||||||
|
if (!isPaste || DataContext is not OrderSupportTicketViewModel viewModel)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
IDataObject data;
|
IDataObject data;
|
||||||
try { data = Clipboard.GetDataObject(); } catch (ExternalException) { return; }
|
try
|
||||||
if (data == null) return;
|
{
|
||||||
if (data.GetDataPresent(DataFormats.Bitmap) && data.GetData(DataFormats.Bitmap) is BitmapSource bitmap) { viewModel.AddPendingImage(bitmap); e.Handled = true; return; }
|
data = Clipboard.GetDataObject();
|
||||||
if (!data.GetDataPresent(DataFormats.FileDrop) || data.GetData(DataFormats.FileDrop) is not string[] files) return;
|
}
|
||||||
var images = files.Where(path => PendingAttachmentViewModel.TryGetMimeType(System.IO.Path.GetExtension(path), out _)).ToArray();
|
catch (ExternalException)
|
||||||
if (images.Length == 0) return;
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.GetDataPresent(DataFormats.Bitmap)
|
||||||
|
&& data.GetData(DataFormats.Bitmap) is BitmapSource bitmap)
|
||||||
|
{
|
||||||
|
viewModel.AddPendingImage(bitmap);
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!data.GetDataPresent(DataFormats.FileDrop)
|
||||||
|
|| data.GetData(DataFormats.FileDrop) is not string[] files)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var images = files
|
||||||
|
.Where(path => PendingAttachmentViewModel.TryGetMimeType(System.IO.Path.GetExtension(path), out _))
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
if (images.Length == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
viewModel.AddPendingImages(images);
|
viewModel.AddPendingImages(images);
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user