From b415496652f550c7da9fc4abd9721252842cc3e1 Mon Sep 17 00:00:00 2001 From: masayume_ht <1936714878@qq.com> Date: Thu, 27 Apr 2023 15:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E4=BF=AE=E5=A4=8D=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E5=99=A8=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98=20--23.04.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.txt | 3 ++- huagao/Device/GScanO1003399.cpp | 10 +++++----- huagao/Device/PublicFunc.cpp | 2 +- huagao/huagaods.cpp | 20 ++++++++++---------- huagao/huagaotwds.rc | Bin 53908 -> 53782 bytes 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/changelog.txt b/changelog.txt index 5445fdc0..ed00f21d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -86,4 +86,5 @@ 7.添加3288 linux待纸扫描功能 --23.03.08 8.添加安卓设备锁定协议支持 --23.03.13 9.适配卓育云ODM厂商 --23.04.24 - 10.对接爱云校做协议适配 --23.04.24 \ No newline at end of file + 10.对接爱云校做协议适配 --23.04.24 + 11.调整文件编码格式修复指示器乱码问题 --23.04.27 \ No newline at end of file diff --git a/huagao/Device/GScanO1003399.cpp b/huagao/Device/GScanO1003399.cpp index 25776b37..4c3ad309 100644 --- a/huagao/Device/GScanO1003399.cpp +++ b/huagao/Device/GScanO1003399.cpp @@ -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>& 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")); diff --git a/huagao/Device/PublicFunc.cpp b/huagao/Device/PublicFunc.cpp index dc47e912..e97cc608 100644 --- a/huagao/Device/PublicFunc.cpp +++ b/huagao/Device/PublicFunc.cpp @@ -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")); diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp index 28a8ea26..5f1bb3b5 100644 --- a/huagao/huagaods.cpp +++ b/huagao/huagaods.cpp @@ -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 DeviceID{ #endif // ISG100 }; -#elif defiend ZHUOYUYUN +#elif defined ZHUOYUYUN static std::vector DeviceID{ {0x3072,0x2100}, }; diff --git a/huagao/huagaotwds.rc b/huagao/huagaotwds.rc index 0b8300eb673cb4fd9d30e0596696607d8d7298e6..139d23d2d789bd956026e684f5992dbcc94dd41b 100644 GIT binary patch delta 18 acmbQTlzG|`<_-G}O;$S~u{q?h13v&$SO`=A delta 42 zcmV+_0M-ANqyv