Support read selected blocks

This commit is contained in:
wh201906
2020-08-07 23:51:24 +08:00
parent 25d7886f2a
commit 4dba7882e5
6 changed files with 98 additions and 69 deletions
+9 -3
View File
@@ -486,10 +486,16 @@ void MainWindow::on_MF_Attack_hardnestedButton_clicked()
mifare->hardnested();
}
void MainWindow::on_MF_RW_readAllButton_clicked()
void MainWindow::on_MF_RW_readSelectedButton_clicked()
{
setState(false);
mifare->readAll();
QList<int> selectedBlocks;
for(int i = 0; i < mifare->cardType.block_size; i++)
{
if(ui->MF_dataWidget->item(i, 1)->checkState() == Qt::Checked)
selectedBlocks.append(i);
}
mifare->readSelected(selectedBlocks);
setState(true);
}
@@ -919,5 +925,5 @@ void MainWindow::saveClientPath(const QString& path)
void MainWindow::on_testButton_clicked()
{
mifare->_readsec(0, Mifare::KEY_A, "FFFFFFFFFFFF");
// mifare->_readsec(0, Mifare::KEY_A, "FFFFFFFFFFFF");
}
+1 -1
View File
@@ -77,7 +77,7 @@ private slots:
void on_MF_Sniff_listButton_clicked();
void on_MF_RW_readAllButton_clicked();
void on_MF_RW_readSelectedButton_clicked();
void on_MF_RW_readBlockButton_clicked();
+3 -3
View File
@@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>870</width>
<width>970</width>
<height>770</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>870</width>
<width>970</width>
<height>770</height>
</size>
</property>
@@ -631,7 +631,7 @@
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="MF_RW_readAllButton">
<widget class="QPushButton" name="MF_RW_readSelectedButton">
<property name="text">
<string>Read Selected</string>
</property>