From bd2ffc39575aec1c46bc4c70d7d9d1691e6d344c Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 14 Jun 2022 16:21:50 +0800 Subject: [PATCH] modify hisysevent Signed-off-by: chen0088 --- common/include/utils/dcamera_hisysevent_adapter.h | 2 +- .../native_cpp/camera_sink/src/dcamera_sink_handler.cpp | 2 ++ .../camera_sink/src/dcamera_sink_load_callback.cpp | 2 -- .../native_cpp/camera_source/src/dcamera_source_handler.cpp | 2 ++ .../camera_source/src/dcamera_source_load_callback.cpp | 2 -- services/channel/src/dcamera_softbus_adapter.cpp | 2 ++ .../multimedia_codec/decoder/decode_data_process_common.cpp | 6 +++--- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index 78edcbd..fec7474 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -32,7 +32,7 @@ const std::string OPEN_CAMERA_EVENT = "DCAMERA_OPEN"; const std::string CLOSE_CAMERA_EVENT = "DCAMERA_CLOSE"; const std::string START_CAPTURE_EVENT = "DCAMERA_CAPTURE"; -enum DcameraHisyseventErrno { +enum DcameraHisyseventErrno : int32_t { DCAMERA_SA_ERROR = 0, DCAMERA_HDF_ERROR = 1, DCAMERA_CREATE_SESSIONSVR_ERROR = 2, diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 9fa16d9..2358c3c 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -42,6 +42,8 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID)); ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index 2d8055e..b372c4c 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -42,8 +42,6 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, - CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 4b688c2..b32bd9f 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -44,6 +44,8 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID)); ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index c373bd2..90150c2 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -42,8 +42,6 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbility void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, - CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 95eae78..c04631c 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -124,6 +124,8 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam } int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, + CreateMsg("create session server failed, sessionName %s", sessionName.c_str())); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index c1a370a..b85c5fb 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -110,9 +110,9 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, - CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); + CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), + sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR,