增加oem-美松达和光电通
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 78 KiB |
|
@ -27,6 +27,10 @@ LoginDialog::LoginDialog(const QString &account, const QString &password, QWidge
|
|||
this->setWindowIcon(QIcon(":images/image_rsc/logo/NoBrand_logo.ico"));
|
||||
#elif defined(OEM_DELI)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/deli.ico"));
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound.ico"));
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/toec.ico"));
|
||||
#else
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
|
||||
#endif
|
||||
|
|
|
@ -35,8 +35,12 @@ HLOG g_hLog = nullptr;
|
|||
const char *appName = "DeliScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char *appName = "NeuScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *appName = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *appName = "ToecScan";
|
||||
#else
|
||||
const char *appName = "HuaGoScan";
|
||||
const char *appName = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
|
||||
|
@ -96,6 +100,10 @@ HGResult GetAppPassword(HGChar* appPassword, HGUInt maxLen)
|
|||
password = "deliscan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
password = "scan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
password = "maxsound";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
password = "toecscan";
|
||||
#endif
|
||||
|
||||
if (maxLen < strlen(appPassword) + 1)
|
||||
|
|
|
@ -48,6 +48,10 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
this->setWindowIcon(QIcon(":images/image_rsc/logo/NoBrand_logo.ico"));
|
||||
#elif defined(OEM_DELI)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/deli.ico"));
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound.ico"));
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/toec.ico"));
|
||||
#else
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
|
||||
#endif
|
||||
|
@ -136,6 +140,10 @@ static HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
|
|||
appName = "DeliScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
appName = "NeuScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
appName = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
appName = "ToecScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
|
|
@ -0,0 +1,170 @@
|
|||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "winres.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// 中文(简体,中国) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
|
||||
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
|
||||
#pragma code_page(936)
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE
|
||||
BEGIN
|
||||
"#include ""winres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE
|
||||
BEGIN
|
||||
"\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
#if defined(OEM_HANWANG)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\Hanvon_logo1.ico"
|
||||
#elif defined(OEM_LISICHENG)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\Lanxum_logo.ico"
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\Cumtenn_logo.ico"
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\Microtek_logo.ico"
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico"
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico"
|
||||
#elif defined(OEM_DELI)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\deli.ico"
|
||||
#else
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\logo.ico"
|
||||
#endif
|
||||
|
||||
#endif // 中文(简体,中国) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 4,52,10000,24240
|
||||
PRODUCTVERSION 4,52,10000,24240
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS VS_FF_DEBUG
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "000403a8"
|
||||
BEGIN
|
||||
VALUE "FileVersion", "4.52.10000.24240\0"
|
||||
VALUE "ProductVersion", "4.52.10000.24240\0"
|
||||
#if defined(OEM_HANWANG)
|
||||
VALUE "ProductName", "HANVONSCAN\0"
|
||||
VALUE "CompanyName", "汉王科技股份有限公司\0"
|
||||
VALUE "FileDescription", "汉王扫描仪应用程序\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) HANVONSCAN 2023\0"
|
||||
VALUE "InternalName", "HWFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "HWFWUpgrade.exe\0"
|
||||
#elif defined(OEM_LISICHENG)
|
||||
VALUE "ProductName", "LANXUMSCAN\0"
|
||||
VALUE "CompanyName", "立思辰信息科技有限公司\0"
|
||||
VALUE "FileDescription", "立思辰扫描仪应用程序\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) LANXUMSCAN 2023\0"
|
||||
VALUE "InternalName", "LSCFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "LSCFWUpgrade.exe\0"
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
VALUE "ProductName", "CUMTENNSCAN\0"
|
||||
VALUE "CompanyName", "浙江沧田智能信息科技有限公司\0"
|
||||
VALUE "FileDescription", "沧田扫描仪应用程序\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) CUMTENNSCAN 2023\0"
|
||||
VALUE "InternalName", "CTSFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "CTSFWUpgrade.exe\0"
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
VALUE "ProductName", "MICROTEKSCAN\0"
|
||||
VALUE "CompanyName", "Microtek DocWizard EX\0"
|
||||
VALUE "FileDescription", "Microtek DocWizard EX App\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) MICROTEKSCAN 2023\0"
|
||||
VALUE "InternalName", "ZJFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "ZJFWUpgrade.exe\0"
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
VALUE "ProductName", "UNISCAN\0"
|
||||
VALUE "CompanyName", "紫光股份有限公司\0"
|
||||
VALUE "FileDescription", "紫光扫描仪应用程序\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) UNISCAN 2023\0"
|
||||
VALUE "InternalName", "ZGFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "ZGFWUpgrade.exe\0"
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
VALUE "ProductName", "SCANNER\0"
|
||||
VALUE "CompanyName", "Scanner\0"
|
||||
VALUE "FileDescription", "Scanner\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) SCANNER 2023\0"
|
||||
VALUE "InternalName", "NEUFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "NEUFWUpgrade.exe\0"
|
||||
#elif defined(OEM_DELI)
|
||||
VALUE "ProductName", "DELISCAN\0"
|
||||
VALUE "CompanyName", "得力信息科技有限公司\0"
|
||||
VALUE "FileDescription", "得力扫描仪应用程序\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) DELISCAN 2023\0"
|
||||
VALUE "InternalName", "DLFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "DLFWUpgrade.exe\0"
|
||||
#else
|
||||
VALUE "ProductName", "HUAGOSCAN\0"
|
||||
VALUE "CompanyName", "宁波华高信息科技有限公司\0"
|
||||
VALUE "FileDescription", "华高扫描仪应用程序\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) HUAGOSCAN 2023\0"
|
||||
VALUE "InternalName", "HGFWUpgrade.exe\0"
|
||||
VALUE "OriginalFilename", "HGFWUpgrade.exe\0"
|
||||
#endif
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x0004, 936
|
||||
END
|
||||
END
|
||||
/* End of Version info */
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
|
@ -83,6 +83,8 @@
|
|||
<file>image_rsc/logo/logo.ico</file>
|
||||
<file>image_rsc/logo/NoBrand_logo.ico</file>
|
||||
<file>image_rsc/logo/RightWay_logo.ico</file>
|
||||
<file>image_rsc/logo/maxsound.ico</file>
|
||||
<file>image_rsc/logo/toec.ico</file>
|
||||
<file>image_rsc/logo/waiting.gif</file>
|
||||
<file>image_rsc/statusbar/statusBar_admin.png</file>
|
||||
<file>image_rsc/scroll/bottom_Hot.png</file>
|
||||
|
|
|
@ -67,6 +67,10 @@ HGResult VersionDll::Load()
|
|||
strcat(dllPath, "NEUVersion.dll");
|
||||
#elif defined(OEM_DELI)
|
||||
strcat(dllPath, "DLVersion.dll");
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
strcat(dllPath, "MSDVersion.dll");
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
strcat(dllPath, "GDTVersion.dll");
|
||||
#else
|
||||
strcat(dllPath, "HGVersion.dll");
|
||||
#endif
|
||||
|
@ -85,6 +89,10 @@ HGResult VersionDll::Load()
|
|||
strcat(dllPath, "libNeuVersion.so");
|
||||
#elif defined(OEM_DELI)
|
||||
strcat(dllPath, "libDlVersion.so");
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
strcat(dllPath, "libMsdVersion.dll");
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
strcat(dllPath, "libGdtVersion.dll");
|
||||
#else
|
||||
strcpy(dllPath, "libHGVersion.so");
|
||||
#endif
|
||||
|
|
|
@ -281,6 +281,10 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section)
|
|||
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("Scan")));
|
||||
#elif defined(OEM_DELI)
|
||||
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("DLScan")));
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
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")));
|
||||
#else
|
||||
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan")));
|
||||
#endif
|
||||
|
|
|
@ -39,6 +39,10 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
|
|||
oemName = HGVERSION_OEMNAME_NEUTRAL;
|
||||
#elif defined(OEM_DELI)
|
||||
oemName = HGVERSION_OEMNAME_DELI;
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
oemName = HGVERSION_OEMNAME_MAXSOUND;
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
oemName = HGVERSION_OEMNAME_TOEC;
|
||||
#else
|
||||
oemName = HGVERSION_OEMNAME_HUAGO;
|
||||
#endif
|
||||
|
|
|
@ -33,6 +33,10 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
|
|||
oemName = HGVERSION_OEMNAME_NEUTRAL;
|
||||
#elif defined(OEM_DELI)
|
||||
oemName = HGVERSION_OEMNAME_DELI;
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
oemName = HGVERSION_OEMNAME_MAXSOUND;
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
oemName = HGVERSION_OEMNAME_TOEC;
|
||||
#else
|
||||
oemName = HGVERSION_OEMNAME_HUAGO;
|
||||
#endif
|
||||
|
|
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 78 KiB |
|
@ -9,21 +9,25 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
|
|
@ -142,6 +142,14 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
|||
this->setWindowIcon(QIcon(":images/image_rsc/logo/deli.ico"));
|
||||
this->setWindowTitle(tr("DeliScan"));
|
||||
m_oemName = HGVERSION_OEMNAME_DELI;
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/maxsound.ico"));
|
||||
this->setWindowTitle(tr("MaxsoundScan"));
|
||||
m_oemName = HGVERSION_OEMNAME_MAXSOUND;
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/toec.ico"));
|
||||
this->setWindowTitle(tr("ToecScan"));
|
||||
m_oemName = HGVERSION_OEMNAME_TOEC;
|
||||
#else
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
|
||||
this->setWindowTitle(tr("HuaGoScan"));
|
||||
|
@ -164,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)
|
||||
#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 (m_versionDll->IsValid())
|
||||
{
|
||||
ui->actionact_update->setVisible(true);
|
||||
|
@ -400,6 +408,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
|||
m_password = "scan";
|
||||
#elif defined(OEM_DELI)
|
||||
m_password = "deliscan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
m_password = "maxsound";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
m_password = "toecscan";
|
||||
#else
|
||||
m_password = "huagoscan";
|
||||
#endif
|
||||
|
@ -3338,6 +3350,10 @@ void MainWindow::on_act_help_triggered()
|
|||
filename = QApplication::applicationDirPath() + "/NeuScan_App_Help_manual_EN.pdf";
|
||||
#elif defined(OEM_DELI)
|
||||
filename = QApplication::applicationDirPath() + "/DeliScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
filename = QApplication::applicationDirPath() + "/MaxsoundScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
filename = QApplication::applicationDirPath() + "/ToecScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
|
@ -3369,6 +3385,10 @@ void MainWindow::on_act_help_triggered()
|
|||
filename = QApplication::applicationDirPath() + "/../../entries/help/NeuScan_App_Help_manual_EN.pdf";
|
||||
#elif defined(OEM_DELI)
|
||||
filename = QApplication::applicationDirPath() + "/../../entries/help/DeliScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
filename = QApplication::applicationDirPath() + "/../../entries/help/MaxsoundScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
filename = QApplication::applicationDirPath() + "/../../entries/help/ToecScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
|
@ -3399,6 +3419,10 @@ void MainWindow::on_act_help_triggered()
|
|||
filename = QApplication::applicationDirPath() + "/../doc/NeuScan_App_Help_manual_EN.pdf";
|
||||
#elif defined(OEM_DELI)
|
||||
filename = QApplication::applicationDirPath() + "/../doc/DeliScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
filename = QApplication::applicationDirPath() + "/../doc/MaxsoundScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
filename = QApplication::applicationDirPath() + "/../doc/ToecScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
|
@ -3481,6 +3505,10 @@ void MainWindow::on_act_about_triggered()
|
|||
buildVersion = 24;
|
||||
#elif defined (OEM_NEUTRAL)
|
||||
buildVersion = 26;
|
||||
#elif defined (OEM_MEISONGDA)
|
||||
buildVersion = 28;
|
||||
#elif defined (OEM_GUANGDIANTONG)
|
||||
buildVersion = 30;
|
||||
#endif
|
||||
|
||||
buildVersion = buildVersion * 10;
|
||||
|
|
|
@ -66,6 +66,10 @@ IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico"
|
|||
IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico"
|
||||
#elif defined(OEM_DELI)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\deli.ico"
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\maxsound.ico"
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\toec.ico"
|
||||
#else
|
||||
IDI_ICON1 ICON "image_rsc\\logo\\logo.ico"
|
||||
#endif
|
||||
|
|
|
@ -162,6 +162,10 @@ SaveParam Form_SaveParam::GetDefSaveParam()
|
|||
saveParam.fileNamePrefix = "Scan";
|
||||
#elif defined(OEM_DELI)
|
||||
saveParam.fileNamePrefix = "DLScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
saveParam.fileNamePrefix = "MSDScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
saveParam.fileNamePrefix = "GDTScan";
|
||||
#else
|
||||
saveParam.fileNamePrefix = "HGScan";
|
||||
#endif
|
||||
|
|
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 78 KiB |
|
@ -12,21 +12,25 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
|
134
build.bat
|
@ -219,41 +219,105 @@ if "%OEM%" == "hw" (
|
|||
MSBuild.exe DLTwainUI.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%" == "msd" (
|
||||
%QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_MEISONGDA 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_MEISONGDA
|
||||
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_MEISONGDA
|
||||
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_MEISONGDA
|
||||
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_MEISONGDA
|
||||
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_MEISONGDA" -r -tp vc HGTwainUI.pro
|
||||
MSBuild.exe MSDTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64
|
||||
cd /d ../
|
||||
|
||||
%QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_MEISONGDA 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_MEISONGDA
|
||||
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_MEISONGDA
|
||||
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_MEISONGDA
|
||||
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_MEISONGDA
|
||||
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_MEISONGDA" -r -tp vc HGTwainUI.pro
|
||||
MSBuild.exe MSDTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release
|
||||
cd /d ../
|
||||
) else (
|
||||
if "%OEM%" == "gdt" (
|
||||
%QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_GUANGDIANTONG 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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG" -r -tp vc HGTwainUI.pro
|
||||
MSBuild.exe GDTTwainUI.vcxproj -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64
|
||||
cd /d ../
|
||||
|
||||
%QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_GUANGDIANTONG 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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG
|
||||
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_GUANGDIANTONG" -r -tp vc HGTwainUI.pro
|
||||
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 ../
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
# Define OEM macros here for test, for example: DEFINES += OEM_HANWANG
|
||||
|
||||
DEFINES += OEM_GUANGDIANTONG
|
||||
if (contains(DEFINES, OEM_HANWANG)) {
|
||||
OEM_PREFIX = HW
|
||||
OEM_PREFIX2 = Hw
|
||||
|
@ -43,10 +43,24 @@ if (contains(DEFINES, OEM_HANWANG)) {
|
|||
OEM_PREFIX3 = dl
|
||||
OEM_NAME = deli
|
||||
} else {
|
||||
OEM_PREFIX = HG
|
||||
OEM_PREFIX2 = HG
|
||||
OEM_PREFIX3 = hg
|
||||
OEM_NAME = huagao
|
||||
if (contains(DEFINES, OEM_MEISONGDA)) {
|
||||
OEM_PREFIX = MSD
|
||||
OEM_PREFIX2 = Msd
|
||||
OEM_PREFIX3 = msd
|
||||
OEM_NAME = maxsound
|
||||
} else {
|
||||
if (contains(DEFINES, OEM_GUANGDIANTONG)) {
|
||||
OEM_PREFIX = GDT
|
||||
OEM_PREFIX2 = Gdt
|
||||
OEM_PREFIX3 = gdt
|
||||
OEM_NAME = toec
|
||||
} else {
|
||||
OEM_PREFIX = HG
|
||||
OEM_PREFIX2 = HG
|
||||
OEM_PREFIX3 = hg
|
||||
OEM_NAME = huagao
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,15 @@ if (contains(DEFINES, OEM_HANWANG)) {
|
|||
if (contains(DEFINES, OEM_DELI)) {
|
||||
TARGET = "DELI SCAN2"
|
||||
} else {
|
||||
TARGET = HuaGoScan2
|
||||
if (contains(DEFINES, OEM_MEISONGDA)) {
|
||||
TARGET = "MaxsoundScan2"
|
||||
} else {
|
||||
if (contains(DEFINES, OEM_GUANGDIANTONG)) {
|
||||
TARGET = "ToecScan2"
|
||||
} else {
|
||||
TARGET = HuaGoScan2
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,21 +5,25 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
|
|
@ -3,22 +3,27 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
|
||||
|
|
|
@ -3,22 +3,27 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
|
||||
|
|
|
@ -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)
|
||||
#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)
|
||||
std::string oemIden = "HUAGOSCAN";
|
||||
#elif defined(OEM_HANWANG)
|
||||
std::string oemIden = "Hanvon";
|
||||
|
@ -332,6 +332,10 @@ bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum)
|
|||
std::string oemIden = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
std::string oemIden = "DELI SCAN";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
std::string oemIden = "MAXSOUND";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
std::string oemIden = "TOEC";
|
||||
#endif
|
||||
|
||||
if (sourceName != strstr(sourceName, oemIden.c_str()) || 4 != majorNum)
|
||||
|
|
|
@ -21,5 +21,7 @@
|
|||
<file>image_rsc/logo/RightWay_logo.ico</file>
|
||||
<file>image_rsc/logo/uniscan.ico</file>
|
||||
<file>image_rsc/logo/deli.ico</file>
|
||||
<file>image_rsc/logo/maxsound.ico</file>
|
||||
<file>image_rsc/logo/toec.ico</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
@ -192,6 +192,10 @@ HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
|
|||
appName = "DeliScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
appName = "NeuScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
appName = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
appName = "ToecScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
|
|
@ -15,21 +15,25 @@ HGThread g_hThread = NULL;
|
|||
Manager* g_manager = NULL;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
#if defined (HG_CMP_MSC)
|
||||
|
|
|
@ -2219,6 +2219,10 @@ void hg_settingdialog::setIcon()
|
|||
this->setWindowIcon(QIcon(":logo/image_rsc/logo/NoBrand_logo.ico"));
|
||||
#elif defined(OEM_DELI)
|
||||
this->setWindowIcon(QIcon(":logo/image_rsc/logo/deli.ico"));
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
this->setWindowIcon(QIcon(":logo/image_rsc/logo/maxsound.ico"));
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
this->setWindowIcon(QIcon(":logo/image_rsc/logo/toec.ico"));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 78 KiB |
|
@ -16,6 +16,8 @@ HG_DECLARE_HANDLE(HGVersionMgr);
|
|||
#define HGVERSION_OEMNAME_MICROTEK "Microtek"
|
||||
#define HGVERSION_OEMNAME_UNIS "Unis"
|
||||
#define HGVERSION_OEMNAME_DELI "Deli"
|
||||
#define HGVERSION_OEMNAME_MAXSOUND "Maxsound"
|
||||
#define HGVERSION_OEMNAME_TOEC "Toec"
|
||||
|
||||
#pragma pack(push)
|
||||
#pragma pack(4)
|
||||
|
|
|
@ -3,22 +3,27 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
|
||||
|
|
|
@ -450,6 +450,10 @@ HGBool HGLibDeviceImpl::ClearRollerCount()
|
|||
password = "scan";
|
||||
#elif defined(OEM_DELI)
|
||||
password = "deliscan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
password = "maxsound";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
password = "toecscan";
|
||||
#else
|
||||
password = "huagoscan";
|
||||
#endif
|
||||
|
|
|
@ -3,22 +3,27 @@
|
|||
HLOG g_hLog = nullptr;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
#if defined(HG_CMP_MSC)
|
||||
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
|
||||
|
|
|
@ -19,21 +19,25 @@ HLOG g_hLog = nullptr;
|
|||
HGMsgPump msgPumpV2 = NULL;
|
||||
|
||||
#if defined(OEM_HANWANG)
|
||||
const char* oem = "HanvonScan";
|
||||
const char* oem = "HanvonScan";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
const char* oem = "LanxumScan";
|
||||
const char* oem = "LanxumScan";
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
const char* oem = "CumtennScan";
|
||||
const char* oem = "CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
const char* oem = "MicrotekScan";
|
||||
const char* oem = "MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
const char* oem = "UniScan";
|
||||
const char* oem = "UniScan";
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
const char* oem = "NeuScan";
|
||||
const char* oem = "NeuScan";
|
||||
#elif defined(OEM_DELI)
|
||||
const char* oem = "DeliScan";
|
||||
const char* oem = "DeliScan";
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
const char *oem = "MaxsoundScan";
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
const char *oem = "ToecScan";
|
||||
#else
|
||||
const char* oem = "HuaGoScan";
|
||||
const char* oem = "HuaGoScan";
|
||||
#endif
|
||||
|
||||
static void HGAPI CrashFunc(HGPointer crashAddr, HGPointer param)
|
||||
|
@ -111,6 +115,10 @@ static void HGAPI ThreadFuncV2(HGThread thread, HGPointer param)
|
|||
#define SERVICE_NAME TEXT("NEUWebService")
|
||||
#elif defined(OEM_DELI)
|
||||
#define SERVICE_NAME TEXT("DLWebService")
|
||||
#elif defined(OEM_MEISONGDA)
|
||||
#define SERVICE_NAME TEXT("MSDWebService")
|
||||
#elif defined(OEM_GUANGDIANTONG)
|
||||
#define SERVICE_NAME TEXT("GDTWebService")
|
||||
#else
|
||||
#define SERVICE_NAME TEXT("HGWebService")
|
||||
#endif
|
||||
|
|