lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加OEM启明泰和

This commit is contained in:
yangjiaxuan 2024-10-22 09:25:45 +08:00
parent 61c0cee1a5
commit c60c1bbb33
40 changed files with 161 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/fwupgrade/FWUpgrade_resource.qrc
View File

@ -25,5 +25,6 @@
<file>image_rsc/logo/deli.ico</file> <file>image_rsc/logo/deli.ico</file>
<file>image_rsc/logo/maxsound_logo.ico</file> <file>image_rsc/logo/maxsound_logo.ico</file>
<file>image_rsc/logo/toec_logo.ico</file> <file>image_rsc/logo/toec_logo.ico</file>
<file>image_rsc/logo/teachcloud_logo.ico</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
app/fwupgrade/image_rsc/logo/teachcloud_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 KiB

2
app/fwupgrade/logindialog.cpp
View File

@ -31,6 +31,8 @@ LoginDialog::LoginDialog(const QString &account, const QString &password, QWidge
this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound_logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound_logo.ico"));
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico")); 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 #else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
#endif #endif

4
app/fwupgrade/main.cpp
View File

@ -39,6 +39,8 @@ HLOG g_hLog = nullptr;
const char *appName = "MaxsoundScan"; const char *appName = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *appName = "ToecScan"; const char *appName = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *appName = "TeachCloudScan";
#else #else
const char *appName = "HuaGoScan"; const char *appName = "HuaGoScan";
#endif #endif
@ -104,6 +106,8 @@ HGResult GetAppPassword(HGChar* appPassword, HGUInt maxLen)
password = "maxsound"; password = "maxsound";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
password = "toecscan"; password = "toecscan";
#elif defined(OEM_QIMINGTAIHE)
password = "teachcloud";
#endif #endif
if (maxLen < strlen(appPassword) + 1) if (maxLen < strlen(appPassword) + 1)

6
app/fwupgrade/mainwindow.cpp
View File

@ -52,6 +52,8 @@ MainWindow::MainWindow(QWidget *parent)
this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound_logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound_logo.ico"));
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico")); 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 #else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
#endif #endif
@ -144,6 +146,8 @@ static HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
appName = "MaxsoundScan"; appName = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
appName = "ToecScan"; appName = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
appName = "TeachCloudScan";
#endif #endif
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
@ -407,7 +411,7 @@ int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigne
break; break;
case SANE_EVENT_DEVICE_LEFT: 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); emit p->sane_dev_remove(sane_dev->name);
} }
break; break;

2
app/fwupgrade/resource.rc
View File

@ -70,6 +70,8 @@ IDI_ICON1 ICON "image_rsc\\logo\\deli.ico"
IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico" IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico"
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico" IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico"
#elif defined(OEM_QIMINGTAIHE)
IDI_ICON1 ICON "image_rsc\\logo\\teachcloud_logo.ico"
#else #else
IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" IDI_ICON1 ICON "image_rsc\\logo\\logo.ico"
#endif #endif

1
app/scanner2/Scanner_resource.qrc
View File

@ -85,6 +85,7 @@
<file>image_rsc/logo/RightWay_logo.ico</file> <file>image_rsc/logo/RightWay_logo.ico</file>
<file>image_rsc/logo/maxsound_logo.ico</file> <file>image_rsc/logo/maxsound_logo.ico</file>
<file>image_rsc/logo/toec_logo.ico</file> <file>image_rsc/logo/toec_logo.ico</file>
<file>image_rsc/logo/teachcloud_logo.ico</file>
<file>image_rsc/logo/waiting.gif</file> <file>image_rsc/logo/waiting.gif</file>
<file>image_rsc/statusbar/statusBar_admin.png</file> <file>image_rsc/statusbar/statusBar_admin.png</file>
<file>image_rsc/scroll/bottom_Hot.png</file> <file>image_rsc/scroll/bottom_Hot.png</file>

4
app/scanner2/VersionDll.cpp
View File

