From fc91bfee2c150119de9ecc84d85147893330506d Mon Sep 17 00:00:00 2001
From: wh201906 <62299611+wh201906@users.noreply.github.com>
Date: Thu, 16 Apr 2020 01:03:53 +0800
Subject: [PATCH] Add MF_ReadBlock/WriteBlock function

---
 mainwindow.cpp | 30 ++++++++++++++++++++++++++++++
 mainwindow.h   |  4 ++++
 mainwindow.ui  | 12 ++++++++----
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9839938..ccc00e0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -205,6 +205,36 @@ void MainWindow::on_MF_RW_readAllButton_clicked()
 
 }
 
+void MainWindow::on_MF_RW_readBlockButton_clicked()
+{
+    QString result = execCMDWithOutput("hf mf rdbl "
+                           + ui->MF_RW_blockBox->text()
+                           + " "
+                           + ui->MF_RW_keyTypeBox->currentText()
+                           + " "
+                           + ui->MF_RW_keyEdit->text());
+    if(result.indexOf("isOk:01") != -1)
+    {
+        ui->MF_RW_dataEdit->setText(result.mid(result.indexOf("isOk:01")+13, 47).toUpper());
+    }
+}
+
+void MainWindow::on_MF_RW_writeBlockButton_clicked()
+{
+    QString result = execCMDWithOutput("hf mf wrbl "
+                      + ui->MF_RW_blockBox->text()
+                      + " "
+                      + ui->MF_RW_keyTypeBox->currentText()
+                      + " "
+                      + ui->MF_RW_keyEdit->text()
+                      + " "
+                      + ui->MF_RW_dataEdit->text().replace(" ",""));
+    if(result.indexOf("isOk:01") != -1)
+    {
+
+    }
+}
+
 // ************************************************
 
 
diff --git a/mainwindow.h b/mainwindow.h
index 1d9cf0a..d9eeae8 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -59,6 +59,10 @@ private slots:
 
     void on_MF_RW_readAllButton_clicked();
 
+    void on_MF_RW_readBlockButton_clicked();
+
+    void on_MF_RW_writeBlockButton_clicked();
+
 private:
     Ui::MainWindow *ui;
     PM3Process* pm3;
diff --git a/mainwindow.ui b/mainwindow.ui
index 25d4a20..1ddfbab 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -415,12 +415,16 @@
               </widget>
              </item>
              <item>
-              <widget class="QLineEdit" name="MF_RW_keyEdit"/>
+              <widget class="QLineEdit" name="MF_RW_keyEdit">
+               <property name="text">
+                <string>FFFFFFFFFFFF</string>
+               </property>
+              </widget>
              </item>
              <item>
               <widget class="QLabel" name="label_3">
                <property name="text">
-                <string>Type:</string>
+                <string>Key Type:</string>
                </property>
               </widget>
              </item>
@@ -428,12 +432,12 @@
               <widget class="QComboBox" name="MF_RW_keyTypeBox">
                <item>
                 <property name="text">
-                 <string>KeyA</string>
+                 <string>A</string>
                 </property>
                </item>
                <item>
                 <property name="text">
-                 <string>KeyB</string>
+                 <string>B</string>
                 </property>
                </item>
               </widget>