### 2022-03-02更新

------
#### TimeClock    V1.0.2203.0201
- *.[改进]修复启动出错时无法保存log的bug。
This commit is contained in:
鑫Intel 2022-03-02 20:33:37 +08:00
parent 6c1b3349ca
commit 3fb4fa4be9
22 changed files with 2206 additions and 376 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -358,6 +358,30 @@
<param name="Parameter"></param> <param name="Parameter"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:ryCommonDb.SQLiteDataProvider.ExecuteNonQuery(ryCommonDb.RyQuickSQL,System.String,System.Boolean)">
<summary>
执行SQL语句
</summary>
<param name="mySQL"></param>
<param name="wheresql">只针对IsAdd为false才生效where 以后的sql语句</param>
<param name="IsAdd">是新增还是更新</param>
<returns></returns>
</member>
<member name="M:ryCommonDb.SQLiteDataProvider.Insert(ryCommonDb.RyQuickSQL)">
<summary>
插入数据库
</summary>
<param name="mySQL"></param>
<returns></returns>
</member>
<member name="M:ryCommonDb.SQLiteDataProvider.Update(ryCommonDb.RyQuickSQL,System.String)">
<summary>
更新数据库
</summary>
<param name="mySQL"></param>
<param name="wheresql">where 以后的sql语句</param>
<returns></returns>
</member>
<member name="M:ryCommonDb.SQLiteDataProvider.ExecuteNonQuery(System.String,ryCommonDb.RyQuickSQL)"> <member name="M:ryCommonDb.SQLiteDataProvider.ExecuteNonQuery(System.String,ryCommonDb.RyQuickSQL)">
<summary> <summary>

Binary file not shown.

View File

@ -1,2 +1,2 @@
[TimeClock] [TimeClock]
hwnd=2563002 hwnd=1195326

Binary file not shown.

View File

@ -1,3 +1,3 @@
<root> <root>
<list id="LastUpdateTime" Value="2021/12/14 16:17:11" /> <list id="LastUpdateTime" Value="2022/3/2 20:28:06" />
</root> </root>

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,4 +1,9 @@
### 2021-12-14更新 ### 2022-03-02更新
------
#### TimeClock V1.0.2203.0201
- *.[改进]修复启动出错时无法保存log的bug。
### 2021-12-14更新
------ ------
#### TimeClock V1.0.2112.1401 #### TimeClock V1.0.2112.1401
- *.[改进]针对多显示器进行便笺靠边隐藏功能的改进。 - *.[改进]针对多显示器进行便笺靠边隐藏功能的改进。

View File

@ -53,7 +53,7 @@ namespace MyTimeClock
static void WriteLogs(string file_name, string text) static void WriteLogs(string file_name, string text)
{ {
string log_text = text; string log_text = text;
System.IO.File.WriteAllBytes(Application.StartupPath + "\\logs\\" + file_name, rySafe.AES.AESEncrypt(log_text, "ryTao")); System.IO.File.WriteAllText(Application.StartupPath + "\\logs\\" + file_name, log_text,System.Text.Encoding.UTF8);
if (MessageBox.Show("捕获到无法处理的异常!\r\n\r\n已生成错误日志,是否要提交给我们以帮助我们尽快解决这个BUG?" + if (MessageBox.Show("捕获到无法处理的异常!\r\n\r\n已生成错误日志,是否要提交给我们以帮助我们尽快解决这个BUG?" +
"\r\n\r\n当前日志包含了当前电脑的系统版本、进程、运行库、错误描述等信息,以帮助我们分析解决问题。\r\n\r\n选“是”自动提交错误日志。\r\n选“否”取消。", "错误", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.Yes) "\r\n\r\n当前日志包含了当前电脑的系统版本、进程、运行库、错误描述等信息,以帮助我们分析解决问题。\r\n\r\n选“是”自动提交错误日志。\r\n选“否”取消。", "错误", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.Yes)
{ {

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.1909.1501")] [assembly: AssemblyVersion("2.0.2203.0201")]
[assembly: AssemblyFileVersion("2.0.1909.1501")] [assembly: AssemblyFileVersion("2.0.2203.0201")]

View File

@ -292,6 +292,7 @@ namespace TimeClock.DbOp
} }
else else
{ {
if(!IsMini)
SaveSticky(); SaveSticky();
} }
this.Close(); this.Close();
@ -500,7 +501,8 @@ namespace TimeClock.DbOp
} }
else else
{ {
mStor.SetAttrValue("Width",NormalWidth);
mStor.SetAttrValue("Height",NormalHeight);
} }
mStor.SetAttrValue("TopMost", this.TopMost); mStor.SetAttrValue("TopMost", this.TopMost);
mStor.SetAttrValue("Opacity", this.Opacity); mStor.SetAttrValue("Opacity", this.Opacity);
@ -609,6 +611,7 @@ namespace TimeClock.DbOp
} }
private void FrmSticky_ResizeEnd(object sender, EventArgs e) private void FrmSticky_ResizeEnd(object sender, EventArgs e)
{ {
if(!IsMini)
SaveSticky(); SaveSticky();
} }