@ -71,6 +71,8 @@ HGResult VersionDll::Load()
strcat(dllPath, "MSDVersion.dll"); strcat(dllPath, "MSDVersion.dll");
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
strcat(dllPath, "GDTVersion.dll"); strcat(dllPath, "GDTVersion.dll");
#elif defined(OEM_QIMINGTAIHE)
strcat(dllPath, "QMTHVersion.dll");
#else #else
strcat(dllPath, "HGVersion.dll"); strcat(dllPath, "HGVersion.dll");
#endif #endif
@ -93,6 +95,8 @@ HGResult VersionDll::Load()
strcat(dllPath, "libMsdVersion.dll"); strcat(dllPath, "libMsdVersion.dll");
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
strcat(dllPath, "libGdtVersion.dll"); strcat(dllPath, "libGdtVersion.dll");
#elif defined(OEM_QIMINGTAIHE)
strcat(dllPath, "libQmthVersion.dll");
#else #else
strcpy(dllPath, "libHGVersion.so"); strcpy(dllPath, "libHGVersion.so");
#endif #endif

2
app/scanner2/dialog_aquireinto.cpp
View File

@ -285,6 +285,8 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("MSDScan"))); ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("MSDScan")));
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("GDTScan"))); 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 #else
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan"))); ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan")));
#endif #endif

2
app/scanner2/dialog_feedback.cpp
View File

@ -43,6 +43,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
oemName = HGVERSION_OEMNAME_MAXSOUND; oemName = HGVERSION_OEMNAME_MAXSOUND;
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
oemName = HGVERSION_OEMNAME_TOEC; oemName = HGVERSION_OEMNAME_TOEC;
#elif defined(OEM_QIMINGTAIHE)
oemName = HGVERSION_OEMNAME_TEACHCLOUD;
#else #else
oemName = HGVERSION_OEMNAME_HUAGO; oemName = HGVERSION_OEMNAME_HUAGO;
#endif #endif

2
app/scanner2/dialog_upgrade.cpp
View File

@ -37,6 +37,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
oemName = HGVERSION_OEMNAME_MAXSOUND; oemName = HGVERSION_OEMNAME_MAXSOUND;
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
oemName = HGVERSION_OEMNAME_TOEC; oemName = HGVERSION_OEMNAME_TOEC;
#elif defined(OEM_QIMINGTAIHE)
oemName = HGVERSION_OEMNAME_TEACHCLOUD;
#else #else
oemName = HGVERSION_OEMNAME_HUAGO; oemName = HGVERSION_OEMNAME_HUAGO;
#endif #endif

BIN
app/scanner2/image_rsc/logo/teachcloud_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 KiB

2
app/scanner2/main.cpp
View File

@ -26,6 +26,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

18
app/scanner2/mainwindow.cpp
View File

