渠道变量统一到brand_xx文件
This commit is contained in:
parent
7d0998924a
commit
a5223a6c33
|
@ -1231,180 +1231,3 @@ namespace setting3399
|
|||
};
|
||||
|
||||
|
||||
#ifndef WIN32
|
||||
#ifdef OEM_HANWANG
|
||||
#define LIBNAME "libhwdriver.so"
|
||||
#define HGVERSION_LIBNANE "libHwVersion.so"
|
||||
#define IMGPRC_LIBNANE "libHwImgProc.so"
|
||||
#define HGBASE_LIBNAME "libHwBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/HanvonScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/HanvonScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN
|
||||
#endif
|
||||
|
||||
#elif defined(OEM_LISICHENG)
|
||||
#define LIBNAME "liblscdriver.so"
|
||||
#define HGVERSION_LIBNANE "libLscVersion.so"
|
||||
#define IMGPRC_LIBNANE "libLscImgProc.so"
|
||||
#define HGBASE_LIBNAME "libLscBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/LanxumScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/LanxumScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
#endif
|
||||
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
#define LIBNAME "libctsdriver.so"
|
||||
#define HGVERSION_LIBNANE "libCtsVersion.so"
|
||||
#define IMGPRC_LIBNANE "libCtsImgProc.so"
|
||||
#define HGBASE_LIBNAME "libCtsBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/CumtennScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/CumtennScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
#endif
|
||||
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
#define LIBNAME "libzjdriver.so"
|
||||
#define HGVERSION_LIBNANE "libZjVersion.so"
|
||||
#define IMGPRC_LIBNANE "libZjImgProc.so"
|
||||
#define HGBASE_LIBNAME "libZjBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/MicrotekScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN "../../entries/help/MicrotekScan_scanSettings_Help_manual_EN.pdf"
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/MicrotekScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN "../doc/MicrotekScan_scanSettings_Help_manual_EN.pdf"
|
||||
#endif
|
||||
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
#define LIBNAME "libzgdriver.so"
|
||||
#define HGVERSION_LIBNANE "libZGVersion.so"
|
||||
#define IMGPRC_LIBNANE "libZgImgProc.so"
|
||||
#define HGBASE_LIBNAME "libZgBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/UniScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/UniScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#endif
|
||||
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
#define LIBNAME "libneudriver.so"
|
||||
#define HGVERSION_LIBNANE "libNeuVersion.so"
|
||||
#define IMGPRC_LIBNANE "libNeuImgProc.so"
|
||||
#define HGBASE_LIBNAME "libNeuBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/NeuScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/NeuScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#endif
|
||||
|
||||
#elif defined(OEM_DELI)
|
||||
#define LIBNAME "libdldriver.so"
|
||||
#define HGVERSION_LIBNANE "libDlVersion.so"
|
||||
#define IMGPRC_LIBNANE "libDlImgProc.so"
|
||||
#define HGBASE_LIBNAME "libDlBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/DeliScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/DeliScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define LIBNAME "libhgdriver.so"
|
||||
#define HGVERSION_LIBNANE "libHGVersion.so"
|
||||
#define IMGPRC_LIBNANE "libHGImgProc.so"
|
||||
#define HGBASE_LIBNAME "libHGBase.so"
|
||||
|
||||
#ifdef UOS
|
||||
#define HELP_PATH "../../entries/help/HuaGoScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#elif KYLIN
|
||||
#define HELP_PATH "../doc/HuaGoScan_scanSettings_Help_manual.pdf";
|
||||
#define HELP_PATH_EN ""
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#else
|
||||
#ifdef OEM_HANWANG
|
||||
#define HGVERSION_LIBNANE "HWVersion.dll"
|
||||
#define IMGPRC_LIBNANE "HWImgProc.dll"
|
||||
#define HGBASE_LIBNAME "HWBase.dll"
|
||||
#define HELP_PATH "HanvonScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
|
||||
#elif defined(OEM_LISICHENG)
|
||||
#define HGVERSION_LIBNANE "LSCVersion.dll"
|
||||
#define IMGPRC_LIBNANE "LSCImgProc.dll"
|
||||
#define HGBASE_LIBNAME "LSCBase.dll"
|
||||
#define HELP_PATH "LanxumScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
|
||||
#elif defined(OEM_CANGTIAN)
|
||||
#define HGVERSION_LIBNANE "CTSVersion.dll"
|
||||
#define IMGPRC_LIBNANE "CtsImgProc.dll"
|
||||
#define HGBASE_LIBNAME "CtsBase.dll"
|
||||
#define HELP_PATH "CumtennScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
#define HGVERSION_LIBNANE "ZJVersion.dll"
|
||||
#define IMGPRC_LIBNANE "ZJImgProc.dll"
|
||||
#define HGBASE_LIBNAME "ZJBase.dll"
|
||||
#define HELP_PATH "MicrotekScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN "MicrotekScan_scanSettings_Help_manual_EN.pdf"
|
||||
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
#define HGVERSION_LIBNANE "ZGVersion.dll"
|
||||
#define IMGPRC_LIBNANE "ZGImgProc.dll"
|
||||
#define HGBASE_LIBNAME "ZGBase.dll"
|
||||
#define HELP_PATH "UniScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
|
||||
#elif defined(OEM_NEUTRAL)
|
||||
#define HGVERSION_LIBNANE "NEUVersion.dll"
|
||||
#define IMGPRC_LIBNANE "NEUImgProc.dll"
|
||||
#define HGBASE_LIBNAME "NEUBase.dll"
|
||||
#define HELP_PATH "NeuScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
|
||||
#elif defined(OEM_DELI)
|
||||
#define HGVERSION_LIBNANE "DLVersion.dll"
|
||||
#define IMGPRC_LIBNANE "DLImgProc.dll"
|
||||
#define HGBASE_LIBNAME "DLBase.dll"
|
||||
#define HELP_PATH "DeliScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN ""
|
||||
|
||||
#else
|
||||
#define OEM_HUAGAO
|
||||
#define HGVERSION_LIBNANE "HGVersion.dll"
|
||||
#define IMGPRC_LIBNANE "HGImgProc.dll"
|
||||
#define HGBASE_LIBNAME "HGBase.dll"
|
||||
#define HELP_PATH "HuaGoScan_scanSettings_Help_manual.pdf"
|
||||
#define HELP_PATH_EN "HuaGoScan_scanSettings_Help_manual_EN.pdf"
|
||||
|
||||
#endif
|
||||
|
||||
#define LIBNAME "scanner.dll"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1160,14 +1160,6 @@ namespace hg_imgproc
|
|||
SDKExit ocrexit = NULL;
|
||||
|
||||
#ifndef WIN32
|
||||
#ifdef OEM_HANWANG
|
||||
string libname = "libhwdriver.so";
|
||||
#elif defined(OEM_LISICHENG)
|
||||
string libname = "liblscdriver.so";
|
||||
#else
|
||||
string libname = "libhgdriver.so";
|
||||
#endif
|
||||
|
||||
string scanner_path = utils::get_module_full_path(SCANNER_DRIVER_PART_NAME);
|
||||
|
||||
if(scanner_path.empty())
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -26,8 +26,6 @@
|
|||
/// <summary>
|
||||
/// supporting devices :
|
||||
///
|
||||
#define TO_STR(s) #s
|
||||
#define PID_AND_NAME(p, n) 0x##p, std::string(n) + " - " + TO_STR(p)
|
||||
#define GET_LANG(str,b) from_default_language(str,b)
|
||||
static struct
|
||||
{
|
||||
|
@ -572,7 +570,7 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne
|
|||
size_t append_cnt = 1;
|
||||
|
||||
|
||||
bytes += sizeof(g_logo);
|
||||
//bytes += sizeof(g_logo);
|
||||
bytes += strlen(GET_LANG(BRAND_APP_NAME, &islang)) + 8; append_cnt++;
|
||||
bytes += strlen(GET_LANG(BRAND_TITLE_VERSION,&islang)) + 8; append_cnt++;
|
||||
bytes += strlen(GET_LANG(BRAND_TITLE_COPYRIGHT,&islang)) + 8; append_cnt++;
|
||||
|
@ -632,9 +630,9 @@ scanner_err hg_scanner_mgr::get_about_info(scanner_handle h, void* data, unsigne
|
|||
strcpy(ptr, s.c_str());
|
||||
MOVE_TO_NEXT_STR(ptr);
|
||||
|
||||
about->logo_bytes = sizeof(g_logo);;
|
||||
about->logo = ptr;
|
||||
memcpy(ptr, g_logo, about->logo_bytes);
|
||||
//about->logo_bytes = sizeof(g_logo);;
|
||||
//about->logo = ptr;
|
||||
//memcpy(ptr, g_logo, about->logo_bytes);
|
||||
ptr += about->logo_bytes + 1;
|
||||
|
||||
int count = 0, rolls = 0, ret = SCANNER_ERR_OK;
|
||||
|
|
|
@ -781,9 +781,10 @@ static Identity* srcIdent = nullptr;
|
|||
// Version(VERSION_MAIN, VERSION_SUB, Language::English, Country::China, VERSION_STR(VERSION_MAIN, VERSION_SUB, VERSION_BUILD1, VERSION_PATCH)),
|
||||
// DataGroup::Image, PRODUCT_VENDOR, PRODUCT_FAMILY, Str32(product_twain_name.c_str()));
|
||||
|
||||
static void init_identity(void)
|
||||
class my_cleanup
|
||||
{
|
||||
if(!srcIdent)
|
||||
public:
|
||||
my_cleanup()
|
||||
{
|
||||
Str32 n;
|
||||
|
||||
|
@ -791,16 +792,8 @@ static void init_identity(void)
|
|||
srcIdent = new Identity(Version(VERSION_MAIN, VERSION_SUB, Language::English, Country::China, VERSION_STR(VERSION_MAIN, VERSION_SUB, VERSION_BUILD1, VERSION_PATCH)),
|
||||
DataGroup::Image, PRODUCT_VENDOR, PRODUCT_FAMILY, n);
|
||||
}
|
||||
}
|
||||
|
||||
class my_cleanup
|
||||
{
|
||||
public:
|
||||
my_cleanup()
|
||||
{}
|
||||
~my_cleanup()
|
||||
{
|
||||
if (srcIdent)
|
||||
delete srcIdent;
|
||||
srcIdent = nullptr;
|
||||
}
|
||||
|
@ -855,14 +848,10 @@ int huagao_ds::on_scanner_event(int ev, void* param)
|
|||
|
||||
const Identity& huagao_ds::defaultIdentity() noexcept {
|
||||
// remember, we return a reference, therefore the identity must not be placed on the stack of this method
|
||||
init_identity();
|
||||
|
||||
return *srcIdent;
|
||||
}
|
||||
Result huagao_ds::selectIdentity(Twpp::Identity& ident) noexcept {
|
||||
// remember, we return a reference, therefore the identity must not be placed on the stack of this method
|
||||
init_identity();
|
||||
|
||||
ident = *srcIdent;
|
||||
|
||||
return success();
|
||||
|
@ -1301,11 +1290,12 @@ Result huagao_ds::imageInfoGet(const Identity&, ImageInfo& data)
|
|||
}
|
||||
else
|
||||
{
|
||||
utils::log_info(" imageInfoGet = false\r\n", 1);
|
||||
utils::to_log(LOG_LEVEL_DEBUG, " imageInfoGet = false, error = 0x%x\r\n", scanner_->last_error());
|
||||
|
||||
data.setHeight(0);
|
||||
|
||||
return { ReturnCode::XferDone, ConditionCode::Bummer };
|
||||
//return { ReturnCode::XferDone, ConditionCode::Bummer };
|
||||
return { ReturnCode::Failure, condition_code_from_hg_error(scanner_->last_error()) };
|
||||
}
|
||||
|
||||
int h = data.height();
|
||||
|
|
|
@ -1418,10 +1418,6 @@ COM_API_IMPLEMENT(scanner, bool, ui_is_ok(void))
|
|||
|
||||
|
||||
// called from device-layer ...
|
||||
int scanner::last_err(void)
|
||||
{
|
||||
return err_;
|
||||
}
|
||||
int scanner::handle_device_event(int ev_code, void* data, unsigned int* len)
|
||||
{
|
||||
if (ev_code == SANE_EVENT_WORKING)
|
||||
|
|
|
@ -174,6 +174,5 @@ public:
|
|||
// methods:
|
||||
public:
|
||||
int open(void);
|
||||
int last_err(void);
|
||||
int handle_device_event(int ev_code, void* data, unsigned int* len);
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue