fix bug-159; 修改OEM路径
This commit is contained in:
parent
3dce0bf435
commit
4ce9daba9e
|
@ -92,6 +92,7 @@ hg_scanner::hg_scanner(ScannerSerial serial
|
||||||
, fractate_level_(50), ui_ev_cb_(ui_default_callback), scan_life_(NULL)
|
, fractate_level_(50), ui_ev_cb_(ui_default_callback), scan_life_(NULL)
|
||||||
, notify_setting_result_(false), user_cancel_(false), cb_mem_(true), test_1_paper_(false)
|
, notify_setting_result_(false), user_cancel_(false), cb_mem_(true), test_1_paper_(false)
|
||||||
, setting_count_(0),img_type_(""), online_(false),is_quality_(-1),is_color_fill(false),is_multiout(false),save_multiout(OPTION_VALUE_DLSC_CS_HD_HB)
|
, setting_count_(0),img_type_(""), online_(false),is_quality_(-1),is_color_fill(false),is_multiout(false),save_multiout(OPTION_VALUE_DLSC_CS_HD_HB)
|
||||||
|
, final_img_index_(0)
|
||||||
{
|
{
|
||||||
final_path_ = hg_log::ini_get("paths", "final_img");
|
final_path_ = hg_log::ini_get("paths", "final_img");
|
||||||
if(final_path_.empty())
|
if(final_path_.empty())
|
||||||
|
@ -1666,7 +1667,24 @@ int hg_scanner::try_third_app_handle_start(bool& handled)
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(3));
|
std::this_thread::sleep_for(std::chrono::milliseconds(3));
|
||||||
|
|
||||||
if (!wait_img_.is_waiting() || !wait_usb_.is_waiting() || final_imgs_.size())
|
if (!wait_img_.is_waiting() || !wait_usb_.is_waiting() || final_imgs_.size())
|
||||||
ret = SCANNER_ERR_OK;
|
{
|
||||||
|
while (final_imgs_.size() == 0)
|
||||||
|
{
|
||||||
|
if (wait_img_.is_waiting() && wait_usb_.is_waiting())
|
||||||
|
break;
|
||||||
|
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(3));
|
||||||
|
}
|
||||||
|
if (final_imgs_.size() == 0)
|
||||||
|
{
|
||||||
|
final_img_index_ = 0;
|
||||||
|
|
||||||
|
if (user_cancel_)
|
||||||
|
handled = false;
|
||||||
|
else
|
||||||
|
ret = SCANNER_ERR_DEVICE_NO_PAPER;
|
||||||
|
}
|
||||||
|
}
|
||||||
else if (final_img_index_)
|
else if (final_img_index_)
|
||||||
{
|
{
|
||||||
final_img_index_ = 0;
|
final_img_index_ = 0;
|
||||||
|
|
|
@ -513,9 +513,9 @@ extern "C"
|
||||||
home += PATH_SEPARATOR + lead;
|
home += PATH_SEPARATOR + lead;
|
||||||
|
|
||||||
#ifdef OEM_HANWANG
|
#ifdef OEM_HANWANG
|
||||||
home += "HwScanner";
|
home += "HanvonScan";
|
||||||
#elif defined(OEM_LISICHENG)
|
#elif defined(OEM_LISICHENG)
|
||||||
home += "LscScanner";
|
home += "LanxumScan";
|
||||||
#else
|
#else
|
||||||
home += "HuaGoScan";
|
home += "HuaGoScan";
|
||||||
#endif;
|
#endif;
|
||||||
|
|
Loading…
Reference in New Issue