openharmony/print_print_fwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/print_print_fwk synced 2025-02-18 17:27:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!409 过滤打印错误信息

Browse Source 
Merge pull request !409 from 单海洋/myfeature
This commit is contained in:
openharmony_ci 2024-10-11 04:19:17 +00:00 committed by Gitee
commit 55e8a3160a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services/print_service/src/print_cups_client.cpp
View File

@ -102,6 +102,7 @@ static const std::string PRINTER_STATE_MARKER_LOW_WARNING = "marker-supply-low-w
static const std::string PRINTER_STATE_MEDIA_EMPTY_WARNING = "media-empty-warning";
static const std::string PRINTER_STATE_NONE = "none";
static const std::string PRINTER_STATE_EMPTY = "";
static const std::string PRINTER_STATE_ERROR = "error";
static const std::string PRINTER_STATE_MEDIA_EMPTY = "media-empty";
static const std::string PRINTER_STATE_MEDIA_JAM = "media-jam";
static const std::string PRINTER_STATE_PAUSED = "paused";
@ -1290,13 +1291,7 @@ void PrintCupsClient::JobStatusCallback(JobMonitorParam *param, JobStatus *jobSt
} else if (jobStatus->job_state == IPP_JOB_PROCESSING) {
PRINT_HILOGD("IPP_JOB_PROCESSING");
std::string printerState(jobStatus->printer_state_reasons);
if (find(IGNORE_STATE_LIST.begin(), IGNORE_STATE_LIST.end(), printerState) != IGNORE_STATE_LIST.end()) {
param->serviceAbility->UpdatePrintJobState(param->serviceJobId, PRINT_JOB_RUNNING,
PRINT_JOB_BLOCKED_BUSY);
} else if (strstr(jobStatus->printer_state_reasons, PRINTER_STATE_MARKER_LOW_WARNING.c_str()) != NULL) {
param->serviceAbility->UpdatePrintJobState(param->serviceJobId, PRINT_JOB_RUNNING,
PRINT_JOB_BLOCKED_BUSY);
} else if (strstr(jobStatus->printer_state_reasons, PRINTER_STATE_MEDIA_EMPTY_WARNING.c_str()) != NULL) {
if (strstr(jobStatus->printer_state_reasons, PRINTER_STATE_ERROR.c_str()) == NULL) {
param->serviceAbility->UpdatePrintJobState(param->serviceJobId, PRINT_JOB_RUNNING,
PRINT_JOB_BLOCKED_BUSY);
} else {