!8428 修改validator结果替换bug

Merge pull request !8428 from 田文哲/OpenHarmony-3.2-Release

validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets

@@ -116,7 +116,7 @@ struct IndexPage {
       let number = WriteTitle.length + 11;
       let Index = ColorBack.indexOf(WriteTitle);
 
-      if (this.result === 'true'){
+      if (this.result === 'true '){
         this.ColorObject[this.current] = '#ff008000';
         let Log = (titles+';'+'#ff008000'+';');
         let key = ColorBack.substring(Index,Index+number);
@@ -282,12 +282,12 @@ struct IndexPage {
         FailIndex = report.indexOf('false',FailIndex + 1);
       }
       let failNum = (FailNum).toString();
-      let PassIndex = report.indexOf('true');
+      let PassIndex = report.indexOf('true ');
       let PassNum = 0;
       while (PassIndex != -1) {
         console.log(PassIndex);
         PassNum++;
-        PassIndex = report.indexOf('true',PassIndex + 1);
+        PassIndex = report.indexOf('true ',PassIndex + 1);
       }
       let TestNum = FailNum + PassNum;
       let testNum = (TestNum).toString();

validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets

@@ -50,7 +50,7 @@ struct CustomContainer1 {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);
@@ -126,7 +126,7 @@ struct CustomContainer1 {
     };
     let name = this.name;
     let displayName = `${info.prefix}${name}${info.suffix}`;
-    let dirPath = path + '/' + displayName;
+    let dirPath = path + '/screenshot' + '/' + displayName;
     let imagePackerApi = image.createImagePacker();
     let arrayBuffer = await imagePackerApi.packing(data, packOpts);
     let fd = fileio.openSync(dirPath,0o102,0o666);

validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets

@@ -99,7 +99,7 @@ struct IndexPage {
       let number = WriteTitle.length + 11;
       let Index = ColorBack.indexOf(WriteTitle);
 
-      if (this.result === 'true'){
+      if (this.result === 'true '){
         this.ColorObject[this.current] = '#ff008000';
         let Log = (titles+';'+'#ff008000'+';');
         let key = ColorBack.substring(Index,Index+number);
@@ -265,12 +265,12 @@ struct IndexPage {
         FailIndex = report.indexOf('false',FailIndex + 1);
       }
       let failNum = (FailNum).toString();
-      let PassIndex = report.indexOf('true');
+      let PassIndex = report.indexOf('true ');
       let PassNum = 0;
       while (PassIndex != -1) {
         console.log(PassIndex);
         PassNum++;
-        PassIndex = report.indexOf('true',PassIndex + 1);
+        PassIndex = report.indexOf('true ',PassIndex + 1);
       }
       let TestNum = FailNum + PassNum;
       let testNum = (TestNum).toString();

validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets

@@ -100,7 +100,7 @@ struct IndexPage {
       let number = WriteTitle.length + 11;
       let Index = ColorBack.indexOf(WriteTitle);
 
-      if (this.result === 'true'){
+      if (this.result === 'true '){
         this.ColorObject[this.current] = '#ff008000';
         let Log = (titles+';'+'#ff008000'+';');
         let key = ColorBack.substring(Index,Index+number);
@@ -266,12 +266,12 @@ struct IndexPage {
         FailIndex = report.indexOf('false',FailIndex + 1);
       }
       let failNum = (FailNum).toString();
-      let PassIndex = report.indexOf('true');
+      let PassIndex = report.indexOf('true ');
       let PassNum = 0;
       while (PassIndex != -1) {
         console.log(PassIndex);
         PassNum++;
-        PassIndex = report.indexOf('true',PassIndex + 1);
+        PassIndex = report.indexOf('true ',PassIndex + 1);
       }
       let TestNum = FailNum + PassNum;
       let testNum = (TestNum).toString();

validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets

@@ -113,7 +113,7 @@ struct IndexPage {
       let number = WriteTitle.length + 11;
       let Index = ColorBack.indexOf(WriteTitle);
 
-      if (this.result === 'true'){
+      if (this.result === 'true '){
         this.ColorObject[this.current] = '#ff008000';
         let Log = (titles+';'+'#ff008000'+';');
         let key = ColorBack.substring(Index,Index+number);
@@ -255,7 +255,6 @@ struct IndexPage {
   ReadTextParseXml(){
     let ReportPath = path1 + '/ExperienceReport.txt';
     let dir = fileio.opendirSync(path1);
-    console.info("ssssss"+dir);
     while (dir) {
       let OP = fileio.openSync(ReportPath, 0o100 | 0o2002, 0o664);
       let buf = new ArrayBuffer(40960);
@@ -281,12 +280,12 @@ struct IndexPage {
         FailIndex = report.indexOf('false',FailIndex + 1);
       }
       let failNum = (FailNum).toString();
-      let PassIndex = report.indexOf('true');
+      let PassIndex = report.indexOf('true ');
       let PassNum = 0;
       while (PassIndex != -1) {
         console.log(PassIndex);
         PassNum++;
-        PassIndex = report.indexOf('true',PassIndex + 1);
+        PassIndex = report.indexOf('true ',PassIndex + 1);
       }
       let TestNum = FailNum + PassNum;
       let testNum = (TestNum).toString();

validator/acts_validator/src/main/ets/pages/Player/Player_index.ets

@@ -99,7 +99,7 @@ struct IndexPage {
       let number = WriteTitle.length + 11;
       let Index = ColorBack.indexOf(WriteTitle);
 
-      if (this.result === 'true') {
+      if (this.result === 'true ') {
         this.ColorObject[this.current] = '#ff008000';
         let Log = (titles + ';' + '#ff008000' + ';');
         let key = ColorBack.substring(Index, Index + number);
@@ -285,12 +285,12 @@ struct IndexPage {
         FailIndex = report.indexOf('false', FailIndex + 1);
       }
       let failNum = (FailNum).toString();
-      let PassIndex = report.indexOf('true');
+      let PassIndex = report.indexOf('true ');
       let PassNum = 0;
       while (PassIndex != -1) {
         console.log(PassIndex);
         PassNum++;
-        PassIndex = report.indexOf('true', PassIndex + 1);
+        PassIndex = report.indexOf('true ', PassIndex + 1);
       }
       let TestNum = FailNum + PassNum;
       let testNum = (TestNum).toString();

validator/acts_validator/src/main/ets/pages/common/AudioContainer.ets

@@ -47,7 +47,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets

@@ -55,7 +55,7 @@ export struct CustomContainer {
       .onClick(() => {
         router.back({
           url: this.Url,
-          params: { result: 'true', title: this.name,
+          params: { result: 'true ', title: this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets

@@ -57,7 +57,7 @@ export struct CustomContainer {
         if (this.clickFrequency === this.testingFrequency){
           router.back({
             url:this.Url,
-            params: {result : 'true', title : this.name,
+            params: {result : 'true ', title : this.name,
             }
           })
         }

validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets

@@ -48,7 +48,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets

@@ -48,7 +48,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets

@@ -48,7 +48,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets

@@ -50,7 +50,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets

@@ -52,7 +52,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets

@@ -48,7 +48,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets

@@ -48,7 +48,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets

@@ -49,7 +49,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets

@@ -48,7 +48,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets

@@ -50,7 +50,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets

@@ -50,7 +50,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets

@@ -55,7 +55,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets

@@ -50,7 +50,7 @@ export struct CustomContainer {
       .onClick(()=>{
         router.back({
           url:this.Url,
-          params: {result : 'true', title : this.name,
+          params: {result : 'true ', title : this.name,
           }
         })
         this.getScreen(isFullScreen);

validator/acts_validator/src/main/ets/pages/index.ets

@@ -339,12 +339,12 @@ struct IndexPage {
       FailIndex = report.indexOf('false',FailIndex + 1);
     }
     let failNum = (FailNum).toString();
-    let PassIndex = report.indexOf('true');
+    let PassIndex = report.indexOf('true ');
     let PassNum = 0;
     while(PassIndex != -1) {
       console.log(PassIndex);
       PassNum++;
-      PassIndex = report.indexOf('true',PassIndex + 1);
+      PassIndex = report.indexOf('true ',PassIndex + 1);
     }
     let TestNum = FailNum + PassNum;
     let testNum = (TestNum).toString();
@@ -359,12 +359,12 @@ struct IndexPage {
       ArkUIFailIndex = ArkUIReport.indexOf('false',ArkUIFailIndex + 1);
     }
     let ArkuiFailNum = (ArkUIFailNum).toString();
-    let ArkUIPassIndex = ArkUIReport.indexOf('true');
+    let ArkUIPassIndex = ArkUIReport.indexOf('true ');
     let ArkUIPassNum = 0;
     while (ArkUIPassIndex != -1) {
       console.log(ArkUIPassIndex);
       ArkUIPassNum++;
-      ArkUIPassIndex = ArkUIReport.indexOf('true',ArkUIPassIndex + 1);
+      ArkUIPassIndex = ArkUIReport.indexOf('true ',ArkUIPassIndex + 1);
     }
     let ArkUITestNum = ArkUIFailNum + ArkUIPassNum;
     let ArkuiTestNum = (ArkUITestNum).toString();
@@ -379,12 +379,12 @@ struct IndexPage {
       AudioFailIndex = AudioReport.indexOf('false',AudioFailIndex + 1);
     }
     let audioFailNum = (AudioFailNum).toString();
-    let AudioPassIndex = AudioReport.indexOf('true');
+    let AudioPassIndex = AudioReport.indexOf('true ');
     let AudioPassNum = 0;
     while (AudioPassIndex != -1) {
       console.log(AudioPassIndex);
       AudioPassNum++;
-      AudioPassIndex = AudioReport.indexOf('true',AudioPassIndex + 1);
+      AudioPassIndex = AudioReport.indexOf('true ',AudioPassIndex + 1);
     }
     let AudioTestNum = AudioFailNum + AudioPassNum;
     let audioTestNum = (AudioTestNum).toString();
@@ -399,12 +399,12 @@ struct IndexPage {
       CameraFailIndex = CameraReport.indexOf('false',CameraFailIndex + 1);
     }
     let cameraFailNum = (CameraFailNum).toString();
-    let CameraPassIndex = CameraReport.indexOf('true');
+    let CameraPassIndex = CameraReport.indexOf('true ');
     let CameraPassNum = 0;
     while (CameraPassIndex != -1) {
       console.log(CameraPassIndex);
       CameraPassNum++;
-      CameraPassIndex = CameraReport.indexOf('true',CameraPassIndex + 1);
+      CameraPassIndex = CameraReport.indexOf('true ',CameraPassIndex + 1);
     }
     let CameraTestNum = CameraFailNum + CameraPassNum;
     let cameraTestNum = (CameraTestNum).toString();
@@ -419,12 +419,12 @@ struct IndexPage {
       PlayerFailIndex = PlayerReport.indexOf('false',PlayerFailIndex + 1);
     }
     let playerFailNum = (PlayerFailNum).toString();
-    let PlayerPassIndex = PlayerReport.indexOf('true');
+    let PlayerPassIndex = PlayerReport.indexOf('true ');
     let PlayerPassNum = 0;
     while (PlayerPassIndex != -1) {
       console.log(PlayerPassIndex);
       PlayerPassNum++;
-      PlayerPassIndex = PlayerReport.indexOf('true',PlayerPassIndex + 1);
+      PlayerPassIndex = PlayerReport.indexOf('true ',PlayerPassIndex + 1);
     }
     let PlayerTestNum = PlayerFailNum + PlayerPassNum;
     let playerTestNum = (PlayerTestNum).toString();
@@ -439,12 +439,12 @@ struct IndexPage {
       ExperienceFailIndex = ExperienceReport.indexOf('false',ExperienceFailIndex + 1);
     }
     let experienceFailNum = (ExperienceFailNum).toString();
-    let ExperiencePassIndex = ExperienceReport.indexOf('true');
+    let ExperiencePassIndex = ExperienceReport.indexOf('true ');
     let ExperiencePassNum = 0;
     while (ExperiencePassIndex != -1) {
       console.log(ExperiencePassIndex);
       ExperiencePassNum++;
-      ExperiencePassIndex = ExperienceReport.indexOf('true',ExperiencePassIndex + 1);
+      ExperiencePassIndex = ExperienceReport.indexOf('true ',ExperiencePassIndex + 1);
     }
     let ExperienceTestNum = ExperienceFailNum + ExperiencePassNum;
     let experienceTestNum = (ExperienceTestNum).toString();