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

Modifying conflicts between WiFi and P2P IP addresses Singed-off-by:dongzhengkuan@huawei.com

Browse Source 
Signed-off-by: 15549494042 <dongzhengkuan@huawei.com>
This commit is contained in:
15549494042 2024-02-02 15:41:15 +08:00
parent ebb9527f98
commit 4d2ff11c74
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -930,7 +930,7 @@ JobParameters* PrintCupsClient::BuildJobParameters(const PrintJob &jobInfo)
params->jobOriginatingUserName = DEFAULT_USER;
params->mediaSize = GetMedieSize(jobInfo);
params->color = GetColorString(jobInfo.GetColorMode());
jobParams->printerId = jobInfo.GetPrinterId();
params->printerId = jobInfo.GetPrinterId();
params->printerName = PrintUtil::StandardizePrinterName(optionJson["printerName"]);
params->printerUri = optionJson["printerUri"];
params->documentFormat = optionJson["documentFormat"];
@ -1176,7 +1176,7 @@ float PrintCupsClient::ConvertInchTo100MM(float num)
bool PrintCupsClient::IsIpConflict(const std::string &printerId, std::string &nic)
{
if (printerId.find(P2P_PRINTER) == std::string.npos) {
if (printerId.find(P2P_PRINTER) == std::string::npos) {
PRINT_HILOGD("The printer is not p2p: %{private}s", printerId.c_str());
return false;
}
@ -1208,6 +1208,6 @@ std::string PrintCupsClient::GetIpAddress(unsigned int number)
unsigned int ip2 = (number << IP_RIGHT_SHIFT_8) >> IP_RIGHT_SHIFT_24;
unsigned int ip1 = (number << IP_RIGHT_SHIFT_16) >> IP_RIGHT_SHIFT_24;
unsigned int ip0 = (number << IP_RIGHT_SHIFT_24) >> IP_RIGHT_SHIFT_24;
return sdt::to_string(ip3) + "." + sdt::to_string(ip2) + "." + sdt::to_string(ip1) + "." + sdt::to_string(ip0);
return std::to_string(ip3) + "." + std::to_string(ip2) + "." + std::to_string(ip1) + "." + std::to_string(ip0);
}
}