From e35f7f1e418746dcf73f3626fc72b9f592a999b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=BA=A2=E5=B8=BD?= <761716178@qq.com> Date: Mon, 15 Jan 2024 22:53:10 +0800 Subject: [PATCH] =?UTF-8?q?Picture=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0Load?= =?UTF-8?q?ingImage=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CPF.Android/OpenGLView.cs | 5 +++++ CPF.Windows/ClipboardImpl.cs | 22 ++++++++++++++---- CPF/Controls/Picture.cs | 41 +++++++++++++++++++++++++++++++++- CPF/Styling/ResourceManager.cs | 16 +++++++++++++ 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/CPF.Android/OpenGLView.cs b/CPF.Android/OpenGLView.cs index 4a0d31f..9badbf0 100644 --- a/CPF.Android/OpenGLView.cs +++ b/CPF.Android/OpenGLView.cs @@ -257,5 +257,10 @@ namespace CPF.Android const string lib = "/system/lib/egl/libEGL_mali.so"; [DllImport(lib)] public extern static IntPtr eglGetProcAddress(string procname); + + public void MakeCurrent() + { + + } } } \ No newline at end of file diff --git a/CPF.Windows/ClipboardImpl.cs b/CPF.Windows/ClipboardImpl.cs index 5a769db..abd55ca 100644 --- a/CPF.Windows/ClipboardImpl.cs +++ b/CPF.Windows/ClipboardImpl.cs @@ -406,8 +406,22 @@ namespace CPF.Windows case DataFormat.Text: if (formatId == (int)UnmanagedMethods.ClipboardFormat.CF_TEXT) { - var rv = Marshal.PtrToStringAnsi(hText); - return rv; + try + { + var rv = Marshal.PtrToStringAnsi(hText);//在Unity 里会报错 + return rv; + } + catch (Exception e) + { + System.Diagnostics.Debug.WriteLine(e); + Console.WriteLine(e); + var dwBufSize = (int)UnmanagedMethods.GlobalSize(hText); + //var ss = new String((sbyte*)hText, 0, dwBufSize); + byte[] cc = new byte[dwBufSize]; + Marshal.Copy(hText, cc, 0, (int)dwBufSize); + string ss = Encoding.GetEncoding("GBK").GetString(cc).TrimEnd('\0'); + return ss; + } } else { @@ -464,7 +478,7 @@ namespace CPF.Windows #if Net4 var bmp = (UnmanagedMethods.BITMAPINFOHEADER)Marshal.PtrToStructure(ptr, typeof(UnmanagedMethods.BITMAPINFOHEADER)); #else - var bmp = Marshal.PtrToStructure(ptr); + var bmp = Marshal.PtrToStructure(ptr); #endif IntPtr screenDC = UnmanagedMethods.GetDC(IntPtr.Zero); @@ -478,7 +492,7 @@ namespace CPF.Windows var hBitmap = UnmanagedMethods.CreateDIBSection(memDc, ref info, 0, out IntPtr ppvBits, IntPtr.Zero, 0); var oldBits = UnmanagedMethods.SelectObject(memDc, hBitmap);//将位图载入上下文 //_ = UnmanagedMethods.GlobalLock(hText); - _ = UnmanagedMethods.StretchDIBits(memDc, 0, 0, bmp.biWidth, bmp.biHeight, 0, 0, bmp.biWidth, bmp.biHeight, (ptr + sizeof(UnmanagedMethods.BITMAPINFOHEADER)), ref info, 0, (uint)TernaryRasterOperations.SRCCOPY); + _ = UnmanagedMethods.StretchDIBits(memDc, 0, 0, bmp.biWidth, Math.Abs(bmp.biHeight), 0, 0, bmp.biWidth, Math.Abs(bmp.biHeight), (ptr + sizeof(UnmanagedMethods.BITMAPINFOHEADER)), ref info, 0, (uint)TernaryRasterOperations.SRCCOPY); //sizeof(UnmanagedMethods.BITMAPFILEHEADER) + //var c = sizeof(UnmanagedMethods.BITMAPINFOHEADER); diff --git a/CPF/Controls/Picture.cs b/CPF/Controls/Picture.cs index 842d4d3..9b10a67 100644 --- a/CPF/Controls/Picture.cs +++ b/CPF/Controls/Picture.cs @@ -26,6 +26,17 @@ namespace CPF.Controls } + /// + /// 加载中显示的图片 + /// + [TypeConverter(typeof(StringConverter)), CPF.Design.FileBrowser(".png;.jpg;.bmp;.gif")] + [PropertyMetadata(null)] + [Description("加载中显示的图片")] + public Image LoadingImage + { + get { return GetValue(); } + set { SetValue(value); } + } /// /// 图片源，可以是路径、Url、Drawing.Image对象、Stream、byte[] /// @@ -124,6 +135,10 @@ namespace CPF.Controls timer = null; } } + if (img != null && img != ResourceManager.ErrorImage && img != LoadingImage) + { + RaiseEvent(EventArgs.Empty, nameof(ImageLoaded)); + } } //int frameTimer = 0; private void Timer_Tick(object sender, EventArgs e) @@ -165,8 +180,18 @@ namespace CPF.Controls Invalidate(); } } + + [PropertyChanged(nameof(LoadingImage))] + void OnLoadingImage(object newValue, object oldValue, PropertyMetadataAttribute attribute) + { + var load = newValue as Image; + if (load != null && img == null) + { + SetImage(load); + } + } [PropertyChanged(nameof(Source))] - void RegisterSource(object newValue, object oldValue, PropertyMetadataAttribute attribute) + void OnSource(object newValue, object oldValue, PropertyMetadataAttribute attribute) { if (newValue != null) { @@ -183,6 +208,11 @@ namespace CPF.Controls else if (newValue is string) { var s = newValue as string; + var load = LoadingImage; + if (load != null) + { + SetImage(load); + } ResourceManager.GetImage(s, a => { Invoke(() => @@ -403,6 +433,15 @@ namespace CPF.Controls remove { RemoveHandler(value); } } + /// + /// 图片加载 + /// + public event EventHandler ImageLoaded + { + add { AddHandler(value); } + remove { RemoveHandler(value); } + } + protected override void OnOverrideMetadata(OverrideMetadata overridePropertys) { base.OnOverrideMetadata(overridePropertys); diff --git a/CPF/Styling/ResourceManager.cs b/CPF/Styling/ResourceManager.cs index d1661d5..8688f00 100644 --- a/CPF/Styling/ResourceManager.cs +++ b/CPF/Styling/ResourceManager.cs @@ -78,6 +78,22 @@ namespace CPF.Styling } set { errorImage = value; } } + static Image loadingImage; + /// + /// 获取或设置加载图片 + /// + public static Image LoadingImage + { + get + { + if (loadingImage == null || loadingImage.ImageImpl == null) + { + GetImage("res://CPF/loading.gif", a => loadingImage = a); + } + return loadingImage; + } + set { loadingImage = value; } + } static ConcurrentDictionary> res = new ConcurrentDictionary>(); static ConcurrentDictionary>> downloading = new ConcurrentDictionary>>();