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

告警修改 Signed-off-by:baozewei@huawei.com

Browse Source 
Signed-off-by: b30052170 <baozewei@huawei.com>
This commit is contained in:
b30052170 2024-09-06 11:29:29 +08:00
parent 86876759b5
commit f9378d286e
6 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/kits/napi/scan_napi/src/scan_async_call.cpp
View File

@ -157,8 +157,10 @@ void ScanAsyncCall::OnComplete(napi_env env, napi_status status, void *data)
uint32_t errorIndex = E_SCAN_NONE;
if (context->paramStatus != napi_ok) {
errorIndex = E_SCAN_INVALID_PARAMETER;
} else {
} else if (context->ctx != nullptr){
errorIndex = context->ctx->GetErrorIndex();
} else {
errorIndex = E_SCAN_GENERIC_FAILURE;
}
SCAN_HILOGE("ErrorMessage: [%{public}s], ErrorIndex:[%{public}d]",
GetErrorText(errorIndex).c_str(), errorIndex);

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

@ -54,8 +54,6 @@ using namespace std;
using namespace OHOS::HiviewDFX;
using namespace Security::AccessToken;
using json = nlohmann::json;
const std::string PRINTER_SERVICE_FILE_PATH = "/data/service/el2/public/print_service";
const std::string PRINTER_PREFERENCE_FILE = "printer_preference.json";
const uint32_t MAX_JOBQUEUE_NUM = 512;
const uint32_t ASYNC_CMD_DELAY = 10;
@ -111,6 +109,8 @@ static const std::string NOTIFY_INFO_SPOOLER_CLOSED_FOR_STARTED = "spooler_close
static const std::string PRINTER_ID_DELIMITER = ":";
static const std::string USB_PRINTER = "usb";
const std::string PRINTER_PREFERENCE_FILE = "printer_preference.json";
static bool g_publishState = false;
REGISTER_SYSTEM_ABILITY_BY_ID(PrintServiceAbility, PRINT_SERVICE_ID, true);

8
services/print_service/src/print_system_data.cpp
View File

@ -23,14 +23,6 @@
#include "print_util.h"
#include "print_constant.h"
namespace {
const std::string PRINTER_SERVICE_FILE_PATH = "/data/service/el2/public/print_service";
const std::string PRINTER_LIST_FILE = "printer_list.json";
const std::string PRINTER_LIST_VERSION = "v1";
const std::string PRINT_USER_DATA_FILE = "print_user_data.json";
const std::string PRINT_USER_DATA_VERSION = "v1";
} // namespace
namespace OHOS {
namespace Print {

4
services/print_service/src/print_user_data.cpp
View File

@ -29,10 +29,6 @@ namespace Print {
using namespace std;
const std::string PRINTER_SERVICE_FILE_PATH = "/data/service/el2/public/print_service";
const std::string PRINT_USER_DATA_FILE = "print_user_data.json";
const std::string PRINT_USER_DATA_VERSION = "v1";
void PrintUserData::RegisterPrinterCallback(const std::string &type, const sptr<IPrintCallback> &listener)
{
registeredListeners_[type] = listener;

5
utils/include/print_constant.h
View File

@ -232,5 +232,10 @@ const std::string PRINTER_DISCOVER_EVENT_TYPE = "printerDiscover";
const std::string PRINTER_CHANGE_EVENT_TYPE = "printerChange";
static const std::string PERMISSION_NAME_PRINT = "ohos.permission.PRINT";
static const std::string PERMISSION_NAME_PRINT_JOB = "ohos.permission.MANAGE_PRINT_JOB";
const std::string PRINTER_SERVICE_FILE_PATH = "/data/service/el2/public/print_service";
const std::string PRINTER_LIST_FILE = "printer_list.json";
const std::string PRINTER_LIST_VERSION = "v1";
const std::string PRINT_USER_DATA_FILE = "print_user_data.json";
const std::string PRINT_USER_DATA_VERSION = "v1";
} // namespace OHOS::Print
#endif // PRINT_CONSTANT_H

2
utils/include/print_ipp_over_usb_util.h
View File

@ -103,7 +103,7 @@ inline void PrintIppOverUsbUtil::MakeHeader(size_t startLine, size_t endline, co
{
// 提取key和value
size_t theSplitIndex = startLine; // ":" 所在的位置
while (data[theSplitIndex] != CODE_SPLIT_VALUE_COLON && theSplitIndex < endline) {
while (theSplitIndex < endline && data[theSplitIndex] != CODE_SPLIT_VALUE_COLON) {
theSplitIndex++;
}
std::string keyString;