diff --git a/build-profile.json5 b/build-profile.json5 index 9f537a55..967eda60 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,9 +5,9 @@ "name": "default", "material": { "certpath": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.cer", - "storePassword": "0000001A90E6E9540F9CBC4E39CC7C881A2A94B57FDBB05FCE0C9A7545D57CEC3D9769CB6EFAD07F7603", + "storePassword": "0000001AB61830524F6A5103767C682166FEC85D127535C8AA470AE2466C4D4DD3276D14D443E3CA3FE0", "keyAlias": "debugKey", - "keyPassword": "0000001A66B03EA13B1C25F7A07B8592F2BE2065E421AF22BD092C40D07803F6D68B36D4F8854DDFA63C", + "keyPassword": "0000001A1E111727472BB060E2BD70FC7B7DEB5C34D39433FA4CEB58948C47D25822669923B78641F3DF", "profile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p7b", "signAlg": "SHA256withECDSA", "storeFile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p12" diff --git a/entry/src/main/cpp/bin/libJudgeSdk.so b/entry/src/main/cpp/bin/libJudgeSdk.so index 8ade2116..d699551a 100644 Binary files a/entry/src/main/cpp/bin/libJudgeSdk.so and b/entry/src/main/cpp/bin/libJudgeSdk.so differ diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index c04b5e64..7ccaff97 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -1524,7 +1524,7 @@ export default class Judge { gpsDigit }} = judgeConfig const examType = 3 - const {sensor,gps} = tempData; + const {sensor,gps, gps2} = tempData; if (tempData.sensor === undefined) { return } @@ -1554,6 +1554,9 @@ export default class Judge { //@ts-ignore const translateProjects = translateProject.map(numStr => string2Bytes(parseInt(numStr, 2), 8)[0]) + const gps2Jd = Number(convertGpsCoord2(gps2.jd).toFixed(gpsDigit)) * Math.pow(10, gpsDigit) + const gps2Wd = Number(convertGpsCoord2(gps2.wd).toFixed(gpsDigit)) * Math.pow(10, gpsDigit) + //@ts-ignore let tempSd = ((judgeConfigObj['350'] == 0 ? sd : cs) * 1.852).toFixed(0) * 1 if (tempSd < 1) { @@ -1595,9 +1598,9 @@ export default class Judge { //n个扣分序号 kfArr.map(kf => string2Bytes(kf.kfxh, 8)[0]), //TODO 牵引车第二gps精度、纬度 - string2Bytes(0, 4 * 8), string2Bytes(0, 4 * 8), + string2Bytes(gps2Jd, 4 * 8), string2Bytes(gps2Wd, 4 * 8), //TODO 牵引车第二航向角 - string2Bytes(0, 2 * 8), + string2Bytes(gps2.hxj * 100, 2 * 8), //TODO 摩托压线 Byte[20], string2Bytes(0, 20 * 8), //考试用时 diff --git a/entry/src/profile.per b/entry/src/profile.per index 0bb6e7a9..a383af1f 100644 --- a/entry/src/profile.per +++ b/entry/src/profile.per @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICFjCCAZygAwIBAgIJAKp/RlmaT1oCMAoGCCqGSM49BAMDMGMxCzAJBgNVBAYT -AkNOMRQwEgYDVQQKEwtPcGVuSGFybW9ueTEZMBcGA1UECxMQT3Blbkhhcm1vbnkg -VGVhbTEjMCEGA1UEAxMaT3Blbkhhcm1vbnkgQXBwbGljYXRpb24gQ0EwHhcNMjUw -NDE1MDkwMzM2WhcNMzUwNDEzMDkwMzM2WjBKMRUwEwYDVQQDDAxpZGVfZGVtb19h -cHAxDTALBgNVBAsTBFVuaXQxFTATBgNVBAoTDE9yZ2FuaXphdGlvbjELMAkGA1UE -BhMCQ04wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQm//kXDxgKlUSc1COTY0Kq -nYbFzDL+P7WhBd4LivOJmHHcWBh4L+vIC1+t+4prdF4Oy9KC9QAoH+VPYou5Taq9 -o1IwUDAdBgNVHQ4EFgQUwMgtlNBiWYUlHzLb3NzFySav544wDgYDVR0PAQH/BAQD -AgeAMB8GA1UdIwQYMBaAFNuGtyIW1QuhS7fdJXu58QV9oi1HMAoGCCqGSM49BAMD -A2gAMGUCMQC9Nc7V1n17UoCL654+9WdsLHFn3JilQGXoCeeY3wI+gUMTzX46TB/T -Yl9mO0cSvwkCMG/cucH1pP3ET2H3l466eEijj8yZF3aNCNY9mYtQsNcXsLpUMmWN -qKa5HKyVmPM5ew== +MIICFDCCAZugAwIBAgIIPsv1pl7qe7cwCgYIKoZIzj0EAwMwYzELMAkGA1UEBhMC +Q04xFDASBgNVBAoTC09wZW5IYXJtb255MRkwFwYDVQQLExBPcGVuSGFybW9ueSBU +ZWFtMSMwIQYDVQQDExpPcGVuSGFybW9ueSBBcHBsaWNhdGlvbiBDQTAeFw0yNTA2 +MDQwNTM0NTNaFw0zNTA2MDIwNTM0NTNaMEoxFTATBgNVBAMMDGlkZV9kZW1vX2Fw +cDENMAsGA1UECxMEVW5pdDEVMBMGA1UEChMMT3JnYW5pemF0aW9uMQswCQYDVQQG +EwJDTjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABC3zJoi9U6sI3bu/0AJCkrn7 +6KDFdmOUc2aE2brhInkwfaiB8OPFZI8k10jZ7JhnLE3HOmdqyqdW15FZX5g07QOj +UjBQMB0GA1UdDgQWBBR5VajOPMkmK8tc7bCDx0mkduzcDTAOBgNVHQ8BAf8EBAMC +B4AwHwYDVR0jBBgwFoAU24a3IhbVC6FLt90le7nxBX2iLUcwCgYIKoZIzj0EAwMD +ZwAwZAIwM8mmHt6iUyhcQchTO8wFd2PI1977YOVbA60lHQfTJvPH5oeoaDLC+RFy +bwLcn5MCAjAqReCHPutTVg73sJRL9WhVwnoTLzYKQWjvbQe50JxH6bTZ0V0I4m/w +oSj5TdpTxos= -----END CERTIFICATE----- -67310D35AF33C65F515453B57F0093354AC76A9916134B0621D0116BCEA0E6C4 \ No newline at end of file +1B2A4453F882EE15A162C5C8B13DCB7841F7F5AD9DCFB737AA0823040F44AA71 \ No newline at end of file