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 @@
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 @@