From e17d91111f796efdab88a5bcb9017c48bb0804d2 Mon Sep 17 00:00:00 2001 From: zhangqing Date: Wed, 10 Sep 2025 09:38:26 +0800 Subject: [PATCH] arkui-x update master OH to weekly_20250908 and OH fix build bug Signed-off-by: zhangqing Change-Id: I6d0db5521da45dc6fda8c76f56deda80651182d8 --- platform/hilog_printf.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/platform/hilog_printf.cpp b/platform/hilog_printf.cpp index 9eced91..c63593c 100644 --- a/platform/hilog_printf.cpp +++ b/platform/hilog_printf.cpp @@ -17,6 +17,7 @@ #include "interface/native/log.h" static int g_logLevel = LOG_LEVEL_MIN; +static int g_preferStrategy = UNSET_LOGLEVEL; static OHOS::Ace::LogLevel ConvertLogLevel(LogLevel level) { @@ -39,7 +40,9 @@ static OHOS::Ace::LogLevel ConvertLogLevel(LogLevel level) int HiLogPrintArgs(const LogType type, const LogLevel level, const unsigned int domain, const char *tag, const char *fmt, va_list ap) { - OHOS::HiviewDFX::Hilog::Platform::LogPrint(ConvertLogLevel(level), fmt, ap); + if (HiLogIsLoggable(domain, tag, level)) { + OHOS::HiviewDFX::Hilog::Platform::LogPrint(ConvertLogLevel(level), fmt, ap); + } return 0; } @@ -54,13 +57,26 @@ int HiLogPrint(LogType type, LogLevel level, unsigned int domain, const char *ta } void HiLogSetAppMinLogLevel(LogLevel level) +{ + HiLogSetAppLogLevel(level, PREFER_CLOSE_LOG); +} + +void HiLogSetAppLogLevel(LogLevel level, PreferStrategy prefer) { g_logLevel = level; + g_preferStrategy = prefer; } bool HiLogIsLoggable(unsigned int domain, const char *tag, LogLevel level) { - if ((level <= LOG_LEVEL_MIN) || (level >= LOG_LEVEL_MAX) || (level < g_logLevel) || tag == nullptr) { + if (g_preferStrategy != UNSET_LOGLEVEL) { + if (g_preferStrategy == PREFER_CLOSE_LOG && level < g_logLevel) { + return false; + } else if (g_preferStrategy == PREFER_OPEN_LOG && level >= g_logLevel) { + return true; + } + } + if ((level <= LOG_LEVEL_MIN) || (level >= LOG_LEVEL_MAX) || tag == nullptr) { return false; } -- Gitee