Merge pull request #10 from xcicode/dev

Dev

Author: XAS-712

MifareOneTool/Form1.Designer.cs

@@ -118,6 +118,7 @@ private void Form1_Load(object sender, EventArgs e)
             //ghu.Update(Properties.Settings.Default.GitHubR);
             //remoteVersionLabel.Text = "远程版本 " + ghu.remoteVersion;
             checkBoxAutoABN.Checked = Properties.Settings.Default.AutoABN;
+            checkBoxWriteProtect.Checked = Properties.Settings.Default.WriteCheck;
         }
 
         private void buttonScanCard_Click(object sender, EventArgs e)
@@ -251,6 +252,8 @@ private void buttonSelectKey_Click(object sender, EventArgs e)
 
         bool writecheck(string file)
         {
+            if (checkBoxWriteProtect.Checked == false)
+            { return true; }//如果禁用，直接假装检查成功
             S50 card = new S50();
             try
             {
@@ -1095,5 +1098,67 @@ private void checkBoxAutoABN_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.AutoABN = checkBoxAutoABN.Checked;
         }
+
+        private void buttonEUIDWrite_Click(object sender, EventArgs e)
+        {
+            buttonBmfWrite_Click(sender, e);
+        }
+
+        private void buttonEReadUID_Click(object sender, EventArgs e)
+        {
+            buttonBmfRead_Click(sender, e);
+        }
+
+        private void checkBoxWriteProtect_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.WriteCheck = checkBoxWriteProtect.Checked;
+        }
+
+        private void buttonHardNested_Click(object sender, EventArgs e)
+        {
+            if (lprocess) { MessageBox.Show("有任务运行中，不可执行。", "设备忙", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } Form1.ActiveForm.Text = "MifareOne Tool - 运行中";
+            FormHardNes fhn = new FormHardNes();
+            if (fhn.ShowDialog() == DialogResult.Yes)
+            {
+                string hardargs = fhn.GetArg();
+                BackgroundWorker bgw = new BackgroundWorker();
+                bgw.DoWork += new DoWorkEventHandler(Hardnest);
+                bgw.WorkerReportsProgress = true;
+                bgw.ProgressChanged += new ProgressChangedEventHandler(default_rpt);
+                bgw.RunWorkerAsync(hardargs);
+            }
+            else
+            {
+                Text = "MifareOne Tool - 已取消";
+            }
+        }
+        void Hardnest(object sender, DoWorkEventArgs e)
+        {
+            if (lprocess) { return; }
+            ProcessStartInfo psi = new ProcessStartInfo("nfc-bin/libnfc_hardnested.exe");
+            psi.Arguments = (string)e.Argument;
+            psi.CreateNoWindow = true;
+            psi.UseShellExecute = false;
+            psi.RedirectStandardOutput = true;
+            psi.RedirectStandardError = true;
+            lprocess = true;
+            BackgroundWorker b = (BackgroundWorker)sender;
+            process = Process.Start(psi); running = true;
+            process.OutputDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
+            process.ErrorDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
+            //StreamReader stderr = process.StandardError;
+            process.BeginOutputReadLine();
+            process.BeginErrorReadLine();
+            process.WaitForExit();
+            lprocess = false; running = false;
+            if (process.ExitCode == 0)
+            {
+                b.ReportProgress(100, "##运行完毕##");
+            }
+            else
+            {
+                b.ReportProgress(100, "##运行出错##");
+            }
+        }
     }
 }