From 10e91c868d7ce1d74ba10ee62155d8e001d0afb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Wed, 9 Mar 2022 08:41:34 +0000 Subject: [PATCH 1/7] 1 --- frameworks/ability_lite/src/ability_thread.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frameworks/ability_lite/src/ability_thread.cpp b/frameworks/ability_lite/src/ability_thread.cpp index 46bcef1..4e70f8c 100644 --- a/frameworks/ability_lite/src/ability_thread.cpp +++ b/frameworks/ability_lite/src/ability_thread.cpp @@ -114,6 +114,11 @@ void AbilityThread::InitUITaskEnv() return; } + if(std::experimental::filesystem::exists("/sdcard/data/")) + { + constexpr static char FONT_PATH[] = "/sdcard/data/"; + } + HILOG_INFO(HILOG_MODULE_APP, "Hal and UI init"); GraphicStartUp::Init(); GraphicStartUp::InitFontEngine(reinterpret_cast(g_fontPsramBaseAddr), MIN_FONT_PSRAM_LENGTH, -- Gitee From 5460f0800f155c06f523ff1d7c123ad74bc43141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Wed, 9 Mar 2022 09:02:19 +0000 Subject: [PATCH 2/7] dd --- frameworks/ability_lite/src/ability_thread.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/ability_lite/src/ability_thread.cpp b/frameworks/ability_lite/src/ability_thread.cpp index 4e70f8c..431983a 100644 --- a/frameworks/ability_lite/src/ability_thread.cpp +++ b/frameworks/ability_lite/src/ability_thread.cpp @@ -114,8 +114,7 @@ void AbilityThread::InitUITaskEnv() return; } - if(std::experimental::filesystem::exists("/sdcard/data/")) - { + if (std::experimental::filesystem::exists("/sdcard/data/")){ constexpr static char FONT_PATH[] = "/sdcard/data/"; } -- Gitee From 7dcce2b1f3809bfde7655244399af69bc2192ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Wed, 9 Mar 2022 09:19:51 +0000 Subject: [PATCH 3/7] 33 --- frameworks/ability_lite/src/ability_thread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/ability_lite/src/ability_thread.cpp b/frameworks/ability_lite/src/ability_thread.cpp index 431983a..9952d36 100644 --- a/frameworks/ability_lite/src/ability_thread.cpp +++ b/frameworks/ability_lite/src/ability_thread.cpp @@ -114,7 +114,7 @@ void AbilityThread::InitUITaskEnv() return; } - if (std::experimental::filesystem::exists("/sdcard/data/")){ + if (!std::experimental::filesystem::exists("/storage/data/")){ constexpr static char FONT_PATH[] = "/sdcard/data/"; } -- Gitee From 04855dd933a951843515ad55c3c64ae1ccfd0982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Mon, 14 Mar 2022 06:38:31 +0000 Subject: [PATCH 4/7] yest --- frameworks/want_lite/src/want.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index 2178ce7..fdc7871 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -57,7 +57,7 @@ constexpr static int DATA_LENGTH = 2048; constexpr uint8_t INT_VALUE_TYPE = 6; constexpr uint8_t STRING_VALUE_TYPE = 13; constexpr uint8_t KEY_VALUE_PAIR_TYPE = 97; - +namespace OHOS { void ClearWant(Want *want) { if (want == nullptr) { @@ -472,3 +472,4 @@ const char *WantToUri(Want want) return uri; } #endif +} \ No newline at end of file -- Gitee From a857ad37a205568aa4ea84bc4fa35b7bcff83132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Mon, 14 Mar 2022 06:56:09 +0000 Subject: [PATCH 5/7] 121 --- frameworks/ability_lite/src/ability_thread.cpp | 4 ---- frameworks/want_lite/src/want.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/frameworks/ability_lite/src/ability_thread.cpp b/frameworks/ability_lite/src/ability_thread.cpp index 9952d36..46bcef1 100644 --- a/frameworks/ability_lite/src/ability_thread.cpp +++ b/frameworks/ability_lite/src/ability_thread.cpp @@ -114,10 +114,6 @@ void AbilityThread::InitUITaskEnv() return; } - if (!std::experimental::filesystem::exists("/storage/data/")){ - constexpr static char FONT_PATH[] = "/sdcard/data/"; - } - HILOG_INFO(HILOG_MODULE_APP, "Hal and UI init"); GraphicStartUp::Init(); GraphicStartUp::InitFontEngine(reinterpret_cast(g_fontPsramBaseAddr), MIN_FONT_PSRAM_LENGTH, diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index fdc7871..ce3e71d 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -57,7 +57,7 @@ constexpr static int DATA_LENGTH = 2048; constexpr uint8_t INT_VALUE_TYPE = 6; constexpr uint8_t STRING_VALUE_TYPE = 13; constexpr uint8_t KEY_VALUE_PAIR_TYPE = 97; -namespace OHOS { +namespace { void ClearWant(Want *want) { if (want == nullptr) { -- Gitee From 261a948903ea0614245931637e087ef71c9f1617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Mon, 14 Mar 2022 07:12:54 +0000 Subject: [PATCH 6/7] 12 --- frameworks/want_lite/src/want.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index ce3e71d..3d4c7d3 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -57,8 +57,9 @@ constexpr static int DATA_LENGTH = 2048; constexpr uint8_t INT_VALUE_TYPE = 6; constexpr uint8_t STRING_VALUE_TYPE = 13; constexpr uint8_t KEY_VALUE_PAIR_TYPE = 97; -namespace { -void ClearWant(Want *want) + + +static void ClearWant(Want *want) { if (want == nullptr) { return; @@ -72,7 +73,7 @@ void ClearWant(Want *want) AdapterFree(want->data); } -bool SetWantElement(Want *want, ElementName element) +static bool SetWantElement(Want *want, ElementName element) { if (want == nullptr) { return false; @@ -471,5 +472,4 @@ const char *WantToUri(Want want) return uri; } -#endif -} \ No newline at end of file +#endif \ No newline at end of file -- Gitee From 6278df51c90e876040fa24bc0587286815011a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Mon, 14 Mar 2022 07:29:41 +0000 Subject: [PATCH 7/7] wwq --- frameworks/want_lite/src/want.cpp | 4 ++-- interfaces/kits/ability_lite/ability_loader.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index 3d4c7d3..daa4c5e 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -59,7 +59,7 @@ constexpr uint8_t STRING_VALUE_TYPE = 13; constexpr uint8_t KEY_VALUE_PAIR_TYPE = 97; -static void ClearWant(Want *want) +void ClearWant(Want *want) { if (want == nullptr) { return; @@ -73,7 +73,7 @@ static void ClearWant(Want *want) AdapterFree(want->data); } -static bool SetWantElement(Want *want, ElementName element) +bool SetWantElement(Want *want, ElementName element) { if (want == nullptr) { return false; diff --git a/interfaces/kits/ability_lite/ability_loader.h b/interfaces/kits/ability_lite/ability_loader.h index e35e223..a46aa96 100644 --- a/interfaces/kits/ability_lite/ability_loader.h +++ b/interfaces/kits/ability_lite/ability_loader.h @@ -111,11 +111,13 @@ private: * @param className Indicates the {@link Ability} class name to register. */ #define REGISTER_AA(className) \ + do{\ __attribute__((constructor)) void RegisterAA##className() { \ AbilityLoader::GetInstance().RegisterAbility(#className, []()->Ability* { \ return new className; \ }); \ - } + }\ + } while(0) /** * @brief Registers the class name of an {@link AbilitySlice} child class. -- Gitee