From 0baa63d9b6e084c4c5521401e598045c1cd145bb Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Jun 2024 14:54:04 +0800 Subject: [PATCH 1/9] fix err Signed-off-by: unknown --- bundle.json | 7 ++++++- frameworks/ability_lite/BUILD.gn | 8 ++++---- frameworks/ability_lite/example/BUILD.gn | 4 ++-- services/abilitymgr_lite/BUILD.gn | 24 ++++++++++++------------ services/abilitymgr_lite/tools/BUILD.gn | 2 +- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/bundle.json b/bundle.json index bf13d42..db6ba7d 100644 --- a/bundle.json +++ b/bundle.json @@ -13,7 +13,12 @@ "name": "ability_lite", "subsystem": "ability", "syscap": [], - "features": [], + "features": [ + "ability_lite_enable_ohos_appexecfwk_feature_ability", + "ability_lite_enable_ohos_aafwk_multi_tasks_feature", + "ability_lite_config_ohos_aafwk_ams_task_size", + "ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size" + ], "adapted_system_type": [ "mini", "small" diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index d396ddf..e9a9bdf 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -77,7 +77,7 @@ lite_library("ability") { "src/ability_thread.cpp", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { sources += [ "src/ability_slice.cpp", "src/ability_slice_manager.cpp", @@ -131,7 +131,7 @@ lite_library("ability") { } cflags_cc = cflags - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { public_deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite" ] } @@ -141,13 +141,13 @@ lite_library("ability") { defines += [ "OPENHARMONY_FONT_PATH" ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { defines += [ "ABILITY_WINDOW_SUPPORT" ] } } lite_component("aafwk_abilitykit_lite") { - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { public_configs = [ ":abilitykit_config" ] } diff --git a/frameworks/ability_lite/example/BUILD.gn b/frameworks/ability_lite/example/BUILD.gn index 0546e47..a15d5a5 100644 --- a/frameworks/ability_lite/example/BUILD.gn +++ b/frameworks/ability_lite/example/BUILD.gn @@ -24,7 +24,7 @@ lite_library("hiability") { "${src_path}/service_ability.cpp", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { sources += [ "${src_path}/main_ability.cpp", "${src_path}/main_ability_slice.cpp", @@ -52,7 +52,7 @@ lite_library("hiability") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite" ] defines += [ "ENABLE_WINDOW=1", diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index a084d9c..ab6511f 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -34,9 +34,9 @@ lite_library("abilityms") { "src/slite/slite_ability_loader.cpp", ] - if (defined(config_ohos_aafwk_ams_task_size) && - config_ohos_aafwk_ams_task_size > 0) { - defines = [ "AMS_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size" ] + if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && + ability_lite_config_ohos_aafwk_ams_task_size > 0) { + defines = [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] } if (defined(config_ohos_aafwk_ability_list_capacity) && @@ -45,15 +45,15 @@ lite_library("abilityms") { [ "ABILITY_LIST_CAPACITY=$config_ohos_aafwk_ability_list_capacity" ] } - if (defined(config_ohos_aafwk_aafwk_lite_task_stack_size) && - config_ohos_aafwk_aafwk_lite_task_stack_size > 0) { + if (defined(ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size) && + ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size > 0) { defines += [ - "TASK_STACK_SIZE=$config_ohos_aafwk_aafwk_lite_task_stack_size", - "NATIVE_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size", + "TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size", + "NATIVE_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", ] } - if (enable_ohos_aafwk_multi_tasks_feature == true) { + if (ability_lite_enable_ohos_aafwk_multi_tasks_feature == true) { defines += [ "_MINI_MULTI_TASKS_" ] } @@ -136,12 +136,12 @@ lite_library("abilityms") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - if (defined(config_ohos_aafwk_ams_task_size) && - config_ohos_aafwk_ams_task_size > 0) { - defines += [ "AMS_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size" ] + if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && + ability_lite_config_ohos_aafwk_ams_task_size > 0) { + defines += [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] } - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/surface_lite" ] defines += [ "ABILITY_WINDOW_SUPPORT" ] } diff --git a/services/abilitymgr_lite/tools/BUILD.gn b/services/abilitymgr_lite/tools/BUILD.gn index b229ac0..3f1112b 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -51,7 +51,7 @@ executable("aa") { "//build/lite/config/component/cJSON:cjson_shared", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite", "${graphic_path}/graphic_utils_lite:utils_lite", -- Gitee From dc5721432ee70fe267e33c2946b1b8ee0c0f08a5 Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Fri, 7 Jun 2024 15:23:01 +0800 Subject: [PATCH 2/9] fixwarning Signed-off-by: hanlu1@huawei.com --- bundle.json | 3 ++- services/abilitymgr_lite/BUILD.gn | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bundle.json b/bundle.json index db6ba7d..6249d47 100644 --- a/bundle.json +++ b/bundle.json @@ -17,7 +17,8 @@ "ability_lite_enable_ohos_appexecfwk_feature_ability", "ability_lite_enable_ohos_aafwk_multi_tasks_feature", "ability_lite_config_ohos_aafwk_ams_task_size", - "ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size" + "ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size", + "ability_lite_config_ohos_aafwk_ability_list_capacity" ], "adapted_system_type": [ "mini", diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index ab6511f..45ea6c1 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -39,10 +39,10 @@ lite_library("abilityms") { defines = [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] } - if (defined(config_ohos_aafwk_ability_list_capacity) && - config_ohos_aafwk_ability_list_capacity > 0) { + if (defined(ability_lite_ability_lite_config_ohos_aafwk_ability_list_capacity) && + ability_lite_ability_lite_config_ohos_aafwk_ability_list_capacity > 0) { defines += - [ "ABILITY_LIST_CAPACITY=$config_ohos_aafwk_ability_list_capacity" ] + [ "ABILITY_LIST_CAPACITY=$ability_lite_ability_lite_config_ohos_aafwk_ability_list_capacity" ] } if (defined(ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size) && -- Gitee From 30165bc847df0a0a13b31bedb229451ab7dd283d Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Fri, 7 Jun 2024 15:25:55 +0800 Subject: [PATCH 3/9] f Signed-off-by: hanlu1@huawei.com --- services/abilitymgr_lite/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index 45ea6c1..459db3d 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -39,10 +39,10 @@ lite_library("abilityms") { defines = [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] } - if (defined(ability_lite_ability_lite_config_ohos_aafwk_ability_list_capacity) && - ability_lite_ability_lite_config_ohos_aafwk_ability_list_capacity > 0) { + if (defined(ability_lite_config_ohos_aafwk_ability_list_capacity) && + ability_lite_config_ohos_aafwk_ability_list_capacity > 0) { defines += - [ "ABILITY_LIST_CAPACITY=$ability_lite_ability_lite_config_ohos_aafwk_ability_list_capacity" ] + [ "ABILITY_LIST_CAPACITY=$ability_lite_config_ohos_aafwk_ability_list_capacity" ] } if (defined(ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size) && -- Gitee From 77f4901760cdb1839d8219d04edc36633ff221a6 Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 15:51:19 +0800 Subject: [PATCH 4/9] fix Signed-off-by: hanlu1@huawei.com --- services/abilitymgr_lite/BUILD.gn | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index 459db3d..16629ab 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -36,13 +36,14 @@ lite_library("abilityms") { if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && ability_lite_config_ohos_aafwk_ams_task_size > 0) { - defines = [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] + defines = [ + "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", + ] } if (defined(ability_lite_config_ohos_aafwk_ability_list_capacity) && ability_lite_config_ohos_aafwk_ability_list_capacity > 0) { - defines += - [ "ABILITY_LIST_CAPACITY=$ability_lite_config_ohos_aafwk_ability_list_capacity" ] + defines += [ "ABILITY_LIST_CAPACITY=$ability_lite_config_ohos_aafwk_ability_list_capacity" ] } if (defined(ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size) && @@ -138,7 +139,9 @@ lite_library("abilityms") { if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && ability_lite_config_ohos_aafwk_ams_task_size > 0) { - defines += [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] + defines += [ + "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", + ] } if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { -- Gitee From 0574c7bdf6fb769f2135f85896a3a6c48c0033a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Wed, 11 Sep 2024 10:50:05 +0000 Subject: [PATCH 5/9] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 076a698..f9e5018 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -21,9 +21,9 @@ namespace OHOS { -namespace { - constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; -} +namespace{ +constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; + } AbilityConnectMission::~AbilityConnectMission() { -- Gitee From e684b54b2738c055f8843c7c3da6d3e9d5a1c847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Thu, 12 Sep 2024 08:47:30 +0000 Subject: [PATCH 6/9] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index f9e5018..7dc3ec7 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -55,6 +55,7 @@ PageAbilityRecord *AbilityConnectMission::FindServiceRecord(uint64_t token) cons PageAbilityRecord *AbilityConnectMission::FindServiceRecord(const char *bundleName, const char *abilityName) const { + int android,b; CHECK_NULLPTR_RETURN_PTR(bundleName, "AbilityConnectMission", "invalid argument"); CHECK_NULLPTR_RETURN_PTR(abilityName, "AbilityConnectMission", "invalid argument"); for (const auto record : serviceRecords_) { -- Gitee From f916b1a7d49c726d27b20a72763ca70d8bcfad7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Fri, 13 Sep 2024 03:16:15 +0000 Subject: [PATCH 7/9] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 7dc3ec7..33cba2e 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -27,9 +27,9 @@ constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; AbilityConnectMission::~AbilityConnectMission() { - for (auto iterator = serviceRecords_.begin(); iterator != serviceRecords_.end(); ++iterator) { - auto record = *iterator; - delete record; + for (auto iterator = serviceRecords_.begin();iterator != serviceRecords_.end(); ++iterator) { +auto record = *iterator; +delete record; } serviceRecords_.clear(); PRINTD("AbilityConnectMission", "Constructor"); -- Gitee From ec6f3f7577ccc3ff20358015572be476e2ddc053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Fri, 13 Sep 2024 05:51:04 +0000 Subject: [PATCH 8/9] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 33cba2e..0e8ba30 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -31,8 +31,8 @@ AbilityConnectMission::~AbilityConnectMission() auto record = *iterator; delete record; } - serviceRecords_.clear(); - PRINTD("AbilityConnectMission", "Constructor"); +serviceRecords_.clear(); +PRINTD("AbilityConnectMission", "Constructor"); } void AbilityConnectMission::PushServiceRecord(PageAbilityRecord &abilityRecord) -- Gitee From 3f2657d7ed068bc5eca0fdb5454a4dd72ea55b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Sun, 15 Sep 2024 08:40:10 +0000 Subject: [PATCH 9/9] update interfaces/kits/ability_lite/ability.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- interfaces/kits/ability_lite/ability.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/ability_lite/ability.h b/interfaces/kits/ability_lite/ability.h index d87c9ba..13aaf04 100644 --- a/interfaces/kits/ability_lite/ability.h +++ b/interfaces/kits/ability_lite/ability.h @@ -75,7 +75,7 @@ class AbilityWindow; class Ability : public AbilityContext { public: Ability() = default; - virtual ~Ability() = default; +virtual ~Ability() = default; /** * @brief Called when this ability is started. You must override this function if you want to perform some @@ -92,7 +92,7 @@ public: * STATE_INACTIVE is an instantaneous state. The ability in this state may be visible but does not have * focus. You can override this function to implement your own processing logic. */ - virtual void OnInactive(); + virtual void OnInactive(); /** * @brief Called when this ability enters the STATE_ACTIVE state. -- Gitee