diff --git a/app/fwupgrade/FWUpgrade_resource.qrc b/app/fwupgrade/FWUpgrade_resource.qrc index eca3c2b8..c17845cd 100644 --- a/app/fwupgrade/FWUpgrade_resource.qrc +++ b/app/fwupgrade/FWUpgrade_resource.qrc @@ -25,5 +25,6 @@ image_rsc/logo/deli.ico image_rsc/logo/maxsound_logo.ico image_rsc/logo/toec_logo.ico + image_rsc/logo/teachcloud_logo.ico diff --git a/app/fwupgrade/image_rsc/logo/teachcloud_logo.ico b/app/fwupgrade/image_rsc/logo/teachcloud_logo.ico new file mode 100644 index 00000000..73f08379 Binary files /dev/null and b/app/fwupgrade/image_rsc/logo/teachcloud_logo.ico differ diff --git a/app/fwupgrade/logindialog.cpp b/app/fwupgrade/logindialog.cpp index 6938a271..d96c8610 100644 --- a/app/fwupgrade/logindialog.cpp +++ b/app/fwupgrade/logindialog.cpp @@ -31,6 +31,8 @@ LoginDialog::LoginDialog(const QString &account, const QString &password, QWidge this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound_logo.ico")); #elif defined(OEM_GUANGDIANTONG) this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico")); +#elif defined(OEM_QIMINGTAIHE) + this->setWindowIcon(QIcon(":images/image_rsc/logo/teachcloud_logo.ico")); #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); #endif diff --git a/app/fwupgrade/main.cpp b/app/fwupgrade/main.cpp index dcf30d77..2565726b 100644 --- a/app/fwupgrade/main.cpp +++ b/app/fwupgrade/main.cpp @@ -39,6 +39,8 @@ HLOG g_hLog = nullptr; const char *appName = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *appName = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *appName = "TeachCloudScan"; #else const char *appName = "HuaGoScan"; #endif @@ -104,6 +106,8 @@ HGResult GetAppPassword(HGChar* appPassword, HGUInt maxLen) password = "maxsound"; #elif defined(OEM_GUANGDIANTONG) password = "toecscan"; +#elif defined(OEM_QIMINGTAIHE) + password = "teachcloud"; #endif if (maxLen < strlen(appPassword) + 1) diff --git a/app/fwupgrade/mainwindow.cpp b/app/fwupgrade/mainwindow.cpp index 4229e1be..422fea42 100644 --- a/app/fwupgrade/mainwindow.cpp +++ b/app/fwupgrade/mainwindow.cpp @@ -52,6 +52,8 @@ MainWindow::MainWindow(QWidget *parent) this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound_logo.ico")); #elif defined(OEM_GUANGDIANTONG) this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico")); +#elif defined(OEM_QIMINGTAIHE) + this->setWindowIcon(QIcon(":images/image_rsc/logo/teachcloud_logo.ico")); #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); #endif @@ -144,6 +146,8 @@ static HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen) appName = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) appName = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + appName = "TeachCloudScan"; #endif #if defined(HG_CMP_MSC) @@ -407,7 +411,7 @@ int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigne break; case SANE_EVENT_DEVICE_LEFT: { - SANE_Device* sane_dev = (SANE_Device*)data; + SANE_Device* sane_dev = (SANE_Device*)data; emit p->sane_dev_remove(sane_dev->name); } break; diff --git a/app/fwupgrade/resource.rc b/app/fwupgrade/resource.rc index 2a1254b5..ef88a78f 100644 --- a/app/fwupgrade/resource.rc +++ b/app/fwupgrade/resource.rc @@ -70,6 +70,8 @@ IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico" #elif defined(OEM_GUANGDIANTONG) IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico" +#elif defined(OEM_QIMINGTAIHE) +IDI_ICON1 ICON "image_rsc\\logo\\teachcloud_logo.ico" #else IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" #endif diff --git a/app/scanner2/Scanner_resource.qrc b/app/scanner2/Scanner_resource.qrc index 38bc7030..7c71e8dc 100644 --- a/app/scanner2/Scanner_resource.qrc +++ b/app/scanner2/Scanner_resource.qrc @@ -85,6 +85,7 @@ image_rsc/logo/RightWay_logo.ico image_rsc/logo/maxsound_logo.ico image_rsc/logo/toec_logo.ico + image_rsc/logo/teachcloud_logo.ico image_rsc/logo/waiting.gif image_rsc/statusbar/statusBar_admin.png image_rsc/scroll/bottom_Hot.png diff --git a/app/scanner2/VersionDll.cpp b/app/scanner2/VersionDll.cpp index 643c0521..103bdbb1 100644 --- a/app/scanner2/VersionDll.cpp +++ b/app/scanner2/VersionDll.cpp @@ -71,6 +71,8 @@ HGResult VersionDll::Load() strcat(dllPath, "MSDVersion.dll"); #elif defined(OEM_GUANGDIANTONG) strcat(dllPath, "GDTVersion.dll"); + #elif defined(OEM_QIMINGTAIHE) + strcat(dllPath, "QMTHVersion.dll"); #else strcat(dllPath, "HGVersion.dll"); #endif @@ -93,6 +95,8 @@ HGResult VersionDll::Load() strcat(dllPath, "libMsdVersion.dll"); #elif defined(OEM_GUANGDIANTONG) strcat(dllPath, "libGdtVersion.dll"); + #elif defined(OEM_QIMINGTAIHE) + strcat(dllPath, "libQmthVersion.dll"); #else strcpy(dllPath, "libHGVersion.so"); #endif diff --git a/app/scanner2/dialog_aquireinto.cpp b/app/scanner2/dialog_aquireinto.cpp index 8fb23e67..40ce6128 100644 --- a/app/scanner2/dialog_aquireinto.cpp +++ b/app/scanner2/dialog_aquireinto.cpp @@ -285,6 +285,8 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section) ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("MSDScan"))); #elif defined(OEM_GUANGDIANTONG) ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("GDTScan"))); +#elif defined(OEM_QIMINGTAIHE) + ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("QMTHScan"))); #else ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan"))); #endif diff --git a/app/scanner2/dialog_feedback.cpp b/app/scanner2/dialog_feedback.cpp index d1150b4d..f5781963 100644 --- a/app/scanner2/dialog_feedback.cpp +++ b/app/scanner2/dialog_feedback.cpp @@ -43,6 +43,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked() oemName = HGVERSION_OEMNAME_MAXSOUND; #elif defined(OEM_GUANGDIANTONG) oemName = HGVERSION_OEMNAME_TOEC; +#elif defined(OEM_QIMINGTAIHE) + oemName = HGVERSION_OEMNAME_TEACHCLOUD; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner2/dialog_upgrade.cpp b/app/scanner2/dialog_upgrade.cpp index 767744e4..192460ec 100644 --- a/app/scanner2/dialog_upgrade.cpp +++ b/app/scanner2/dialog_upgrade.cpp @@ -37,6 +37,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers oemName = HGVERSION_OEMNAME_MAXSOUND; #elif defined(OEM_GUANGDIANTONG) oemName = HGVERSION_OEMNAME_TOEC; +#elif defined(OEM_QIMINGTAIHE) + oemName = HGVERSION_OEMNAME_TEACHCLOUD; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner2/image_rsc/logo/teachcloud_logo.ico b/app/scanner2/image_rsc/logo/teachcloud_logo.ico new file mode 100644 index 00000000..73f08379 Binary files /dev/null and b/app/scanner2/image_rsc/logo/teachcloud_logo.ico differ diff --git a/app/scanner2/main.cpp b/app/scanner2/main.cpp index b8df7347..de85c04f 100644 --- a/app/scanner2/main.cpp +++ b/app/scanner2/main.cpp @@ -26,6 +26,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index e9e172b2..fa086543 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -146,6 +146,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico")); this->setWindowTitle(tr("ToecScan")); m_oemName = HGVERSION_OEMNAME_TOEC; +#elif defined(OEM_QIMINGTAIHE) + this->setWindowIcon(QIcon(":images/image_rsc/logo/teachcloud_logo.ico")); + this->setWindowTitle(tr("TeachCloudScan")); + m_oemName = HGVERSION_OEMNAME_TEACHCLOUD; #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowTitle(tr("HuaGoScan")); @@ -168,7 +172,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) ui->actionact_update->setVisible(false); ui->act_feedback->setVisible(false); -#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI) && !defined(OEM_MEISONGDA) && !defined(OEM_GUANGDIANTONG) +#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI) && !defined(OEM_MEISONGDA) && !defined(OEM_GUANGDIANTONG) && !defined(OEM_QIMINGTAIHE) if (m_versionDll->IsValid()) { ui->actionact_update->setVisible(true); @@ -408,6 +412,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) m_password = "maxsound"; #elif defined(OEM_GUANGDIANTONG) m_password = "toecscan"; +#elif defined(OEM_QIMINGTAIHE) + m_password = "teachcloud"; #else m_password = "huagoscan"; #endif @@ -3355,6 +3361,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/MaxsoundScan_App_Help_manual.pdf"; #elif defined(OEM_GUANGDIANTONG) filename = QApplication::applicationDirPath() + "/ToecScan_App_Help_manual.pdf"; + #elif defined(OEM_QIMINGTAIHE) + filename = QApplication::applicationDirPath() + "/TeachCloudScan_App_Help_manual.pdf"; #else filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3390,6 +3398,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../../entries/help/MaxsoundScan_App_Help_manual.pdf"; #elif defined(OEM_GUANGDIANTONG) filename = QApplication::applicationDirPath() + "/../../entries/help/ToecScan_App_Help_manual.pdf"; +#elif defined(OEM_QIMINGTAIHE) + filename = QApplication::applicationDirPath() + "/../../entries/help/TeachCloudScan_App_Help_manual.pdf"; #else filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3424,6 +3434,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../doc/MaxsoundScan_App_Help_manual.pdf"; #elif defined(OEM_GUANGDIANTONG) filename = QApplication::applicationDirPath() + "/../doc/ToecScan_App_Help_manual.pdf"; +#elif defined(OEM_QIMINGTAIHE) + filename = QApplication::applicationDirPath() + "/../doc/TeachCloudScan_App_Help_manual.pdf"; #else filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3510,6 +3522,8 @@ void MainWindow::on_act_about_triggered() buildVersion = 28; #elif defined (OEM_GUANGDIANTONG) buildVersion = 30; +#elif defined (OEM_QIMINGTAIHE) + buildVersion = 32; #endif buildVersion = buildVersion * 10; @@ -3561,7 +3575,7 @@ void MainWindow::on_act_about_triggered() content += tr("