@ -146,6 +146,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/toec_logo.ico"));
this->setWindowTitle(tr("ToecScan")); this->setWindowTitle(tr("ToecScan"));
m_oemName = HGVERSION_OEMNAME_TOEC; 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 #else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
this->setWindowTitle(tr("HuaGoScan")); this->setWindowTitle(tr("HuaGoScan"));
@ -168,7 +172,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
ui->actionact_update->setVisible(false); ui->actionact_update->setVisible(false);
ui->act_feedback->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()) if (m_versionDll->IsValid())
{ {
ui->actionact_update->setVisible(true); ui->actionact_update->setVisible(true);
@ -408,6 +412,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
m_password = "maxsound"; m_password = "maxsound";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
m_password = "toecscan"; m_password = "toecscan";
#elif defined(OEM_QIMINGTAIHE)
m_password = "teachcloud";
#else #else
m_password = "huagoscan"; m_password = "huagoscan";
#endif #endif
@ -3355,6 +3361,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/MaxsoundScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/MaxsoundScan_App_Help_manual.pdf";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
filename = QApplication::applicationDirPath() + "/ToecScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/ToecScan_App_Help_manual.pdf";
#elif defined(OEM_QIMINGTAIHE)
filename = QApplication::applicationDirPath() + "/TeachCloudScan_App_Help_manual.pdf";
#else #else
filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
#endif #endif
@ -3390,6 +3398,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../../entries/help/MaxsoundScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/../../entries/help/MaxsoundScan_App_Help_manual.pdf";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
filename = QApplication::applicationDirPath() + "/../../entries/help/ToecScan_App_Help_manual.pdf"; 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 #else
filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf";
#endif #endif
@ -3424,6 +3434,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../doc/MaxsoundScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/../doc/MaxsoundScan_App_Help_manual.pdf";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
filename = QApplication::applicationDirPath() + "/../doc/ToecScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/../doc/ToecScan_App_Help_manual.pdf";
#elif defined(OEM_QIMINGTAIHE)
filename = QApplication::applicationDirPath() + "/../doc/TeachCloudScan_App_Help_manual.pdf";
#else #else
filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf"; filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf";
#endif #endif
@ -3510,6 +3522,8 @@ void MainWindow::on_act_about_triggered()
buildVersion = 28; buildVersion = 28;
#elif defined (OEM_GUANGDIANTONG) #elif defined (OEM_GUANGDIANTONG)
buildVersion = 30; buildVersion = 30;
#elif defined (OEM_QIMINGTAIHE)
buildVersion = 32;
#endif #endif
buildVersion = buildVersion * 10; buildVersion = buildVersion * 10;
@ -3561,7 +3575,7 @@ void MainWindow::on_act_about_triggered()
content += tr("<p>DriverVer: %1</p>").arg(QString::fromLocal8Bit(version)); content += tr("<p>DriverVer: %1</p>").arg(QString::fromLocal8Bit(version));
QString appLang = getCfgValue("global", "language", QString("chinese")); QString appLang = getCfgValue("global", "language", QString("chinese"));
#if defined(OEM_NEUTRAL) #if defined(OEM_NEUTRAL) || defined(OEM_QIMINGTAIHE)
QMessageBox::about(this, title, content); QMessageBox::about(this, title, content);
#else #else

2
app/scanner2/resource.rc
View File

@ -70,6 +70,8 @@ IDI_ICON1 ICON "image_rsc\\logo\\deli.ico"
IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico" IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico"
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico" IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico"
#elif defined(OEM_QIMINGTAIHE)
IDI_ICON1 ICON "image_rsc\\logo\\teachcloud_logo.ico"
#else #else
IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" IDI_ICON1 ICON "image_rsc\\logo\\logo.ico"
#endif #endif

2
app/scantool/form_saveparam.cpp
View File

@ -166,6 +166,8 @@ SaveParam Form_SaveParam::GetDefSaveParam()
saveParam.fileNamePrefix = "MSDScan"; saveParam.fileNamePrefix = "MSDScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
saveParam.fileNamePrefix = "GDTScan"; saveParam.fileNamePrefix = "GDTScan";
#elif defined(OEM_QIMINGTAIHE)
saveParam.fileNamePrefix = "QMTHScan";
#else #else
saveParam.fileNamePrefix = "HGScan"; saveParam.fileNamePrefix = "HGScan";
#endif #endif

2
app/scantool/main.cpp
View File

@ -33,6 +33,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

BIN
app/upgrade/image_rsc/logo/teachcloud_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 KiB

2
app/upgrade/main.cpp
View File

@ -29,6 +29,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

100
build.bat
View File

@ -281,41 +281,73 @@ if "%OEM%" == "hw" (
MSBuild.exe GDTTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release MSBuild.exe GDTTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release
cd /d ../ cd /d ../
) else ( ) else (
%QT_PATH%/msvc2017_64/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro if "%OEM%" == "qmth" (
cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_QIMINGTAIHE USE_SCRIPT" -r -tp vc HGSolutionWin.pro
%~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 cp %~dp0\app\scanner2\resource.rc %~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\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE
%~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 cp %~dp0\app\fwupgrade\resource.rc %~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\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE
%~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 cp %~dp0\app\upgrade\resource.rc %~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\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE
%~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc
MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_QIMINGTAIHE
cd /d HGTwainUI MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64
%QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro cd /d HGTwainUI
MSBuild.exe HGTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_QIMINGTAIHE" -r -tp vc HGTwainUI.pro
cd /d ../HGScanTool MSBuild.exe QMTHTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64
%QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGScanTool.pro cd /d ../
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 %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 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 %~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 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 %~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 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 %~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 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 %~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 MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release
cd /d HGTwainUI cd /d HGTwainUI
%QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_QIMINGTAIHE" -r -tp vc HGTwainUI.pro
MSBuild.exe HGTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release MSBuild.exe QMTHTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release
cd /d ../HGScanTool cd /d ../
%QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGScanTool.pro ) else (
MSBuild.exe HGScanTool.vcxproj -t:rebuild /m:8 /p:Configuration=Release %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro
cd /d ../ 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 ../
)
) )
) )
) )

