### 2021-09-07更新
------ #### MyDb V3.0.2109.0701 - *.[新增]WinHotReg类新增Clear和Count属性。 - *.[新增]RyFiles类新增CopyBigFile函数,采用流读写,可复制大文件。 - *.[新增]RyFiles类的ReadAllText和ReadAllLines函数支持指定默认编码。
This commit is contained in:
parent
b9de6d327a
commit
14503efbda
Binary file not shown.
Binary file not shown.
|
@ -1947,6 +1947,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllText(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件内容,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
|
@ -1954,6 +1962,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.WriteAllLines(System.String,System.String[],System.Text.Encoding)">
|
||||
<summary>
|
||||
写入所有文本行到文件,如果文件夹不存在,会自动创建
|
||||
|
@ -9201,6 +9217,11 @@
|
|||
<param name="vk"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="P:SysFuns.WinHotReg.Count">
|
||||
<summary>
|
||||
获取热键数量
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.UnHotKey(System.Int32)">
|
||||
<summary>
|
||||
删除热键
|
||||
|
@ -9213,6 +9234,11 @@
|
|||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.Clear">
|
||||
<summary>
|
||||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:SysFuns.WinHotReg.HotkeyEventHandler">
|
||||
<summary>
|
||||
热键事件
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1947,6 +1947,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllText(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件内容,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
|
@ -1954,6 +1962,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.WriteAllLines(System.String,System.String[],System.Text.Encoding)">
|
||||
<summary>
|
||||
写入所有文本行到文件,如果文件夹不存在,会自动创建
|
||||
|
@ -9201,6 +9217,11 @@
|
|||
<param name="vk"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="P:SysFuns.WinHotReg.Count">
|
||||
<summary>
|
||||
获取热键数量
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.UnHotKey(System.Int32)">
|
||||
<summary>
|
||||
删除热键
|
||||
|
@ -9213,6 +9234,11 @@
|
|||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.Clear">
|
||||
<summary>
|
||||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:SysFuns.WinHotReg.HotkeyEventHandler">
|
||||
<summary>
|
||||
热键事件
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1947,6 +1947,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllText(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件内容,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
|
@ -1954,6 +1962,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.WriteAllLines(System.String,System.String[],System.Text.Encoding)">
|
||||
<summary>
|
||||
写入所有文本行到文件,如果文件夹不存在,会自动创建
|
||||
|
@ -9174,6 +9190,11 @@
|
|||
<param name="vk"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="P:SysFuns.WinHotReg.Count">
|
||||
<summary>
|
||||
获取热键数量
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.UnHotKey(System.Int32)">
|
||||
<summary>
|
||||
删除热键
|
||||
|
@ -9186,6 +9207,11 @@
|
|||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.Clear">
|
||||
<summary>
|
||||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:SysFuns.WinHotReg.HotkeyEventHandler">
|
||||
<summary>
|
||||
热键事件
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1947,6 +1947,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllText(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件内容,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
|
@ -1954,6 +1962,14 @@
|
|||
<param name="path"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.ReadAllLines(System.String,System.Text.Encoding)">
|
||||
<summary>
|
||||
读取文件所有行,可以自动识别文件编码
|
||||
</summary>
|
||||
<param name="path"></param>
|
||||
<param name="defaultEncoding"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:ryCommon.RyFiles.WriteAllLines(System.String,System.String[],System.Text.Encoding)">
|
||||
<summary>
|
||||
写入所有文本行到文件,如果文件夹不存在,会自动创建
|
||||
|
@ -9174,6 +9190,11 @@
|
|||
<param name="vk"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="P:SysFuns.WinHotReg.Count">
|
||||
<summary>
|
||||
获取热键数量
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.UnHotKey(System.Int32)">
|
||||
<summary>
|
||||
删除热键
|
||||
|
@ -9186,6 +9207,11 @@
|
|||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:SysFuns.WinHotReg.Clear">
|
||||
<summary>
|
||||
删除所有热键
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:SysFuns.WinHotReg.HotkeyEventHandler">
|
||||
<summary>
|
||||
热键事件
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,4 +1,11 @@
|
|||
### 2021-09-03更新
|
||||
### 2021-09-07更新
|
||||
------
|
||||
#### MyDb V3.0.2109.0701
|
||||
- *.[新增]WinHotReg类新增Clear和Count属性。
|
||||
- *.[新增]RyFiles类新增CopyBigFile函数,采用流读写,可复制大文件。
|
||||
- *.[新增]RyFiles类的ReadAllText和ReadAllLines函数支持指定默认编码。
|
||||
|
||||
### 2021-09-03更新
|
||||
------
|
||||
#### ryControls V3.0.2109.0301
|
||||
- *.[改进]RichTextBox2控件现在可以自由选择字符区间。
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -748,12 +748,22 @@ namespace ryCommon
|
|||
/// <param name="path"></param>
|
||||
/// <returns></returns>
|
||||
public static string ReadAllText(string path)
|
||||
{
|
||||
return ReadAllText(path, Encoding.Default);
|
||||
}
|
||||
/// <summary>
|
||||
/// 读取文件内容,可以自动识别文件编码
|
||||
/// </summary>
|
||||
/// <param name="path"></param>
|
||||
/// <param name="defaultEncoding"></param>
|
||||
/// <returns></returns>
|
||||
public static string ReadAllText(string path, Encoding defaultEncoding)
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
try
|
||||
{
|
||||
return System.IO.File.ReadAllText(path, ryCommon.TxtFileEncoder.GetEncoding(path));
|
||||
return System.IO.File.ReadAllText(path, ryCommon.TxtFileEncoder.GetEncoding(path, defaultEncoding));
|
||||
}
|
||||
catch { return ""; }
|
||||
}
|
||||
|
@ -765,10 +775,20 @@ namespace ryCommon
|
|||
/// <param name="path"></param>
|
||||
/// <returns></returns>
|
||||
public static string[] ReadAllLines(string path)
|
||||
{
|
||||
return ReadAllLines(path, Encoding.Default);
|
||||
}
|
||||
/// <summary>
|
||||
/// 读取文件所有行,可以自动识别文件编码
|
||||
/// </summary>
|
||||
/// <param name="path"></param>
|
||||
/// <param name="defaultEncoding"></param>
|
||||
/// <returns></returns>
|
||||
public static string[] ReadAllLines(string path, Encoding defaultEncoding)
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return System.IO.File.ReadAllLines(path, ryCommon.TxtFileEncoder.GetEncoding(path));
|
||||
return System.IO.File.ReadAllLines(path, ryCommon.TxtFileEncoder.GetEncoding(path, defaultEncoding));
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -32,5 +32,5 @@ using System;
|
|||
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
|
||||
// 方法是按如下所示使用“*”: :
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.2109.0101")]
|
||||
[assembly: AssemblyFileVersion("3.0.2109.0101")]
|
||||
[assembly: AssemblyVersion("3.0.2109.0701")]
|
||||
[assembly: AssemblyFileVersion("3.0.2109.0701")]
|
|
@ -84,8 +84,9 @@ namespace SysFuns
|
|||
{
|
||||
UnHotKey();
|
||||
System.Windows.Forms.Application.RemoveMessageFilter(this);
|
||||
}
|
||||
List<HotKeyType> list_hotkey = new List<HotKeyType>();
|
||||
}
|
||||
|
||||
readonly List<HotKeyType> list_hotkey = new List<HotKeyType>();
|
||||
/// <summary>
|
||||
/// 注册热键
|
||||
/// </summary>
|
||||
|
@ -122,6 +123,10 @@ namespace SysFuns
|
|||
}
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取热键数量
|
||||
/// </summary>
|
||||
public int Count { get { return list_hotkey.Count; } }
|
||||
/// <summary>
|
||||
/// 删除热键
|
||||
/// </summary>
|
||||
|
@ -130,17 +135,10 @@ namespace SysFuns
|
|||
public bool UnHotKey(int id)
|
||||
{
|
||||
bool result = UnregisterHotKey(handle, id);
|
||||
if (result)
|
||||
{
|
||||
for (int i = list_hotkey.Count - 1; i >= 0; i--)
|
||||
{
|
||||
HotKeyType item = (HotKeyType)list_hotkey[i];
|
||||
if (item.id == id)
|
||||
{
|
||||
list_hotkey.RemoveAt(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (result)
|
||||
{
|
||||
var index = list_hotkey.FindIndex(a => a.id == id);
|
||||
if (index >= 0) { list_hotkey.RemoveAt(index); }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
@ -160,6 +158,13 @@ namespace SysFuns
|
|||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 删除所有热键
|
||||
/// </summary>
|
||||
public void Clear()
|
||||
{
|
||||
UnHotKey();
|
||||
}
|
||||
/// <summary>
|
||||
/// 热键事件
|
||||
/// </summary>
|
||||
/// <param name="HotKeyID"></param>
|
||||
|
|
Loading…
Reference in New Issue
Block a user