feat:兼容

build-profile.json5

@@ -4,13 +4,13 @@
       {
         "name": "default",
         "material": {
-          "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
+          "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
-          "storePassword": "0000001A411B16D84BA448A9AED56C5B7E351A55B8BA7BA0073A2313B214C24C5740A4B49E6E80AD05F0",
+          "storePassword": "0000001B9218E93471F2A44A01ABD15085B7E6559AA521451282FE409AA909959ABFF583BA55DE81FCD28D",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001AD6836BCC5536725F76279FB36A15D9F61E7CE88C2D043642297F81A9662DEB365314D756CB63",
+          "keyPassword": "0000001B9371EC8276C4763BC0896E780B6B3185DC2BC34D1840A43A5172D35344D5B4777EA7430ED7589C",
-          "profile": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b",
+          "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b",
           "signAlg": "SHA256withECDSA",
-          "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12"
+          "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12"
         }
       }
     ],

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}")

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
 

entry/src/main/ets/pages/compontents/judge/RealTime.ets

@@ -1,4 +1,5 @@
-import apiJudgeSdk from '@ohos.judgesdk';
+//@ts-ignore
+import libJudgeSdk from '@ohos.judgesdk'
 import Judge from '../../judgeSDK/utils/judgeReal';
 import { MarkRule, Project, ProjectObj } from '../../judgeSDK/api/judgeSDK.d';
 import common from '@ohos.app.ability.common';
@@ -72,10 +73,10 @@ export default struct RealTime {
             .width(this.widthNumber)
             .height(this.heightNumber)
             .onLoad(() => {
-              apiJudgeSdk.examJudgeMapSetDrawing(true); //停止绘制地图轨迹，false:表示结束绘制
+              libJudgeSdk.examJudgeMapSetDrawing(true); //停止绘制地图轨迹，false:表示结束绘制
             })
             .onDestroy(() => {
-              apiJudgeSdk.examJudgeMapSetDrawing(false); //停止绘制地图轨迹，false:表示结束绘制
+              libJudgeSdk.examJudgeMapSetDrawing(false); //停止绘制地图轨迹，false:表示结束绘制
               this.draw = false;
               clearInterval(globalThis.realTimer)
             })