fix bugs
This commit is contained in:
parent
b245028f85
commit
b8a9d3f3a7
@ -490,7 +490,13 @@ namespace MifareOneTool
|
|||||||
|
|
||||||
private void button15_Click(object sender, EventArgs e)
|
private void button15_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
process.Kill();
|
if (lprocess)
|
||||||
|
{
|
||||||
|
if (process.HasExited == false)
|
||||||
|
{
|
||||||
|
process.Kill();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void button8_Click(object sender, EventArgs e)
|
private void button8_Click(object sender, EventArgs e)
|
||||||
@ -500,7 +506,7 @@ namespace MifareOneTool
|
|||||||
byte[] buid = new byte[4];
|
byte[] buid = new byte[4];
|
||||||
RNGCryptoServiceProvider rng=new RNGCryptoServiceProvider();
|
RNGCryptoServiceProvider rng=new RNGCryptoServiceProvider();
|
||||||
rng.GetNonZeroBytes(buid);
|
rng.GetNonZeroBytes(buid);
|
||||||
string uid = Interaction.InputBox("请输入UID号", "请输入需要写入的UID卡号,共8位十六进制数,如E44A3BF1。", hex(buid),-1,-1).Trim();
|
string uid = Interaction.InputBox("请输入需要写入的UID卡号,共8位十六进制数,如E44A3BF1。", "请输入UID号", hex(buid),-1,-1).Trim();
|
||||||
if(!Regex.IsMatch(uid, pat)){
|
if(!Regex.IsMatch(uid, pat)){
|
||||||
MessageBox.Show("输入的UID号不合法", "InputError", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("输入的UID号不合法", "InputError", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
return;
|
return;
|
||||||
@ -509,7 +515,7 @@ namespace MifareOneTool
|
|||||||
bgw.DoWork += new DoWorkEventHandler(set_uid);
|
bgw.DoWork += new DoWorkEventHandler(set_uid);
|
||||||
bgw.WorkerReportsProgress = true;
|
bgw.WorkerReportsProgress = true;
|
||||||
bgw.ProgressChanged += new ProgressChangedEventHandler(default_rpt);
|
bgw.ProgressChanged += new ProgressChangedEventHandler(default_rpt);
|
||||||
bgw.RunWorkerAsync();
|
bgw.RunWorkerAsync(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_uid(object sender, DoWorkEventArgs e)
|
void set_uid(object sender, DoWorkEventArgs e)
|
||||||
|
|||||||
@ -50,6 +50,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Microsoft.VisualBasic" />
|
||||||
<Reference Include="Newtonsoft.Json">
|
<Reference Include="Newtonsoft.Json">
|
||||||
<HintPath>.\Newtonsoft.Json.dll</HintPath>
|
<HintPath>.\Newtonsoft.Json.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user