15
build2/qt/HGOEM.pri
View File

@ -55,10 +55,17 @@ if (contains(DEFINES, OEM_HANWANG)) {
OEM_PREFIX3 = gdt OEM_PREFIX3 = gdt
OEM_NAME = toec OEM_NAME = toec
} else { } else {
OEM_PREFIX = HG if (contains(DEFINES, OEM_QIMINGTAIHE)) {
OEM_PREFIX2 = HG OEM_PREFIX = QMTH
OEM_PREFIX3 = hg OEM_PREFIX2 = Qmth
OEM_NAME = huagao OEM_PREFIX3 = qmth
OEM_NAME = teachcloud
} else {
OEM_PREFIX = HG
OEM_PREFIX2 = HG
OEM_PREFIX3 = hg
OEM_NAME = huagao
}
} }
} }
} }

6
build2/qt/HGScanner2/HGScanner2.pro
View File

@ -48,7 +48,11 @@ if (contains(DEFINES, OEM_HANWANG)) {
if (contains(DEFINES, OEM_GUANGDIANTONG)) { if (contains(DEFINES, OEM_GUANGDIANTONG)) {
TARGET = "ToecScan2" TARGET = "ToecScan2"
} else { } else {
TARGET = HuaGoScan2 if (contains(DEFINES, OEM_QIMINGTAIHE)) {
TARGET = "TeachCloudScan2"
} else {
TARGET = HuaGoScan2
}
} }
} }
} }

BIN
doc/scanner/MaxsoundScan_App_Help_manual.pdf
View File

Binary file not shown.

BIN
doc/scanner/TeachCloudScan_App_Help_manual.pdf Normal file
View File

Binary file not shown.

BIN
doc/scanner/TeachCloudScan_scanSettings_Help_manual.pdf Normal file
View File

Binary file not shown.

BIN
doc/scanner/ToecScan_App_Help_manual.pdf
View File

Binary file not shown.

2
modules/base/dllmain.cpp
View File

@ -22,6 +22,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

2
modules/imgfmt/dllmain.cpp
View File

@ -20,6 +20,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

2
modules/imgproc/dllmain.cpp
View File

@ -20,6 +20,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

4
modules/twain_user/HGTwainImpl.cpp
View File

@ -316,7 +316,7 @@ LRESULT CALLBACK HGTwainDSMImpl::NewWndProc(HWND hWnd, UINT msg, WPARAM wParam,
bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum) 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"; std::string oemIden = "HUAGOSCAN";
#elif defined(OEM_HANWANG) #elif defined(OEM_HANWANG)
std::string oemIden = "Hanvon"; std::string oemIden = "Hanvon";
@ -336,6 +336,8 @@ bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum)
std::string oemIden = "MAXSOUND"; std::string oemIden = "MAXSOUND";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
std::string oemIden = "TOEC"; std::string oemIden = "TOEC";
#elif defined(OEM_QIMINGTAIHE)
std::string oemIden = "TEACHCLOUDSCAN";
#endif #endif
if (sourceName != strstr(sourceName, oemIden.c_str()) || 4 != majorNum) if (sourceName != strstr(sourceName, oemIden.c_str()) || 4 != majorNum)

1
modules/twainui/TwainUI_resource.qrc
View File

