openharmony/print_print_fwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/print_print_fwk synced 2024-11-23 00:50:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!521 解决某些情况下打印机不显示在发现列表的问题

Browse Source 
Merge pull request !521 from liuwenfeng/master
This commit is contained in:
openharmony_ci 2024-11-22 10:28:56 +00:00 committed by Gitee
commit 39be486f4f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/print_service/src/print_service_ability.cpp
View File

@ -3162,22 +3162,22 @@ bool PrintServiceAbility::AddVendorPrinterToDiscovery(const std::string &globalV
printerInfo->SetPrinterName(cupsPrinter.name);
}
printerInfo->SetPrinterId(globalPrinterId);
printerInfo->SetPrinterState(PRINTER_ADDED);
printSystemData_.AddPrinterToDiscovery(printerInfo);
}
printerInfo->SetPrinterState(PRINTER_ADDED);
SendPrinterDiscoverEvent(PRINTER_ADDED, *printerInfo);
SendPrinterEvent(*printerInfo);
if (printSystemData_.IsPrinterAdded(printerInfo->GetPrinterId()) &&
!printSystemData_.CheckPrinterBusy(printerInfo->GetPrinterId())) {
if (CheckPrinterUriDifferent(printerInfo)) {
PRINT_HILOGW("different printer uri, ignore it");
} else {
PRINT_HILOGI("added printer, update status to idle");
printerInfo->SetPrinterStatus(PRINTER_STATUS_IDLE);
printSystemData_.UpdatePrinterStatus(printerInfo->GetPrinterId(), PRINTER_STATUS_IDLE);
SendPrinterEventChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
SendPrinterChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
if (CheckPrinterUriDifferent(printerInfo) &&
UpdateAddedPrinterInCups(printerInfo->GetPrinterId(), printerInfo->GetUri())) {
printSystemData_.UpdatePrinterUri(printerInfo);
printSystemData_.SaveCupsPrinterMap();
}
printerInfo->SetPrinterStatus(PRINTER_STATUS_IDLE);
printSystemData_.UpdatePrinterStatus(printerInfo->GetPrinterId(), PRINTER_STATUS_IDLE);
SendPrinterEventChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
SendPrinterChangeEvent(PRINTER_EVENT_STATE_CHANGED, *printerInfo);
}
return true;
}