diff --git a/entry/src/main/cpp/CMakeLists.txt b/entry/src/main/cpp/CMakeLists.txt index eeb186f2..81a4f9ec 100644 --- a/entry/src/main/cpp/CMakeLists.txt +++ b/entry/src/main/cpp/CMakeLists.txt @@ -211,6 +211,7 @@ elseif(JUDGE_OS_OHOS) message("${MSG_NOTE} now compiler platform JUDGE_OS_OHOS") set(JUDGE_INCLUDE_PLATFORM + ${CMAKE_SYSROOT}/usr/include/ace ${CMAKE_SYSROOT}/usr/include/ace/xcomponent ${CMAKE_SYSROOT}/usr/include/native_window ${CMAKE_SOURCE_DIR}/sdk/api/js @@ -230,10 +231,10 @@ elseif(JUDGE_OS_OHOS) ) set(JUDGE_LIB_FILE_PLATFORM - ace_napi.z uv - ace_ndk.z native_window #//for-surface-nativeXComponent + ace_napi.z + ace_ndk.z hilog_ndk.z ) @@ -241,8 +242,8 @@ elseif(JUDGE_OS_ANDROID) message("${MSG_NOTE} now compiler platform JUDGE_OS_ANDROID") set(JUDGE_INCLUDE_PLATFORM - ${CMAKE_SOURCE_DIR}/third/android/include #本地开发看代码用的 ${CMAKE_SOURCE_DIR}/sdk/api/jni + ${CMAKE_SOURCE_DIR}/third/android/include #本地开发看代码用的 ) file(GLOB_RECURSE JUDGE_SOURCE_PLATFORM @@ -377,6 +378,7 @@ function(showOutputInfo) message(STATUS "${MSG_INFO} ENV{CFLAGS}=$ENV{CFLAGS}") message(STATUS "${MSG_INFO} ENV{CXXFLAGS=$ENV{CXXFLAGS}") + message(STATUS "${MSG_INFO} CMAKE_SYSROOT = ${CMAKE_SYSROOT}") message(STATUS "${MSG_INFO} CMAKE_DEFAULT_BUILD_TYPE = ${CMAKE_DEFAULT_BUILD_TYPE}") message(STATUS "${MSG_INFO} CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}") message(STATUS "${MSG_INFO} CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}") diff --git a/entry/src/main/cpp/sdk/common/Loggerxx.h b/entry/src/main/cpp/sdk/common/Loggerxx.h index eb97d5cc..4ccf398c 100644 --- a/entry/src/main/cpp/sdk/common/Loggerxx.h +++ b/entry/src/main/cpp/sdk/common/Loggerxx.h @@ -182,10 +182,12 @@ private: * **************************************************/ -#define Logxx Loggerxx::GetInstance() #ifdef JUDGE_USE_LOG +#define Logxx Loggerxx::GetInstance() +#define LOG_CALL_FUNC(func,format,...) Logxx->func(__FILE__,__LINE__,__FUNCTION__,LOG_TAG_SDK,UTF8S(format),##__VA_ARGS__) + //初始化日志模块 #define logInit(level) Logxx->init(level); //卸载日志模块 @@ -193,17 +195,17 @@ private: //设置日志级别 #define logSetLevel(level) Logxx->setLevel(level); //错误日志宏函数 -#define logerror(format, ...) Logxx->error (__FILE__, __LINE__, __FUNCTION__, LOG_TAG_SDK, format, ##__VA_ARGS__); +#define logerror(format, ...) LOG_CALL_FUNC(error, format, ##__VA_ARGS__); //警告日志宏函数 -#define logwarning(format, ...) Logxx->warning(__FILE__, __LINE__, __FUNCTION__, LOG_TAG_SDK, format, ##__VA_ARGS__); +#define logwarning(format, ...) LOG_CALL_FUNC(warning, format, ##__VA_ARGS__); //跟踪日志宏函数 -#define logtrace(format, ...) Logxx->trace (__FILE__, __LINE__, __FUNCTION__, LOG_TAG_SDK, format, ##__VA_ARGS__); +#define logtrace(format, ...) LOG_CALL_FUNC(trace, format, ##__VA_ARGS__); //信息日志宏函数 -#define loginfo(format, ...) Logxx->info (__FILE__, __LINE__, __FUNCTION__, LOG_TAG_SDK, format, ##__VA_ARGS__); +#define loginfo(format, ...) LOG_CALL_FUNC(info, format, ##__VA_ARGS__); //流水日志宏函数 -#define lognote(format, ...) Logxx->note (__FILE__, __LINE__, __FUNCTION__, LOG_TAG_SDK, format, ##__VA_ARGS__); +#define lognote(format, ...) LOG_CALL_FUNC(note, format, ##__VA_ARGS__); //调试日志宏函数 -#define logdebug(format, ...) Logxx->debug (__FILE__, __LINE__, __FUNCTION__, LOG_TAG_SDK, format, ##__VA_ARGS__); +#define logdebug(format, ...) LOG_CALL_FUNC(debug, format, ##__VA_ARGS__); #else