@ -23,5 +23,6 @@
<file>image_rsc/logo/deli.ico</file> <file>image_rsc/logo/deli.ico</file>
<file>image_rsc/logo/maxsound_logo.ico</file> <file>image_rsc/logo/maxsound_logo.ico</file>
<file>image_rsc/logo/toec_logo.ico</file> <file>image_rsc/logo/toec_logo.ico</file>
<file>image_rsc/logo/teachcloud_logo.ico</file>
</qresource> </qresource>
</RCC> </RCC>

2
modules/twainui/app_cfg.cpp
View File

@ -196,6 +196,8 @@ HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
appName = "MaxsoundScan"; appName = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
appName = "ToecScan"; appName = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
appName = "TeachCloudScan";
#endif #endif
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)

2
modules/twainui/dllmain.cpp
View File

@ -32,6 +32,8 @@ Manager* g_manager = NULL;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

2
modules/twainui/hg_settingdialog.cpp
View File

@ -2227,6 +2227,8 @@ void hg_settingdialog::setIcon()
this->setWindowIcon(QIcon(":logo/image_rsc/logo/maxsound_logo.ico")); this->setWindowIcon(QIcon(":logo/image_rsc/logo/maxsound_logo.ico"));
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
this->setWindowIcon(QIcon(":logo/image_rsc/logo/toec_logo.ico")); 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 #endif
} }

BIN
modules/twainui/image_rsc/logo/teachcloud_logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 KiB

1
modules/version/HGVersion.h
View File

@ -18,6 +18,7 @@ HG_DECLARE_HANDLE(HGVersionMgr);
#define HGVERSION_OEMNAME_DELI "Deli" #define HGVERSION_OEMNAME_DELI "Deli"
#define HGVERSION_OEMNAME_MAXSOUND "Maxsound" #define HGVERSION_OEMNAME_MAXSOUND "Maxsound"
#define HGVERSION_OEMNAME_TOEC "Toec" #define HGVERSION_OEMNAME_TOEC "Toec"
#define HGVERSION_OEMNAME_TEACHCLOUD "Teachcloud"
#pragma pack(push) #pragma pack(push)
#pragma pack(4) #pragma pack(4)

2
modules/version/dllmain.cpp
View File

@ -20,6 +20,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

2
sdk/scannerlib/HGLibDeviceImpl.cpp
View File

@ -454,6 +454,8 @@ HGBool HGLibDeviceImpl::ClearRollerCount()
password = "maxsound"; password = "maxsound";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
password = "toecscan"; password = "toecscan";
#elif defined(OEM_QIMINGTAIHE)
password = "teachcloud";
#else #else
password = "huagoscan"; password = "huagoscan";
#endif #endif

2
sdk/scannerlib/dllmain.cpp
View File

@ -20,6 +20,8 @@ HLOG g_hLog = nullptr;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif

4
sdk/webservice/main.cpp
View File

@ -36,6 +36,8 @@ HGMsgPump msgPumpV2 = NULL;
const char *oem = "MaxsoundScan"; const char *oem = "MaxsoundScan";
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
const char *oem = "ToecScan"; const char *oem = "ToecScan";
#elif defined(OEM_QIMINGTAIHE)
const char *oem = "TeachCloudScan";
#else #else
const char* oem = "HuaGoScan"; const char* oem = "HuaGoScan";
#endif #endif
@ -119,6 +121,8 @@ static void HGAPI ThreadFuncV2(HGThread thread, HGPointer param)
#define SERVICE_NAME TEXT("MSDWebService") #define SERVICE_NAME TEXT("MSDWebService")
#elif defined(OEM_GUANGDIANTONG) #elif defined(OEM_GUANGDIANTONG)
#define SERVICE_NAME TEXT("GDTWebService") #define SERVICE_NAME TEXT("GDTWebService")
#elif defined(OEM_QIMINGTAIHE)
#define SERVICE_NAME TEXT("QMTHWebService")
#else #else
#define SERVICE_NAME TEXT("HGWebService") #define SERVICE_NAME TEXT("HGWebService")
#endif #endif