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 25e1937..b31ec30 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 @@ -15,8 +15,6 @@ #include "dcamera_sink_load_callback.h" -#include - #include "hisysevent.h" #include "dcamera_sink_handler.h" #include "distributed_hardware_log.h" 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 b27bf31..2664978 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 @@ -15,8 +15,6 @@ #include "dcamera_source_load_callback.h" -#include - #include "hisysevent.h" #include "dcamera_source_handler.h" #include "distributed_hardware_log.h" diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 1906225..d386373 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -15,8 +15,6 @@ #include "dcamera_source_dev.h" -#include - #include "anonymous_string.h" #include "hisysevent.h" #include "distributed_camera_constants.h" diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 5d3eeea..be63b93 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -211,24 +211,30 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "SOFTBUS_SESSION_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MYSESSIONNAME", mySessName.c_str(), - "PEERSESSIONNAME", peerSessName.c_str(), - "PEERDEVID", peerDevId.c_str(), - "MSG", "open softbus session failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportSoftbusSessionFail(mySessName, peerSessName, peerDevId); return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; } +void DCameraSoftbusAdapter::ReportSoftbusSessionFail(std::string mySessName, + std::string peerSessName, std::string peerDevId) +{ + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "SOFTBUS_SESSION_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MYSESSIONNAME", mySessName.c_str(), + "PEERSESSIONNAME", peerSessName.c_str(), + "PEERDEVID", peerDevId.c_str(), + "MSG", "open softbus session failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } +} + int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t sessionId) { DHLOGI("close softbus sessionId: %d", sessionId); diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 1fcf9a5..118f83b 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -15,8 +15,6 @@ #include "decode_data_process.h" -#include - #include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" 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 d9a7103..dacc723 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 @@ -15,8 +15,6 @@ #include "decode_data_process.h" -#include - #include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h"