diff --git a/MifareOneTool/ClassMifareS50.cs b/MifareOneTool/ClassMifareS50.cs index 9133362..6115acc 100644 --- a/MifareOneTool/ClassMifareS50.cs +++ b/MifareOneTool/ClassMifareS50.cs @@ -212,6 +212,10 @@ namespace MifareOneTool { info += " 有数据"; } + if (this.Verify() != 0x00) + { + info += " 有错误"; + } return info; } } diff --git a/MifareOneTool/FormHTool.Designer.cs b/MifareOneTool/FormHTool.Designer.cs index 6c050dd..d16b43d 100644 --- a/MifareOneTool/FormHTool.Designer.cs +++ b/MifareOneTool/FormHTool.Designer.cs @@ -65,6 +65,7 @@ this.labelCurSec = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.新建ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.s50BindingSource = new System.Windows.Forms.BindingSource(this.components); this.menuStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -88,6 +89,7 @@ // 文件ToolStripMenuItem // this.文件ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.新建ToolStripMenuItem, this.打开ToolStripMenuItem, this.保存ToolStripMenuItem, this.另存为ToolStripMenuItem, @@ -233,11 +235,11 @@ // // buttonSaveSectorEdit // - this.buttonSaveSectorEdit.Location = new System.Drawing.Point(186, 16); + this.buttonSaveSectorEdit.Location = new System.Drawing.Point(147, 16); this.buttonSaveSectorEdit.Name = "buttonSaveSectorEdit"; - this.buttonSaveSectorEdit.Size = new System.Drawing.Size(100, 25); + this.buttonSaveSectorEdit.Size = new System.Drawing.Size(139, 25); this.buttonSaveSectorEdit.TabIndex = 20; - this.buttonSaveSectorEdit.Text = "修改扇区"; + this.buttonSaveSectorEdit.Text = "修改扇区(Enter)"; this.buttonSaveSectorEdit.UseVisualStyleBackColor = true; this.buttonSaveSectorEdit.Click += new System.EventHandler(this.buttonSaveSectorEdit_Click); // @@ -470,12 +472,21 @@ this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = "欢迎使用M1T的集成编辑器S50HTool!\n打开文件请点左上角文件-打开或Ctrl+O\n"; // + // 新建ToolStripMenuItem + // + this.新建ToolStripMenuItem.Name = "新建ToolStripMenuItem"; + this.新建ToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.新建ToolStripMenuItem.Size = new System.Drawing.Size(222, 24); + this.新建ToolStripMenuItem.Text = "新建"; + this.新建ToolStripMenuItem.Click += new System.EventHandler(this.新建ToolStripMenuItem_Click); + // // s50BindingSource // this.s50BindingSource.DataSource = typeof(MifareOneTool.S50); // // FormHTool // + this.AcceptButton = this.buttonSaveSectorEdit; this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(838, 452); @@ -540,5 +551,6 @@ private System.Windows.Forms.Label label6; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.ToolStripMenuItem 新建ToolStripMenuItem; } } \ No newline at end of file diff --git a/MifareOneTool/FormHTool.cs b/MifareOneTool/FormHTool.cs index 17b663a..248962e 100644 --- a/MifareOneTool/FormHTool.cs +++ b/MifareOneTool/FormHTool.cs @@ -340,5 +340,13 @@ namespace MifareOneTool logAppend("UID已改为" + Form1.hex(buid) + ",计算得到BCC=" + Form1.hex(new byte[]{bcc})); reloadEdit(0); } + + private void 新建ToolStripMenuItem_Click(object sender, EventArgs e) + { + reloadEdit(-1); + this.currentS50 = new S50(); + reloadList(); + logAppend("已重置并新建卡。"); + } } } diff --git a/MifareOneTool/Properties/AssemblyInfo.cs b/MifareOneTool/Properties/AssemblyInfo.cs index 8ed9f30..5b9539e 100644 --- a/MifareOneTool/Properties/AssemblyInfo.cs +++ b/MifareOneTool/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.5.1.0")] +[assembly: AssemblyFileVersion("1.5.1.0")]