屏蔽其他ome厂商锁定功能
This commit is contained in:
parent
7db6c95d37
commit
576b633d5c
|
@ -224,7 +224,11 @@ hg_scanner::hg_scanner(ScannerSerial serial
|
||||||
|
|
||||||
thread_usb_read_.reset(new std::thread(&hg_scanner::thread_handle_usb, this));
|
thread_usb_read_.reset(new std::thread(&hg_scanner::thread_handle_usb, this));
|
||||||
thread_img_handle_.reset(new std::thread(&hg_scanner::thread_image_handle, this));
|
thread_img_handle_.reset(new std::thread(&hg_scanner::thread_image_handle, this));
|
||||||
|
|
||||||
|
#ifdef OEM_HUAGAO
|
||||||
thread_devslock_handle_.reset(new std::thread(&hg_scanner::thread_devslock_handle, this));
|
thread_devslock_handle_.reset(new std::thread(&hg_scanner::thread_devslock_handle, this));
|
||||||
|
#endif
|
||||||
|
|
||||||
ImagePrc_pHandle_ = hg_imgproc::init(pid_, isx86_Advan_);;
|
ImagePrc_pHandle_ = hg_imgproc::init(pid_, isx86_Advan_);;
|
||||||
}
|
}
|
||||||
hg_scanner::~hg_scanner()
|
hg_scanner::~hg_scanner()
|
||||||
|
@ -236,8 +240,12 @@ hg_scanner::~hg_scanner()
|
||||||
thread_usb_read_->join();
|
thread_usb_read_->join();
|
||||||
if (thread_img_handle_.get() && thread_img_handle_->joinable())
|
if (thread_img_handle_.get() && thread_img_handle_->joinable())
|
||||||
thread_img_handle_->join();
|
thread_img_handle_->join();
|
||||||
|
|
||||||
|
#ifdef OEM_HUAGAO
|
||||||
if (thread_devslock_handle_.get() && thread_devslock_handle_->joinable())
|
if (thread_devslock_handle_.get() && thread_devslock_handle_->joinable())
|
||||||
thread_devslock_handle_->join();
|
thread_devslock_handle_->join();
|
||||||
|
#endif
|
||||||
|
|
||||||
delete custom_gamma_val_;
|
delete custom_gamma_val_;
|
||||||
hg_imgproc::release(ImagePrc_pHandle_);
|
hg_imgproc::release(ImagePrc_pHandle_);
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
#define HGVERSION_LIBNANE "libCtsVersion.so"
|
#define HGVERSION_LIBNANE "libCtsVersion.so"
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
|
#define OEM_HUAGAO
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define HGVERSION_LIBNANE "HGVersion.dll"
|
#define HGVERSION_LIBNANE "HGVersion.dll"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -170,7 +170,10 @@ hg_scanner_239::hg_scanner_239(const char* dev_name, int pid,usb_io* io) : hg_sc
|
||||||
}
|
}
|
||||||
init_version();
|
init_version();
|
||||||
hg_version_init_handle();
|
hg_version_init_handle();
|
||||||
|
|
||||||
|
#ifdef OEM_HUAGAO
|
||||||
wait_devsislock_.notify();
|
wait_devsislock_.notify();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
hg_scanner_239::~hg_scanner_239()
|
hg_scanner_239::~hg_scanner_239()
|
||||||
{
|
{
|
||||||
|
@ -1195,11 +1198,6 @@ int hg_scanner_239::start(void)
|
||||||
status_ = SCANNER_ERR_DEVICE_COUNT_MODE;
|
status_ = SCANNER_ERR_DEVICE_COUNT_MODE;
|
||||||
return status_;
|
return status_;
|
||||||
}
|
}
|
||||||
//else if ((get_scan_islock(val)) == SCANNER_ERR_DEVICE_ISLOCK)
|
|
||||||
//{
|
|
||||||
// status_ = SCANNER_ERR_DEVICE_ISLOCK;
|
|
||||||
// return status_;
|
|
||||||
//}
|
|
||||||
|
|
||||||
notify_ui_working_status(STATU_DESC_REWRITE_CONFIGURATION);
|
notify_ui_working_status(STATU_DESC_REWRITE_CONFIGURATION);
|
||||||
if(ret == SCANNER_ERR_OK)
|
if(ret == SCANNER_ERR_OK)
|
||||||
|
@ -1226,11 +1224,15 @@ int hg_scanner_239::start(void)
|
||||||
VLOG_MINI_1(LOG_LEVEL_WARNING, "start status01 is(%s), the result will be unpredictable.\n", hg_scanner_err_name(ret));
|
VLOG_MINI_1(LOG_LEVEL_WARNING, "start status01 is(%s), the result will be unpredictable.\n", hg_scanner_err_name(ret));
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef OEM_HUAGAO
|
||||||
if (is_checksum_strat_scan)
|
if (is_checksum_strat_scan)
|
||||||
{
|
{
|
||||||
std::string str("C34E58CD5F3F2FF703E1AA24892FBD69");
|
std::string str("C34E58CD5F3F2FF703E1AA24892FBD69");
|
||||||
set_scan_lock_check_val(str);
|
set_scan_lock_check_val(str);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ret = write_command(setting3399::SC_START);
|
ret = write_command(setting3399::SC_START);
|
||||||
|
|
||||||
io_->set_timeout(1000);
|
io_->set_timeout(1000);
|
||||||
|
|
Loading…
Reference in New Issue