View File

@ -88,12 +88,20 @@ namespace TimeClock.DbOp
txtName.MouseDown += KeysLeave_MouseDown; txtName.MouseDown += KeysLeave_MouseDown;
TxtContent.MouseDown += KeysLeave_MouseDown; TxtContent.MouseDown += KeysLeave_MouseDown;
tabControl1.MouseDown += KeysLeave_MouseDown; tabControl1.MouseDown += KeysLeave_MouseDown;
if (System.IO.Directory.Exists(Itrycn_Info.UserDbFolder + @"\sound\"))
{
string[] files = System.IO.Directory.GetFiles(Itrycn_Info.UserDbFolder + @"\sound\");
for (int i = 0; i < files.Length; i++)
{
CbbSound.Items.Add(new SoundInfo() { Name = System.IO.Path.GetFileName(files[i]), Path = files[i] });
}
}
if (System.IO.Directory.Exists(Itrycn_Info.SysDbFolder + @"\animation\sound\")) if (System.IO.Directory.Exists(Itrycn_Info.SysDbFolder + @"\animation\sound\"))
{ {
string[] files = System.IO.Directory.GetFiles(Itrycn_Info.SysDbFolder + @"\animation\sound\"); string[] files = System.IO.Directory.GetFiles(Itrycn_Info.SysDbFolder + @"\animation\sound\");
for (int i = 0; i < files.Length; i++) for (int i = 0; i < files.Length; i++)
{ {
CbbSound.Items.Add(System.IO.Path.GetFileName(files[i])); CbbSound.Items.Add(new SoundInfo() { Name = System.IO.Path.GetFileName(files[i]), Path = files[i] });
} }
if(CbbSound.Items.Contains("默认提醒.wav")) if(CbbSound.Items.Contains("默认提醒.wav"))
{ {
@ -101,7 +109,15 @@ namespace TimeClock.DbOp
} }
} }
} }
class SoundInfo
{
public string Name { get; set; }
public string Path { get; set; }
public override string ToString()
{
return Name;
}
}
private void KeysLeave_MouseDown(object sender, MouseEventArgs e) private void KeysLeave_MouseDown(object sender, MouseEventArgs e)
{ {
panelEx2.Visible = false; panelEx2.Visible = false;
@ -587,7 +603,15 @@ namespace TimeClock.DbOp
tStor.SetAttrValue("Pram", CbbPram.Text); tStor.SetAttrValue("Pram", CbbPram.Text);
tStor.SetAttrValue("week", week); tStor.SetAttrValue("week", week);
tStor.SetAttrValue("sound_on", ChkSound.Checked); tStor.SetAttrValue("sound_on", ChkSound.Checked);
var sound_item = (SoundInfo)CbbSound.SelectedItem;
if (sound_item == null)
{
tStor.SetAttrValue("sound", CbbSound.Text); tStor.SetAttrValue("sound", CbbSound.Text);
}
else
{
tStor.SetAttrValue("sound", sound_item.Path);
}
tStor.SetAttrValue("showpic_on", ChkShowPic.Checked); tStor.SetAttrValue("showpic_on", ChkShowPic.Checked);
tStor.SetAttrValue("showpic", pic_path); tStor.SetAttrValue("showpic", pic_path);
tStor.SetAttrValue("NoShowTip", ChkNoShowTip.Checked); tStor.SetAttrValue("NoShowTip", ChkNoShowTip.Checked);
@ -1119,10 +1143,18 @@ namespace TimeClock.DbOp
} }
private void BtnPlay_Click(object sender, EventArgs e) private void BtnPlay_Click(object sender, EventArgs e)
{
var item = (SoundInfo)CbbSound.SelectedItem;
if (item == null)
{ {
string path = CbbSound.Text; string path = CbbSound.Text;
Itrycn_Info.PlaySound(path); Itrycn_Info.PlaySound(path);
} }
else
{
Itrycn_Info.PlaySound(item.Path);
}
}
private void ButtonEx1_Click(object sender, EventArgs e) private void ButtonEx1_Click(object sender, EventArgs e)
{ {

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2112.1401")] [assembly: AssemblyVersion("1.0.2203.0201")]
[assembly: AssemblyFileVersion("1.0.2112.1401")] [assembly: AssemblyFileVersion("1.0.2203.0201")]