From 857d15466e79029c4c81e22ccaca2048a75a363b Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Wed, 6 Sep 2023 18:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=B7=A5=E5=85=B7=E5=9B=BA?= =?UTF-8?q?=E4=BB=B6=E5=8D=87=E7=BA=A7=E5=A2=9E=E5=8A=A0=E5=AF=B9G300?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/fwupgrade/mainwindow.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/fwupgrade/mainwindow.cpp b/app/fwupgrade/mainwindow.cpp index 3e77872e..a697e462 100644 --- a/app/fwupgrade/mainwindow.cpp +++ b/app/fwupgrade/mainwindow.cpp @@ -168,11 +168,28 @@ QString MainWindow::GetDevType(const QString& fwVersion, bool *canLock) { QString dev = fwVersion.left(2); if (fwVersion.mid(2, 2) == "40" || fwVersion.mid(2, 2) == "50" - || fwVersion.mid(2, 2) == "60" || fwVersion.mid(2, 2) == "70") + || fwVersion.mid(2, 2) == "60" || fwVersion.mid(2, 2) == "70" + || fwVersion.mid(2, 2) == "80" || fwVersion.mid(2, 2) == "90") { // 3288 - QString ver = fwVersion.mid(2, 2); + QString ppm = fwVersion.mid(2, 2); QString date = fwVersion.mid(4, 6); + + if (dev == "G3") + { + if (date >= "220424" && date <= "230105") + { + devType = dev + "x0" + "/" + "220424-230105"; + } + else if (date >= "230106" && date <= "230305") + { + devType = dev + "x0" + "/" + "230106-230305"; + } + else if (date >= "230306") + { + devType = dev + "x0" + "/" + "230306-"; + } + } } else {