灯光评判

entry/src/main/cpp/BUILD.gn

@@ -1,4 +1,5 @@
-# judge library build
+
+# FFmpeg build
 
 import("//build/ohos.gni")
 
@@ -14,21 +15,25 @@ ohos_source_set("judge_dynamic") {
     "sdk/api/js/JSTypedef.cpp",
     "sdk/api/platform/JudgeApiFactory.cpp",
     "sdk/api/platform/JudgeSdk.cpp",
-    "sdk/common/CostTimeHelper.cpp",
+    "sdk/common/CleverHelper.cpp",
     "sdk/common/CryptoAlgorithm.cpp",
+    "sdk/common/HSystem.cpp",
+    "sdk/common/HVersion.cpp",
     "sdk/common/Loggerxx.cpp",
-    "sdk/common/ProfilerHelper.cpp",
-    "sdk/common/TAssert.cpp",
     "sdk/common/TQueue.cpp",
     "sdk/common/TimerPool.cpp",
     "sdk/common/Tools.cpp",
+    "sdk/database/IDBTables.cpp",
     "sdk/database/carinfo/CarInfoTable.cpp",
-    "sdk/database/mark/MarkItemRule.cpp",
+    "sdk/database/iteminfo/ItemInfoTable.cpp",
+    "sdk/database/mappoint/MapPointItemTable.cpp",
+    "sdk/database/mappoint/MapPointTable.cpp",
     "sdk/database/mark/MarkTable.cpp",
     "sdk/database/sysparm/SysParmTable.cpp",
     "sdk/database/sysset/SysSetTable.cpp",
-    "sdk/database/sysset/XSysSet.cpp",
-    "sdk/exam/ExamCar.cpp",
+    "sdk/exam/ExamCarSub2.cpp",
+    "sdk/exam/ExamCarSub3.cpp",
+    "sdk/exam/ExamCarSub3New.cpp",
     "sdk/exam/ExamDatagram.cpp",
     "sdk/exam/ExamHistory.cpp",
     "sdk/exam/ExamSensor.cpp",
@@ -39,29 +44,53 @@ ohos_source_set("judge_dynamic") {
     "sdk/graphic/IGraphicAbstract.cpp",
     "sdk/judge/IJudgeBrokerInterface.cpp",
     "sdk/judge/IJudgeItem.cpp",
-    "sdk/judge/JudgeItemFactory.cpp",
-    "sdk/judge/sub2/ISub2Judge.cpp",
-    "sdk/judge/sub2/Sub2JudgeCftc.cpp",
-    "sdk/judge/sub2/Sub2JudgeComm.cpp",
-    "sdk/judge/sub2/Sub2JudgeDcrk.cpp",
-    "sdk/judge/sub2/Sub2JudgePdqb.cpp",
-    "sdk/judge/sub2/Sub2JudgeQxxs.cpp",
-    "sdk/judge/sub2/Sub2JudgeZjzw.cpp",
-    "sdk/judge/sub3/ISub3Judge.cpp",
-    "sdk/parser/XIParser.cpp",
+    "sdk/judge/sub2/ISub2JudgeItem.cpp",
+    "sdk/judge/sub2/ISub2JudgeWrap.cpp",
+    "sdk/judge/sub2/Sub2Judge00Dcrk.cpp",
+    "sdk/judge/sub2/Sub2Judge02Pdqb.cpp",
+    "sdk/judge/sub2/Sub2Judge03Cftc.cpp",
+    "sdk/judge/sub2/Sub2Judge05Qxxs.cpp",
+    "sdk/judge/sub2/Sub2Judge06Zjzw.cpp",
+    "sdk/judge/sub2/Sub2Judge20Comm.cpp",
+    "sdk/judge/sub3/ISub3JudgeItem.cpp",
+    "sdk/judge/sub3/ISub3JudgeWrap.cpp",
+    "sdk/judge/sub3/Sub3Judge01Sczb.cpp",
+    "sdk/judge/sub3/Sub3Judge02Qbxx.cpp",
+    "sdk/judge/sub3/Sub3Judge03Zxxs.cpp",
+    "sdk/judge/sub3/Sub3Judge04Bgcd.cpp",
+    "sdk/judge/sub3/Sub3Judge05Lkzx.cpp",
+    "sdk/judge/sub3/Sub3Judge06Rxhd.cpp",
+    "sdk/judge/sub3/Sub3Judge07Xxqy.cpp",
+    "sdk/judge/sub3/Sub3Judge08Gjzt.cpp",
+    "sdk/judge/sub3/Sub3Judge09Hcxx.cpp",
+    "sdk/judge/sub3/Sub3Judge10Ccxx.cpp",
+    "sdk/judge/sub3/Sub3Judge11Kbtc.cpp",
+    "sdk/judge/sub3/Sub3Judge12Dtxx.cpp",
+    "sdk/judge/sub3/Sub3Judge12Lkdt.cpp",
+    "sdk/judge/sub3/Sub3Judge12Ptdt.cpp",
+    "sdk/judge/sub3/Sub3Judge13Yjxs.cpp",
+    "sdk/judge/sub3/Sub3Judge14Jjdw.cpp",
+    "sdk/judge/sub3/Sub3Judge15Lkzz.cpp",
+    "sdk/judge/sub3/Sub3Judge16Lkyz.cpp",
+    "sdk/judge/sub3/Sub3Judge20Comm.cpp",
+    "sdk/judge/sub3/Sub3Judge41Mndg.cpp",
     "sdk/parser/XParser.cpp",
-    "sdk/parser/XParser2.cpp",
     "sdk/survey/ISurveyCar.cpp",
     "sdk/survey/ISurveyItem.cpp",
-    "sdk/survey/SurveyFactory.cpp",
+    "sdk/survey/ISurveySubject.cpp",
     "sdk/survey/car/SurveyCar.cpp",
+    "sdk/survey/sub2/ISub2SurveyFactory.cpp",
     "sdk/survey/sub2/ISub2SurveyItem.cpp",
     "sdk/survey/sub2/Sub2SurveyCftc.cpp",
     "sdk/survey/sub2/Sub2SurveyDcrk.cpp",
     "sdk/survey/sub2/Sub2SurveyPdqb.cpp",
     "sdk/survey/sub2/Sub2SurveyQxxs.cpp",
     "sdk/survey/sub2/Sub2SurveyZjzw.cpp",
+    "sdk/survey/sub3/ISub3SurveyFactory.cpp",
     "sdk/survey/sub3/ISub3SurveyItem.cpp",
+    "sdk/survey/sub3/Sub3MeshDefines.cpp",
+    "sdk/survey/sub3/Sub3SurveyRoads.cpp",
+    "sdk/survey/sub3/Sub3SurveySharps.cpp",
     "sdk/track/TrackReader.cpp",
     "sdk/track/TrackWriter.cpp",
     "sdk/utility/Geometry.cpp",
@@ -73,13 +102,11 @@ ohos_source_set("judge_dynamic") {
     "third/cpp-md5/md5.cpp",
     "third/inih/INIReader.cpp",
     "third/inih/ini.c",
-    "third/jsoncpp-1.9.5/json/json_reader.cpp",
-    "third/jsoncpp-1.9.5/json/json_value.cpp",
-    "third/jsoncpp-1.9.5/json/json_writer.cpp",
     "third/libb64/base64.cpp",
     "third/libb64/cdecode.c",
     "third/libb64/cencode.c",
-    "third/tinyxml2-9.0.0/tinyxml2.cpp"
+    "third/tinyxml2-10.0.0/tinyxml2.cpp",
+
   ]
   include_dirs = [
     "sdk",
@@ -92,6 +119,8 @@ ohos_source_set("judge_dynamic") {
     "sdk/common",
     "sdk/database",
     "sdk/database/carinfo",
+    "sdk/database/iteminfo",
+    "sdk/database/mappoint",
     "sdk/database/mark",
     "sdk/database/sysparm",
     "sdk/database/sysset",
@@ -109,13 +138,24 @@ ohos_source_set("judge_dynamic") {
     "sdk/utility",
     "third",
     "third/AES",
-    "third/CImg-v.3.2.6",
+    "third/CImg-v.3.4.3",
     "third/cpp-md5",
     "third/inih",
-    "third/jsoncpp-1.9.5",
-    "third/jsoncpp-1.9.5/json",
     "third/libb64",
-    "third/tinyxml2-9.0.0",
+    "third/nlohmann-json-3.11.3",
+    "third/nlohmann-json-3.11.3/include",
+    "third/nlohmann-json-3.11.3/include/nlohmann",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail/conversions",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail/input",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail/iterators",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail/meta",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail/meta/call_std",
+    "third/nlohmann-json-3.11.3/include/nlohmann/detail/output",
+    "third/nlohmann-json-3.11.3/include/nlohmann/thirdparty",
+    "third/nlohmann-json-3.11.3/include/nlohmann/thirdparty/hedley",
+    "third/tinyxml2-10.0.0",
+
     "//foundation/arkui/napi/interfaces/kits",
     "//third_party/node/src",
     "//third_party/libuv/include",
@@ -133,24 +173,16 @@ ohos_source_set("judge_dynamic") {
   "__OHOS_FAMILY__",
  ]
   cflags = [
-    "-Wno-unused-variable",
-    "-Wno-deprecated-declarations",
-    "-Wno-unused-command-line-argument",
-    "-Wno-tautological-constant-out-of-range-compare",
-    "-Wno-unused-function",
-    "-Wno-unused-parameter",
-    "-Wno-unused-but-set-variable",
+    #"-Wno-unused-variable",
+    #"-Wno-tautological-constant-out-of-range-compare",
+    #"-Wunknown-warning-option",
     "-fexceptions",
    ]
 
   cflags_cc = [
-    "-Wno-unused-variable",
-    "-Wno-deprecated-declarations",
-    "-Wno-unused-command-line-argument",
-    "-Wno-tautological-constant-out-of-range-compare",
-    "-Wno-unused-function",
-    "-Wno-unused-parameter",
-    "-Wno-unused-but-set-variable",
+    #"-Wno-unused-variable",
+    #"-Wno-tautological-constant-out-of-range-compare",
+    #"-Wunknown-warning-option",
     "-fexceptions",
     "-std=c++17",
     "-stdlib=libc++",
@@ -169,21 +201,23 @@ ohos_source_set("judge_dynamic") {
 }
 ohos_shared_library("libjudge_sdk") {
   cflags = [
-    "-Wno-unused-variable",
-    "-Wno-deprecated-declarations",
+    #"-Wno-unused-variable",
+    #"-Wno-tautological-constant-out-of-range-compare",
+    #"-Wunknown-warning-option",
     "-fexceptions",
    ]
 
   cflags_cc = [
-    "-Wno-unused-variable",
-    "-Wno-deprecated-declarations",
+    #"-Wno-unused-variable",
+    #"-Wno-tautological-constant-out-of-range-compare",
+    #"-Wunknown-warning-option",
     "-fexceptions",
     "-std=c++17",
     "-stdlib=libc++",
-    "-fexceptions",
   ]
 
   deps = [ ":judge_dynamic" ]
   part_name = "part_judge"
   subsystem_name = "thirdparty"
 }
+

entry/src/main/cpp/bin/test_data/test-begin-exam.json

@@ -4,6 +4,7 @@
 	"exam": 1,
 	"replay": 0,
 	"track": "./track/xxx-yyy-zzz.track",
+	"passing":90,
 	"xm": "张三",
 	"sex": 0,
 	"kslsh": "1234567890",

entry/src/main/cpp/bin/test_data/test-real-exam.json

@@ -35,7 +35,6 @@
 		"yl": 0,
 		"yy": 0,
 		"rmndg": 0,
-		"wavend": 1,
 		"mndg": "2,1,3;4,1,2;3,4,2;2,2,1;3,1,1;",
 		"sde": 0,
 		"xhd":""