diff --git a/SunnyUI/Common/FastLZx64.dat b/SunnyUI/Common/FastLZx64.dat deleted file mode 100644 index b6f01037..00000000 Binary files a/SunnyUI/Common/FastLZx64.dat and /dev/null differ diff --git a/SunnyUI/Common/FastLZx86.dat b/SunnyUI/Common/FastLZx86.dat deleted file mode 100644 index 2e72915f..00000000 Binary files a/SunnyUI/Common/FastLZx86.dat and /dev/null differ diff --git a/SunnyUI/Common/UCompress.cs b/SunnyUI/Common/UCompress.cs deleted file mode 100644 index 30e083a3..00000000 --- a/SunnyUI/Common/UCompress.cs +++ /dev/null @@ -1,146 +0,0 @@ -/****************************************************************************** - * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。 - * CopyRight (C) 2012-2024 ShenYongHua(沈永华). - * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com - * - * Blog: https://www.cnblogs.com/yhuse - * Gitee: https://gitee.com/yhuse/SunnyUI - * GitHub: https://github.com/yhuse/SunnyUI - * - * SunnyUI.dll can be used for free under the GPL-3.0 license. - * If you use this code, please keep this note. - * 如果您使用此代码，请保留此说明。 - ****************************************************************************** - * 文件名称: UCompress.cs - * 文件说明: 数据帧压缩类 - * 当前版本: V3.4 - * 创建日期: 2023-07-17 - * - * 2023-07-17: V3.4.0 增加文件说明 -******************************************************************************/ - -using System; -using System.Runtime.InteropServices; - -namespace Sunny.UI -{ - public enum DataFrameCompressType - { - [DisplayText("None")] - None = 0, - - [DisplayText("FastLZ")] - FastLZ = 1, - - [DisplayText("ZLib")] - ZLib = 2, - - [DisplayText("GZip")] - GZip = 3, - - [DisplayText("Deflate")] - Deflate = 4 - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)] - public struct DataFrame - { - public DateTime DateTime; - public byte[] Data; - public int Index; - public int CRC; - - public DataFrame(DateTime dateTime, byte[] data, int index, int crc) - { - DateTime = dateTime; - Data = data; - Index = index; - CRC = crc; - } - - public static DataFrame Empty() - { -#if NET40 - return new DataFrame(DateTime.MinValue, new byte[0], -1, 0); -#else - return new DataFrame(DateTime.MinValue, Array.Empty(), -1, 0); -#endif - } - } - - public static class DataFrameCompressHelper - { - public static byte[] Compress(DataFrame frame, DataFrameCompressType compressType, out int compressedLength, out int decompressLength) - { - byte[] compressed; - decompressLength = frame.Data.Length; - switch (compressType) - { - case DataFrameCompressType.None: - compressed = frame.Data; - break; - case DataFrameCompressType.FastLZ: - if (FastLZ.CheckFastLZDll()) - { - compressed = FastLZ.Compress(frame.Data, 0, frame.Data.Length); - decompressLength = Math.Max(frame.Data.Length * 2, 66); - } - else - { - throw new NullReferenceException("FastLZx86.dll and FastLZx64.dll not exists."); - } - break; - case DataFrameCompressType.ZLib: - compressed = frame.Data.ZLibCompress(); - break; - case DataFrameCompressType.GZip: - compressed = frame.Data.GZipCompress(); - break; - case DataFrameCompressType.Deflate: - compressed = frame.Data.DeflateCompress(); - break; - default: - compressed = frame.Data; - break; - } - - compressedLength = compressed.Length; - return compressed; - } - - public static byte[] Decompress(byte[] package, DataFrameCompressType compressType, int decompressLength) - { - byte[] data; - switch (compressType) - { - case DataFrameCompressType.None: - data = package; - break; - case DataFrameCompressType.FastLZ: - if (FastLZ.CheckFastLZDll()) - { - data = FastLZ.Decompress(package, 0, package.Length, decompressLength); - } - else - { - throw new NullReferenceException("FastLZx86.dll and FastLZx64.dll not exists."); - } - break; - case DataFrameCompressType.ZLib: - data = package.ZLibDecompress(); - break; - case DataFrameCompressType.GZip: - data = package.GZipDecompress(); - break; - case DataFrameCompressType.Deflate: - data = package.DeflateDecompress(); - break; - default: - data = package; - break; - } - - return data; - } - } -} diff --git a/SunnyUI/Common/UFastLZ.cs b/SunnyUI/Common/UFastLZ.cs deleted file mode 100644 index 369639cd..00000000 --- a/SunnyUI/Common/UFastLZ.cs +++ /dev/null @@ -1,356 +0,0 @@ -/****************************************************************************** - * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。 - * CopyRight (C) 2012-2024 ShenYongHua(沈永华). - * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com - * - * Blog: https://www.cnblogs.com/yhuse - * Gitee: https://gitee.com/yhuse/SunnyUI - * GitHub: https://github.com/yhuse/SunnyUI - * - * SunnyUI.dll can be used for free under the GPL-3.0 license. - * If you use this code, please keep this note. - * 如果您使用此代码，请保留此说明。 - ****************************************************************************** - * 文件名称: FastLZ.cs - * 文件说明: FastLZ压缩解压类 - * 当前版本: V3.1 - * 创建日期: 2022-03-31 - * 引用地址: https://ariya.github.io/FastLZ/ - * - * FastLZ (MIT license) is an ANSI C/C90 implementation of Lempel-Ziv 77 - * algorithm (LZ77) of lossless data compression. It is suitable to compress - * series of text/paragraphs, sequences of raw pixel data, or any other blocks - * of data with lots of repetition. It is not intended to be used on images, - * videos, and other formats of data typically already in an optimal - * compressed form. - * - * 2022-03-31: V3.1.2 增加文件说明 - * 2022-07-07: V3.2.1 增加了扩展的自定义压缩解压方法 - * 2022-07-07: V3.2.1 增加内置FastLZx86.dll、FastLZx64.dll资源文件 - ****************************************************************************** - * 压缩函数 - * int fastlz_compress_level(int level, const void* input, int length, void* output); - * - * level： 压缩级别，目前，仅支持级别1和级别2。 - * 级别1是最快的压缩，通常对短数据有用。 - * 级别2稍微慢一点，但它提供了更好的压缩比。 - * 无论级别如何，压缩数据都可以使用下面的函数fastlz_decompress进行解压缩。 - * - * input： 输入缓冲区，用于存放要压缩的数据。 - * length： 输入缓冲区的大小，最小输入缓冲区大小为16。 - * output： 输出缓冲区，用于存放压缩后的数据。输出缓冲区必须至少比输入缓冲区大5%，并且不能小于66字节。 - * - * 返回值是压缩后的数据大小，如果输入不可压缩，则返回值可能大于长度。注意，输入缓冲区和输出缓冲区不能重叠。 - ****************************************************************************** - * 解压函数 - * int fastlz_decompress(const void* input, int length, void* output, int maxout); - * - * input： 输入缓冲区，用于存放要解压的数据。 - * length： 输入缓冲区的长度。 - * output： 输出缓冲区，用于存放解压后的数据。 - * maxout： 输出缓冲区的所能容纳的最大长度。解压时会保证输出缓冲区的写入量不会超过maxout中指定的值。 - * - * 返回值是解压后的数据大小。如果发生错误，例如压缩数据损坏或输出缓冲区不够大，则将返回0。 - * 注意，输入缓冲区和输出缓冲区不能重叠。 - ****************************************************************************** - * 扩展CompressEx，DecompressEx - * 扩展压缩结果增加16个字节头部和8个字节尾部，以!开头，\r\n结尾 - * 20个字节头部: - * 4字节标识(!FLZ) - * 4字节时间戳高位，精确到秒Seconds，这是Unix时间戳，以Jan1st1970开始的秒数（可空） - * 4字节时间戳低位，能够精确到毫秒Milliseconds（可空） - * 4字节(输出缓冲区的所能容纳的最大长度maxout) - * 4字节(当前数据大小) - * 8个字节尾部: - * 4字节序号（可空） - * 1字节(*) - * 1字节(CRC,累加和,0不判断) - * 2字节(\r\n) - ****************************************************************************** - * FastLZx86.dll、FastLZx64.dll见项目 https://gitee.com/yhuse/SunnyUI.FastLZ -******************************************************************************/ - -using System; -using System.IO; -using System.Runtime.InteropServices; - -namespace Sunny.UI -{ - public static unsafe class FastLZx86 - { - [DllImport("FastLZx86.dll", EntryPoint = "FastLZ_Compress", CallingConvention = CallingConvention.Cdecl)] - public static extern int FastLZ_Compress(void* input, int length, void* output); - - [DllImport("FastLZx86.dll", EntryPoint = "FastLZ_Compress_level", CallingConvention = CallingConvention.Cdecl)] - public static extern int FastLZ_Compress_level(int level, void* input, int length, void* output); - - [DllImport("FastLZx86.dll", EntryPoint = "FastLZ_Decompress", CallingConvention = CallingConvention.Cdecl)] - public static extern int FastLZ_Decompress(void* input, int length, void* output, int maxout); - } - - public static unsafe class FastLZx64 - { - [DllImport("FastLZx64.dll", EntryPoint = "FastLZ_Compress", CallingConvention = CallingConvention.Cdecl)] - public static extern int FastLZ_Compress(void* input, int length, void* output); - - [DllImport("FastLZx64.dll", EntryPoint = "FastLZ_Compress_level", CallingConvention = CallingConvention.Cdecl)] - public static extern int FastLZ_Compress_level(int level, void* input, int length, void* output); - - [DllImport("FastLZx64.dll", EntryPoint = "FastLZ_Decompress", CallingConvention = CallingConvention.Cdecl)] - public static extern int FastLZ_Decompress(void* input, int length, void* output, int maxout); - } - - public enum FastLZCompressionLevel - { - Level1 = 1, - Level2 = 2 - } - - /// - /// FastLZ压缩解压类 - /// - public static unsafe class FastLZ - { - /// - /// 是否64位 - /// - /// - private static bool Is64bitApp() - { - return IntPtr.Size == 8; - } - - /// - /// 压缩(原生） - /// - /// 输入 - /// 起始位置 - /// 长度 - /// 压缩结果 - public static byte[] Compress(byte[] input, int begin, int length) - { - CheckFastLZDll(); - byte[] output = new byte[Math.Max(length * 2, 66)]; - fixed (void* pSrc1 = &input[begin]) - fixed (void* pSrc2 = output) - { - int outlen = Is64bitApp() ? FastLZx64.FastLZ_Compress(pSrc1, length, pSrc2) : FastLZx86.FastLZ_Compress(pSrc1, length, pSrc2); - byte[] result = new byte[outlen]; - Array.Copy(output, 0, result, 0, outlen); - return result; - } - } - - /// - /// 压缩(原生） - /// - /// 压缩级别 - /// 输入 - /// 起始位置 - /// 长度 - /// 压缩结果 - public static byte[] Compress(FastLZCompressionLevel level, byte[] input, int begin, int length) - { - CheckFastLZDll(); - byte[] output = new byte[Math.Max(length * 2, 66)]; - fixed (void* pSrc1 = &input[begin]) - fixed (void* pSrc2 = output) - { - int outlen = Is64bitApp() ? FastLZx64.FastLZ_Compress_level((int)level, pSrc1, length, pSrc2) : FastLZx86.FastLZ_Compress_level((int)level, pSrc1, length, pSrc2); - byte[] result = new byte[outlen]; - Array.Copy(output, 0, result, 0, outlen); - return result; - } - } - - /// - /// 解压缩(原生） - /// - /// 输入 - /// 起始位置 - /// 长度 - /// 解压结果最大长度 - /// 解压缩结果 - public static byte[] Decompress(byte[] input, int begin, int length, int maxout) - { - CheckFastLZDll(); - byte[] output = new byte[maxout + 66]; - fixed (byte* pSrc1 = &input[begin]) - fixed (byte* pSrc2 = output) - { - int outlen = Is64bitApp() ? FastLZx64.FastLZ_Decompress(pSrc1, length, pSrc2, output.Length) : FastLZx86.FastLZ_Decompress(pSrc1, length, pSrc2, output.Length); - byte[] result = new byte[outlen]; - Array.Copy(output, 0, result, 0, outlen); - return result; - } - } - - private static byte[] ExHead = "!FLZ".ToEnBytes(4); - private const int ExHeadAllLength = 20; - private const int ExTailAllLength = 8; - private static DateTime Jan1st1970 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); - - /// - /// 压缩(扩展） - /// - /// 输入 - /// 起始位置 - /// 长度 - /// 时间 - /// 索引 - /// 压缩结果 - public static byte[] CompressEx(byte[] input, int begin, int length, DateTime dateTime, int index) - { - CheckFastLZDll(); - byte[] result = CompressEx(input, begin, length); - if (result.Length > 0) - { - TimeSpan span = dateTime - Jan1st1970; - int totalSeconds = (int)span.TotalSeconds; - int milliseconds = span.Milliseconds; - Array.Copy(BitConverter.GetBytes(totalSeconds), 0, result, 4, 4); - Array.Copy(BitConverter.GetBytes(milliseconds), 0, result, 8, 4); - Array.Copy(BitConverter.GetBytes(index), 0, result, result.Length - 8, 4); - } - - return result; - } - - /// - /// 压缩(扩展） - /// - /// 输入 - /// 起始位置 - /// 长度 - /// 压缩结果 - public static byte[] CompressEx(byte[] input, int begin, int length) - { - CheckFastLZDll(); - byte[] result = new byte[0]; - if (begin + length > input.Length) return result; - byte[] output = new byte[Math.Max(length * 2, 66)]; - fixed (void* pSrc1 = &input[begin]) - fixed (void* pSrc2 = output) - { - int outlen = Is64bitApp() ? FastLZx64.FastLZ_Compress(pSrc1, length, pSrc2) : FastLZx86.FastLZ_Compress(pSrc1, length, pSrc2); - result = new byte[outlen + ExHeadAllLength + ExTailAllLength]; - - Array.Copy(ExHead, 0, result, 0, ExHead.Length); - Array.Copy(BitConverter.GetBytes((int)0), 0, result, 4, 4); - Array.Copy(BitConverter.GetBytes((int)0), 0, result, 8, 4); - Array.Copy(BitConverter.GetBytes((int)output.Length), 0, result, 12, 4); - Array.Copy(BitConverter.GetBytes((int)outlen), 0, result, 16, 4); - - Array.Copy(output, 0, result, ExHeadAllLength, outlen); - Array.Copy(BitConverter.GetBytes((int)0), 0, result, result.Length - 8, 4); - - result[result.Length - 4] = 42; //* - result[result.Length - 3] = 0; //CRC - result[result.Length - 2] = 13; //\r - result[result.Length - 1] = 10; //\n - - return result; - } - } - - /// - /// 解压缩(扩展） - /// - /// 输入 - /// 起始位置 - /// 长度 - /// 解压缩结果 - public static byte[] DecompressEx(byte[] input, int begin, int length) - { - CheckFastLZDll(); - byte[] result = new byte[0]; - if (input.Length <= 2 + ExHeadAllLength + ExTailAllLength) return result; - if (begin + length > input.Length) return result; - if (input[begin] != 33) return result; - if (input[begin + length - 4] != 42) return result; - if (length != BitConverter.ToInt32(input, begin + 16) + ExHeadAllLength + ExTailAllLength) return result; - - byte[] output = new byte[BitConverter.ToInt32(input, begin + ExHead.Length)]; - fixed (byte* pSrc1 = &input[begin + ExHeadAllLength]) - fixed (byte* pSrc2 = output) - { - length = length - ExHeadAllLength - ExTailAllLength; - int outlen = Is64bitApp() ? FastLZx64.FastLZ_Decompress(pSrc1, length, pSrc2, output.Length) : FastLZx86.FastLZ_Decompress(pSrc1, length, pSrc2, output.Length); - result = new byte[outlen]; - Array.Copy(output, 0, result, 0, outlen); - return result; - } - } - - /// - /// 解压缩(扩展） - /// - /// 输入 - /// 起始位置 - /// 长度 - /// 时间 - /// 索引 - /// 解压缩结果 - public static byte[] DecompressEx(byte[] input, int begin, int length, out DateTime datetime, out int index) - { - CheckFastLZDll(); - byte[] result = DecompressEx(input, begin, length); - - datetime = Jan1st1970; - index = 0; - if (result.Length > 0) - { - datetime = Jan1st1970.AddSeconds(BitConverter.ToInt32(input, begin + 4)).AddMilliseconds(BitConverter.ToInt32(input, begin + 8)); - index = BitConverter.ToInt32(input, begin + length - 8); - } - - return result; - } - - private static bool FileExist = false; - - public static bool CheckFastLZDll() - { - if (FileExist) return true; - if (File.Exists(DirEx.CurrentDir() + "FastLZx86.dll") && File.Exists(DirEx.CurrentDir() + "FastLZx64.dll")) - { - FileExist = true; - return true; - } - - try - { - CreateResourceToFile(DirEx.CurrentDir() + "FastLZx86.dll", "Sunny.UI.Common.FastLZx86.dat"); - CreateResourceToFile(DirEx.CurrentDir() + "FastLZx64.dll", "Sunny.UI.Common.FastLZx64.dat"); - } - catch - { - return false; - } - - FileExist = File.Exists(DirEx.CurrentDir() + "FastLZx86.dll") && File.Exists(DirEx.CurrentDir() + "FastLZx64.dll"); - return FileExist; - } - - /// - /// 从系统资源中保存文件 - /// - /// 文件名 - /// 资源名称 - private static void CreateResourceToFile(string file, string resource) - { - if (!File.Exists(file)) - { - Stream stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(resource); - if (stream != null) - { - byte[] buffer = new byte[stream.Length]; - stream.Read(buffer, 0, (int)stream.Length); - stream.Close(); - - File.WriteAllBytes(file, buffer); - } - } - } - } -} \ No newline at end of file diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj index d2c1bb1e..070d900a 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -50,8 +50,6 @@ - -