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

修复北向接口错误码

Browse Source 
Signed-off-by: 田迅 <tianxun3@huawei.com>
This commit is contained in:
田迅 2024-11-15 19:39:34 +08:00
parent c53cb2a8d9
commit a510fdf88e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/kits/napi/print_napi/include/napi_inner_print.h
View File

@ -59,7 +59,7 @@ private:
static bool IsSupportType(const std::string& type);
static bool IsValidApplicationEvent(uint32_t event);
static bool IsValidDefaultPrinterType(uint32_t type);
static napi_value NapiThrowError(napi_env env, int32_t errCode);
static void NapiThrowError(napi_env env, int32_t errCode);
private:
struct InnerPrintContext : public PrintAsyncCall::Context {

19
interfaces/kits/napi/print_napi/src/napi_inner_print.cpp
View File

@ -533,7 +533,8 @@ napi_value NapiInnerPrint::On(napi_env env, napi_callback_info info)
if (!NapiInnerPrint::IsSupportType(type)) {
PRINT_HILOGE("Event On type : %{public}s not support", type.c_str());
return NapiThrowError(env, E_PRINT_INVALID_PARAMETER);
NapiThrowError(env, E_PRINT_INVALID_PARAMETER);
return nullptr;
}
valuetype = napi_undefined;
@ -550,7 +551,8 @@ napi_value NapiInnerPrint::On(napi_env env, napi_callback_info info)
int32_t ret = PrintManagerClient::GetInstance()->On("", type, callback);
if (ret != E_PRINT_NONE) {
PRINT_HILOGE("Failed to register event");
return NapiThrowError(env, ret);
NapiThrowError(env, ret);
return nullptr;
}
return nullptr;
}
@ -573,7 +575,8 @@ napi_value NapiInnerPrint::Off(napi_env env, napi_callback_info info)
if (!NapiInnerPrint::IsSupportType(type)) {
PRINT_HILOGE("Event Off type : %{public}s not support", type.c_str());
return NapiThrowError(env, E_PRINT_INVALID_PARAMETER);
NapiThrowError(env, E_PRINT_INVALID_PARAMETER);
return nullptr;
}
if (argc == NapiPrintUtils::ARGC_TWO) {
@ -585,7 +588,8 @@ napi_value NapiInnerPrint::Off(napi_env env, napi_callback_info info)
int32_t ret = PrintManagerClient::GetInstance()->Off("", type);
if (ret != E_PRINT_NONE) {
PRINT_HILOGE("Failed to unregister event");
return NapiThrowError(env, ret);
NapiThrowError(env, ret);
return nullptr;
}
return nullptr;
}
@ -613,6 +617,7 @@ napi_value NapiInnerPrint::StartGetPrintFile(napi_env env, napi_callback_info in
int32_t retCallback = PrintManagerClient::GetInstance()->On("", PRINT_GET_FILE_CALLBACK_ADAPTER, callback);
if (retCallback != E_PRINT_NONE) {
PRINT_HILOGE("Failed to register startGetPrintFile callback");
NapiThrowError(env, retCallback);
return nullptr;
}
}
@ -627,7 +632,8 @@ napi_value NapiInnerPrint::StartGetPrintFile(napi_env env, napi_callback_info in
int32_t ret = PrintManagerClient::GetInstance()->StartGetPrintFile(jobId, *printAttributes, fd);
if (ret != E_PRINT_NONE) {
PRINT_HILOGE("Failed to StartGetPrintFile");
return NapiThrowError(env, ret);
NapiThrowError(env, ret);
return nullptr;
}
}
return nullptr;
@ -893,12 +899,11 @@ bool NapiInnerPrint::IsValidDefaultPrinterType(uint32_t type)
return false;
}
napi_value NapiInnerPrint::NapiThrowError(napi_env env, const int32_t errCode)
void NapiInnerPrint::NapiThrowError(napi_env env, const int32_t errCode)
{
napi_value result = nullptr;
napi_create_error(env, NapiPrintUtils::CreateInt32(env, errCode),
NapiPrintUtils::CreateStringUtf8(env, NapiPrintUtils::GetPrintErrorMsg(errCode)), &result);
napi_throw(env, result);
return nullptr;
}
} // namespace OHOS::Print