From 2d718ed5cf7e931f73686240abdfcb2a0bdf1b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Wed, 2 Mar 2022 13:10:18 +0000 Subject: [PATCH 1/2] Description:Repair dotting function Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4W00V; Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.cpp | 44 ++++++++++++++++++++ utils/bundle_lite/aafwk_event_error_code.h | 31 +++++--------- 2 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 utils/bundle_lite/aafwk_event_error_code.cpp diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp new file mode 100644 index 0000000..97acf04 --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include "aafwk_event_error_code.h" +#include "product_adapter.h" + +namespace OHOS { +namespace ACELite { +AafwkEventCodePrint *AafwkEventCodePrint::GetInstance() +{ + static AafwkEventCodePrint printInstance; + return &printInstance; +} + +void AafwkEventCodePrint::AafwkEventPrint(uint8_t info2, uint8_t info3) +{ + ProductAdapter::PrintEventTrace(0, info2, info3); +} + +void AafwkEventCodePrint::AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) +{ + ProductAdapter::PrintEventTrace(info1, info2, info3); +} + +void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) +{ + ProductAdapter::PrintErrCode(info1, info2); +} + +} // namespace ACELite +} // namespace OHOS diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 6b2c959..15a0d4c 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -17,7 +17,6 @@ #define UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_CODE_H #include "memory_heap.h" -#include "product_adapter.h" #include "aafwk_event_error_id.h" namespace OHOS { @@ -29,29 +28,19 @@ namespace ACELite { class AafwkEventCodePrint final : public MemoryHeap { public: + AafwkEventCodePrint() = default; + ~AafwkEventCodePrint() = default; - static AafwkEventCodePrint *GetInstance() - { - static AafwkEventCodePrint printInstance; - return &printInstance; - } - - void AafwkEventPrint(uint8_t info2, uint8_t info3) - { - ProductAdapter::PrintEventTrace(0, info2, info3); - } - - void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) - { - ProductAdapter::PrintEventTrace(info1, info2, info3); - } - - void AafwkErrorPrint(uint8_t info1, uint16_t info2) - { - ProductAdapter::PrintErrCode(info1, info2); - } + static AafwkEventCodePrint *GetInstance(); + + void AafwkEventPrint(uint8_t info2, uint8_t info3); + + void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3); + + void AafwkErrorPrint(uint8_t info2, uint16_t info3); + }; } } -- Gitee From 50a0bfe5a79be8429167ca9f29cc6df55b484025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Wed, 2 Mar 2022 13:28:17 +0000 Subject: [PATCH 2/2] Description:Repair dotting function Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4W00V; Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.cpp | 1 - utils/bundle_lite/aafwk_event_error_code.h | 1 - 2 files changed, 2 deletions(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp index 97acf04..666ab62 100644 --- a/utils/bundle_lite/aafwk_event_error_code.cpp +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -39,6 +39,5 @@ void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) { ProductAdapter::PrintErrCode(info1, info2); } - } // namespace ACELite } // namespace OHOS diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 15a0d4c..23e1f5b 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -40,7 +40,6 @@ public: void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3); void AafwkErrorPrint(uint8_t info2, uint16_t info3); - }; } } -- Gitee