From 52f823805a7d31f169ef65144b2be06eb5fb997a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= <wuluofeng@huawei.com>
Date: Thu, 3 Mar 2022 09:19:40 +0000
Subject: [PATCH] test

---
 .../src/gt_bundle_manager_service.cpp         |  4 ++
 utils/bundle_lite/aafwk_event_error_code.cpp  | 44 +++++++++++++++++++
 utils/bundle_lite/aafwk_event_error_code.h    | 31 +++++--------
 utils/bundle_lite/adapter.h                   |  2 -
 4 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 utils/bundle_lite/aafwk_event_error_code.cpp

diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
index a6bc4aa..d1ac38c 100755
--- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
+++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
@@ -14,6 +14,8 @@
  */
 
 #include "gt_bundle_manager_service.h"
+#include "aafwk_event_error_id.h"
+#include "aafwk_event_error_code.h"
 #include "ability_info_utils.h"
 #include "ability_message_id.h"
 #include "appexecfwk_errors.h"
@@ -35,6 +37,8 @@
 #include "utils.h"
 #include "want.h"
 
+using namespace OHOS::ACELite;
+
 namespace OHOS {
 const uint8_t OPERATION_DOING = 200;
 const uint8_t BMS_INSTALLATION_START = 101;
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);
+
 };
 }
 }
diff --git a/utils/bundle_lite/adapter.h b/utils/bundle_lite/adapter.h
index 0f53edb..e52402b 100755
--- a/utils/bundle_lite/adapter.h
+++ b/utils/bundle_lite/adapter.h
@@ -76,8 +76,6 @@ const unsigned int RETRY_TIMES = 10;
         } \
     } while (0)
 
-#define APP_ERRCODE_EXTRA(code1, code2)
-#define APP_EVENT(code1)
 #define RecordAbiityInfoEvt(code1)
 #define MutexDelete(a) osMutexDelete(a)
 #define MutexAcquire(a, b) osMutexAcquire(a, b)
-- 
Gitee