!8344 validator的arkui的bug修改和部分描述修改

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

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -57,11 +57,14 @@ struct SetCircle {
         }
         Row({space:10}){
           Text('font-style').fontSize(13).border({width:0}).size({width:'24%',height:'18%'})
-          Text('normal').fontSize(13).border({width:2}).size({width:'24%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('normal').fontSize(13)
+          }
+          .size({width:'24%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal normal 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal normal 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num1 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -71,11 +74,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('italic').fontSize(13).border({width:2}).size({width:'24%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('italic').fontSize(13)
+          }
+          .size({width:'24%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'italic normal 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'italic normal 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num2 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -88,11 +94,14 @@ struct SetCircle {
         }
         Row({space:8}) {
           Text('font-weight').fontSize(13).border({ width: 0 }).size({ width: '24%', height: '18%' })
-          Text('normal').fontSize(13).border({ width: 2 }).size({ width: '16%', height: '18%' })
-            .onClick(() => {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('normal').fontSize(13)
+          }
+          .size({width:'16%',height:'18%'})
+            .onChange(() => {
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal normal 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal normal 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num3 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -102,11 +111,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('bold').fontSize(13).border({width:2}).size({width:'16%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('bold').fontSize(13)
+          }
+          .size({width:'16%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal bold 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal bold 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num4 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -116,11 +128,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('bolder').fontSize(13).border({width:2}).size({width:'16%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('bolder').fontSize(13)
+          }
+          .size({width:'16%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal bolder 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal bolder 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num5 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -130,11 +145,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('lighter').fontSize(13).border({width:2}).size({width:'16%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('lighter').fontSize(13)
+          }
+          .size({width:'16%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal lighter 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal lighter 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num6 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -146,11 +164,14 @@ struct SetCircle {
             })
         }
         Row({space:5}) {
-          Text('100').fontSize(13).border({ width: 2 }).size({ width: '10%', height: '18%' })
-            .onClick(() => {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('100').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(() => {
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 100 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 100 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num7 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -160,11 +181,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('200').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('200').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 200 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 200 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num8 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -174,11 +198,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('300').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('300').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 300 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 300 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num9 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -188,11 +215,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('400').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('400').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 400 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 400 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num10 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -202,11 +232,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('500').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('500').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 500 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 500 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num11 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -216,11 +249,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('600').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('600').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 600 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 600 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num12 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -230,11 +266,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('700').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('700').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 700 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 700 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num13 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -244,11 +283,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('800').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('800').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 800 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 800 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num14 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -258,11 +300,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('900').fontSize(13).border({width:2}).size({width:'10%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('900').fontSize(13)
+          }
+          .size({ width: '10%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal 900 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal 900 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num15 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -275,11 +320,14 @@ struct SetCircle {
         }
         Row({space:10}){
           Text('font-family').fontSize(13).border({width:0}).size({width:'24%',height:'18%'})
-          Text('sans-serif').fontSize(13).border({width:2}).size({width:'24%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('sans-serif').fontSize(13)
+          }
+          .size({width:'24%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal normal 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal normal 80px sans-serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num16 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -289,11 +337,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('serif').fontSize(13).border({width:2}).size({width:'24%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('serif').fontSize(13)
+          }
+          .size({width:'24%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal normal 120px serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal normal 80px serif';
+              this.context.fillText("Hello World", 40, 180);
               this.num17 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -303,11 +354,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('monospace').fontSize(13).border({width:2}).size({width:'24%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('monospace').fontSize(13)
+          }
+          .size({width:'24%',height:'18%'})
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
-              this.context.font = 'normal normal 120px monospace';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.font = 'normal normal 80px monospace';
+              this.context.fillText("Hello World", 40, 180);
               this.num18 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -320,11 +374,14 @@ struct SetCircle {
         }
         Row({space:10}) {
           Text('font-size').fontSize(13).border({ width: 0 }).size({ width: '18%', height: '18%' })
-          Text('small').fontSize(13).border({ width: 2 }).size({ width: '18%', height: '18%' })
-            .onClick(() => {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('small').fontSize(13)
+          }
+          .size({ width: '18%', height: '18%' })
+            .onChange(() => {
               this.context.clearRect(0, 10, 600, 600);
               this.context.font = 'normal normal 10px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.fillText("Hello World", 40, 180);
               this.num19 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -334,11 +391,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('medium').fontSize(13).border({width:2}).size({width:'18%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('medium').fontSize(13)
+          }
+          .size({ width: '18%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
               this.context.font = 'normal normal 50px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.fillText("Hello World", 40, 180);
               this.num20 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -348,11 +408,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('large').fontSize(13).border({width:2}).size({width:'18%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('large').fontSize(13)
+          }
+          .size({ width: '18%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
               this.context.font = 'normal normal 80px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.fillText("Hello World", 40, 180);
               this.num21 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -362,11 +425,14 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('extra').fontSize(13).border({width:2}).size({width:'18%',height:'18%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('extra').fontSize(13)
+          }
+          .size({ width: '18%', height: '18%' })
+            .onChange(()=>{
               this.context.clearRect(0, 10, 600, 600);
               this.context.font = 'normal normal 120px sans-serif';
-              this.context.fillText("Hello World", 80, 120);
+              this.context.fillText("Hello World", 40, 180);
               this.num22 = 1;
               if( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1
               && this.num6 == 1 && this.num7 == 1 && this.num8 == 1 && this.num9 == 1 && this.num10 == 1
@@ -384,8 +450,6 @@ struct SetCircle {
           .height('100%')
           .backgroundColor('#ffffffff')
           .onReady(() =>{
-            this.context.font = '120px sans-serif';
-            this.context.fillText("Hello World", 80, 120);
           })
       }.width('100%').height('70%')
     }.width('100%').height('80%').backgroundColor(Color.White)

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -37,11 +37,17 @@ struct SetCircle {
           .gesture(
           PanGesture({})
             .onActionStart((event: GestureEvent) => {
-              this.context.clearRect(100, 100, 250, 200);
               console.info('Pan start');
               this.Vue = true;
             })
             .onActionUpdate((event: GestureEvent) => {
+              this.context.clearRect(100, 100, 250, 200);
+              if(event.offsetX>200){
+                event.offsetX = 200;
+              }
+              else if (event.offsetX < 20){
+                event.offsetX = 20;
+              }
               this.X = event.offsetX;
               this.context.globalAlpha = (this.X)*0.005;
               this.context.fillStyle = 'rgb(255,0,0)';

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -22,7 +22,7 @@ struct SetCircle {
   private context: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.settings);
   @State FillColor: string = '#FF000000';
   @State name: string = 'CanvasGlobalCompositeOperation';
-  @State StepTips: string = '操作步骤：点击不同的合成操作的方式'+'\n'+'预期结果：原本默认合成方式会随点击变化';
+  @State StepTips: string = '操作步骤：点击不同的合成操作的方式'+'\n'+'预期结果：原本默认合成方式会随点击变化（红色为先绘制内容，蓝色为后绘制内容）';
   @State Vue: boolean = false;
   @State num1: number = 0;
   @State num2: number = 0;
@@ -45,8 +45,17 @@ struct SetCircle {
           Text('').fontSize(0).border({width:0}).size({width:'0%',height:'2%'})
         }
         Row({space:10}){
-          Text('s-over').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-          .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('s-over').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+          .onChange(()=>{
+            this.context.clearRect(0, 10, 350, 300);
+            this.context.fillStyle = 'rgb(255,0,0)';
+            this.context.fillRect(150, 150, 50, 50);
+            this.context.globalCompositeOperation = 'source-over';
+            this.context.fillStyle = 'rgb(0,0,255)';
+            this.context.fillRect(180, 180, 50, 50);
             this.context.clearRect(0, 10, 350, 300);
             this.context.fillStyle = 'rgb(255,0,0)';
             this.context.fillRect(150, 150, 50, 50);
@@ -60,8 +69,17 @@ struct SetCircle {
               this.Vue = true;
             }
           })
-          Text('s-atop').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('s-atop').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=>{
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -75,8 +93,17 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('s-in').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('s-in').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=>{
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -90,8 +117,17 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('s-out').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=>{
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('s-out').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=>{
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -107,8 +143,17 @@ struct SetCircle {
             })
         }
         Row({space:10}){
-          Text('d-over').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-          .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('d-over').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+          .onChange(()=> {
+            this.context.clearRect(0, 10, 350, 300);
+            this.context.fillStyle = 'rgb(255,0,0)';
+            this.context.fillRect(150, 150, 50, 50);
+            this.context.globalCompositeOperation = 'source-over';
+            this.context.fillStyle = 'rgb(0,0,255)';
+            this.context.fillRect(180, 180, 50, 50);
             this.context.clearRect(0, 10, 350, 300);
             this.context.fillStyle = 'rgb(255,0,0)';
             this.context.fillRect(150, 150, 50, 50);
@@ -122,8 +167,17 @@ struct SetCircle {
               this.Vue = true;
             }
           })
-          Text('d-atop').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('d-atop').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=> {
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -137,8 +191,17 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('d-in').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('d-in').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=> {
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -152,8 +215,17 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('d-out').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('d-out').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=> {
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -169,8 +241,17 @@ struct SetCircle {
             })
         }
         Row({space:10}){
-          Text('lighter').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('lighter').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=> {
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -184,8 +265,17 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('copy').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('copy').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=> {
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -199,8 +289,17 @@ struct SetCircle {
                 this.Vue = true;
               }
             })
-          Text('xor').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
-            .onClick(()=> {
+          Toggle({type:ToggleType.Button, isOn:false}){
+            Text('xor').fontSize(13)
+          }
+          .size({width:'18%',height:'20%'})
+            .onChange(()=> {
+              this.context.clearRect(0, 10, 350, 300);
+              this.context.fillStyle = 'rgb(255,0,0)';
+              this.context.fillRect(150, 150, 50, 50);
+              this.context.globalCompositeOperation = 'source-over';
+              this.context.fillStyle = 'rgb(0,0,255)';
+              this.context.fillRect(180, 180, 50, 50);
               this.context.clearRect(0, 10, 350, 300);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 50, 50);
@@ -223,11 +322,6 @@ struct SetCircle {
           .height('100%')
           .backgroundColor('#ffffffff')
           .onReady(() =>{
-            this.context.fillStyle = 'rgb(255,0,0)';
-            this.context.fillRect(150, 150, 50, 50);
-            this.context.globalCompositeOperation = 'source-over';
-            this.context.fillStyle = 'rgb(0,0,255)';
-            this.context.fillRect(180, 180, 50, 50);
           })
       }.width('100%').height('70%')
     }.width('100%').height('80%').backgroundColor(Color.White)

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -36,15 +36,22 @@ struct SetCircle {
           .gesture(
           PanGesture({})
             .onActionStart((event: GestureEvent) => {
-              this.context.clearRect(100, 100, 250, 200);
               console.info('Pan start');
               this.Vue = true;
             })
             .onActionUpdate((event: GestureEvent) => {
+              if(event.offsetX > 200){
+                event.offsetX = 200;
+              }
+              else if(event.offsetX < 20){
+                event.offsetX = 20;
+              }
               this.X = event.offsetX;
-              this.context.arc(180, 150, 50, 0, 6.28);
+              this.context.clearRect(100, 90, 250, 200);
               this.context.setLineDash([20,30]);
-              this.context.lineDashOffset = (this.X)*0.02;
+              this.context.beginPath();
+              this.context.arc(180, 150, 50, 0, 6.28);
+              this.context.lineDashOffset = (this.X) * 0.2;
               this.context.stroke();
             })
             .onActionEnd(() => {
@@ -53,7 +60,7 @@ struct SetCircle {
           )
       }.width('70%').height('25%')
       Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-        Text('虚线偏移量: ' + (this.X)*0.02 )
+        Text('虚线偏移量: ' + (this.X)*0.2 )
       }.width('100%').height('20%')
       Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
         Canvas(this.context)
@@ -61,10 +68,6 @@ struct SetCircle {
           .height('100%')
           .backgroundColor('#ffffffff')
           .onReady(() =>{
-            this.context.arc(180, 150, 50, 0, 6.28);
-            this.context.setLineDash([20,30]);
-            this.context.lineDashOffset = 0.1;
-            this.context.stroke();
           })
       }.width('100%').height('55%')
     }.width('100%').height('80%').backgroundColor(Color.White)

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -36,11 +36,17 @@ struct SetCircle {
           .gesture(
           PanGesture({})
             .onActionStart((event: GestureEvent) => {
-              this.context.clearRect(100, 100, 250, 200);
               console.info('Pan start');
               this.Vue = true;
             })
             .onActionUpdate((event: GestureEvent) => {
+              if(event.offsetX > 200){
+                event.offsetX = 200;
+              }
+              else if(event.offsetX < 20){
+                event.offsetX = 20;
+              }
+              this.context.clearRect(100, 100, 250, 200);
               this.X = event.offsetX;
               this.context.lineWidth = (this.X)*0.1;
               this.context.strokeRect(120, 120, 120, 120);

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -36,13 +36,19 @@ struct SetCircle {
           .gesture(
           PanGesture({})
             .onActionStart((event: GestureEvent) => {
-              this.context.clearRect(0, 0, 600, 500);
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 100, 100);
               console.info('Pan start');
               this.Vue = true;
             })
             .onActionUpdate((event: GestureEvent) => {
+              if(event.offsetX > 200){
+                event.offsetX = 200;
+              }
+              else if(event.offsetX < 20){
+                event.offsetX = 20;
+              }
+              this.context.clearRect(0, 0, 600, 500);
               this.X = event.offsetX;
               this.context.shadowBlur = this.X;
               this.context.shadowColor = 'rgb(0,0,0)';

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -77,8 +77,6 @@ struct SetCircle {
           .height('100%')
           .backgroundColor('#ffffffff')
           .onReady(() =>{
-            this.context.shadowBlur = 30;
-            this.context.shadowColor = 'rgb(0,0,255)';
             this.context.fillStyle = 'rgb(255,0,0)';
             this.context.fillRect(150, 150, 100, 100);
           })

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -36,7 +36,6 @@ struct SetCircle {
           .gesture(
           PanGesture({})
             .onActionStart((event: GestureEvent) => {
-              this.context.clearRect(10, 50, 400, 300);
               this.context.shadowColor = 'rgb(0,0,0)';
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 100, 100);
@@ -44,6 +43,13 @@ struct SetCircle {
               this.Vue = true;
             })
             .onActionUpdate((event: GestureEvent) => {
+              if(event.offsetX > 200){
+                event.offsetX = 200;
+              }
+              else if(event.offsetX < 20){
+                event.offsetX = 20;
+              }
+              this.context.clearRect(10, 50, 400, 300);
               this.X = event.offsetX;
               this.context.shadowBlur = 10;
               this.context.shadowOffsetX = (this.X)*0.05;

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -36,7 +36,6 @@ struct SetCircle {
           .gesture(
           PanGesture({})
             .onActionStart((event: GestureEvent) => {
-              this.context.clearRect(10, 50, 400, 300);
               this.context.shadowColor = 'rgb(0,0,0)';
               this.context.fillStyle = 'rgb(255,0,0)';
               this.context.fillRect(150, 150, 100, 100);
@@ -44,6 +43,13 @@ struct SetCircle {
               this.Vue = true;
             })
             .onActionUpdate((event: GestureEvent) => {
+              if(event.offsetX > 200){
+                event.offsetX = 200;
+              }
+              else if(event.offsetX < 20){
+                event.offsetX = 20;
+              }
+              this.context.clearRect(10, 50, 400, 300);
               this.X = event.offsetX;
               this.context.shadowBlur = 10;
               this.context.shadowOffsetY = (this.X)*0.05;

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -39,11 +39,12 @@ struct SetCircle {
           .onClick(()=>{
             this.context.clearRect(0, 10, 500, 500);
             this.context.lineWidth = 2;
-            this.context.moveTo(180, 10);
-            this.context.lineTo(180, 310);
+            this.context.moveTo(250, 10);
+            this.context.lineTo(250, 310);
             this.context.stroke();
             this.context.textAlign = 'start';
-            this.context.fillText('textAlign=start', 180, 160);
+            this.context.font = '40px sans-serif'
+            this.context.fillText('textAlign=start', 250, 160);
             this.num1 = 1;
             if ( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1 ){
               this.Vue = true;
@@ -53,11 +54,11 @@ struct SetCircle {
           .onClick(()=>{
             this.context.clearRect(0, 10, 500, 500);
             this.context.lineWidth = 2;
-            this.context.moveTo(180, 10);
-            this.context.lineTo(180, 310);
+            this.context.moveTo(250, 10);
+            this.context.lineTo(250, 310);
             this.context.stroke();
             this.context.textAlign = 'end';
-            this.context.fillText('textAlign=end', 180, 160);
+            this.context.fillText('textAlign=end', 250, 160);
             this.num2 = 1;
             if ( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1 ){
               this.Vue = true;
@@ -67,11 +68,11 @@ struct SetCircle {
           .onClick(()=>{
             this.context.clearRect(0, 10, 500, 500);
             this.context.lineWidth = 2;
-            this.context.moveTo(180, 10);
-            this.context.lineTo(180, 310);
+            this.context.moveTo(250, 10);
+            this.context.lineTo(250, 310);
             this.context.stroke();
             this.context.textAlign = 'left';
-            this.context.fillText('textAlign=left', 180, 160);
+            this.context.fillText('textAlign=left', 250, 160);
             this.num3 = 1;
             if ( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1 ){
               this.Vue = true;
@@ -81,11 +82,11 @@ struct SetCircle {
           .onClick(()=>{
             this.context.clearRect(0, 10, 500, 500);
             this.context.lineWidth = 2;
-            this.context.moveTo(180, 10);
-            this.context.lineTo(180, 310);
+            this.context.moveTo(250, 10);
+            this.context.lineTo(250, 310);
             this.context.stroke();
             this.context.textAlign = 'center';
-            this.context.fillText('textAlign=center', 180, 160);
+            this.context.fillText('textAlign=center', 250, 160);
             this.num4 = 1;
             if ( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1 ){
               this.Vue = true;
@@ -95,11 +96,11 @@ struct SetCircle {
           .onClick(()=> {
             this.context.clearRect(0, 10, 500, 500);
             this.context.lineWidth = 2;
-            this.context.moveTo(180, 10);
-            this.context.lineTo(180, 310);
+            this.context.moveTo(250, 10);
+            this.context.lineTo(250, 310);
             this.context.stroke();
             this.context.textAlign = 'right';
-            this.context.fillText('textAlign=right', 180, 160);
+            this.context.fillText('textAlign=right', 250, 160);
             this.num5 = 1;
             if ( this.num1 == 1 && this.num2 == 1 && this.num3 == 1 && this.num4 == 1 && this.num5 == 1 ){
               this.Vue = true;
@@ -113,12 +114,9 @@ struct SetCircle {
           .backgroundColor('#ffffffff')
           .onReady(() =>{
             this.context.lineWidth = 2;
-            this.context.moveTo(180, 10);
-            this.context.lineTo(180, 310);
+            this.context.moveTo(250, 10);
+            this.context.lineTo(250, 310);
             this.context.stroke();
-            this.context.font = '60px sans-serif';
-            this.context.textAlign = 'start';
-            this.context.fillText('textAlign=start', 180, 160);
           })
       }.width('100%').height('70%')
     }.width('100%').height('80%').backgroundColor(Color.White)

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

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CanvasCustomContainer1';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SetCircle {
@@ -43,6 +43,7 @@ struct SetCircle {
             this.context.moveTo(0, 120);
             this.context.lineTo(400, 120);
             this.context.stroke();
+            this.context.font = '60px sans-serif';
             this.context.textBaseline = 'top';
             this.context.fillText('Top', 160, 120);
             this.num1 = 1;
@@ -120,11 +121,8 @@ struct SetCircle {
             this.context.strokeStyle = '#0000ff';
             this.context.lineWidth = 2;
             this.context.moveTo(0, 120);
-            this.context.lineTo(400, 120);
+            this.context.lineTo(500, 120);
             this.context.stroke();
-            this.context.font = '60px sans-serif';
-            this.context.textBaseline = 'top';
-            this.context.fillText('Top', 160, 120);
           })
       }.width('100%').height('70%')
     }.width('100%').height('80%').backgroundColor(Color.White)

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

@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct LongPressGestureExample {
   @State X: number = 0;
   @State name: string = 'LongPressGesture';
-  @State StepTips: string = '操作步骤：用至少一根手指长按图像（最多十根手指）'+'\n'+'预期结果：长按动作触发计数增加';
+  @State StepTips: string = '操作步骤：手指长按图像'+'\n'+'预期结果：长按动作触发计数增加，显示计数可大于10';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
@@ -36,7 +36,9 @@ struct LongPressGestureExample {
         .onAction((event: GestureEvent) => {
           if (event.repeat) {
             this.X++;
-            this.Vue = true;
+            if(this.X >= 10){
+              this.Vue = true;
+            }
           }
         })
         .onActionEnd(() => {

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

@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer3';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct PanGestureExample {
   @State X: number = 0;
   @State Y: number = 0;
   @State name: string = 'PanGesture';
-  @State StepTips: string = '操作步骤：用至少一根手指拖动图像（最多十根手指）'+'\n'+'预期结果：图片正常拖动，偏移坐标显示正常';
+  @State StepTips: string = '操作步骤：手指拖动图像'+'\n'+'预期结果：图片正常拖动，偏移坐标显示正常';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);

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

@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct PinchGuestureTest {
   @State X: number = 1;
   @State name: string = 'PinchGesture';
-  @State StepTips: string = '操作步骤：用手指触摸捏合图片（至少2根手指，最大为5指）'+'\n'+'预期结果：图片能够被正常捏合放缩';
+  @State StepTips: string = '操作步骤：两根手指触摸捏合图片'+'\n'+'预期结果：图片能够被正常捏合放缩';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);

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

@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer2';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct RotationGuestureTest {
   @State X: number = 0;
   @State name: string = 'RotationGesture';
-  @State StepTips: string = '操作步骤：用至少两根手指旋转图像（最多五根手指）'+'\n'+'预期结果：图片能够正常旋转';
+  @State StepTips: string = '操作步骤：两根手指旋转图像'+'\n'+'预期结果：图片能够正常旋转且文本旋转角度显示正常';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);

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

@@ -12,15 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct CustomContainerUser {
   private listArr: number[] = Array.from(new Array(50).keys());
   @State name: string = 'ScrollingList';
-  @State StepTips: string = '操作步骤：滑动列表观察是否能正常滑动'+'\n'+'预期结果：列表滑动正常';
+  @State StepTips: string = '操作步骤：滑动列表观察是否能上下滑动'+'\n'
+  +'预期结果：列表从Item#1滑动至Item#50，并且从#Item50滑动至#Item1，滑动正常，无卡顿';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);

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

@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer3';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct SwipeGestureTest {
   @State X : number = 0;
   @State Y : number = 0;
   @State name: string = 'SwipeGesture';
-  @State StepTips: string = '操作步骤：用至少一根手指滑动图像（最多十根手指）'+'\n'+'预期结果：图片正常滑动，手势滑动角度及速度显示正常';
+  @State StepTips: string = '操作步骤：手指上下滑动图像'+'\n'+'预期结果：图片正常滑动，手势滑动角度及速度显示正常';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);

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

@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import router from '@ohos.router';
 import {CustomContainer} from '../common/CustomContainer4';
 import FirstDialog from '../model/FirstDialog';
-import router from '@ohos.router';
 @Entry
 @Component
 struct TapGestureExample {
   @State value: string = '';
   @State name: string = 'TapGesture';
-  @State StepTips: string = '操作步骤：用至少一根手指连续双击图像（最多十根手指）'+'\n'+'预期结果：双击图片后文本提示正常弹出';
+  @State StepTips: string = '操作步骤：手指连续双击图像'+'\n'+'预期结果：双击图片后文本提示正常弹出';
   @State Vue: boolean = false;
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);

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

@@ -25,7 +25,7 @@ let CameraColdPath = path + '/ColdStartCamera.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'CameraColdStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,9 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面`
-            + '\n' + '\n' + `3.双击执行.bat选择冷启动>相机测试，回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面` + '\n' + '\n'
+            + `3.清空后台应用,将底层任务栏中应用拖至桌面` + '\n' + '\n' + `4.工作台运行‘点击启动测试.bat’选择冷启动>相机测试，回车执行`
+            + '\n' + '\n' +`5.测试应用自动执行冷启动后手动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果'
+            + '\n' + '\n' + `7.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let ContactsColdPath = path + '/ColdStartContacts.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'ContactsColdStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,9 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面`
-            + '\n' + '\n' + `3.双击执行.bat选择冷启动>联系人测试，回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面` + '\n' + '\n'
+            + `3.清空后台应用,将底层任务栏中应用拖至桌面` + '\n' + '\n' + `4.工作台运行‘点击启动测试.bat’选择冷启动>联系人测试，回车执行`
+            + '\n' + '\n' +`5.测试应用自动执行冷启动后手动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果'
+            + '\n' + '\n' + `7.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let ContactsColdPath = path + '/HotStartContacts.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'ContactsHotStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于1000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,10 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.开启应用回退到桌面，保证此时后台应用存在`
-            + '\n' + '\n' + `3.双击执行.bat选择热启动>联系人测试`+ '\n' + '\n' +`4.测试应用手动执行热启动返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若所有热启动测试均在规定时延内完成则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面`+ '\n' + '\n'
+            + `3.开启联系人应用回退到桌面，保证此时后台应用存在` + '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择热启动>联系人测试`+ '\n' + '\n' +
+            `5.测试应用手动执行热启动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果' + '\n' + '\n'
+            + `7.若所有热启动测试均在规定时延内完成则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -26,7 +26,7 @@ let Xpath = path + '/DeskFps.log'
 @Component
 struct CustomContainerUser {
   @State name: string = 'DeskFps';
-  @State StepTips: string = '操作步骤：根据操作提示滑动系统桌面测试帧率'+'\n'+'预期结果：帧率高于54帧测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示滑动系统桌面测试帧率'+'\n'+'预期结果：帧率大于54帧测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State Fps: string = '0';
@@ -44,9 +44,9 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n'
-            + `2.双击执行.bat选择帧率>桌面`+ '\n' + '\n' +`3.左右滑动系统桌面连续10s以上` + '\n' + '\n'
-            + '4.回到DeskFps测试项点击停止键' + '\n' + '\n' + `5.若测试最高帧率大于54帧则通过测试`
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面`+ '\n' + '\n'
+            + `3.工作台运行’点击启动测试.bat‘选择帧率>桌面`+ '\n' + '\n' +`4.左右滑动系统桌面连续10s以上` + '\n' + '\n'
+            + '5.回到DeskFps测试项点击结束键' + '\n' + '\n' + `6.若测试最高帧率大于54帧则通过测试`
             + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }

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

@@ -24,7 +24,7 @@ let Xpath = path + '/CompleteTimeKeyboard.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'KeyboardDisplay';
-  @State StepTips: string = '操作步骤：根据操作提示点击输入框等待键盘加载'+'\n'+'预期结果：输入键盘弹出时延低于1000ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示点击输入框等待键盘加载'+'\n'+'预期结果：输入键盘弹出时延小于1000ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -42,10 +42,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入信息` + '\n' + '\n' +'2.新建一条信息显示输入框'+ '\n' + '\n'
-            + `3.双击执行.bat选择完成时延>键盘按键弹出`+ '\n' + '\n' +`4.点击输入框等待键盘弹出` + '\n' + '\n'
-            + '5.待脚本执行结束回到Validator点击停止键' + '\n' + '\n' + `6.若弹出键盘时延小于或等于1000ms则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入信息` + '\n' + '\n' +
+            '3.新建一条信息显示输入框'+ '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择完成时延>键盘按键弹出`+ '\n' + '\n' +
+            `5.点击输入框等待键盘弹出` + '\n' + '\n' + '6.待脚本执行结束回到Validator点击结束键' + '\n' + '\n'
+            + `7.若弹出键盘时延小于或等于1000ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -24,7 +24,7 @@ let Xpath = path + '/ResponseTimeKeyboard.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'KeyboardInput';
-  @State StepTips: string = '操作步骤：根据操作提示点击键盘按键'+'\n'+'预期结果：键盘输入响应时延低于150ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示点击键盘按键'+'\n'+'预期结果：键盘输入响应时延小于150ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -42,10 +42,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入信息` + '\n' + '\n' +'2.新建一条信息点击输入框打开键盘'+ '\n' + '\n'
-            + `3.双击执行.bat选择响应时延>键盘按键输入`+ '\n' + '\n' +`4.随意点击按键等待响应` + '\n' + '\n'
-            + '5.待脚本执行结束回到Validator点击停止键' + '\n' + '\n' + `6.若按键响应时延小于或等于150ms则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入信息` + '\n' + '\n' +
+            '3.新建一条信息点击输入框打开键盘'+ '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择响应时延>键盘按键输入`+ '\n' + '\n'
+            +`5.随意点击按键等待响应` + '\n' + '\n' + '6.待脚本执行结束回到Validator点击结束键' + '\n' + '\n' +
+            `7.若按键响应时延小于或等于150ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let MmsColdPath = path + '/ColdStartMms.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'MmsColdStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,9 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面`
-            + '\n' + '\n' + `3.双击执行.bat选择冷启动>信息测试,回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面` + '\n' + '\n'
+            + `3.清空后台应用,将底层任务栏中应用拖至桌面` + '\n' + '\n' + `4.工作台运行‘点击启动测试.bat’选择冷启动>信息测试，回车执行`
+            + '\n' + '\n' +`5.测试应用自动执行冷启动后手动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果'
+            + '\n' + '\n' + `7.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let MmsColdPath = path + '/HotStartMms.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'MmsHotStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于1000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,10 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.开启应用回退到桌面，保证此时后台应用存在`
-            + '\n' + '\n' + `3.双击执行.bat选择热启动>信息测试`+ '\n' + '\n' +`4.测试应用手动执行热启动后返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `5.若热启动测试在规定时延内完成则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面`+ '\n' + '\n'
+            + `3.开启信息应用回退到桌面，保证此时后台应用存在` + '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择热启动>信息测试`+ '\n' + '\n' +
+            `5.测试应用手动执行热启动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果' + '\n' + '\n'
+            + `7.若所有热启动测试均在规定时延内完成则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -24,7 +24,7 @@ let Xpath = path + '/PhotoFps.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'PhotoFps';
-  @State StepTips: string = '操作步骤：根据操作提示滑动图库测试帧率'+'\n'+'预期结果：帧率高于或等于54帧测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示滑动图库测试帧率'+'\n'+'预期结果：帧率大于或等于54帧测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State Fps: string = '0';
@@ -42,10 +42,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' +`1.在图库中预置500张图片`+ '\n' + '\n' +`2.点击开始键进入图库`+ '\n' + '\n'
-            + `3.双击执行.bat选择帧率>图库`+ '\n' + '\n' +`4.滑动图库缩略图界面连续10s以上` + '\n' + '\n'
-            + '5.回到PhotoFps测试项点击停止键' + '\n' + '\n' + `6.若测试最高帧率大于或等于54帧则通过测试`
-            + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.在图库中预置500张图片`+ '\n' + '\n'
+            + `3.点击开始键进入图库`+ '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择帧率>图库`+ '\n' + '\n' +
+            `5.滑动图库缩略图界面连续10s以上` + '\n' + '\n' + '6.回到PhotoFps测试项点击结束键' + '\n' + '\n' +
+            `7.若测试最高帧率大于或等于54帧则通过测试` + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let PhotosColdPath = path + '/ColdStartPhotos.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'PhotosColdStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,9 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面`
-            + '\n' + '\n' + `3.双击执行.bat选择冷启动>图库测试,回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面` + '\n' + '\n'
+            + `3.清空后台应用,将底层任务栏中应用拖至桌面` + '\n' + '\n' + `4.工作台运行‘点击启动测试.bat’选择冷启动>图库测试，回车执行`
+            + '\n' + '\n' +`5.测试应用自动执行冷启动后手动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果'
+            + '\n' + '\n' + `7.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let PhotosColdPath = path + '/HotStartPhotos.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'PhotosHotStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于1000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,10 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.开启应用回退到桌面，保证此时后台应用存在`
-            + '\n' + '\n' + `3.双击执行.bat选择热启动>图库测试`+ '\n' + '\n' +`4.测试应用手动执行热启动后返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `5.若热启动测试在规定时延内完成则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面`+ '\n' + '\n'
+            + `3.开启图库应用回退到桌面，保证此时后台应用存在` + '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择热启动>图库测试`+ '\n' + '\n' +
+            `5.测试应用手动执行热启动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果' + '\n' + '\n'
+            + `7.若所有热启动测试均在规定时延内完成则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -24,7 +24,7 @@ let Xpath = path + '/ResponseTimePhotos.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'ScrollPhotosList';
-  @State StepTips: string = '操作步骤：根据操作提示滑动图库缩略表'+'\n'+'预期结果：滑动响应时延低于150ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示滑动图库缩略表'+'\n'+'预期结果：滑动响应时延小于150ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -42,10 +42,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' +`1.在图库中预置500张图片`+ '\n' + '\n' +`2.点击开始键进入图库`+ '\n' + '\n'
-            + `3.双击执行.bat选择响应时延>图库缩略列表滑动`+ '\n' + '\n' +`4.滑动图库缩略列表等待响应` + '\n' + '\n'
-            + '5.待脚本执行结束回到Validator点击停止键' + '\n' + '\n' + `6.若滑动响应时延小于或等于150ms则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.在图库中预置500张图片`+ '\n' + '\n'
+            +`3.点击开始键进入图库`+ '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择响应时延>图库缩略列表滑动`+ '\n' + '\n' +
+            `5.滑动图库缩略列表等待响应` + '\n' + '\n' + '6.待脚本执行结束回到Validator点击结束键' + '\n' + '\n' +
+            `7.若滑动响应时延小于或等于150ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let SettingsColdPath = path + '/ColdStartSetting.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'SettingsColdStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,9 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面`
-            + '\n' + '\n' + `3.双击执行.bat选择冷启动>设置测试,回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面` + '\n' + '\n'
+            + `3.清空后台应用,将底层任务栏中应用拖至桌面` + '\n' + '\n' + `4.工作台运行‘点击启动测试.bat’选择冷启动>设置测试，回车执行`
+            + '\n' + '\n' +`5.测试应用自动执行冷启动后手动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果'
+            + '\n' + '\n' + `7.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -25,7 +25,7 @@ let SettingsColdPath = path + '/HotStartSetting.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'SettingsHotStart';
-  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于1000ms则测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State num: number = 0;
@@ -48,10 +48,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' + `1.点击开始键进入系统桌面`+ '\n' + '\n' + `2.开启应用回退到桌面，保证此时后台应用存在`
-            + '\n' + '\n' + `3.双击执行.bat选择热启动>设置测试`+ '\n' + '\n' +`4.测试应用手动执行热启动后返回validator界面`
-            + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `5.若热启动测试在规定时延内完成则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入系统桌面`+ '\n' + '\n'
+            + `3.开启设置应用回退到桌面，保证此时后台应用存在` + '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择热启动>设置测试`+ '\n' + '\n' +
+            `5.测试应用手动执行热启动返回validator界面` + '\n' + '\n' + '6.点击结束键观察测试结果' + '\n' + '\n'
+            + `7.若所有热启动测试均在规定时延内完成则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -26,7 +26,7 @@ let Xpath = path + '/CompleteTimeLauncher.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'StartBackgroundTask';
-  @State StepTips: string = '操作步骤：根据操作提示打开后台任务'+'\n'+'预期结果：打开后台任务时延低于600ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示打开后台任务'+'\n'+'预期结果：打开后台任务时延小于600ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -44,9 +44,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' +`1.点击开始键进入桌面开启任务管理器` + '\n' + '\n' + `2.双击执行.bat选择完成时延>后台任务切换`+
-            '\n' + '\n' +`3.随意点开一个后台任务` + '\n' + '\n' + '4.待脚本执行结束回到Validator点击停止键'
-            + '\n' + '\n' + `5.若打开后台任务时延小于或等于600ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入桌面开启任务管理器`
+            + '\n' + '\n' + `3.工作台运行’点击启动测试.bat‘选择完成时延>后台任务切换`+ '\n' + '\n' +`4.随意点开一个后台任务`
+            + '\n' + '\n' + '5.待脚本执行结束回到Validator点击结束键' + '\n' + '\n' +
+            `6.若打开后台任务时延小于或等于600ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -26,7 +26,7 @@ let Xpath = path + '/ResponseTimeLauncher.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'StartNotification';
-  @State StepTips: string = '操作步骤：根据操作提示下拉通知栏'+'\n'+'预期结果：下拉通知栏时延低于150ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示下拉通知栏'+'\n'+'预期结果：下拉通知栏时延小于150ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -44,9 +44,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' +`1.点击开始键进入桌面` + '\n' + '\n' + `2.双击执行.bat选择响应时延>下拉状态栏`+
-            '\n' + '\n' +`3.从屏幕顶部滑动下拉通知栏` + '\n' + '\n' + '4.待脚本执行结束回到Validator点击停止键'
-            + '\n' + '\n' + `5.若下拉通知栏时延小于或等于150ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入桌面` + '\n' + '\n'
+            + `3.工作台运行’点击启动测试.bat‘选择响应时延>下拉状态栏`+ '\n' + '\n' +`4.从屏幕顶部滑动下拉通知栏` + '\n' + '\n'
+            + '5.待脚本执行结束回到Validator点击结束键' + '\n' + '\n' + `6.若下拉通知栏时延小于或等于150ms则通过测试` +
+            '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -26,7 +26,7 @@ let Xpath = path + '/CompleteTimeLauncher.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'StartTaskManager';
-  @State StepTips: string = '操作步骤：根据操作提示打开任务管理器'+'\n'+'预期结果：打开任务管理器时延低于1000ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示打开任务管理器'+'\n'+'预期结果：打开任务管理器时延小于1000ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -44,9 +44,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' +`1.点击开始键进入桌面` + '\n' + '\n' + `2.双击执行.bat选择完成时延>启动任务管理器`+
-            '\n' + '\n' +`3.点击右下角方框开启任务管理器` + '\n' + '\n' + '4.待脚本执行结束回到Validator点击停止键'
-            + '\n' + '\n' + `5.若启动任务管理器时延小于或等于1000ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.点击开始键进入桌面` + '\n' + '\n'
+            + `3.工作台运行’点击启动测试.bat‘选择完成时延>启动任务管理器`+ '\n' + '\n' +`4.点击右下角方框开启任务管理器` + '\n' + '\n'
+            + '5.待脚本执行结束回到Validator点击结束键' + '\n' + '\n' + `6.若启动任务管理器时延小于或等于1000ms则通过测试`
+            + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -24,7 +24,7 @@ let Xpath = path + '/ResponseTimePhotos.log';
 @Component
 struct CustomContainerUser {
   @State name: string = 'ViewPhoto';
-  @State StepTips: string = '操作步骤：根据操作提示点击图片等待加载'+'\n'+'预期结果：图片响应时延低于150ms测试通过';
+  @State StepTips: string = '操作步骤：根据操作提示点击图片等待加载'+'\n'+'预期结果：图片响应时延小于150ms测试通过';
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
@@ -42,10 +42,10 @@ struct CustomContainerUser {
               .fontColor(Color.White).fontSize('24fp')
           }
           Row(){
-            Text(`测试步骤:`+ '\n' + '\n' +`1.在图库中预置500张图片`+ '\n' + '\n' +`2.点击开始键进入图库`+ '\n' + '\n'
-            + `3.双击执行.bat选择响应时延>查看图片`+ '\n' + '\n' +`4.点击一张图库缩略图等待响应` + '\n' + '\n'
-            + '5.待脚本执行结束回到Validator点击停止键' + '\n' + '\n' + `6.若图片响应时延小于或等于150ms则通过测试`
-            + '\n' + '\n' + '\n' + '\n' )
+            Text(`测试步骤:`+ '\n' + '\n' + '1.测试设备通过USB连接工作台' + '\n' + '\n' + `2.在图库中预置500张图片`+ '\n' + '\n'
+            + `3.点击开始键进入图库`+ '\n' + '\n' + `4.工作台运行’点击启动测试.bat‘选择响应时延>查看图片` + '\n' + '\n' +
+            `5.点击一张图库缩略图等待响应` + '\n' + '\n' + '6.待脚本执行结束回到Validator点击结束键' + '\n' + '\n' +
+            `7.若图片响应时延小于或等于150ms则通过测试` + '\n' + '\n' + '\n' + '\n' )
               .fontColor(Color.White).fontSize('20fp')
           }
           Row(){

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

@@ -229,6 +229,9 @@ struct IndexPage {
     let StartTime = String.fromCharCode.apply(null, new Uint8Array(buf));
     let Index = StartTime.indexOf(';');
     let starttime = StartTime.substring(0,Index);
+    if(starttime === ''){
+      starttime = '*'
+    }
     let ArkUIReport;
     let AudioReport;
     let CameraReport;