lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整 紫光网站，3399超时退出60秒，

This commit is contained in:
13038267101 2023-04-08 11:33:44 +08:00
parent 5df746336a
commit e3fc225fa0
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/char_const.h
View File

@ -136,7 +136,7 @@
#define BRAND_TITE_MANUFACTOR "\345\210\266\351\200\240\345\225\206/\345\274\200\345\217\221\345\225\206"
// #define BRAND_TITLE_URL "公司网址"
#define BRAND_TITLE_URL "\345\205\254\345\217\270\347\275\221\345\235\200"
#define BRAND_COMPANY_URL "www.unisscan.com"
#define BRAND_COMPANY_URL "www.uniscan.com"
#define BRAND_URL_COMPANY_URL "http://www.unisscan.com"
//#define BRAND_TITLE_TEL "联系电话"
#define BRAND_TITLE_TEL "\350\201\224\347\263\273\347\224\265\350\257\235"

3
hgdriver/hgdev/hg_scanner.cpp
View File

@ -960,6 +960,8 @@ bool hg_scanner::is_to_file(void)
}
void hg_scanner::thread_handle_image_process(void)
{
//VLDGlobalEnable();
//VLDReportLeaks();
//while (run_ && !user_cancel_)
while (run_)
{
@ -1015,6 +1017,7 @@ void hg_scanner::thread_handle_image_process(void)
VLOG_MINI_1(LOG_LEVEL_FATAL, "Reload USB data '%s' failed!\n", tiny_buffer->file().c_str());
}
}
//VLDGlobalDisable();
}
void hg_scanner::working_begin(void*)
{

2
hgdriver/hgdev/hg_scanner.h
View File

@ -10,7 +10,7 @@
#include <algorithm>
#include <mutex>
#include <thread>
//#include <vld.h>
#include "usb_manager.h"
#include "../../sdk/hginclude/huagaoxxx_warraper_ex.h"
#include "jsonconfig.h"

10
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1078,13 +1078,7 @@ void hg_scanner_239::thread_get_dves_image(void)
{
status_ = ret;
notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, ret); // 取图通信超时
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, " > 600DPI:%s\n", hg_scanner_err_name(status_));
break;
}
else if (img_conf_.resolution_dst < 600.0 && sw.elapsed_s() > 20 && !is_auto_paper_scan)
{
notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, ret);
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "< 600DPI:%s\n", hg_scanner_err_name(status_));
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, " get image time out:%s\n", hg_scanner_err_name(status_));
break;
}
@ -1092,7 +1086,7 @@ void hg_scanner_239::thread_get_dves_image(void)
{
stop();
notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN), SANE_EVENT_ERROR, status_);
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "< exit wait:%s\n", from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN));
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "auto paper scan exit :%s\n", from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_EXIT_WAIT_SCAN));
}
if ((get_status() & 0x03) == 0)

1
hgdriver/hgdev/hg_scanner_239.h
View File

@ -11,6 +11,7 @@
#include <stdio.h>
#include <list>
#include "hg_scanner.h"
//#include <vld.h>
//#ifdef OEM_HANWANG
//#define hg_scanner_239 hw_scanner_239

14
hgdriver/hgdev/image_process.cpp
View File

@ -1165,17 +1165,17 @@ namespace hg_imgproc
int quality(int dpi_dst)
{
int ret = SCANNER_ERR_OK;
CImageApplyFilter::FilterMode sharpenType = CImageApplyFilter::FilterMode::None;
std::vector<cv::Mat> mats(mats_);
mats_.clear();
//std::vector<cv::Mat> mats(mats_);
//mats_.clear();
//mats_.resize(mats.size());
float xy = (float)dpi_dst/200.0;
for (size_t i = 0; i < mats.size(); ++i)
for (size_t i = 0; i < mats_.size(); ++i)
{
cv::Mat out;
cv::resize(mats[i],out, cv::Size(),xy,xy);
mats_.push_back(out);
//cv::Mat out;
cv::resize(mats_[i], mats_[i], cv::Size(),xy,xy);
//mats_.push_back(out);
}
if (mats_.empty())

1
hgdriver/hgdev/image_process.h
View File

@ -10,6 +10,7 @@
#include <vector>
#include <sane/sane_ex.h>
#include "../ImageProcess/ImageApplyHeaders.h"
//#include <vld.h>
class tiny_buffer;
namespace hg_imgproc
{