diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 5705ff8..6a8e09c 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -360,7 +360,7 @@ void hg_scanner_mgr::on_hgscanner_pnp(usb_event ev, libusb_device* device, int v int index = -1; for (int i = 0; i < _countof(g_supporting_devices); ++i) { - // 064B 多台设备使用这个vid,所以加载时不会清楚要打开哪一台设备,只有通过外部进行加载改变实例 + // 064B 澶氬彴璁惧浣跨敤杩欎釜vid锛屾墍浠ュ姞杞芥椂涓嶄細娓呮瑕佹墦寮€鍝竴鍙拌澶囷紝鍙湁閫氳繃澶栭儴杩涜鍔犺浇鏀瑰彉瀹炰緥 if (g_supporting_devices[i].vid == vid && g_supporting_devices[i].pid == pid) { index = i; @@ -388,14 +388,14 @@ void hg_scanner_mgr::on_hgscanner_pnp(usb_event ev, libusb_device* device, int v size_t i = 0; for (; i < online_devices_.size(); ++i) { - if (online_devices_[i].dev == device) // 此处假定同一台设备重新连接后,设备对象“device”保持不变;如果假设不成立,会导致设备重连消息不能正常接收,绑定到该设备的scanner对象得不到释? + if (online_devices_[i].dev == device) // 姝ゅ鍋囧畾鍚屼竴鍙拌澶囬噸鏂拌繛鎺ュ悗锛岃澶囧璞♀€渄evice鈥濅繚鎸佷笉鍙橈紱濡傛灉鍋囪涓嶆垚绔嬶紝浼氬鑷磋澶囬噸杩炴秷鎭笉鑳芥甯告帴鏀讹紝缁戝畾鍒拌璁惧鐨剆canner瀵硅薄寰椾笉鍒伴噴鏀? { online_devices_[i].ind = index; add = false; break; } } - if (add) // 处理对象“device”改变的情景 + if (add) // 澶勭悊瀵硅薄鈥渄evice鈥濇敼鍙樼殑鎯呮櫙 { i = 0; for (auto& v : online_devices_) @@ -851,8 +851,8 @@ scanner_err hg_scanner_mgr::hg_scanner_get_parameter(scanner_handle h, const cha strcmp(SANE_STD_OPT_NAME_FIRMWARE_VERSION, name) == 0 || strcmp(SANE_STD_OPT_NAME_DEVICE_IP_ADDR, name) == 0 || strcmp(SANE_STD_OPT_NAME_ROLLER_COUNT, name) == 0 || - strcmp(SANE_STD_OPT_NAME_TOTAL_COUNT, name) == 0 || - strcmp(SANE_STD_OPT_NAME_GET_DEVS_L0G, name) == 0) + strcmp(SANE_STD_OPT_NAME_TOTAL_COUNT, name) == 0 /*|| + strcmp(SANE_STD_OPT_NAME_GET_DEVS_L0G, name) == 0*/) return (scanner_err)SCAN_PTR(h)->set_setting(name, data, len); }