features

xcicode · Mar 23, 2019 · dd10478 · dd10478
1 parent b5053e2
commit dd10478
Show file tree

Hide file tree

Showing 11 changed files with 602 additions and 392 deletions.
diff --git a/MifareOneTool/Form1.Designer.cs b/MifareOneTool/Form1.Designer.cs
diff --git a/MifareOneTool/Form1.cs b/MifareOneTool/Form1.cs
@@ -47,6 +47,7 @@ void writeConfig(string devstr, bool autoscan = true, bool intscan = false)
             cfg += "device.name = \"NFC-Device\"\n";
             cfg += "device.connstring = \"" + devstr + "\"";
             File.WriteAllText("libnfc.conf", cfg);
+            curDevice.Text = "设备串口：" + devstr.Replace("pn532_uart:", "").Replace(":115200", "");
         }
 
         void default_rpt(object sender, ProgressChangedEventArgs e)
@@ -117,7 +118,7 @@ void default_rpt(object sender, ProgressChangedEventArgs e)
             {
                 logAppend((string)e.UserState);
                 logAppend("##Nonce收集完毕##");
-                logAppend("您可以在本地计算，或是上传到云计算服务节点进行计算。");
+                logAppend("您可以上传到云计算服务节点进行计算。");
 
                 Text = "MifareOne Tool - 运行完毕";
             }
@@ -133,6 +134,9 @@ void default_rpt(object sender, ProgressChangedEventArgs e)
                 {
                     logAppend("将自动选择首个设备：" + myReaders.First());
                     writeConfig(myReaders.First());
+                    SetDeviceCombo.Items.Clear();
+                    SetDeviceCombo.Items.AddRange(myReaders.ToArray());
+                    SetDeviceCombo.SelectedIndex = 0;
                 }
             }
             else
@@ -207,7 +211,21 @@ private void Form1_Load(object sender, EventArgs e)
             {
                 tabControl1.SelectedIndex = 1;
             }
-            File.Delete("libnfc.conf");
+            //File.Delete("libnfc.conf");//用户COM口一般不常变化
+            if (Properties.Settings.Default.MultiMode)
+            {
+                if (File.Exists("libnfc.conf"))
+                {
+                    string[] conf = File.ReadAllLines("libnfc.conf");
+                    foreach (string line in conf)
+                    {
+                        if (line.StartsWith("device.connstring = \"pn532_uart:"))
+                        {
+                            curDevice.Text = "设备串口：" + line.Replace("device.connstring = \"pn532_uart:", "").Replace(":115200\"", "");
+                        }
+                    }
+                }
+            }
         }
 
         private void buttonScanCard_Click(object sender, EventArgs e)
@@ -275,6 +293,7 @@ private void LoadUidKey(string uid)
             if (uid.Length < 8) { return; }
             logAppend("正在检索是否存在key.mfd…");
             List<string> files = Directory.EnumerateFiles("auto_keys", "*.mfd").ToList<string>();
+            files.Reverse();//保证拿到最新的
             for (int i = 0; i < files.Count; i++)
             {
                 if (files[i].StartsWith("auto_keys\\" + uid))
@@ -749,18 +768,7 @@ private void buttonConSave_Click(object sender, EventArgs e)
             MessageBox.Show("终端内容已保存至m1t.log文件", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
-        private void buttonKill_Click(object sender, EventArgs e)
-        {
-            if (lprocess)
-            {
-                if (process.HasExited == false)
-                {
-                    process.Kill();
-                    Form1.ActiveForm.Text = "MifareOne Tool - 已终止";
-                    logAppend("##程序已被强制停止##");
-                }
-            }
-        }
+
 
         private void buttonUidWrite_Click(object sender, EventArgs e)
         {
@@ -901,6 +909,19 @@ void cmf_write(object sender, DoWorkEventArgs e)
             b.ReportProgress(100, "##运行完毕##");
         }
 
+        private void buttonKill_Click(object sender, EventArgs e)
+        {
+            if (lprocess)
+            {
+                if (process.HasExited == false)
+                {
+                    process.Kill();
+                    Form1.ActiveForm.Text = "MifareOne Tool - 已终止";
+                    logAppend("##程序已被强制停止##");
+                }
+            }
+        }
+
         private void buttonLockUfuid_Click(object sender, EventArgs e)
         {
             if (lprocess) { MessageBox.Show("有任务运行中，不可执行。", "设备忙", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } Form1.ActiveForm.Text = "MifareOne Tool - 运行中";
@@ -1436,5 +1457,19 @@ private void buttonEStop_Click(object sender, EventArgs e)
         {
             buttonKill_Click(sender, e);
         }
+
+        private void SetDeviceCombo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (SetDeviceCombo.SelectedIndex >= 0)
+            {
+                writeConfig(SetDeviceCombo.SelectedItem.ToString());
+                logAppend("已指定使用该NFC设备：" + SetDeviceCombo.SelectedItem.ToString());
+            }
+        }
+
+        private void checkBoxMultiDev_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.MultiMode = checkBoxMultiDev.Checked;
+        }
     }
 }
diff --git a/MifareOneTool/Form1.resx b/MifareOneTool/Form1.resx
@@ -120,17 +120,14 @@
   <metadata name="toolTipHelp.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTipHelp.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>157, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="toolStripCheckUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc