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": "0000001B2A120129476E60A13CB90F2A118FC1DACD776EBF625CBC8C75E83CE8BC2DA4E57F6E6868B0CA45",
+          "storePassword": "0000001B3420049DC7C5AF0BB88578D3A8346DDCD0E0CA25562A5558634CD9044933BA52474F87B9E07F32",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001BE3163B872A727924E46576C7DF1ACBE4283BA076307E0B53166334958EEE387B446DD981CBE5BA",
+          "keyPassword": "0000001B011F84A5952B68C41905A196EADE759B725C8E922F08D8AFD5EFCB71EF82352768670704E9A01B",
           "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"

entry/src/main/ets/entryability/EntryAbility.ets

@@ -73,8 +73,9 @@ export default class EntryAbility extends UIAbility {
 
     const windowClass = await windowStage.getMainWindow();
     globalThis.windowClass = windowClass
-    await windowClass.setWindowLayoutFullScreen(true)
+    // await windowClass.setWindowLayoutFullScreen(true)
     await windowClass.setWindowSystemBarEnable([]) //全屏
+    // await windowClass.setWindowSystemBarEnable(['navigation'])
 
     windowStage.loadContent('pages/Index', (err, data) => {
       if (err.code) {

entry/src/main/ets/pages/Judge.ets

@@ -50,6 +50,7 @@ struct Index {
     promptAction.showToast({
       message: "当前模式:" + this.mode
     })
+    globalThis.windowClass.setWindowSystemBarEnable([])
     const time = await getCurrentTime()
 
     this.startTime = time.split(' ')[1]
@@ -316,7 +317,7 @@ struct Index {
       }
       if (no1 == 6) {
         const name = decodeURI(systemParm.txt1)
-        // 白考过滤掉夜间行驶
+        // 夜间行驶
         if (this.mode !== 2 && no2 == 13) {
           return
         }
@@ -325,21 +326,15 @@ struct Index {
           return
         }
         let isRequired = allItems.includes(no2 + '')
-        let isEnd = false
-        let isUpload = false
-
-        // 夜考除夜间行驶其他项目不需要重复上传
-        if (this.mode === 2 && no2 != 13) {
-          isUpload = true
-        }
-        // 夜考靠边停车设置为非必须
         if (this.mode === 2 && no2 == 11) {
           isRequired = false
         }
-        // 加减档自动完成，为非必须项目
         if (no2 == 14) {
           isRequired = false
         }
+        if (no2 == 13 && this.mode === 1) {
+          isRequired = false
+        }
         const currentProject: Project = {
           name,
           abbreviation: decodeURI(systemParm.txt3),
@@ -348,10 +343,19 @@ struct Index {
           // 白考夜间行驶非必考
           isRequired,
           //是否考过了
-          isEnd,
+          isEnd: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'),
           //项目开始数据是否上传过
-          isUpload,
+          isUpload: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'),
         }
+        // if (this.mode === 2) {
+        //   let type: '1' | '2' | '3'
+        //   if (no2 == 13) {
+        //     type = '2'
+        //   } else {
+        //     type = isRequired ? '1' : '3'
+        //   }
+        //   currentProject.ykType = type
+        // }
         this.projectsObj[no2*1] = currentProject
         this.projectsCenterObj[txt2] = currentProject
         this.projects.push(currentProject);

entry/src/profile.per

@@ -1,15 +0,0 @@
------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==
------END CERTIFICATE-----
-67310D35AF33C65F515453B57F0093354AC76A9916134B0621D0116BCEA0E6C4