diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetX.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetX.ets index 20f22f866e927a87139f6969515b406117d6dd35..de2d7918da41cad176eba5934ad52fc59fbf7d14 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetX.ets +++ b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetX.ets @@ -23,7 +23,7 @@ struct SetCircle { @State FillColor: string = '#FF000000'; @State X: number = 0; @State name: string = 'CanvasShadowOffsetX'; - @State StepTips: string = '操作步骤：拖动滑块向右移动'+'\n'+'预期结果：阴影会随着拖动距离增大而向下偏移，并显示偏移数值'; + @State StepTips: string = '操作步骤：拖动滑块向右移动'+'\n'+'预期结果：阴影会随着拖动距离增大而向右偏移，并显示偏移数值'; @State Vue: boolean = false; async aboutToAppear(){ await FirstDialog.ChooseDialog(this.StepTips,this.name); diff --git a/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingTypeC.ets b/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingTypeC.ets index 96e4cd1d739c4bd5036e569d9fd56ccf11ef1b6e..46e3966646f176dec32123da7bf9496f3ac42fee 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingTypeC.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingTypeC.ets @@ -104,7 +104,7 @@ struct audioInputRouting { } Row(){ Column(){ - Button(`No`) + Button(`不支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -115,7 +115,7 @@ struct audioInputRouting { }) } Column(){ - Button(`Yes`) + Button(`支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -126,14 +126,14 @@ struct audioInputRouting { } } Row(){ - Text('测试目的:\n当设备连接TypeC耳机时，是否音频输入路由正确切换\n测试准备\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持TypeC耳机\n2. 按下RECORD按钮\n3. 连接TypeC耳机\n4. 对着耳机mic讲话\n5. 按下STOP按钮\n6. 按下PLAY按钮听录制音频正常播放\n测试标准：\n如果设备不支持TypeC耳机输入或者接收到输入路由通知、路由显示为TypeC耳机，通过TypeC可正常录制和播放，则用例pass').fontColor(Color.White).fontSize('18fp') + Text('测试目的:\n当设备连接TypeC耳机时，是否音频输入路由正确切换\n测试准备\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持TypeC耳机\n2. 连接TypeC耳机\n3. 按下录制按钮\n4. 对着耳机mic讲话\n5. 按下停止按钮\n6. 按下播放按钮\n测试标准：\n如果设备不支持TypeC耳机输入或者接收到输入路由通知、路由显示为TypeC耳机，通过TypeC可正常录制和播放，则用例pass').fontColor(Color.White).fontSize('18fp') } Row(){ Text(`Audio输入路由：${this.inputDevice}`).fontColor(Color.White).fontSize('18fp') } Row(){ Column(){ - Button(`RECORD`) + Button(`录制`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -147,7 +147,7 @@ struct audioInputRouting { }) } Column(){ - Button(`STOP`) + Button(`停止`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -162,7 +162,7 @@ struct audioInputRouting { }) } Column(){ - Button(`PLAY`) + Button(`播放`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') diff --git a/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingWiredHeadset.ets b/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingWiredHeadset.ets index 6bba9beee46cbc323fdbd41bb27d8e82f8022a1d..cab2c341191b7aa97167f74b492aeb1526e5044a 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingWiredHeadset.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingWiredHeadset.ets @@ -104,7 +104,7 @@ struct audioInputRouting { } Row(){ Column(){ - Button(`No`) + Button(`不支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -115,7 +115,7 @@ struct audioInputRouting { }) } Column(){ - Button(`Yes`) + Button(`支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -126,14 +126,14 @@ struct audioInputRouting { } } Row(){ - Text('测试目的:\n当设备连接3.5mm有线耳机时，是否音频输入路由正确切换\n测试准备\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持3.5mm有线耳机\n2. 按下RECORD按钮\n3. 连接3.5mm有线耳机\n4. 对着耳机mic讲话\n5. 按下STOP按钮\n6. 按下PLAY按钮听录制音频正常播放\n测试标准：\n如果设备不支持3.5mm有线耳机输入或者接收到路由通知、路由显示为3.5mm耳机，通过3.5mm耳机可正常录制和播放，则用例pass').fontColor(Color.White).fontSize('18fp') + Text('测试目的:\n当设备连接3.5mm有线耳机时，是否音频输入路由正确切换\n测试准备\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持3.5mm有线耳机\n2. 连接3.5mm有线耳机\n3. 按下录制按钮\n4. 对着耳机mic讲话\n5. 按下停止按钮\n6. 按下播放按钮\n测试标准：\n如果设备不支持3.5mm有线耳机输入或者接收到路由通知、路由显示为3.5mm耳机，通过3.5mm耳机可正常录制和播放，则用例pass').fontColor(Color.White).fontSize('18fp') } Row(){ Text(`Audio输入路由：${this.inputDevice}`).fontColor(Color.White).fontSize('18fp') } Row(){ Column(){ - Button(`RECORD`) + Button(`录制`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -147,7 +147,7 @@ struct audioInputRouting { }) } Column(){ - Button(`STOP`) + Button(`停止`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -162,7 +162,7 @@ struct audioInputRouting { }) } Column(){ - Button(`PLAY`) + Button(`播放`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') diff --git a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingBT.ets b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingBT.ets index db8bfd0f36d152cd99b42eb2bf643dcee1ddd942..91ad2cad4221fce114eed13f6252be951ede0389 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingBT.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingBT.ets @@ -94,7 +94,7 @@ struct audioOutputRouting { } Row(){ Column(){ - Button(`No`) + Button(`不支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -105,7 +105,7 @@ struct audioOutputRouting { }) } Column(){ - Button(`Yes`) + Button(`支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -117,7 +117,7 @@ struct audioOutputRouting { } } Row(){ - Text('测试目的:\n当设备连接蓝牙耳机时，音频路由是否正确切换\n测试准备:\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持蓝牙外设\n2. 按下PLAY按钮\n3. 连接蓝牙耳机\n4. 拔出蓝牙耳机\n5. 按下STOP按钮\n测试标准：\n如果设备不支持蓝牙耳机连接或者插拔蓝牙耳机后接收到路由通知、路由显示正确，且连接蓝牙后音频通过蓝牙耳机播放，则用例pass').fontColor(Color.White).fontSize('18fp') + Text('测试目的:\n当设备连接蓝牙耳机时，音频路由是否正确切换\n测试准备:\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持蓝牙外设\n2. 按下播放按钮\n3. 连接华为蓝牙耳机\n4. 拔出蓝牙耳机\n5. 按下停止按钮\n测试标准：\n如果设备不支持蓝牙耳机连接或者插拔蓝牙耳机后接收到路由通知、路由显示正确，且连接蓝牙后音频通过蓝牙耳机播放，则用例pass').fontColor(Color.White).fontSize('18fp') } Row(){ @@ -125,7 +125,7 @@ struct audioOutputRouting { } Row(){ Column(){ - Button(`PLAY`) + Button(`播放`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -141,7 +141,7 @@ struct audioOutputRouting { }) } Column(){ - Button(`STOP`) + Button(`停止`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') diff --git a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingTypeC.ets b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingTypeC.ets index 4c6454ff3460108452778f5bdd92a7b35ac53365..87bac194e1d2ae92df34ca774d4876cdb6d2ccfb 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingTypeC.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingTypeC.ets @@ -94,7 +94,7 @@ struct audioOutputRouting { } Row(){ Column(){ - Button(`No`) + Button(`不支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -105,7 +105,7 @@ struct audioOutputRouting { }) } Column(){ - Button(`Yes`) + Button(`支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -117,7 +117,7 @@ struct audioOutputRouting { } } Row(){ - Text('测试目的:\n当设备连接TypeC耳机时，音频路由是否正确切换\n测试准备:\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持TypeC外设\n2. 按下PLAY按钮\n3. 连接TypeC耳机\n4. 拔出TypeC耳机\n5. 按下STOP按钮\n测试标准：\n如果设备不支持TypeC耳机连接或者插拔TypeC耳机后接收到路由通知、路由显示正确，且连接TypeC后音频通过TypeC耳机播放，则用例pass').fontColor(Color.White).fontSize('18fp') + Text('测试目的:\n当设备连接TypeC耳机时，音频路由是否正确切换\n测试准备:\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持TypeC外设\n2. 按下播放按钮\n3. 连接华为TypeC耳机\n4. 拔出TypeC耳机\n5. 按下停止按钮\n测试标准：\n如果设备不支持TypeC耳机连接或者插拔TypeC耳机后接收到路由通知、路由显示正确，且连接TypeC后音频通过TypeC耳机播放，则用例pass').fontColor(Color.White).fontSize('18fp') } Row(){ @@ -125,7 +125,7 @@ struct audioOutputRouting { } Row(){ Column(){ - Button(`PLAY`) + Button(`播放`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -141,7 +141,7 @@ struct audioOutputRouting { }) } Column(){ - Button(`STOP`) + Button(`停止`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') diff --git a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingWiredHeadset.ets b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingWiredHeadset.ets index 91a72f83a6af5f23f6e6178bddeee3d343f1d33f..c6aada4e1b7431ff9a95568e8ccd7326ab37b08b 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingWiredHeadset.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingWiredHeadset.ets @@ -94,7 +94,7 @@ struct audioOutputRouting { } Row(){ Column(){ - Button(`No`) + Button(`不支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -105,7 +105,7 @@ struct audioOutputRouting { }) } Column(){ - Button(`Yes`) + Button(`支持`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -117,7 +117,7 @@ struct audioOutputRouting { } } Row(){ - Text('测试目的:\n当设备连接3.5mm有线耳机时，音频路由是否正确切换\n测试准备:\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持外设\n2. 按下PLAY按钮\n3. 连接3.5mm有线耳机\n4. 拔出3.5mm有线耳机\n5. 按下STOP按钮\n测试标准：\n如果设备不支持有线耳机输入或者插入和拔出有线耳机后接收到路由通知，路由显示正确，且连接外设后音频通过外设播放，则用例pass').fontColor(Color.White).fontSize('18fp') + Text('测试目的:\n当设备连接3.5mm有线耳机时，音频路由是否正确切换\n测试准备:\n断连任何外设，保持设备常亮\n测试步骤：\n1. 验证设备是否支持3.5mm耳机外设\n2. 按下播放按钮\n3. 连接华为3.5mm有线耳机\n4. 拔出3.5mm有线耳机\n5. 按下停止按钮\n测试标准：\n如果设备不支持有线耳机输入或者插入和拔出有线耳机后接收到路由通知，路由显示正确，且连接外设后音频通过外设播放，则用例pass').fontColor(Color.White).fontSize('18fp') } Row(){ @@ -125,7 +125,7 @@ struct audioOutputRouting { } Row(){ Column(){ - Button(`PLAY`) + Button(`播放`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') @@ -141,7 +141,7 @@ struct audioOutputRouting { }) } Column(){ - Button(`STOP`) + Button(`停止`) .borderRadius(8) .backgroundColor(0x317aff) .width('30%') diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraOrientation.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraOrientation.ets index c6dc81f814f8c6c44ae349a98b308fc483e14c9a..8702b06ad678a2651d10f44bec93503310fcd2de 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraOrientation.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraOrientation.ets @@ -26,7 +26,7 @@ import router from '@ohos.router'; struct cameraOrientation { @State FillColor: string = '#FF000000'; @State name: string = 'CameraOrientation'; - @State StepTips: string = '测试目的：用于测试相机预览和拍照旋转能力\n-左侧显示给定旋转角度后的预览窗口\n-右侧显示拍照后的图片\n-对于前置摄像头会有镜像效果' + '\n' + '预期结果：拍照图片与预览窗口的画面一致'; + @State StepTips: string = '测试目的：用于测试相机预览和拍照旋转能力\n-左侧显示预览窗口\n-右侧显示指定旋转角度的拍照图片\n-对于前置摄像头会有镜像效果' + '\n' + '预期结果：拍照图片与预览窗口的画面一致'; private tag: string = 'qlw CameraOrientation' private mXComponentController: XComponentController = new XComponentController() @State surfaceId: number = 0; @@ -130,12 +130,12 @@ struct cameraOrientation { }) }) .size({ width: '100%', height: '100%' }) - Text('Camera Preview').fontSize('20fp').fontColor(Color.White) + Text('预览').fontSize('20fp').fontColor(Color.White) }.size({ width: '40%', height: '60%' }) Column() { Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 }) - Text('Oriented Photo').fontSize('20fp').fontColor(Color.White) + Text('带旋转角度的图片').fontSize('20fp').fontColor(Color.White) }.size({ width: '40%', height: '60%' }) }.width('100%').height('50%') @@ -144,7 +144,7 @@ struct cameraOrientation { Text(`Orientation: ${this.imageRotation}°`).fontSize('16fp').fontColor(Color.White) Text(`顺时针`).fontSize('16fp').fontColor(Color.White) Text(`提示：`).fontSize('16fp').fontColor(Color.White) - Text(`如果左边窗口旋转后与右边窗口相同，选择pass，否则选择fail`) + Text(`如果左边预览窗口顺时针旋转后与右边窗口相同，选择pass，否则选择fail`) .fontSize('16fp').fontColor(Color.White) }.size({ width: '80%', height: '25%' }) diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets index f1b4bd7bff89c0b2c1653dc47074dcb71d611eb3..16c7e68974b7c4b93ae2d5dade290eefd8c40a6b 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets @@ -26,7 +26,7 @@ import router from '@ohos.router'; struct cameraOrientation { @State FillColor: string = '#FF000000'; @State name: string = 'CameraPhotoFormat'; - @State StepTips: string = '测试目的：用于测试相机拍照分辨率能力\n预期结果：所有分辨率均可以拍照，图片与预览一致'; + @State StepTips: string = '测试目的：用于测试相机拍照分辨率能力\n测试步骤：\n1. 点击拍照\n2. 点击下一个\n3. 重复步骤1和2直至所有拍照分辨率均遍历完成\n预期结果：所有分辨率均可以拍照，图片与预览一致'; private tag: string = 'qlw' private mXComponentController: XComponentController = new XComponentController() @State surfaceId: number = 0; @@ -58,7 +58,7 @@ struct cameraOrientation { for (let index = 0; index < this.cameraListLength; index++) { this.cameraList.push({ value: `Camera ${index}` }) } - // 测试总次数 = 摄像头0的分辨率 + 摄像头1的分辨率 优先以RK为主 + this.testingFrequency = this.resolution.length Logger.info(this.tag, `testingFrequency ${this.testingFrequency}`) } @@ -140,12 +140,12 @@ struct cameraOrientation { this.cameraInit() }) .size({ width: '100%', height: '100%' }) - Text('Camera Preview').fontSize('20fp').fontColor(Color.White) + Text('预览').fontSize('20fp').fontColor(Color.White) }.size({ width: '40%', height: '60%' }) Column() { Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 }) - Text('Oriented Photo').fontSize('20fp').fontColor(Color.White) + Text('图片').fontSize('20fp').fontColor(Color.White) }.size({ width: '40%', height: '60%' }) }.width('100%').height('50%') @@ -191,7 +191,7 @@ struct cameraOrientation { }) }.justifyContent(FlexAlign.SpaceEvenly) - Text(`提示：对不同分辨率的图片进行拍摄，根据拍摄结果选择pass或选择fail`) + Text(`提示：不同拍照分辨率下进行拍摄，图片拍摄成功且与预览画面一致则选择pass，否则选择fail`) .fontSize('16fp').fontColor(Color.White).margin({ top: 20 }) }.size({ width: '80%', height: '20%' }) @@ -206,7 +206,7 @@ struct cameraOrientation { this.isNextEnabled = false CameraService.takePicture() }) - Button('NEXT') + Button('下一个') .enabled(!this.isNextEnabled) .opacity(!this.isNextEnabled ? 1 : 0.4) .width('40%') @@ -222,11 +222,18 @@ struct cameraOrientation { this.isNextEnabled = true return } - this.cameraDeviceIndex = Number(!this.cameraDeviceIndex) this.clickFrequency = 0 - await this.cameraInit().then(() => { - this.isCameraChange = true - }) + if (this.cameraListLength > 1) { + this.cameraDeviceIndex = Number(!this.cameraDeviceIndex) + await this.cameraInit().then(() => { + this.isCameraChange = true + }) + } else { + this.Vue = true + this.isEnabled = false + this.isNextEnabled = true + return + } } this.isEnabled = true this.isNextEnabled = true @@ -256,4 +263,4 @@ struct cameraOrientation { url:'pages/Camera/Camera_index', }) } -} \ No newline at end of file +} diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets index 5a6a365953e67a3b3a61db7f3d3d056eb1c91f4b..915e7d5c9e3e2a4955cd4df714bd18d937a22c0e 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets @@ -26,7 +26,7 @@ import router from '@ohos.router'; struct cameraFormat { @State FillColor: string = '#FF000000'; @State name: string = 'CameraPreviewFormat'; - @State StepTips: string = '测试目的：用于测试相机预览分辨率能力\n预期结果：所有分辨率均可以预览成功，预览画面正常'; + @State StepTips: string = '测试目的：用于测试相机预览分辨率能力\n测试步骤：点击下一个遍历所有预览分辨率，观察预览窗口\n预期结果：所有分辨率均可以预览成功，预览画面正常'; private tag: string = 'qlw CameraFormat' private mXComponentController: XComponentController = new XComponentController() @State surfaceId: number = 0; @@ -145,7 +145,7 @@ struct cameraFormat { this.cameraInit() }) .size({ width: '100%', height: '100%' }) - Text('Camera Preview').fontSize('20fp').fontColor(Color.White) + Text('预览').fontSize('20fp').fontColor(Color.White) }.size({ width: '80%', height: '70%' }) Column() { @@ -201,7 +201,7 @@ struct cameraFormat { .onSelect((index: number, value) => { Logger.info(this.tag, `onSelect format index: ${index}, value: ${value}`) }) - Button('NEXT') + Button('下一个') .borderRadius(8) .backgroundColor(0x317aff) .enabled(this.nextEnabled) @@ -229,4 +229,4 @@ struct cameraFormat { url:'pages/Camera/Camera_index', }) } -} \ No newline at end of file +} diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets index e8d5d6b532465887e5113cdefd306be850169e88..2d7336da2ea620e9843f17ac4d52e95b958ef982 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets @@ -26,7 +26,7 @@ import router from '@ohos.router'; struct cameraOrientation { @State FillColor: string = '#FF000000'; @State name: string = 'CameraSerialPhoto'; - @State StepTips: string = '测试目的：用于测试相机连拍\n-左侧显示相机预览窗口\n-右侧显示拍照后的每个图片\n-对于前置摄像头会有镜像效果\n测试步骤：\n1.点击拍照按钮\n预期结果：点击拍照按钮后每个摄像头连拍生成10张图片'; + @State StepTips: string = '测试目的：用于测试相机连拍\n-左侧显示相机预览窗口\n-右侧显示拍照后的每个图片\n-对于前置摄像头会有镜像效果\n测试步骤：\n1.点击拍照按钮\n预期结果：点击拍照按钮后每个摄像头连拍生成10张图片，图片显示正常'; private tag: string = 'qlw CameraSerialPhoto' private mXComponentController: XComponentController = new XComponentController() @State surfaceId: number = 0; @@ -133,12 +133,12 @@ struct cameraOrientation { }) }) .size({ width: '100%', height: '100%' }) - Text('Camera Preview').fontSize('20fp').fontColor(Color.White) + Text('预览').fontSize('20fp').fontColor(Color.White) }.size({ width: '40%', height: '60%' }) Column() { Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 }) - Text('Oriented Photo').fontSize('20fp').fontColor(Color.White) + Text('图片').fontSize('20fp').fontColor(Color.White) }.size({ width: '40%', height: '60%' }) }.width('100%').height('50%') @@ -191,4 +191,4 @@ struct cameraOrientation { url:'pages/Camera/Camera_index', }) } -} \ No newline at end of file +} diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets index cb4ee232306dc00b78bdd2e0712fd64ef2d4e5ea..fdb4073da989885bd1b0a85f0eeb6a183ccc8251 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets @@ -45,11 +45,18 @@ struct cameraOrientation { @State testingFrequency: number = undefined // 测试总数 @State testEnabled: boolean = true @State nextEnabled: boolean = false + @State isVideoPlayback: boolean = false async aboutToAppear() { await FirstDialog.ChooseDialog(this.StepTips, this.name); + mediaPlay.setVideoPlaybackCallback(this.handleVideoPlayback.bind(this)) } + handleVideoPlayback = (isVideoPlayback: boolean) => { + this.isVideoPlayback = isVideoPlayback + Logger.info(this.tag, `VideoPlayBack end, isVideoPlayback: ${this.isVideoPlayback}`) + } + cameraListFn() { this.cameraList = [] this.cameraListLength = CameraService.cameras.length @@ -150,19 +157,21 @@ struct cameraOrientation { this.cameraInit() }) .size({ width: '100%', height: '100%' }) - Text('Video capture').fontSize('20fp').fontColor(Color.White) + Text('视频录制').fontSize('20fp').fontColor(Color.White) }.size({ width: '45%', height: '100%' }) Column() { - XComponent({ - id: '', - type: 'surface', - controller: this.mXComponentController1 - }) - .onLoad(() => { - }) - .size({ width: '100%', height: '100%' }) - Text('Video callback').fontSize('20fp').fontColor(Color.White) + if(!this.isVideoPlayback){ + XComponent({ + id: '', + type: 'surface', + controller: this.mXComponentController1 + }) + .onLoad(() => { + }) + .size({ width: '100%', height: '100%' }) + Text('视频回放').fontSize('20fp').fontColor(Color.White) + } }.size({ width: '45%', height: '100%' }) }.size({ width: '100%', height: '50%' }) @@ -223,7 +232,7 @@ struct cameraOrientation { }.size({ width: '100%', height: '50%' }) Row() { - Button('TEST') + Button('录制') .borderRadius(8) .backgroundColor(0x317aff) .margin(15) @@ -245,7 +254,7 @@ struct cameraOrientation { }, 4000) }) }) - Button('NEXT') + Button('下一个') .borderRadius(8) .backgroundColor(0x317aff) .margin(15) @@ -274,4 +283,4 @@ struct cameraOrientation { url:'pages/Camera/Camera_index', }) } -} \ No newline at end of file +} diff --git a/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets index eb566003f707e85bbc91b4c037e15577876e0750..8aec97cfb973e378609d94d2407207fc7d3cf3c9 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets @@ -48,10 +48,9 @@ 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.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面` + + '\n' + '\n' + `3.双击执行.bat选择冷启动>相机测试，回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面` + + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } Row(){ @@ -92,10 +91,10 @@ struct CustomContainerUser { let CameraBuf = new ArrayBuffer(4096); fileio.readSync(CameraFd,CameraBuf); let CameraReport = String.fromCharCode.apply(null,new Uint8Array(CameraBuf)); - let CameraHead = CameraReport.indexOf(':'); - let CameraTime = CameraReport.substring(CameraHead+1); + let CameraHead = CameraReport.indexOf('time:'); + let CameraTime = CameraReport.substring(CameraHead+5); this.cameraNum = parseFloat(CameraTime); - if( this.cameraNum < 2000 ) { + if( 0 < this.cameraNum && this.cameraNum < 2000 ) { this.num++ } if( this.num === 1 ) { diff --git a/validator/acts_validator/src/main/ets/pages/Experience/ContactsColdStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/ContactsColdStartTest.ets index ae5d2d8f64816b20857a72d82d442f6e02fefe0d..e32acfef994a29bf9c775c6163f41fa0cadca074 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ContactsColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ContactsColdStartTest.ets @@ -48,10 +48,9 @@ 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.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面` + + '\n' + '\n' + `3.双击执行.bat选择冷启动>联系人测试，回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面` + + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } Row(){ @@ -92,10 +91,10 @@ struct CustomContainerUser { let ContactsBuf = new ArrayBuffer(4096); fileio.readSync(ContactsFd,ContactsBuf); let ContactsReport = String.fromCharCode.apply(null,new Uint8Array(ContactsBuf)); - let ContactsHead = ContactsReport.indexOf(':'); - let ContactsTime = ContactsReport.substring(ContactsHead+1); + let ContactsHead = ContactsReport.indexOf('time:'); + let ContactsTime = ContactsReport.substring(ContactsHead+5); this.contactsNum = parseFloat(ContactsTime); - if( this.contactsNum < 2000 ) { + if( 0 < this.contactsNum && this.contactsNum < 2000 ) { this.num++ } if( this.num === 1 ) { diff --git a/validator/acts_validator/src/main/ets/pages/Experience/ContactsHotStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/ContactsHotStartTest.ets index 133ab1ec41def619750122e88dbcd9a6a417990f..65c94da0df37e1e45a5fce29a94eb17e44c27f32 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ContactsHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ContactsHotStartTest.ets @@ -48,9 +48,9 @@ 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.若所有热启动测试均在规定时延内完成则通过测试` + 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' ) .fontColor(Color.White).fontSize('20fp') } @@ -95,7 +95,7 @@ struct CustomContainerUser { let ContactsHead = ContactsReport.indexOf(':'); let ContactsTime = ContactsReport.substring(ContactsHead+1); this.contactsNum = parseFloat(ContactsTime); - if( this.contactsNum < 1000 ) { + if( 0 < this.contactsNum && this.contactsNum < 1000 ) { this.num++ } if( this.num === 1 ) { diff --git a/validator/acts_validator/src/main/ets/pages/Experience/KeyboardDisplayTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/KeyboardDisplayTest.ets index f31c3fa025395cd531f2cc366c64339da72897f5..8e72fd62410814f69cece2f7eed2ad5a9dde4576 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/KeyboardDisplayTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/KeyboardDisplayTest.ets @@ -88,7 +88,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 1000 ) { + if( 0 < time && time < 1000 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/KeyboardInputTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/KeyboardInputTest.ets index aecbdecd3d671b4c19858d0cd022f77d7484ec5f..69bfd71fa8128a54b030adef1208f0d50fb0e058 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/KeyboardInputTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/KeyboardInputTest.ets @@ -88,7 +88,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 150 ) { + if( 0 < time && time < 150 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/MmsColdStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/MmsColdStartTest.ets index 5a5aa6ebdcf393a96f9b30d44df4c852b0287ca4..cb6a20f3a7427a61d683675f5d0e9833f29d20cd 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/MmsColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/MmsColdStartTest.ets @@ -48,10 +48,9 @@ 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.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面` + + '\n' + '\n' + `3.双击执行.bat选择冷启动>信息测试,回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面` + + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } Row(){ @@ -92,10 +91,10 @@ struct CustomContainerUser { let MmsBuf = new ArrayBuffer(4096); fileio.readSync(MmsFd,MmsBuf); let MmsReport = String.fromCharCode.apply(null,new Uint8Array(MmsBuf)); - let MmsHead = MmsReport.indexOf(':'); - let MmsTime = MmsReport.substring(MmsHead+1); + let MmsHead = MmsReport.indexOf('time:'); + let MmsTime = MmsReport.substring(MmsHead+5); this.mmsNum = parseFloat(MmsTime); - if( this.mmsNum < 2000 ) { + if( 0 < this.mmsNum && this.mmsNum < 2000 ) { this.num++ } if( this.num === 1 ) { @@ -105,7 +104,7 @@ struct CustomContainerUser { } } Row(){ - Text('\n' + '\n' + `测试结果：` + '\n' + '\n' + '信息冷启动时延' + this.mmsNum + 'ms' + '\n' + '通过冷启动测试项' + this.num + '个') + Text('\n' + '\n' + `测试结果：` + '\n' + '\n' + '信息冷启动时延' + this.mmsNum + 'ms') .fontColor(Color.White).fontSize('24fp') } } diff --git a/validator/acts_validator/src/main/ets/pages/Experience/MmsHotStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/MmsHotStartTest.ets index 35b0c460e6598ea1644228d8693f2e5dcf57fe17..a2e02fe32d6b5bea311aa8f4025d132de30283d9 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/MmsHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/MmsHotStartTest.ets @@ -48,9 +48,9 @@ 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.若所有热启动测试均在规定时延内完成则通过测试` + 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' ) .fontColor(Color.White).fontSize('20fp') } @@ -95,7 +95,7 @@ struct CustomContainerUser { let MmsHead = MmsReport.indexOf(':'); let MmsTime = MmsReport.substring(MmsHead+1); this.mmsNum = parseFloat(MmsTime); - if( this.mmsNum < 1000 ) { + if( 0 < this.mmsNum && this.mmsNum < 1000 ) { this.num++ } if( this.num === 1 ) { @@ -105,8 +105,7 @@ struct CustomContainerUser { } } Row(){ - Text('\n' + '\n' + '\n' + '\n' + `测试结果：` + '\n' + '\n'+ '信息热启动时延' + this.mmsNum + 'ms' - + '\n' + '通过热启动测试项' + this.num + '个' ) + Text('\n' + '\n' + '\n' + '\n' + `测试结果：` + '\n' + '\n'+ '信息热启动时延' + this.mmsNum + 'ms') .fontColor(Color.White).fontSize('24fp') } } diff --git a/validator/acts_validator/src/main/ets/pages/Experience/PhotosColdStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/PhotosColdStartTest.ets index 43a0728241499e03dc4c93ce708cd00c9c2d4220..ce19ab272444d22a21b03a61fa6676e69e5fbf40 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/PhotosColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/PhotosColdStartTest.ets @@ -48,10 +48,9 @@ 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.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面` + + '\n' + '\n' + `3.双击执行.bat选择冷启动>图库测试,回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面` + + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } Row(){ @@ -92,10 +91,10 @@ struct CustomContainerUser { let photosBuf = new ArrayBuffer(4096); fileio.readSync(photosFd,photosBuf); let photosReport = String.fromCharCode.apply(null,new Uint8Array(photosBuf)); - let photosHead = photosReport.indexOf(':'); - let photosTime = photosReport.substring(photosHead+1); + let photosHead = photosReport.indexOf('time:'); + let photosTime = photosReport.substring(photosHead+5); this.photosNum = parseFloat(photosTime); - if( this.photosNum < 2000 ) { + if( 0 < this.photosNum && this.photosNum < 2000 ) { this.num++ } if( this.num === 1 ) { @@ -105,8 +104,7 @@ struct CustomContainerUser { } } Row(){ - Text('\n' + '\n' + `测试结果：` + '\n' + '\n' + '图库冷启动时延' + this.photosNum + 'ms' - + '\n' + '通过冷启动测试项' + this.num + '个') + Text('\n' + '\n' + `测试结果：` + '\n' + '\n' + '图库冷启动时延' + this.photosNum + 'ms') .fontColor(Color.White).fontSize('24fp') } } diff --git a/validator/acts_validator/src/main/ets/pages/Experience/PhotosHotStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/PhotosHotStartTest.ets index b88434e3cf202b32cab39b892ae737b90010abd6..67d7584be2eb2c767cd78e7a6c5e69f9bbfe279f 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/PhotosHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/PhotosHotStartTest.ets @@ -48,9 +48,9 @@ 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.若所有热启动测试均在规定时延内完成则通过测试` + 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' ) .fontColor(Color.White).fontSize('20fp') } @@ -95,7 +95,7 @@ struct CustomContainerUser { let photosHead = photosReport.indexOf(':'); let photosTime = photosReport.substring(photosHead+1); this.photosNum = parseFloat(photosTime); - if( this.photosNum < 1000 ) { + if( 0 < this.photosNum && this.photosNum < 1000 ) { this.num++ } if( this.num === 1 ) { @@ -105,8 +105,7 @@ struct CustomContainerUser { } } Row(){ - Text('\n' + '\n' + '\n' + '\n' + `测试结果：` + '\n' + '\n' + '图库热启动时延' + this.photosNum + 'ms' - + '\n' + '通过热启动测试项' + this.num + '个' ) + Text('\n' + '\n' + '\n' + '\n' + `测试结果：` + '\n' + '\n' + '图库热启动时延' + this.photosNum + 'ms') .fontColor(Color.White).fontSize('24fp') } } diff --git a/validator/acts_validator/src/main/ets/pages/Experience/ScrollPhotosList.ets b/validator/acts_validator/src/main/ets/pages/Experience/ScrollPhotosList.ets index 19ce0eba2062367e273b761c305e7c0538636864..68dadae72800ef076b249737a5195c4c145d3973 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ScrollPhotosList.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ScrollPhotosList.ets @@ -88,7 +88,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 150 ) { + if( 0 < time && time < 150 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/SettingsColdStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/SettingsColdStartTest.ets index 2ee8f09fed792d5da84ff6de3ef6d3b2549ba49f..59c7f4a9c1c17b79a3426ebd4d5e840375bc74cf 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/SettingsColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/SettingsColdStartTest.ets @@ -48,10 +48,9 @@ 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.点击开始键进入系统桌面`+ '\n' + '\n' + `2.清空后台应用,将底层任务栏中应用拖至桌面` + + '\n' + '\n' + `3.双击执行.bat选择冷启动>设置测试,回车执行`+ '\n' + '\n' +`4.测试应用自动执行冷启动后手动返回validator界面` + + '\n' + '\n' + '5.点击停止键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } Row(){ @@ -92,10 +91,10 @@ struct CustomContainerUser { let setBuf = new ArrayBuffer(4096); fileio.readSync(setFd,setBuf); let setReport = String.fromCharCode.apply(null,new Uint8Array(setBuf)); - let setHead = setReport.indexOf(':'); - let setTime = setReport.substring(setHead+1); + let setHead = setReport.indexOf('time:'); + let setTime = setReport.substring(setHead+5); this.setNum = parseFloat(setTime); - if( this.setNum < 2000 ) { + if( 0 < this.setNum && this.setNum < 2000 ) { this.num++ } if( this.num === 1 ) { @@ -105,8 +104,7 @@ struct CustomContainerUser { } } Row(){ - Text('\n' + '\n' + `测试结果：` + '\n' + '\n' + '设置冷启动时延' + this.setNum + 'ms' - + '\n' + '通过冷启动测试项' + this.num + '个') + Text('\n' + '\n' + `测试结果：` + '\n' + '\n' + '设置冷启动时延' + this.setNum + 'ms') .fontColor(Color.White).fontSize('24fp') } } diff --git a/validator/acts_validator/src/main/ets/pages/Experience/SettingsHotStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/SettingsHotStartTest.ets index ee267b93313bcc90660e371fd0f1a3b4b289d090..b397994a5da069cd3cd1435195346df3bedb1ef8 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/SettingsHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/SettingsHotStartTest.ets @@ -48,9 +48,9 @@ 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.若所有热启动测试均在规定时延内完成则通过测试` + 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' ) .fontColor(Color.White).fontSize('20fp') } @@ -95,7 +95,7 @@ struct CustomContainerUser { let setHead = setReport.indexOf(':'); let setTime = setReport.substring(setHead+1); this.setNum = parseFloat(setTime); - if( this.setNum < 1000 ) { + if( 0 < this.setNum && this.setNum < 1000 ) { this.num++ } if( this.num === 1 ) { @@ -105,8 +105,7 @@ struct CustomContainerUser { } } Row(){ - Text('\n' + '\n' + '\n' + '\n' + `测试结果：` + '\n' + '\n' + '设置热启动时延' + this.setNum + 'ms' - + '\n' + '通过热启动测试项' + this.num + '个' ) + Text('\n' + '\n' + '\n' + '\n' + `测试结果：` + '\n' + '\n' + '设置热启动时延' + this.setNum + 'ms') .fontColor(Color.White).fontSize('24fp') } } diff --git a/validator/acts_validator/src/main/ets/pages/Experience/StartBackgroundTask.ets b/validator/acts_validator/src/main/ets/pages/Experience/StartBackgroundTask.ets index 2c08d710be056e7d4dd5be2c52270d2800563463..0af446263a9e414ccdef04528b49673adbabd8b1 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/StartBackgroundTask.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/StartBackgroundTask.ets @@ -86,7 +86,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 600 ) { + if( 0 < time && time < 600 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/StartNotification.ets b/validator/acts_validator/src/main/ets/pages/Experience/StartNotification.ets index 0746e9b886666ca09060426cf22cb56cd6698ca9..d5b4bb5f951fe4d836572d5e486ca6c92f9348d6 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/StartNotification.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/StartNotification.ets @@ -86,7 +86,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 150 ) { + if( 0 < time && time < 150 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/StartTaskManager.ets b/validator/acts_validator/src/main/ets/pages/Experience/StartTaskManager.ets index 8156a4f3b6936360724a9bb50b7c4543514c7d6c..7d649c06df442c2363c58532c0f97d6f13ea9a40 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/StartTaskManager.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/StartTaskManager.ets @@ -86,7 +86,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 1000 ) { + if( 0 < time && time < 1000 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/ViewPhotoTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/ViewPhotoTest.ets index 29f2d3b73cfdd2ac018692a52b3293c4beefe082..9874972093cf25082c87f01fa28ac01fd25a421e 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ViewPhotoTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ViewPhotoTest.ets @@ -88,7 +88,7 @@ struct CustomContainerUser { let head = report.indexOf(":"); this.time = report.substring(head+1); let time = parseFloat(this.time) - if( time < 150 ) { + if( 0 < time && time < 150 ) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/index.ets b/validator/acts_validator/src/main/ets/pages/index.ets index 45e239f3fd2ea5a424321cd5dbfc62b8ba4eef02..6486106ef62365015a78034d6f51e782aa93c240 100644 --- a/validator/acts_validator/src/main/ets/pages/index.ets +++ b/validator/acts_validator/src/main/ets/pages/index.ets @@ -429,7 +429,7 @@ struct IndexPage { let serializer = new xml.XmlSerializer(bufView); serializer.setDeclaration(); serializer.startElement("testsuites"); - serializer.setAttributes("name", "ActValidator"); + serializer.setAttributes("name", "ActsValidator"); serializer.setAttributes("starttime", starttime); serializer.setAttributes("endtime", endtime); serializer.setAttributes("errors", "0"); @@ -439,8 +439,8 @@ struct IndexPage { serializer.setAttributes("ignored", "0"); serializer.setAttributes("unavailable", "0"); serializer.setAttributes("productinfo", "{ }"); - serializer.setAttributes("modules", "*"); - serializer.setAttributes("runmodules", "*"); + serializer.setAttributes("modules", "ActsValidator"); + serializer.setAttributes("runmodules", "ActsValidator"); /* * ArkUI */ @@ -453,7 +453,7 @@ struct IndexPage { serializer.setAttributes("ignored", "0"); serializer.setAttributes("tests", ArkuiTestNum); serializer.setAttributes("message", "*"); - serializer.setAttributes("modulename", "ActsArkUITest"); + serializer.setAttributes("modulename", "ActsValidator"); for (let i = 0; i < title1.length; i++) { serializer.startElement("testcase"); serializer.setAttributes("name", String(title1[i])); @@ -478,7 +478,7 @@ struct IndexPage { serializer.setAttributes("ignored", "0"); serializer.setAttributes("tests", audioTestNum); serializer.setAttributes("message", "*"); - serializer.setAttributes("modulename", "ActsAudioTest"); + serializer.setAttributes("modulename", "ActsValidator"); for (let i = 0; i < title2.length; i++) { serializer.startElement("testcase"); serializer.setAttributes("name", String(title2[i])); @@ -503,7 +503,7 @@ struct IndexPage { serializer.setAttributes("ignored", "0"); serializer.setAttributes("tests", cameraTestNum); serializer.setAttributes("message", "*"); - serializer.setAttributes("modulename", "ActsCameraTest"); + serializer.setAttributes("modulename", "ActsValidator"); for (let i = 0; i < title3.length; i++) { serializer.startElement("testcase"); serializer.setAttributes("name", String(title3[i])); @@ -528,7 +528,7 @@ struct IndexPage { serializer.setAttributes("ignored", "0"); serializer.setAttributes("tests", playerTestNum); serializer.setAttributes("message", "*"); - serializer.setAttributes("modulename", "ActsPlayerTest"); + serializer.setAttributes("modulename", "ActsValidator"); for (let i = 0; i < title4.length; i++) { serializer.startElement("testcase"); serializer.setAttributes("name", String(title4[i])); @@ -553,7 +553,7 @@ struct IndexPage { serializer.setAttributes("ignored", "0"); serializer.setAttributes("tests", experienceTestNum); serializer.setAttributes("message", "*"); - serializer.setAttributes("modulename", "ActsExperienceTest"); + serializer.setAttributes("modulename", "ActsValidator"); for (let i = 0; i < title5.length; i++) { serializer.startElement("testcase"); serializer.setAttributes("name", String(title5[i])); diff --git a/validator/acts_validator/src/main/ets/pages/model/mediaPlay.ts b/validator/acts_validator/src/main/ets/pages/model/mediaPlay.ts index 1cd845e064418958615068c05a8e73c7b2f55287..33b337ec899896e2685f4df4b98b80029bb01dd3 100644 --- a/validator/acts_validator/src/main/ets/pages/model/mediaPlay.ts +++ b/validator/acts_validator/src/main/ets/pages/model/mediaPlay.ts @@ -9,6 +9,7 @@ export class mediaPlay { private avPlay: media.AVPlayer = undefined private surfaceId: number = -1 public totalDuration: number + private handleVideoPlayback: (isVideoPlayback: boolean) => void = false async getFileFd(name) { let filesDir = globalThis.abilityContext.filesDir @@ -65,8 +66,8 @@ export class mediaPlay { break; case 'initialized': Logger.info(TAG + 'state initialized start ') - if (this.surfaceId) { - AVPlayer.surfaceId = this.surfaceId + if (this.surfaceId != -1) { + AVPlayer.surfaceId = String(this.surfaceId) } await AVPlayer.prepare() Logger.info(TAG, 'state initialized end') @@ -85,6 +86,9 @@ export class mediaPlay { case 'completed': await AVPlayer.stop() await AVPlayer.release() + if (this.handleVideoPlayback) { + this.handleVideoPlayback(true) + } case 'error': Logger.info(TAG, 'state error callback') break; @@ -94,6 +98,10 @@ export class mediaPlay { Logger.info(TAG, `state error callback err:${err},code:${err.code},message:${err.message}}`) }) } + + setVideoPlaybackCallback(callback) { + this.handleVideoPlayback = callback + } async release(){ if (this.avPlay){