diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 6b2c9591f80033e3ff1b03d2e9bf8d30ef4121a9..1cd2309a81cd35cb130a58daaef0b9a043d6f532 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -17,9 +17,32 @@ #define UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_CODE_H #include "memory_heap.h" -#include "product_adapter.h" #include "aafwk_event_error_id.h" + +typedef void (*EventPrintHandler)(uint8_t info1, uint8_t info2, uint8_t info3, uint8_t info4); +typedef void (*ErrCodePrintHandler)(uint8_t info1, uint8_t info2, uint8_t info3, uint16_t info4); + +struct FWKWrapper { + FWKWrapper() + : eventTag_(0), + eventSubTag_(0), + errCodeTag_(0), + errCodeSubTag_(0), + eventPrintHandler_(nullptr), + errCodePrintHandler_(nullptr) + { + } + uint8_t eventTag_; + uint8_t eventSubTag_; + uint8_t errCodeTag_; + uint8_t errCodeSubTag_; + EventPrintHandler eventPrintHandler_; + ErrCodePrintHandler errCodePrintHandler_; +}; + +static FWKWrapper sFwkWrapper; + namespace OHOS { namespace ACELite { #define APP_EVENT(code1) \ @@ -40,17 +63,36 @@ public: void AafwkEventPrint(uint8_t info2, uint8_t info3) { - ProductAdapter::PrintEventTrace(0, info2, info3); + if (sFwkWrapper.eventPrintHandler_ == nullptr || sFwkWrapper.eventTag_ == 0 || sFwkWrapper.eventSubTag_ == 0) { + return; + } + + uint8_t subTag = sFwkWrapper.eventSubTag_; + sFwkWrapper.eventPrintHandler_(sFwkWrapper.eventTag_, subTag, info2, info3); } void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) { - ProductAdapter::PrintEventTrace(info1, info2, info3); + if (sFwkWrapper.eventPrintHandler_ == nullptr || sFwkWrapper.eventTag_ == 0 || sFwkWrapper.eventSubTag_ == 0) { + return; + } + + uint8_t subTag = 0; + if (info1 == 0) { + subTag = sFwkWrapper.eventSubTag_ ; + } else { + subTag = info1; + } + sFwkWrapper.eventPrintHandler_(sFwkWrapper.eventTag_, subTag, info2, info3); } void AafwkErrorPrint(uint8_t info1, uint16_t info2) { - ProductAdapter::PrintErrCode(info1, info2); + if (sFwkWrapper.errCodePrintHandler_ == nullptr || sFwkWrapper.errCodeTag_ == 0 || + sFwkWrapper.errCodeSubTag_ == 0) { + return; + } + sFwkWrapper.errCodePrintHandler_(sFwkWrapper.errCodeTag_, sFwkWrapper.errCodeSubTag_, info1, info2); } }; }