From c26f08d5d7979b86663c79e4e0e27a4c9dce22d0 Mon Sep 17 00:00:00 2001 From: tianwenzhe Date: Thu, 30 Mar 2023 17:45:03 +0800 Subject: [PATCH] change word Signed-off-by: tian-wenzhe411 --- .../main/ets/pages/ArkUI/CanvasShadowOffsetX.ets | 2 +- .../ets/pages/Experience/CameraColdStartTest.ets | 13 ++++++------- .../pages/Experience/ContactsColdStartTest.ets | 13 ++++++------- .../pages/Experience/ContactsHotStartTest.ets | 8 ++++---- .../ets/pages/Experience/KeyboardDisplayTest.ets | 2 +- .../ets/pages/Experience/KeyboardInputTest.ets | 2 +- .../ets/pages/Experience/MmsColdStartTest.ets | 15 +++++++-------- .../ets/pages/Experience/MmsHotStartTest.ets | 11 +++++------ .../ets/pages/Experience/PhotosColdStartTest.ets | 16 +++++++--------- .../ets/pages/Experience/PhotosHotStartTest.ets | 11 +++++------ .../ets/pages/Experience/ScrollPhotosList.ets | 2 +- .../pages/Experience/SettingsColdStartTest.ets | 16 +++++++--------- .../pages/Experience/SettingsHotStartTest.ets | 11 +++++------ .../ets/pages/Experience/StartBackgroundTask.ets | 2 +- .../ets/pages/Experience/StartNotification.ets | 2 +- .../ets/pages/Experience/StartTaskManager.ets | 2 +- .../main/ets/pages/Experience/ViewPhotoTest.ets | 2 +- .../acts_validator/src/main/ets/pages/index.ets | 16 ++++++++-------- 18 files changed, 68 insertions(+), 78 deletions(-) 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 20f22f866..de2d7918d 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/Experience/CameraColdStartTest.ets b/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets index eb566003f..8aec97cfb 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 ae5d2d8f6..e32acfef9 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 133ab1ec4..65c94da0d 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 f31c3fa02..8e72fd624 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 aecbdecd3..69bfd71fa 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 5a5aa6ebd..cb6a20f3a 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 35b0c460e..a2e02fe32 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 43a072824..ce19ab272 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 b88434e3c..67d7584be 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 19ce0eba2..68dadae72 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 2ee8f09fe..59c7f4a9c 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 ee267b933..b397994a5 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 2c08d710b..0af446263 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 0746e9b88..d5b4bb5f9 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 8156a4f3b..7d649c06d 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 29f2d3b73..987497209 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 45e239f3f..6486106ef 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])); -- GitLab