From 77e0deb6451f20f59d821f07873c6634167af0cd Mon Sep 17 00:00:00 2001 From: "zhoushicheng2@huawei.com" Date: Mon, 6 Jun 2022 14:07:51 +0800 Subject: [PATCH] zhoushicheng2@huawei.com Signed-off-by: zhoushicheng2@huawei.com Change-Id: Ib03287e840160714ec9e6ccb3b89f3d9770dd100 --- hisysevent.yaml | 18 +++++++++++++----- services/common/src/event_report.cpp | 5 ++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/hisysevent.yaml b/hisysevent.yaml index 400fb2829d..f04bac09b1 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -111,6 +111,14 @@ CLOSE_ABILITY: TERMINATE_ABILITY: __BASE: {type: BEHAVIOR, level: MINOR, tag: ability, desc: terminate ability} +ABILITY_ONFOREGROUND: + __BASE: {type: BEHAVIOR, level: MINOR, tag: ability, desc: start ability} + ABILITY_NAME: {type: STRING, desc: ability name} + +ABILITY_ONBACKGROUND: + __BASE: {type: BEHAVIOR, level: MINOR, tag: ability, desc: start ability} + ABILITY_NAME: {type: STRING, desc: ability name} + # serviceExtensionAbility behavior event START_SERVICE: @@ -143,7 +151,7 @@ DISCONNECT_SERVICE: APP_ATTACH: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: attach app} - PID: {type: INT32, desc: pid} + APP_PID: {type: INT32, desc: app pid} VERSION_CODE: {type: INT32, desc: version code} VERSION_NAME: {type: STRING, desc: version name} PROCESS_NAME: {type: STRING, desc: process name} @@ -151,7 +159,7 @@ APP_ATTACH: APP_LAUNCH: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: launch app} - PID: {type: INT32, desc: pid} + APP_PID: {type: INT32, desc: app pid} VERSION_CODE: {type: INT32, desc: version code} VERSION_NAME: {type: STRING, desc: version name} PROCESS_NAME: {type: STRING, desc: process name} @@ -159,7 +167,7 @@ APP_LAUNCH: APP_FOREGROUND: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: foreground app} - PID: {type: INT32, desc: pid} + APP_PID: {type: INT32, desc: app pid} VERSION_CODE: {type: INT32, desc: version code} VERSION_NAME: {type: STRING, desc: version name} PROCESS_NAME: {type: STRING, desc: process name} @@ -167,7 +175,7 @@ APP_FOREGROUND: APP_BACKGROUND: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: background app} - PID: {type: INT32, desc: pid} + APP_PID: {type: INT32, desc: app pid} VERSION_CODE: {type: INT32, desc: version code} VERSION_NAME: {type: STRING, desc: version name} PROCESS_NAME: {type: STRING, desc: process name} @@ -175,7 +183,7 @@ APP_BACKGROUND: APP_TERMINATE: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: terminate app} - PID: {type: INT32, desc: pid} + APP_PID: {type: INT32, desc: app pid} VERSION_CODE: {type: INT32, desc: version code} VERSION_NAME: {type: STRING, desc: version name} PROCESS_NAME: {type: STRING, desc: process name} diff --git a/services/common/src/event_report.cpp b/services/common/src/event_report.cpp index bc7c541a3d..03f76be671 100644 --- a/services/common/src/event_report.cpp +++ b/services/common/src/event_report.cpp @@ -47,7 +47,6 @@ void EventReport::SendAppEvent(const std::string &eventName, HiSysEventType type EVENT_KEY_BUNDLE_NAME, eventInfo.bundleName, EVENT_KEY_VERSION_NAME, eventInfo.versionName, EVENT_KEY_VERSION_CODE, eventInfo.versionCode, - EVENT_KEY_ABILITY_NAME, eventInfo.abilityName, EVENT_KEY_PROCESS_NAME, eventInfo.processName); } @@ -155,7 +154,7 @@ void EventReport::SendFormEvent(const std::string &eventName, HiSysEventType typ HiSysEvent::Domain::AAFWK, eventName, type, - EVENT_KEY_ABILITY_NAME, eventInfo.formId, + EVENT_KEY_FORM_ID, eventInfo.formId, EVENT_KEY_BUNDLE_NAME, eventInfo.bundleName, EVENT_KEY_MODULE_NAME, eventInfo.moduleName, EVENT_KEY_ABILITY_NAME, eventInfo.abilityName); @@ -165,7 +164,7 @@ void EventReport::SendFormEvent(const std::string &eventName, HiSysEventType typ HiSysEvent::Domain::AAFWK, eventName, type, - EVENT_KEY_ABILITY_NAME, eventInfo.formId); + EVENT_KEY_FORM_ID, eventInfo.formId); } } } // namespace AAFWK