DriverVer: %1

").arg(QString::fromLocal8Bit(version)); QString appLang = getCfgValue("global", "language", QString("chinese")); -#if defined(OEM_NEUTRAL) +#if defined(OEM_NEUTRAL) || defined(OEM_QIMINGTAIHE) QMessageBox::about(this, title, content); #else diff --git a/app/scanner2/resource.rc b/app/scanner2/resource.rc index ff6ec1bb..b01b43d0 100644 --- a/app/scanner2/resource.rc +++ b/app/scanner2/resource.rc @@ -70,6 +70,8 @@ IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico" #elif defined(OEM_GUANGDIANTONG) IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico" +#elif defined(OEM_QIMINGTAIHE) +IDI_ICON1 ICON "image_rsc\\logo\\teachcloud_logo.ico" #else IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" #endif diff --git a/app/scantool/form_saveparam.cpp b/app/scantool/form_saveparam.cpp index 94cb0cd2..4a74b92a 100644 --- a/app/scantool/form_saveparam.cpp +++ b/app/scantool/form_saveparam.cpp @@ -166,6 +166,8 @@ SaveParam Form_SaveParam::GetDefSaveParam() saveParam.fileNamePrefix = "MSDScan"; #elif defined(OEM_GUANGDIANTONG) saveParam.fileNamePrefix = "GDTScan"; +#elif defined(OEM_QIMINGTAIHE) + saveParam.fileNamePrefix = "QMTHScan"; #else saveParam.fileNamePrefix = "HGScan"; #endif diff --git a/app/scantool/main.cpp b/app/scantool/main.cpp index 48ac2200..1638da71 100644 --- a/app/scantool/main.cpp +++ b/app/scantool/main.cpp @@ -33,6 +33,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/app/upgrade/image_rsc/logo/teachcloud_logo.ico b/app/upgrade/image_rsc/logo/teachcloud_logo.ico new file mode 100644 index 00000000..73f08379 Binary files /dev/null and b/app/upgrade/image_rsc/logo/teachcloud_logo.ico differ diff --git a/app/upgrade/main.cpp b/app/upgrade/main.cpp index fbdfec3f..49d9a1bb 100644 --- a/app/upgrade/main.cpp +++ b/app/upgrade/main.cpp @@ -29,6 +29,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/build.bat b/build.bat index bc6c219e..4dd2236e 100644 --- a/build.bat +++ b/build.bat @@ -281,41 +281,73 @@ if "%OEM%" == "hw" ( MSBuild.exe GDTTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release cd /d ../ ) else ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro - cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 - cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 - cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 - cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 - MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 - cd /d HGTwainUI - %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro - MSBuild.exe HGTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 - cd /d ../HGScanTool - %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGScanTool.pro - MSBuild.exe HGScanTool.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 - cd /d ../ - - %QT_PATH%/msvc2017/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro - cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc - cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc - cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc - cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc - %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc - MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release - cd /d HGTwainUI - %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro - MSBuild.exe HGTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release - cd /d ../HGScanTool - %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGScanTool.pro - MSBuild.exe HGScanTool.vcxproj -t:rebuild /m:8 /p:Configuration=Release - cd /d ../ + if "%OEM%" == "qmth" ( + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_QIMINGTAIHE USE_SCRIPT" -r -tp vc HGSolutionWin.pro + cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE + MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_QIMINGTAIHE" -r -tp vc HGTwainUI.pro + MSBuild.exe QMTHTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 + cd /d ../ + + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_QIMINGTAIHE USE_SCRIPT" -r -tp vc HGSolutionWin.pro + cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_QIMINGTAIHE + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_QIMINGTAIHE + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_QIMINGTAIHE + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_QIMINGTAIHE + MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release + cd /d HGTwainUI + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_QIMINGTAIHE" -r -tp vc HGTwainUI.pro + MSBuild.exe QMTHTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release + cd /d ../ + ) else ( + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro + cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 + MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro + MSBuild.exe HGTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 + cd /d ../HGScanTool + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGScanTool.pro + MSBuild.exe HGScanTool.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 + cd /d ../ + + %QT_PATH%/msvc2017/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro + cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc + MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release + cd /d HGTwainUI + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro + MSBuild.exe HGTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release + cd /d ../HGScanTool + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGScanTool.pro + MSBuild.exe HGScanTool.vcxproj -t:rebuild /m:8 /p:Configuration=Release + cd /d ../ + ) ) ) ) diff --git a/build2/qt/HGOEM.pri b/build2/qt/HGOEM.pri index 1f812841..a4f87e96 100644 --- a/build2/qt/HGOEM.pri +++ b/build2/qt/HGOEM.pri @@ -55,10 +55,17 @@ if (contains(DEFINES, OEM_HANWANG)) { OEM_PREFIX3 = gdt OEM_NAME = toec } else { - OEM_PREFIX = HG - OEM_PREFIX2 = HG - OEM_PREFIX3 = hg - OEM_NAME = huagao + if (contains(DEFINES, OEM_QIMINGTAIHE)) { + OEM_PREFIX = QMTH + OEM_PREFIX2 = Qmth + OEM_PREFIX3 = qmth + OEM_NAME = teachcloud + } else { + OEM_PREFIX = HG + OEM_PREFIX2 = HG + OEM_PREFIX3 = hg + OEM_NAME = huagao + } } } } diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro index 99ee826e..293f466a 100644 --- a/build2/qt/HGScanner2/HGScanner2.pro +++ b/build2/qt/HGScanner2/HGScanner2.pro @@ -48,7 +48,11 @@ if (contains(DEFINES, OEM_HANWANG)) { if (contains(DEFINES, OEM_GUANGDIANTONG)) { TARGET = "ToecScan2" } else { - TARGET = HuaGoScan2 + if (contains(DEFINES, OEM_QIMINGTAIHE)) { + TARGET = "TeachCloudScan2" + } else { + TARGET = HuaGoScan2 + } } } } diff --git a/doc/scanner/MaxsoundScan_App_Help_manual.pdf b/doc/scanner/MaxsoundScan_App_Help_manual.pdf index 4b58cb30..9b395979 100644 Binary files a/doc/scanner/MaxsoundScan_App_Help_manual.pdf and b/doc/scanner/MaxsoundScan_App_Help_manual.pdf differ diff --git a/doc/scanner/TeachCloudScan_App_Help_manual.pdf b/doc/scanner/TeachCloudScan_App_Help_manual.pdf new file mode 100644 index 00000000..a7ea1d30 Binary files /dev/null and b/doc/scanner/TeachCloudScan_App_Help_manual.pdf differ diff --git a/doc/scanner/TeachCloudScan_scanSettings_Help_manual.pdf b/doc/scanner/TeachCloudScan_scanSettings_Help_manual.pdf new file mode 100644 index 00000000..672c7f47 Binary files /dev/null and b/doc/scanner/TeachCloudScan_scanSettings_Help_manual.pdf differ diff --git a/doc/scanner/ToecScan_App_Help_manual.pdf b/doc/scanner/ToecScan_App_Help_manual.pdf index 4b58cb30..c7c24302 100644 Binary files a/doc/scanner/ToecScan_App_Help_manual.pdf and b/doc/scanner/ToecScan_App_Help_manual.pdf differ diff --git a/modules/base/dllmain.cpp b/modules/base/dllmain.cpp index 364ff757..c050cf6c 100644 --- a/modules/base/dllmain.cpp +++ b/modules/base/dllmain.cpp @@ -22,6 +22,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/modules/imgfmt/dllmain.cpp b/modules/imgfmt/dllmain.cpp index 7affbc00..ed62796d 100644 --- a/modules/imgfmt/dllmain.cpp +++ b/modules/imgfmt/dllmain.cpp @@ -20,6 +20,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/modules/imgproc/dllmain.cpp b/modules/imgproc/dllmain.cpp index 7affbc00..ed62796d 100644 --- a/modules/imgproc/dllmain.cpp +++ b/modules/imgproc/dllmain.cpp @@ -20,6 +20,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/modules/twain_user/HGTwainImpl.cpp b/modules/twain_user/HGTwainImpl.cpp index b34272ab..bc5515da 100644 --- a/modules/twain_user/HGTwainImpl.cpp +++ b/modules/twain_user/HGTwainImpl.cpp @@ -316,7 +316,7 @@ LRESULT CALLBACK HGTwainDSMImpl::NewWndProc(HWND hWnd, UINT msg, WPARAM wParam, bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum) { -#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI) && !defined(OEM_MEISONGDA) && !defined(OEM_GUANGDIANTONG) +#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI) && !defined(OEM_MEISONGDA) && !defined(OEM_GUANGDIANTONG) && !defined(OEM_QIMINGTAIHE) std::string oemIden = "HUAGOSCAN"; #elif defined(OEM_HANWANG) std::string oemIden = "Hanvon"; @@ -336,6 +336,8 @@ bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum) std::string oemIden = "MAXSOUND"; #elif defined(OEM_GUANGDIANTONG) std::string oemIden = "TOEC"; +#elif defined(OEM_QIMINGTAIHE) + std::string oemIden = "TEACHCLOUDSCAN"; #endif if (sourceName != strstr(sourceName, oemIden.c_str()) || 4 != majorNum) diff --git a/modules/twainui/TwainUI_resource.qrc b/modules/twainui/TwainUI_resource.qrc index 1cfe29cc..6dd479a5 100644 --- a/modules/twainui/TwainUI_resource.qrc +++ b/modules/twainui/TwainUI_resource.qrc @@ -23,5 +23,6 @@ image_rsc/logo/deli.ico image_rsc/logo/maxsound_logo.ico image_rsc/logo/toec_logo.ico + image_rsc/logo/teachcloud_logo.ico diff --git a/modules/twainui/app_cfg.cpp b/modules/twainui/app_cfg.cpp index 9f40046b..770b1c6f 100644 --- a/modules/twainui/app_cfg.cpp +++ b/modules/twainui/app_cfg.cpp @@ -196,6 +196,8 @@ HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen) appName = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) appName = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + appName = "TeachCloudScan"; #endif #if defined(HG_CMP_MSC) diff --git a/modules/twainui/dllmain.cpp b/modules/twainui/dllmain.cpp index ddf0a204..5f1643db 100644 --- a/modules/twainui/dllmain.cpp +++ b/modules/twainui/dllmain.cpp @@ -32,6 +32,8 @@ Manager* g_manager = NULL; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp index fac653c2..95d3b519 100644 --- a/modules/twainui/hg_settingdialog.cpp +++ b/modules/twainui/hg_settingdialog.cpp @@ -2227,6 +2227,8 @@ void hg_settingdialog::setIcon() this->setWindowIcon(QIcon(":logo/image_rsc/logo/maxsound_logo.ico")); #elif defined(OEM_GUANGDIANTONG) this->setWindowIcon(QIcon(":logo/image_rsc/logo/toec_logo.ico")); +#elif defined(OEM_QIMINGTAIHE) + this->setWindowIcon(QIcon(":logo/image_rsc/logo/teachcloud_logo.ico")); #endif } diff --git a/modules/twainui/image_rsc/logo/teachcloud_logo.ico b/modules/twainui/image_rsc/logo/teachcloud_logo.ico new file mode 100644 index 00000000..73f08379 Binary files /dev/null and b/modules/twainui/image_rsc/logo/teachcloud_logo.ico differ diff --git a/modules/version/HGVersion.h b/modules/version/HGVersion.h index 66ed0b69..73d6df48 100644 --- a/modules/version/HGVersion.h +++ b/modules/version/HGVersion.h @@ -18,6 +18,7 @@ HG_DECLARE_HANDLE(HGVersionMgr); #define HGVERSION_OEMNAME_DELI "Deli" #define HGVERSION_OEMNAME_MAXSOUND "Maxsound" #define HGVERSION_OEMNAME_TOEC "Toec" +#define HGVERSION_OEMNAME_TEACHCLOUD "Teachcloud" #pragma pack(push) #pragma pack(4) diff --git a/modules/version/dllmain.cpp b/modules/version/dllmain.cpp index 7affbc00..ed62796d 100644 --- a/modules/version/dllmain.cpp +++ b/modules/version/dllmain.cpp @@ -20,6 +20,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/sdk/scannerlib/HGLibDeviceImpl.cpp b/sdk/scannerlib/HGLibDeviceImpl.cpp index b9d5a269..de234d6b 100644 --- a/sdk/scannerlib/HGLibDeviceImpl.cpp +++ b/sdk/scannerlib/HGLibDeviceImpl.cpp @@ -454,6 +454,8 @@ HGBool HGLibDeviceImpl::ClearRollerCount() password = "maxsound"; #elif defined(OEM_GUANGDIANTONG) password = "toecscan"; +#elif defined(OEM_QIMINGTAIHE) + password = "teachcloud"; #else password = "huagoscan"; #endif diff --git a/sdk/scannerlib/dllmain.cpp b/sdk/scannerlib/dllmain.cpp index 7affbc00..ed62796d 100644 --- a/sdk/scannerlib/dllmain.cpp +++ b/sdk/scannerlib/dllmain.cpp @@ -20,6 +20,8 @@ HLOG g_hLog = nullptr; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif diff --git a/sdk/webservice/main.cpp b/sdk/webservice/main.cpp index 7184a237..8b512e13 100644 --- a/sdk/webservice/main.cpp +++ b/sdk/webservice/main.cpp @@ -36,6 +36,8 @@ HGMsgPump msgPumpV2 = NULL; const char *oem = "MaxsoundScan"; #elif defined(OEM_GUANGDIANTONG) const char *oem = "ToecScan"; +#elif defined(OEM_QIMINGTAIHE) + const char *oem = "TeachCloudScan"; #else const char* oem = "HuaGoScan"; #endif @@ -119,6 +121,8 @@ static void HGAPI ThreadFuncV2(HGThread thread, HGPointer param) #define SERVICE_NAME TEXT("MSDWebService") #elif defined(OEM_GUANGDIANTONG) #define SERVICE_NAME TEXT("GDTWebService") +#elif defined(OEM_QIMINGTAIHE) + #define SERVICE_NAME TEXT("QMTHWebService") #else #define SERVICE_NAME TEXT("HGWebService") #endif