版本判断调整
This commit is contained in:
parent
34e8c47228
commit
939e888469
|
@ -328,12 +328,12 @@ void hg_scanner_239::init_version(void)
|
|||
else
|
||||
is_kernelsnap_211209_ = false;
|
||||
|
||||
if (fv.length() >= 10 && (fv[5] > 'B' && atoi(fv.substr(6, 4).c_str()) >= 830))
|
||||
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 830))
|
||||
is_kernelsnap_220830_ = true;
|
||||
else
|
||||
is_kernelsnap_220830_ = false;
|
||||
|
||||
if (fv.length() >= 10 && (fv[5] > 'B' && atoi(fv.substr(6, 4).c_str()) >= 1027))
|
||||
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 1027))
|
||||
is_kernelsnap_221027_ = true;
|
||||
else
|
||||
is_kernelsnap_221027_ = false;
|
||||
|
@ -1317,7 +1317,7 @@ int hg_scanner_239::start(void)
|
|||
|
||||
if ((get_scan_is_sleep(val)) == SCANNER_ERR_DEVICE_SLEEPING)
|
||||
{
|
||||
status_ = ret;
|
||||
status_ = SCANNER_ERR_DEVICE_SLEEPING;
|
||||
VLOG_MINI_1(LOG_LEVEL_WARNING, "device start status is(%s)\n", STATU_DESC_SCANNER_ERR_DEVICE_SLEEPING);
|
||||
if(is_kernelsnap_220830_)
|
||||
ret = notify_sleep();
|
||||
|
@ -1326,13 +1326,13 @@ int hg_scanner_239::start(void)
|
|||
}
|
||||
else if (( get_scan_mode(val)) == SCANNER_ERR_DEVICE_COUNT_MODE)
|
||||
{
|
||||
status_ = ret;
|
||||
return ret;
|
||||
status_ = SCANNER_ERR_DEVICE_COUNT_MODE;
|
||||
return status_;
|
||||
}
|
||||
else if ((get_scan_islock(val)) == SCANNER_ERR_DEVICE_ISLOCK)
|
||||
{
|
||||
status_ = ret;
|
||||
return ret;
|
||||
status_ = SCANNER_ERR_DEVICE_ISLOCK;
|
||||
return status_;
|
||||
}
|
||||
|
||||
notify_ui_working_status(STATU_DESC_REWRITE_CONFIGURATION);
|
||||
|
|
Loading…
Reference in New Issue