lmh188
/
twain3.0
mirror of http://192.168.1.51:8099/lmh188/twain3.0
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整文件编码格式修复指示器乱码问题 --23.04.27

This commit is contained in:
masayume_ht 2023-04-27 15:01:07 +08:00
parent c6c27637bf
commit b415496652
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -87,3 +87,4 @@
8.添加安卓设备锁定协议支持 --23.03.13
9.适配卓育云ODM厂商 --23.04.24
10.对接爱云校做协议适配 --23.04.24
11.调整文件编码格式修复指示器乱码问题 --23.04.27

10
huagao/Device/GScanO1003399.cpp
View File

@ -275,7 +275,7 @@ void GScanO1003399::config_params(GScanCap& param)
//if (fwversion.substr(2, 8) == "393B0430")
//{
if (param.papertype == 0)
cfg.g200params.paper = 12; //220513 重影问题默认固定幅面采集
cfg.g200params.paper = 12; //220513 重影问题默认固定幅面采集
else
cfg.g200params.paper = SupPaperTyps_39.count(ps) > 0 ? SupPaperTyps_39[ps] : 0;
//}
@ -301,7 +301,7 @@ void GScanO1003399::config_params(GScanCap& param)
cfg.g200params.enable_sizecheck = param.en_sizecheck == 1 ? 1 : 0;
cfg.g200params.is_textcorrect = cfg.g200params.en_autosize = cfg.g200params.sizeerror_errorratio = 0;
//cfg.g200params.is_fixedpaper = param.en_fixedpaper;
cfg.g200params.is_fixedpaper = true; //220513 重影问题默认固定幅面采集
cfg.g200params.is_fixedpaper = true; //220513 重影问题默认固定幅面采集
cfg.g200params.en_anlogic_key = true;
#ifdef G200
@ -412,7 +412,7 @@ void GScanO1003399::Scanner_StartScan(UINT16 count)
scanflag = false;
return;
}
//if (!Get_Scanner_PaperOn()) //配合连续扫描使用会出现异常
//if (!Get_Scanner_PaperOn()) //配合连续扫描使用会出现异常
//{
// devState = DEV_WRONG;
// Set_ErrorCode(NO_FEED);
@ -602,7 +602,7 @@ void GScanO1003399::usb_run()
if (m_autopaper_timeout == false)
break;
CString str;
str.Format(L"\t 待纸扫描等待中 %d秒 ", std::max(m_param.autopaper_timeout - (int)ceil(sw.elapsed_s()), 0));
str.Format(L"\t 待纸扫描等待中 %d秒 ", std::max(m_param.autopaper_timeout - (int)ceil(sw.elapsed_s()), 0));
this->UpdateScanInfo(str);
std::this_thread::sleep_for(std::chrono::milliseconds(30));
}
@ -894,7 +894,7 @@ void GScanO1003399::imgproce(std::shared_ptr<std::vector<char>>& buff)
_tcscat(szIniFile, _T("\\twain_32\\CumTennScan\\tessdata\\osd.traineddata"));
#elif defined NOLOGO
_tcscat(szIniFile, _T("\\twain_32\\Scan\\tessdata\\osd.traineddata"));
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
_tcscat(szIniFile, _T("\\twain_32\\ZhuoYuYunScan\\tessdata\\osd.traineddata"));
#else
_tcscat(szIniFile, _T("\\twain_32\\HuaGoScan\\tessdata\\osd.traineddata"));

2
huagao/Device/PublicFunc.cpp
View File

@ -473,7 +473,7 @@ CString GetHidedlgPath()
_tcscat(szIniFile, _T("\\twain_32\\RIGHTWAYSCAN\\hidedlg.exe"));
#elif defined NOLOGO
_tcscat(szIniFile, _T("\\twain_32\\Scan\\hidedlg.exe"));
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
_tcscat(szIniFile, _T("\\twain_32\\ZhuoYuYunScan\\hidedlg.exe"));
#else // MAKEHUAGAO
_tcscat(szIniFile, _T("\\twain_32\\ZhibenScan\\hidedlg.exe"));

20
huagao/huagaods.cpp
View File

@ -113,7 +113,7 @@ static constexpr const Identity srcIdent(
"AUGE",
#elif defined LANXUM
"LANXUM",
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZHUOYUYUN",
#elif defined CUMTENN
"CUMTENN",
@ -131,7 +131,7 @@ static constexpr const Identity srcIdent(
"G62S Series",
#elif defined HANVON
"HW-8000",
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZY-2100S",
#else // ISG100
"G100 Series",
@ -141,7 +141,7 @@ static constexpr const Identity srcIdent(
"G73S Series",
#elif defined HANVON
"HW-9000",
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZY-2100S",
#elif defined CUMTENN
"CTS A3",
@ -154,7 +154,7 @@ static constexpr const Identity srcIdent(
"G42S Series",
#elif defined CUMTENN
"CTS A4",
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZY-2100S",
#elif defined HANVON
#ifdef ANDROIDSERIAL
@ -169,7 +169,7 @@ static constexpr const Identity srcIdent(
#elif defined(G400) // G200
#ifdef LANXUM
"G52S Series",
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZY-2100S",
#elif defined HANVON
#ifdef ANDROIDSERIAL
@ -191,7 +191,7 @@ static constexpr const Identity srcIdent(
"Scan G100 TWAIN"
#elif defined AUGE
"AUGESCAN G100 TWAIN"
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZHUOYUYUNSCAN G100 TWAIN"
#elif defined HANVON
"Hanvon HW-8000 TAWIN"
@ -203,7 +203,7 @@ static constexpr const Identity srcIdent(
#else // ISG100
#ifdef MAKEHUAGAO
"HUAGOSCAN G200 TWAIN"
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZHUOYUYUNSCAN G200 TWAIN"
#elif defined NOLOGO
"Scan G200 TWAIN"
@ -236,7 +236,7 @@ static constexpr const Identity srcIdent(
#endif // ANDROIDSERIES
#elif defined NOLOGO
"Scan G300 TWAIN"
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZHUOYUYUNSCAN G300 TWAIN"
#elif defined CUMTENN
"CUMTENN CTS A4 TWAIN"
@ -260,7 +260,7 @@ static constexpr const Identity srcIdent(
#endif // ANDROIDSERIES
#elif defined LANXUM //!LANXUM
"LANXUMSCAN G52S TWAIN"
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
"ZHUOYUYUNSCAN G400 TWAIN"
#elif defined NOLOGO
"Scan G400 TWAIN"
@ -369,7 +369,7 @@ static std::vector<Vid_pid> DeviceID{
#endif // ISG100
};
#elif defiend ZHUOYUYUN
#elif defined ZHUOYUYUN
static std::vector<Vid_pid> DeviceID{
{0x3072,0x2100},
};

BIN
huagao/huagaotwds.rc
View File

Binary file not shown.