From 93eb4676f34988055b1b98efd96da58d47122153 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Wed, 11 Oct 2017 19:01:50 +0900 Subject: [PATCH] GUI V1.0.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 쿡북 비밀번호 변경 --- app/gui/oven_control/define.h | 4 ++-- app/gui/oven_control/fileprocessdlg.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index 3dfa8ee..c9799bc 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -5,11 +5,11 @@ #define MAJOR_VER 1 #define MINOR_VER 0 -#define HOTFIX_VER 6 +#define HOTFIX_VER 7 // 0 for normal // 1 for premium -#define MODEL_GRADE 1 +#define MODEL_GRADE 0 namespace Define { diff --git a/app/gui/oven_control/fileprocessdlg.cpp b/app/gui/oven_control/fileprocessdlg.cpp index eca7d99..c628e8f 100644 --- a/app/gui/oven_control/fileprocessdlg.cpp +++ b/app/gui/oven_control/fileprocessdlg.cpp @@ -596,7 +596,7 @@ void FileProcessDlg::onProgressFinished(){ FileProcessor::detectUSB(strDescPath); - strZipCmd = QString("sh -c \"unzip -P 1234 %1/prime/prime.zip -d /prime\"").arg(strDescPath); + strZipCmd = QString("sh -c \"unzip -P primeov980308 %1/prime/prime.zip -d /prime\"").arg(strDescPath); QFileInfo info(QString("%1/prime/prime.zip").arg(strDescPath)); @@ -646,9 +646,13 @@ void FileProcessDlg::onProgressFinished(){ process.start("sync"); process.waitForFinished(); qDebug() << QTime::currentTime(); + ui->ctrLbRemainTime->setText(tr("CookBook Upload Success!.")); + QTimer::singleShot(2000,this, SLOT(close())); + } + else{ + ui->ctrLbRemainTime->setText(tr("완료")); + QTimer::singleShot(2000,this, SLOT(close())); } - ui->ctrLbRemainTime->setText(tr("완료")); - QTimer::singleShot(1000,this, SLOT(close())); } void FileProcessDlg::onErrorFired(QString Desc) -- 2.1.4