!8567 为性能测试项增加滑动界面，解决部分设备显示不全的问题

Merge pull request !8567 from 田文哲/master

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -31,6 +31,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State Fps: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -39,6 +40,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -115,7 +117,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -29,6 +29,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -37,6 +38,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -100,7 +102,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -29,6 +29,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -37,6 +38,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -100,7 +102,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -29,6 +29,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State Fps: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -37,6 +38,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -116,7 +118,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -29,6 +29,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -37,6 +38,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -100,7 +102,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -35,6 +35,7 @@ struct CustomContainerUser {
   @State mmsNum: number = 0;
   @State cameraNum: number = 0;
   @State contactsNum: number = 0;
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -43,6 +44,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' )
@@ -110,7 +112,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -31,6 +31,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -39,6 +40,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -99,7 +101,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -31,6 +31,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -39,6 +40,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -99,7 +101,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -31,6 +31,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -39,6 +40,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -99,7 +101,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

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

@@ -29,6 +29,7 @@ struct CustomContainerUser {
   @State Vue: boolean = false;
   @State StartEnable: boolean = true;
   @State time: string = '0';
+  scroller: Scroller = new Scroller();
   async aboutToAppear(){
     await FirstDialog.ChooseDialog(this.StepTips,this.name);
     this.Vue = false;
@@ -37,6 +38,7 @@ struct CustomContainerUser {
   @Builder specificNoParam() {
     Column() {
       Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
+        Scroll(this.scroller) {
           Column(){
             Row(){
               Text(`根据以下操作步骤完成测试`+ '\n' + '\n' + '\n' + '\n'+ '\n' + '\n' + '\n' + '\n')
@@ -100,7 +102,7 @@ struct CustomContainerUser {
                 .fontColor(Color.White).fontSize('24fp')
             }
           }
-
+        }
       }
     }.width('100%').height('80%').backgroundColor(Color.Black)
     .justifyContent(FlexAlign.SpaceEvenly)

validator/acts_validator/src/main/resources/base/profile/main_pages.json

@@ -39,8 +39,6 @@
     "pages/Audio/AudioOutputRoutingTypeC",
     "pages/Audio/AudioOutputRoutingBT",
     "pages/Player/Player_index",
-    "pages/Player/PlayAudio",
-    "pages/Player/PlayVideo",
     "pages/Experience/Experience_index",
     "pages/Experience/PhotoFps",
     "pages/Experience/DeskFps",
@@ -59,6 +57,10 @@
     "pages/Experience/StartBackgroundTask",
     "pages/Experience/StartNotification",
     "pages/Experience/ScrollPhotosList",
-    "pages/Experience/KeyboardInputTest"
+    "pages/Experience/KeyboardInputTest",
+    "pages/Player/PlayAudio",
+    "pages/Player/PlayVideo",
+    "pages/Player/PlayAudioList",
+    "pages/Player/PlayVideoList"
   ]
 }