v1.6.1 commit (ct beta)

xcicode · Jan 30, 2019 · 54c02ed · 54c02ed
1 parent 8bb465e
commit 54c02ed
Show file tree

Hide file tree

Showing 8 changed files with 186 additions and 104 deletions.
diff --git a/MifareOneTool/Form1.Designer.cs b/MifareOneTool/Form1.Designer.cs
diff --git a/MifareOneTool/Form1.cs b/MifareOneTool/Form1.cs
@@ -117,6 +117,7 @@ private void Form1_Load(object sender, EventArgs e)
             //GitHubUpdate ghu = new GitHubUpdate(Properties.Settings.Default.GitHubR);
             //ghu.Update(Properties.Settings.Default.GitHubR);
             //remoteVersionLabel.Text = "远程版本 " + ghu.remoteVersion;
+            checkBoxAutoABN.Checked = Properties.Settings.Default.AutoABN;
         }
 
         private void buttonScanCard_Click(object sender, EventArgs e)
@@ -158,15 +159,23 @@ private void buttonMfRead_Click(object sender, EventArgs e)
             string rmfd = "MfRead.tmp";
             string kt = "A";
             string nn = "";
-            switch (MessageBox.Show("使用KeyA（是）或KeyB（否），还是不使用（用于全新白卡）（取消）？", "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+            if (checkBoxAutoABN.Checked && keymfd != "")
             {
-                case DialogResult.No:
-                    kt = "B";
-                    break;
+                kt = "C";
+                logAppend("正在使用智能KeyABN…");
+            }
+            else
+            {
+                switch (MessageBox.Show("使用KeyA（是）或KeyB（否），还是不使用（用于全新白卡）（取消）？", "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+                {
+                    case DialogResult.No:
+                        kt = "B";
+                        break;
 
-                case DialogResult.Cancel:
-                    nn = "x";
-                    break;
+                    case DialogResult.Cancel:
+                        nn = "x";
+                        break;
+                }
             }
             BackgroundWorker bgw = new BackgroundWorker();
             bgw.DoWork += new DoWorkEventHandler(mf_read);
@@ -282,15 +291,23 @@ private void buttonMfWrite_Click(object sender, EventArgs e)
             if (!writecheck(rmfd)) { MessageBox.Show("将要写入的文件存在错误，请用高级模式中的Hex工具打开查看。", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); return; }
             string kt = "A";
             string nn = "";
-            switch (MessageBox.Show("使用KeyA（是）或KeyB（否），还是不使用（用于全新白卡）（取消）？", "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+            if (checkBoxAutoABN.Checked && keymfd != "")
+            {
+                kt = "C";
+                logAppend("正在使用智能KeyABN…");
+            }
+            else
             {
-                case DialogResult.No:
-                    kt = "B";
-                    break;
+                switch (MessageBox.Show("使用KeyA（是）或KeyB（否），还是不使用（用于全新白卡）（取消）？", "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+                {
+                    case DialogResult.No:
+                        kt = "B";
+                        break;
 
-                case DialogResult.Cancel:
-                    nn = "x";
-                    break;
+                    case DialogResult.Cancel:
+                        nn = "x";
+                        break;
+                }
             }
             BackgroundWorker bgw = new BackgroundWorker();
             bgw.DoWork += new DoWorkEventHandler(mf_write);
@@ -674,15 +691,23 @@ private void buttonCmfWrite_Click(object sender, EventArgs e)
             if (!writecheck(rmfd)) { MessageBox.Show("将要写入的文件存在错误，请用高级模式中的Hex工具打开查看。", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); return; }
             string kt = "A";
             string nn = "";
-            switch (MessageBox.Show("使用KeyA（是）或KeyB（否），还是不使用（用于全新白卡）（取消）？", "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+            if (checkBoxAutoABN.Checked && keymfd != "")
             {
-                case DialogResult.No:
-                    kt = "B";
-                    break;
+                kt = "C";
+                logAppend("正在使用智能KeyABN…");
+            }
+            else
+            {
+                switch (MessageBox.Show("使用KeyA（是）或KeyB（否），还是不使用（用于全新白卡）（取消）？", "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+                {
+                    case DialogResult.No:
+                        kt = "B";
+                        break;
 
-                case DialogResult.Cancel:
-                    nn = "x";
-                    break;
+                    case DialogResult.Cancel:
+                        nn = "x";
+                        break;
+                }
             }
             BackgroundWorker bgw = new BackgroundWorker();
             bgw.DoWork += new DoWorkEventHandler(cmf_write);
@@ -761,11 +786,19 @@ private void buttonMfFormat_Click(object sender, EventArgs e)
             if (keymfd == "") { MessageBox.Show("未选择有效key.mfd。", "无密钥", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } Form1.ActiveForm.Text = "MifareOne Tool - 运行中";
             string rmfd = keymfd;
             string kt = "A";
-            switch (MessageBox.Show("使用KeyA（是）或KeyB（否）？", "KeyA/B", MessageBoxButtons.YesNo, MessageBoxIcon.Information))
+            if (checkBoxAutoABN.Checked && keymfd != "")
             {
-                case DialogResult.No:
-                    kt = "B";
-                    break;
+                kt = "C";
+                logAppend("正在使用智能KeyABN…");
+            }
+            else
+            {
+                switch (MessageBox.Show("使用KeyA（是）或KeyB（否）？", "KeyA/B", MessageBoxButtons.YesNo, MessageBoxIcon.Information))
+                {
+                    case DialogResult.No:
+                        kt = "B";
+                        break;
+                }
             }
             BackgroundWorker bgw = new BackgroundWorker();
             bgw.DoWork += new DoWorkEventHandler(mf_format);
@@ -1000,7 +1033,7 @@ private void buttonnKeysMfoc_Click(object sender, EventArgs e)
         private void buttonDictMfoc_Click(object sender, EventArgs e)
         {
             if (lprocess) { MessageBox.Show("有任务运行中，不可执行。", "设备忙", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } Form1.ActiveForm.Text = "MifareOne Tool - 运行中";
-            string cmd_mode="/k";
+            string cmd_mode = "/k";
             //if (Control.ModifierKeys == Keys.Control)
             //{
             //    cmd_mode="/k";
@@ -1013,7 +1046,7 @@ private void buttonDictMfoc_Click(object sender, EventArgs e)
             ofd.Multiselect = false;
             if (ofd.ShowDialog() == DialogResult.OK)
             {
-                filename=ofd.FileName;
+                filename = ofd.FileName;
             }
             else
             {
@@ -1033,15 +1066,15 @@ private void buttonDictMfoc_Click(object sender, EventArgs e)
         [DllImport("user32.dll", EntryPoint = "SetWindowText")]
         public static extern int SetWindowText(IntPtr hwnd, string lpString);
         [DllImport("user32", SetLastError = true)]
-        public static extern int GetWindowText(IntPtr hWnd,StringBuilder lpString,int nMaxCount);
+        public static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
 
         void mfocCMD(object sender, DoWorkEventArgs e)
         {
             if (lprocess) { return; }
             ProcessStartInfo psi = new ProcessStartInfo("cmd.exe");
             string[] args = (string[])e.Argument;
             psi.WorkingDirectory = "./";
-            psi.Arguments = "/T:0A "+ args[2] + @" nfc-bin\mfoc.exe " + args[1] + " -O \"" + args[0] + "\"";
+            psi.Arguments = "/T:0A " + args[2] + @" nfc-bin\mfoc.exe " + args[1] + " -O \"" + args[0] + "\"";
             lprocess = true;
             BackgroundWorker b = (BackgroundWorker)sender;
             process = Process.Start(psi); running = true;
@@ -1057,5 +1090,10 @@ void mfocCMD(object sender, DoWorkEventArgs e)
                 File.Delete(args[0]);
             }
         }
+
+        private void checkBoxAutoABN_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.AutoABN = checkBoxAutoABN.Checked;
+        }
     }
 }
diff --git a/MifareOneTool/Form1.resx b/MifareOneTool/Form1.resx
@@ -120,6 +120,9 @@
   <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>

diff --git a/MifareOneTool/FormDiff.cs b/MifareOneTool/FormDiff.cs
@@ -133,7 +133,7 @@ private string Compare()
                 }
 
             }
-            return "共找到 " + diffCount.ToString() + " 处不同\n" + stb.ToString();
+            return "共找到 " + diffCount.ToString() + " 个扇区不同\n" + stb.ToString();
         }
     }
 }
diff --git a/MifareOneTool/MifareOneTool.csproj b/MifareOneTool/MifareOneTool.csproj
@@ -67,7 +67,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClassMfClassic.cs" />
     <Compile Include="ClassMifareS50.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
@@ -149,4 +148,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/MifareOneTool/Properties/Settings.Designer.cs b/MifareOneTool/Properties/Settings.Designer.cs
diff --git a/MifareOneTool/Properties/Settings.settings b/MifareOneTool/Properties/Settings.settings
@@ -5,5 +5,8 @@
     <Setting Name="GitHubR" Type="System.String" Scope="Application">
       <Value Profile="(Default)">xcicode/MifareOneTool</Value>
     </Setting>
+    <Setting Name="AutoABN" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/MifareOneTool/app.config b/MifareOneTool/app.config
@@ -4,6 +4,9 @@
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
             <section name="MifareOneTool.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="MifareOneTool.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
     </configSections>
     <applicationSettings>
         <MifareOneTool.Properties.Settings>
@@ -12,4 +15,11 @@
             </setting>
         </MifareOneTool.Properties.Settings>
     </applicationSettings>
+    <userSettings>
+        <MifareOneTool.Properties.Settings>
+            <setting name="AutoABN" serializeAs="String">
+                <value>True</value>
+            </setting>
+        </MifareOneTool.Properties.Settings>
+    </userSettings>
 </configuration>