diff --git a/validator/acts_validator/src/main/ets/Application/MyAbilityStage.ts b/validator/acts_validator/src/main/ets/Application/MyAbilityStage.ts index 937630c76a0ee09b9408db2b6149101d47ce890f..8f1214651c57b2ae8b26efcf88ab4655043e622c 100644 --- a/validator/acts_validator/src/main/ets/Application/MyAbilityStage.ts +++ b/validator/acts_validator/src/main/ets/Application/MyAbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.app.ability.AbilityStage" +import AbilityStage from "@ohos.application.AbilityStage" import Logger from '../pages/model/Logger' export default class MyAbilityStage extends AbilityStage { diff --git a/validator/acts_validator/src/main/ets/MainAbility/MainAbility.ts b/validator/acts_validator/src/main/ets/MainAbility/MainAbility.ts index 83b643fcaa2696b47f85b3ac214e09dff0510073..5eb4db42af483fb559ffabe70d57804ab85e3c18 100644 --- a/validator/acts_validator/src/main/ets/MainAbility/MainAbility.ts +++ b/validator/acts_validator/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.app.ability.UIAbility' +import Ability from '@ohos.application.Ability' import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; export default class MainAbility extends Ability { @@ -17,15 +17,15 @@ export default class MainAbility extends Ability { console.log("[Demo] MainAbility onWindowStageCreate") let AtManager = abilityAccessCtrl.createAtManager(); - AtManager.requestPermissionsFromUser(this.context,['ohos.permission.READ_MEDIA', 'ohos.permission.WRITE_MEDIA', - 'ohos.permission.CAPTURE_SCREEN', 'ohos.permission.INTERNET', 'ohos.permission.CAMERA', - 'ohos.permission.MICROPHONE', 'ohos.permission.START_INVISIBLE_ABILITY']).then( () => {} ); - windowStage.loadContent('pages/index', (err, data) => { + AtManager.requestPermissionsFromUser(this.context,["ohos.permission.READ_MEDIA","ohos.permission.WRITE_MEDIA", + "ohos.permission.CAPTURE_SCREEN","ohos.permission.INTERNET","ohos.permission.CAMERA", + "ohos.permission.MICROPHONE", "ohos.permission.START_INVISIBLE_ABILITY"]).then(() => {}) + windowStage.loadContent("pages/index", (err, data) => { if (err.code) { - console.error( 'Failed to load the content. Cause:' + JSON.stringify(err) ); + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); return; } - console.info( 'Succeeded in loading the content. Data: ' + JSON.stringify(data) ); + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) }); } diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets index 4800de25388a351d61c2c92a74e2ed62eeb5a8e5..d4d8a64436cffcba494e4fe29a1a475aa6e58600 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets +++ b/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets @@ -116,7 +116,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'true'){ + if (this.result === 'true '){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -154,7 +154,7 @@ struct IndexPage { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp') - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back(); }) @@ -282,12 +282,12 @@ struct IndexPage { FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('true'); + let PassIndex = report.indexOf('true '); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('true',PassIndex + 1); + PassIndex = report.indexOf('true ',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasFillStyle.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasFillStyle.ets index 7c5adee1cb4c05109dcfb12046332becb143b0d7..060e8155703613e7cd21ef16ee468b8194e680d9 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasFillStyle.ets +++ b/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 { diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasFont.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasFont.ets index e9dcec7b47282b9e285b893212d58cc9da3e86a8..c883f821b8148ed7863b88390b8ba2fbb9dcbc22 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasFont.ets +++ b/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) diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasGlobalAlpha.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasGlobalAlpha.ets index 9f7951318e07ce3fdf90e101666a028340a63df3..9ae79a42ce5a0dc19725825dce1819e4cc0a3f7c 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasGlobalAlpha.ets +++ b/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)'; diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasGlobalCompositeOperation.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasGlobalCompositeOperation.ets index 8e2d477c736330c89921df45f0ceea1afb11c152..99ca55148513dd401067630bda0d44e143d2bcad 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasGlobalCompositeOperation.ets +++ b/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) diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineCap.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineCap.ets index 6749e95c3b311374f70a691e222cd07fecfb29d4..50064122f71e1d96dbedb4316f70a2ed3b3fe85e 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineCap.ets +++ b/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 { diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineDashOffset.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineDashOffset.ets index 2ba278e25a27cb043fc8c67774770759563e214d..57db8c68213b089573f2a66b3876754d37d8a50c 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineDashOffset.ets +++ b/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) diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineJoin.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineJoin.ets index 4b51feefe9662b98b2d0f0df7a47ae18ac4b8a19..84db83a781fd5aa20cef59f203fb940f298c134f 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineJoin.ets +++ b/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 { diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineWidth.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineWidth.ets index 329a76dab1cb99cc4769aa106540a959bc063a37..53f68a052ac3d40a07ee9b7ebd10a6c25ce5f9c8 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasLineWidth.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowBlur.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowBlur.ets index 1ebcb13c7bc8af8dd659dd400775e2b783f679fa..b49413f3fcc95f7b01e3178fb4c9a35ad996c774 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowBlur.ets +++ b/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)'; diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowColor.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowColor.ets index a430b438674d7cd8e8564e20a1a22f8fdb381a54..f5b5dcd78701661d826bd140a1ebd2200dbd74f7 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowColor.ets +++ b/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); }) 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 de2d7918da41cad176eba5934ad52fc59fbf7d14..21f59905c6a9dc67b2fece59ff51c5a782b10413 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetX.ets +++ b/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; diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetY.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetY.ets index 0a2d6c9c56df72d9dca10dfbc4330bab0956ca1c..248f5736a12a38150c53ad491acf270a8c5a9081 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasShadowOffsetY.ets +++ b/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; diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasStrokeStyle.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasStrokeStyle.ets index 5427636f9c71624a268ed774fb62562e73ea9d95..76f985528d7d431062a9608dc59f722d9f859a0b 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasStrokeStyle.ets +++ b/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 { diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasTextAlign.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasTextAlign.ets index 0dc23778f9fba8899459ec037331f0a993487c01..d131fbf26fe59b4f431dd9c5fbb08817c09c59d8 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasTextAlign.ets +++ b/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) diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasTextBaseline.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasTextBaseline.ets index e1aa827966643d4e3417e5fe8343aa0c29f0b001..6d0d5b0b670883fb644bf2c7b43f428a617e591e 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/CanvasTextBaseline.ets +++ b/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) diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/LongPressGesture.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/LongPressGesture.ets index b6298238a9192637349aa571216189a7b25fe301..84b46f97cf74cc3f7765dc202868cac1c68f25e5 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/LongPressGesture.ets +++ b/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(() => { diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/PanGesture.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/PanGesture.ets index e049ca71169e9127aa4dadad168303628bdfbc50..dce227d6d3db288fc251a3ad298933a859af880c 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/PanGesture.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/PinchGestureTest.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/PinchGestureTest.ets index 70f2d4495dc03a700df6992552ec6559738d378e..0f85be41690eb0bebf0f27882d22daac90e3714b 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/PinchGestureTest.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/RotationGestureTest.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/RotationGestureTest.ets index f35e0c87dcac37eee6721fb4ac3a8d9f5af6dfc6..91ca3e14f1365160e3fc4fef89c51608b1dbdf99 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/RotationGestureTest.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/ScrollListTest.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/ScrollListTest.ets index c1f6c6f5fc0623ed1737649e34f1e28878b7fbcc..e3ed9bc74dd820530ad2ed7088ec7293ae697f77 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/ScrollListTest.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/SwipeGestureTest.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/SwipeGestureTest.ets index 2075adc7aadc7e1c88936209c549d750028fa122..f58a7280a383dcc642ac904eaf58ea1f8fc4947e 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/SwipeGestureTest.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/TapGesture.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/TapGesture.ets index 37cb69ad70896b834305724dea836be91e77f68e..8a93e6a1405b6a072b7d2a829459ab7773c6aed8 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/TapGesture.ets +++ b/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); diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets index 4c7d25aac05fc54d5601d9b6339bdeaa85b4a5cd..95985691141e86a002a0a4010835e3eab9d296d5 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets +++ b/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets @@ -50,7 +50,7 @@ struct CustomContainer1 { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -82,7 +82,7 @@ struct CustomContainer1 { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, @@ -126,7 +126,7 @@ struct CustomContainer1 { }; let name = this.name; let displayName = `${info.prefix}${name}${info.suffix}`; - let dirPath = path + '/' + displayName; + let dirPath = path + '/screenshot' + '/' + displayName; let imagePackerApi = image.createImagePacker(); let arrayBuffer = await imagePackerApi.packing(data, packOpts); let fd = fileio.openSync(dirPath,0o102,0o666); 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 46e3966646f176dec32123da7bf9496f3ac42fee..6bc57810e2980e87edfc139156098c88202f0003 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingTypeC.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingTypeC.ets @@ -86,7 +86,7 @@ struct audioInputRouting { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:'pages/Audio/Audio_index', 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 cab2c341191b7aa97167f74b492aeb1526e5044a..b61c2e18234ec4c2424ac3b2ec58c7c1d8ac2ac3 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingWiredHeadset.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioInputRoutingWiredHeadset.ets @@ -86,7 +86,7 @@ struct audioInputRouting { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:'pages/Audio/Audio_index', 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 f40df4b8f0b698eed622f90197f9ee5ce17bd8ce..cdc4ba087329bae78f968ea1488325747b2a86d0 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingBT.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingBT.ets @@ -76,7 +76,7 @@ struct audioOutputRouting { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:'pages/Audio/Audio_index', 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 0766e1cffff998a491e9e0231bab18ebd4a79627..7cb4cff538a0b4c9516aea385c7045754f4d6614 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingTypeC.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingTypeC.ets @@ -76,7 +76,7 @@ struct audioOutputRouting { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:'pages/Audio/Audio_index', 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 609c9be73d36fbb60dde1b8b92c46c182cfe5125..740d304b3daf8dd28d13b6950ea51fb615b00224 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingWiredHeadset.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/AudioOutputRoutingWiredHeadset.ets @@ -76,7 +76,7 @@ struct audioOutputRouting { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:'pages/Audio/Audio_index', diff --git a/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets b/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets index b4f6f55fc08e569bd5d7f3d7914f80ebc6dc2299..22e82cfd8fa6dda07d51b2873c4d5fca509870d3 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets @@ -99,7 +99,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'true'){ + if (this.result === 'true '){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -137,7 +137,7 @@ struct IndexPage { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp') - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back(); }) @@ -265,12 +265,12 @@ struct IndexPage { FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('true'); + let PassIndex = report.indexOf('true '); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('true',PassIndex + 1); + PassIndex = report.indexOf('true ',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraFlash.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraFlash.ets index ce36bd5f96e99b5965d6c932cb2284773d6c5f83..ff0b9f150808c110fe10c2580ff9a2cdc04adb3f 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraFlash.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraFlash.ets @@ -78,7 +78,7 @@ struct cameraOrientation { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ url: 'pages/Camera/Camera_index', 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 902874a16418ef7721bae1da6737152ad502eed3..762b92fd258462efc28233d67f6e4762d30f48ff 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraOrientation.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraOrientation.ets @@ -88,7 +88,7 @@ struct cameraOrientation { onPageShow() { Logger.info(this.tag, `cameraOrientation onPageShow`) - // @ts-ignore + // @ts-ignore this.surfaceId = this.mXComponentController.getXComponentSurfaceId() CameraService.initCamera(this.surfaceId, this.cameraDeviceIndex).then(() => { Logger.info(this.tag, `onPageShow initCamera start`) @@ -106,7 +106,7 @@ struct cameraOrientation { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ url: 'pages/Camera/Camera_index', 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 e2fcf4eedf96c01cb6c32c7af0f7836f384d0923..30a5f1b44bca7c4060e626f0850f009c1c11a51d 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets @@ -113,7 +113,7 @@ struct cameraOrientation { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ url: 'pages/Camera/Camera_index', @@ -265,4 +265,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 b9d58b529e63060fa6bd15525a21207bcbd1cdea..6d034af41dbdb67fd71f1da035359f7b64e49582 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets @@ -118,7 +118,7 @@ struct cameraFormat { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ url: 'pages/Camera/Camera_index', @@ -232,4 +232,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 3b7c2d566fba0dcb79253f454da541b8ecbf6867..33e542ba8d58d11074558f4f7def5e4d3559121c 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets @@ -104,7 +104,7 @@ struct cameraOrientation { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ url: 'pages/Camera/Camera_index', @@ -192,4 +192,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 9e83e564c972857a2617122545e676c6deb65a62..027f8403720d6f744f3ee9251d33b3e84b22c2e8 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets @@ -129,7 +129,7 @@ struct cameraOrientation { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ url: 'pages/Camera/Camera_index', @@ -286,4 +286,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/Camera_index.ets b/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets index 072465388929cd555a43764d5b70658c1a7c47d6..875909cb3c66267d05ae08039838c41eb70822e4 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets @@ -100,7 +100,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'true'){ + if (this.result === 'true '){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -138,7 +138,7 @@ struct IndexPage { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp') - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back(); }) @@ -266,12 +266,12 @@ struct IndexPage { FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('true'); + let PassIndex = report.indexOf('true '); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('true',PassIndex + 1); + PassIndex = report.indexOf('true ',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); 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 8aec97cfb973e378609d94d2407207fc7d3cf3c9..e6ee4150df09647def4c0bfba6c956396f99fb89 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/CameraColdStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let CameraColdPath = path + '/ColdStartCamera.log'; +let path1 = path + '/ExperienceData'; +let CameraColdPath = path1 + '/ColdStartCamera.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'CameraColdStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2300ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,9 +49,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(){ @@ -94,7 +96,7 @@ struct CustomContainerUser { let CameraHead = CameraReport.indexOf('time:'); let CameraTime = CameraReport.substring(CameraHead+5); this.cameraNum = parseFloat(CameraTime); - if( 0 < this.cameraNum && this.cameraNum < 2000 ) { + if( 0 < this.cameraNum && this.cameraNum < 2300 ) { 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 e32acfef994a29bf9c775c6163f41fa0cadca074..f9f7ec19763efe1412c3e72a114d41e9fd09bd88 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ContactsColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ContactsColdStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let ContactsColdPath = path + '/ColdStartContacts.log'; +let path1 = path + '/ExperienceData'; +let ContactsColdPath = path1 + '/ColdStartContacts.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'ContactsColdStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2300ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,9 +49,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(){ @@ -94,7 +96,7 @@ struct CustomContainerUser { let ContactsHead = ContactsReport.indexOf('time:'); let ContactsTime = ContactsReport.substring(ContactsHead+5); this.contactsNum = parseFloat(ContactsTime); - if( 0 < this.contactsNum && this.contactsNum < 2000 ) { + if( 0 < this.contactsNum && this.contactsNum < 2300 ) { 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 65c94da0df37e1e45a5fce29a94eb17e44c27f32..0970966c7ba6180380feab3c64896d3cd7d0c3d8 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ContactsHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ContactsHotStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let ContactsColdPath = path + '/HotStartContacts.log'; +let path1 = path + '/ExperienceData'; +let ContactsColdPath = path1 + '/HotStartContacts.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'ContactsHotStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于600ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,10 +49,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(){ @@ -95,7 +96,7 @@ struct CustomContainerUser { let ContactsHead = ContactsReport.indexOf(':'); let ContactsTime = ContactsReport.substring(ContactsHead+1); this.contactsNum = parseFloat(ContactsTime); - if( 0 < this.contactsNum && this.contactsNum < 1000 ) { + if( 0 < this.contactsNum && this.contactsNum < 600 ) { this.num++ } if( this.num === 1 ) { diff --git a/validator/acts_validator/src/main/ets/pages/Experience/DeskFps.ets b/validator/acts_validator/src/main/ets/pages/Experience/DeskFps.ets index df988a40beae48950667c55e6f6369a018db9db0..1b501368a1a4f4ea0748d4cdd679c279d00d42fe 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/DeskFps.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/DeskFps.ets @@ -21,12 +21,13 @@ import router from '@ohos.router'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let Xpath = path + '/DeskFps.log' +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/DeskFps.log' @Entry @Component struct CustomContainerUser { @State name: string = 'DeskFps'; - @State StepTips: string = '操作步骤：根据操作提示滑动系统桌面测试帧率'+'\n'+'预期结果：帧率高于54帧测试通过'; + @State StepTips: string = '操作步骤：根据操作提示滑动系统桌面测试帧率'+'\n'+'预期结果：帧率大于55帧测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State Fps: string = '0'; @@ -44,9 +45,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.若测试最高帧率大于55帧则通过测试` + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } @@ -103,7 +104,7 @@ struct CustomContainerUser { } let maxFps = Math.max(...Fps); this.Fps = maxFps.toString(); - if(maxFps >= 54) { + if(maxFps >= 55) { this.Vue = true; } }) diff --git a/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets b/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets index 0dc154171080a85fd9b730d4997ffe6499da4ac9..c3132a018dc1d7902b2576a9022adb6f927192ed 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets @@ -24,6 +24,7 @@ import data_preferences from '@ohos.data.preferences'; const TAG = 'ParseXML'; let path = globalThis.dir; let path1 = path + '/Experience'; +let ExperienceDataPath = path + '/ExperienceData'; let VarColor = []; let ColorBackPath = path + '/ExperienceColorBack.txt'; @@ -112,7 +113,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'true'){ + if (this.result === 'true '){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -150,7 +151,7 @@ struct IndexPage { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp') - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back(); }) @@ -243,6 +244,8 @@ struct IndexPage { ClearText(){ fileio.rmdirSync(path1); fileio.mkdirSync(path1); + fileio.rmdirSync(ExperienceDataPath); + fileio.mkdirSync(ExperienceDataPath); let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); for(let i = 0; i < this.TestCaseList.length; i++) { let log = (this.TestCaseList[i].title+';'+'#ff808080'+';').toString(); @@ -252,7 +255,6 @@ struct IndexPage { ReadTextParseXml(){ let ReportPath = path1 + '/ExperienceReport.txt'; let dir = fileio.opendirSync(path1); - console.info("ssssss"+dir); while (dir) { let OP = fileio.openSync(ReportPath, 0o100 | 0o2002, 0o664); let buf = new ArrayBuffer(40960); @@ -278,12 +280,12 @@ struct IndexPage { FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('true'); + let PassIndex = report.indexOf('true '); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('true',PassIndex + 1); + PassIndex = report.indexOf('true ',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); 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 8e72fd62410814f69cece2f7eed2ad5a9dde4576..392d37aba35e3f26733164292eb34a084230ffeb 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/KeyboardDisplayTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/KeyboardDisplayTest.ets @@ -18,13 +18,14 @@ import FirstDialog from '../model/FirstDialog'; import router from '@ohos.router'; let path = globalThis.dir; -let Xpath = path + '/CompleteTimeKeyboard.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/CompleteTimeKeyboard.log'; @Entry @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 +43,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(){ 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 69bfd71fa8128a54b030adef1208f0d50fb0e058..b1f6222ba2a85d795801056853f64894d1fca14a 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/KeyboardInputTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/KeyboardInputTest.ets @@ -18,13 +18,14 @@ import FirstDialog from '../model/FirstDialog'; import router from '@ohos.router'; let path = globalThis.dir; -let Xpath = path + '/ResponseTimeKeyboard.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/ResponseTimeKeyboard.log'; @Entry @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 +43,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(){ 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 cb6a20f3a7427a61d683675f5d0e9833f29d20cd..80b01630b4ed59de8492571d1c01e8a549ac6e02 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/MmsColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/MmsColdStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let MmsColdPath = path + '/ColdStartMms.log'; +let path1 = path + '/ExperienceData'; +let MmsColdPath = path1 + '/ColdStartMms.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'MmsColdStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2300ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,9 +49,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(){ @@ -94,7 +96,7 @@ struct CustomContainerUser { let MmsHead = MmsReport.indexOf('time:'); let MmsTime = MmsReport.substring(MmsHead+5); this.mmsNum = parseFloat(MmsTime); - if( 0 < this.mmsNum && this.mmsNum < 2000 ) { + if( 0 < this.mmsNum && this.mmsNum < 2300 ) { this.num++ } if( this.num === 1 ) { 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 a2e02fe32d6b5bea311aa8f4025d132de30283d9..7bd418e1722ea985bcf58bc67f7c19712e9fd55f 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/MmsHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/MmsHotStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let MmsColdPath = path + '/HotStartMms.log'; +let path1 = path + '/ExperienceData'; +let MmsColdPath = path1 + '/HotStartMms.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'MmsHotStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于600ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,10 +49,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(){ @@ -95,7 +96,7 @@ struct CustomContainerUser { let MmsHead = MmsReport.indexOf(':'); let MmsTime = MmsReport.substring(MmsHead+1); this.mmsNum = parseFloat(MmsTime); - if( 0 < this.mmsNum && this.mmsNum < 1000 ) { + if( 0 < this.mmsNum && this.mmsNum < 600 ) { this.num++ } if( this.num === 1 ) { diff --git a/validator/acts_validator/src/main/ets/pages/Experience/PhotoFps.ets b/validator/acts_validator/src/main/ets/pages/Experience/PhotoFps.ets index 71370173093a2f833dab5f32fc83e21e322aa00a..7153321f4c151755b093409df2f2263ab06acce7 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/PhotoFps.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/PhotoFps.ets @@ -18,13 +18,14 @@ import {CustomContainer} from '../common/ExperienceCustomContainer'; import FirstDialog from '../model/FirstDialog'; let path = globalThis.dir; -let Xpath = path + '/PhotoFps.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/PhotoFps.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'PhotoFps'; - @State StepTips: string = '操作步骤：根据操作提示滑动图库测试帧率'+'\n'+'预期结果：帧率高于或等于54帧测试通过'; + @State StepTips: string = '操作步骤：根据操作提示滑动图库测试帧率'+'\n'+'预期结果：帧率大于或等于55帧测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State Fps: string = '0'; @@ -42,10 +43,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.若测试最高帧率大于或等于55帧则通过测试` + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' + '\n' ) .fontColor(Color.White).fontSize('20fp') } Row(){ @@ -104,7 +105,7 @@ struct CustomContainerUser { } let maxFps = Math.max(...Fps); this.Fps = maxFps.toString(); - if(maxFps >= 54) { + if(maxFps >= 55) { this.Vue = true; } }) 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 ce19ab272444d22a21b03a61fa6676e69e5fbf40..170a9aa0ce7e5a47f1a918afe03c0c9d0a22d0c8 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/PhotosColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/PhotosColdStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let PhotosColdPath = path + '/ColdStartPhotos.log'; +let path1 = path + '/ExperienceData'; +let PhotosColdPath = path1 + '/ColdStartPhotos.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'PhotosColdStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2300ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,9 +49,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(){ @@ -94,7 +96,7 @@ struct CustomContainerUser { let photosHead = photosReport.indexOf('time:'); let photosTime = photosReport.substring(photosHead+5); this.photosNum = parseFloat(photosTime); - if( 0 < this.photosNum && this.photosNum < 2000 ) { + if( 0 < this.photosNum && this.photosNum < 2300 ) { this.num++ } if( this.num === 1 ) { 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 67d7584be2eb2c767cd78e7a6c5e69f9bbfe279f..2d6a5cfdc35c6a1e7f56a341ccfc95f9ef14c02f 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/PhotosHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/PhotosHotStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let PhotosColdPath = path + '/HotStartPhotos.log'; +let path1 = path + '/ExperienceData'; +let PhotosColdPath = path1 + '/HotStartPhotos.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'PhotosHotStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于600ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,10 +49,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(){ @@ -95,7 +96,7 @@ struct CustomContainerUser { let photosHead = photosReport.indexOf(':'); let photosTime = photosReport.substring(photosHead+1); this.photosNum = parseFloat(photosTime); - if( 0 < this.photosNum && this.photosNum < 1000 ) { + if( 0 < this.photosNum && this.photosNum < 600 ) { this.num++ } if( this.num === 1 ) { 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 68dadae72800ef076b249737a5195c4c145d3973..8894fdb6f5185ddf04e7d2fb024ded16d5c7578f 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ScrollPhotosList.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ScrollPhotosList.ets @@ -18,13 +18,14 @@ import {CustomContainer} from '../common/TimeExperienceCustomContainer'; import FirstDialog from '../model/FirstDialog'; let path = globalThis.dir; -let Xpath = path + '/ResponseTimePhotos.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/ResponseTimePhotos.log'; @Entry @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 +43,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(){ 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 59c7f4a9c1c17b79a3426ebd4d5e840375bc74cf..fa52d80df46ea3f8f4b2888463694c5b51c89087 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/SettingsColdStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/SettingsColdStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let SettingsColdPath = path + '/ColdStartSetting.log'; +let path1 = path + '/ExperienceData'; +let SettingsColdPath = path1 + '/ColdStartSetting.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'SettingsColdStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延低于2000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用冷启动时延小于2300ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,9 +49,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(){ @@ -94,7 +96,7 @@ struct CustomContainerUser { let setHead = setReport.indexOf('time:'); let setTime = setReport.substring(setHead+5); this.setNum = parseFloat(setTime); - if( 0 < this.setNum && this.setNum < 2000 ) { + if( 0 < this.setNum && this.setNum < 2300 ) { this.num++ } if( this.num === 1 ) { 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 b397994a5da069cd3cd1435195346df3bedb1ef8..f77a39c328de8c751144a422ad7f9559b6a1cc90 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/SettingsHotStartTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/SettingsHotStartTest.ets @@ -20,12 +20,13 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let SettingsColdPath = path + '/HotStartSetting.log'; +let path1 = path + '/ExperienceData'; +let SettingsColdPath = path1 + '/HotStartSetting.log'; @Entry @Component struct CustomContainerUser { @State name: string = 'SettingsHotStart'; - @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延低于1000ms则测试通过'; + @State StepTips: string = '操作步骤：根据操作提示运行脚本文件，启动应用'+'\n'+'预期结果：所有应用热启动时延小于600ms则测试通过'; @State Vue: boolean = false; @State StartEnable: boolean = true; @State num: number = 0; @@ -48,10 +49,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(){ @@ -95,7 +96,7 @@ struct CustomContainerUser { let setHead = setReport.indexOf(':'); let setTime = setReport.substring(setHead+1); this.setNum = parseFloat(setTime); - if( 0 < this.setNum && this.setNum < 1000 ) { + if( 0 < this.setNum && this.setNum < 600 ) { this.num++ } if( this.num === 1 ) { 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 0af446263a9e414ccdef04528b49673adbabd8b1..c903f1a58c02c5024c43b89d86f8b9a04bd0945e 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/StartBackgroundTask.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/StartBackgroundTask.ets @@ -20,13 +20,14 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let Xpath = path + '/CompleteTimeLauncher.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/CompleteTimeLauncher.log'; @Entry @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 +45,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(){ 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 d5b4bb5f951fe4d836572d5e486ca6c92f9348d6..b426495ca8cad10b42e6d9ee5087c3b869730fbf 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/StartNotification.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/StartNotification.ets @@ -20,13 +20,14 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let Xpath = path + '/ResponseTimeLauncher.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/ResponseTimeLauncher.log'; @Entry @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 +45,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(){ 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 7d649c06df442c2363c58532c0f97d6f13ea9a40..6f64d362497c311c45b8f9edbbe02da590ef664a 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/StartTaskManager.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/StartTaskManager.ets @@ -20,13 +20,14 @@ import context from '@ohos.app.ability.common'; let abilityContext = getContext(this) as context.UIAbilityContext; let path = globalThis.dir; -let Xpath = path + '/CompleteTimeLauncher.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/CompleteTimeLauncher.log'; @Entry @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 +45,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(){ 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 9874972093cf25082c87f01fa28ac01fd25a421e..7170960abb8fb014a65a9217e651a898dadfa14f 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/ViewPhotoTest.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/ViewPhotoTest.ets @@ -18,13 +18,14 @@ import {CustomContainer} from '../common/TimeExperienceCustomContainer'; import FirstDialog from '../model/FirstDialog'; let path = globalThis.dir; -let Xpath = path + '/ResponseTimePhotos.log'; +let path1 = path + '/ExperienceData'; +let Xpath = path1 + '/ResponseTimePhotos.log'; @Entry @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 +43,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(){ diff --git a/validator/acts_validator/src/main/ets/pages/Player/PlayAudio.ets b/validator/acts_validator/src/main/ets/pages/Player/PlayAudio.ets index 0c53487e31e5adba2188a9c5c3ecc6a392235406..5ffd24dc974d3d1f45e5d56152536240c410709e 100644 --- a/validator/acts_validator/src/main/ets/pages/Player/PlayAudio.ets +++ b/validator/acts_validator/src/main/ets/pages/Player/PlayAudio.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + import { CustomContainer } from '../common/AudioContainer'; import FirstDialog from '../model/FirstDialog'; import router from '@ohos.router'; @@ -21,14 +21,14 @@ import router from '@ohos.router'; @Component struct playAudio { @State FillColor: string = '#FF000000'; - @State name: string = 'PlayAudio'; + @State name: string = router.getParams()['audioTitle'] @State StepTips: string = '测试目的：用于测试音频播放暂停seek\n预期结果：音频播放暂停seek功能正常'; - private tag: string = 'qlw' - @State Vue: boolean = false - @State videoSrc: Resource = $rawfile('StarWars10s-1C-44100-2SW.wav') - @State isAutoPlay: boolean = true - @State showControls: boolean = true - controller: VideoController = new VideoController() + private tag: string = 'qlw'; + @State Vue: boolean = false; + @State audioSrc: string = router.getParams()['audioUrl']; + @State isAutoPlay: boolean = true; + @State showControls: boolean = true; + controller: VideoController = new VideoController(); async aboutToAppear() { await FirstDialog.ChooseDialog(this.StepTips, this.name); @@ -39,10 +39,10 @@ struct playAudio { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ - url: 'pages/Player/Player_index', + url: 'pages/Player/PlayAudioList', params: { result: 'None', } }) }) @@ -53,32 +53,33 @@ struct playAudio { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { Video({ - src: this.videoSrc, + src: this.audioSrc, controller: this.controller }) .width('100%') .height('60%') .autoPlay(this.isAutoPlay) .controls(this.showControls) - .onFinish(() => { - this.Vue = true - }) + .onFinish(() => { + this.Vue = true; + }) }.width('100%').height('80%').onClick(() => { - this.showControls = !this.showControls + this.showControls = !this.showControls; }) CustomContainer({ title: this.name, - Url: 'pages/Player/Player_index', + Url: 'pages/Player/PlayAudioList', StepTips: this.StepTips, name: $name, Vue: $Vue }).height('10%').width('100%') }.width('100%').height('100%').backgroundColor(Color.Black) } - onBackPress(){ + + onBackPress() { router.replaceUrl({ - url:'pages/Player/Player_index', + url: 'pages/Player/PlayAudioList', }) } } \ No newline at end of file diff --git a/validator/acts_validator/src/main/ets/pages/Player/PlayAudioList.ets b/validator/acts_validator/src/main/ets/pages/Player/PlayAudioList.ets new file mode 100644 index 0000000000000000000000000000000000000000..63b064503278ba8df8f426958db1731c18ba7d1e --- /dev/null +++ b/validator/acts_validator/src/main/ets/pages/Player/PlayAudioList.ets @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import prompt from '@ohos.prompt'; +import router from '@ohos.router'; +import fileio from '@ohos.fileio'; +import mediaLibrary from '@ohos.multimedia.mediaLibrary' +import data_preferences from '@ohos.data.preferences'; +import MediaUtils from '../model/MediaUtils' + +const TAG = 'ParseXML'; +let path = globalThis.dir; +let path1 = path + '/Player'; + +let VarColor = []; +let ColorBackPath = path1 + '/PlayerAudioColorBack.txt'; +let txtPath = path1 + '/PlayerAudioReport.txt'; + +@Entry +@Component +struct audioNew { + @State ClearAll: boolean = false; + @State name: string = 'PlayerAudio'; + @State Vue: boolean = false; + private current: number = undefined; + @State MediaLib: MediaUtils = new MediaUtils(); + @State count: number = 0; + @State result: string = ''; + @State TEST: number = 0; + @State Url: string = ''; + @State TestCaseList: Array = []; + @State ColorObject: string[] = VarColor; + + async onPageShow() { + let Test = null; + let context = null; + context = globalThis.getContext(); + let preferences; + + let promise = data_preferences.getPreferences(context, 'mystore'); + await promise.then((object) => { + preferences = object; + }); + promise = preferences.get('PlayerAudio', 0); + await promise.then((data) => { + Test = data; + console.info("Succeeded in getting value of 'PlayerAudio'. Data: " + data); + }); + this.TestCaseList = await this.MediaLib.getFileAssetsAlbum('Audios/ValidatorData/'); + + if (Test != 1) { + let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + for (let i = 0; i < this.TestCaseList.length; i++) { + let log = (this.TestCaseList[i].displayName + ';' + '#ff808080' + ';').toString(); + fileio.writeSync(fd, log); + } + fileio.closeSync(fd); + } + promise = preferences.put('PlayerAudio', 1); + promise.then(() => { + console.info("Succeeded in putting value of 'PlayerAudio'."); + }); + promise = preferences.flush(); + promise.then(() => { + console.info("Succeeded in flushing."); + }); + this.TEST = Test; + + let opt = fileio.openSync(ColorBackPath, 0o100 | 0o2002, 0o664); + let buff = new ArrayBuffer(40960); + fileio.readSync(opt, buff); + let ColorBack = String.fromCharCode.apply(null, new Uint8Array(buff)); + let TestList = ColorBack.split(';'); + for (let i = 0; i < Math.floor(TestList.length / 2); i++) { + VarColor[i] = TestList[i * 2+1]; + } + fileio.closeSync(opt); + + if (this.count === 1) { + this.result = router.getParams()['result']; + let titles = router.getParams()['title']; + let name1 = '刚刚点进了哪个用例：' + titles; + let results = this.result; + let WriteTitle = (titles).toString(); + let number = WriteTitle.length + 11; + let Index = ColorBack.indexOf(WriteTitle); + + if (this.result === 'true ') { + this.ColorObject[this.current] = '#ff008000'; + let Log = (titles + ';' + '#ff008000' + ';'); + let key = ColorBack.substring(Index, Index + number); + let FD = fileio.openSync(ColorBackPath, 0o102, 0o666); + ColorBack = ColorBack.replace(key, Log); + let buffer = new ArrayBuffer(4096); + let rd = fileio.readSync(FD, buffer); + let Report = ColorBack.substring(0, rd); + fileio.closeSync(FD); + let Fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + fileio.writeSync(Fd, Report); + filewrite(name1, results, titles); + } + else if (this.result === 'false') { + this.ColorObject[this.current] = '#ffff0000'; + let Log = (titles + ';' + '#ffff0000' + ';'); + let key = ColorBack.substring(Index, Index + number); + let FD = fileio.openSync(ColorBackPath, 0o102, 0o666); + ColorBack = ColorBack.replace(key, Log); + let buffer = new ArrayBuffer(4096); + let rd = fileio.readSync(FD, buffer); + let Report = ColorBack.substring(0, rd); + fileio.closeSync(FD); + let Fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + fileio.writeSync(Fd, Report); + filewrite(name1, results, titles); + } + else if (this.result === 'None') { + this.ColorObject[this.current] = this.ColorObject[this.current]; + } + } + // 所有测试项满足返回ture + let color = '#ff008000'; + let colorBol = this.ColorObject.every((item) => item === color); + this.Vue = colorBol; + } + + build() { + Column() { + Row() { + Button() { + Image($r('app.media.ic_public_back')).width('20vp').height('18vp') + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) + .onClick(() => { + router.back({ + url: 'pages/Player/Player_index', + params: { result: 'None', } + }) + }) + + Row() { + Text('Player Audio') + .fontColor(Color.White) + .fontSize('22fp') + }.justifyContent(FlexAlign.SpaceAround).backgroundColor(Color.Black) + + Row() { + Button() { + Image($r('app.media.ic_public_delete')) + .width('30vp') + .height('30vp') + }.backgroundColor(Color.Black) + .onClick(() => { + AlertDialog.show( + { + message: "是否删除所有记录", + primaryButton: { + value: 'Yes', + action: () => { + this.ClearAll = true; + this.ColorObject.forEach((value, index) => { + this.ColorObject[index] = '#ff808080'; + }); + this.ClearText(); + prompt.showToast({ + message: '结果已删除', duration: 1000 + }); + } + }, + secondaryButton: { + value: 'No', + action: () => { + + } + }, + cancel: () => { + + } + } + ) + }) + } + } + .width('100%') + .justifyContent(FlexAlign.SpaceAround) + .margin({ top: '15vp' }) + .height('6%') + .backgroundColor(Color.Black) + + List({ space: 5 }) { + ForEach(this.TestCaseList, (item: mediaLibrary.FileAsset, index) => { + ListItem() { + Row() { + Text(item.displayName).fontSize(16).fontColor(Color.Black) + } + .width('100%') + .height(50) + .alignItems(VerticalAlign.Center) + .backgroundColor(this.count === 0 && this.TEST === 0 ? '#ff808080' : this.ColorObject[index]) + .onClick(() => { + this.count = 1; + this.ClearAll = false; + this.current = index; + router.push({ + url: 'pages/Player/PlayAudio', + params: { + audioUrl: item.uri, + audioTitle: item.displayName + } + }) + }) + } + }, item => item.title) + }.width('100%').height('80%') + + Row() { + Blank() + Button() { + Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') + } + .width('40%') + .height('30vp') + .backgroundColor(Color.Grey) + .enabled(this.Vue) + .opacity(this.Vue ? 1 : 0.4) + .onClick(() => { + router.back({ + url: 'pages/Player/Player_index', + params: { result: 'true ', title: this.name, + } + }) + prompt.showToast({ + message: '通过', duration: 1000 + }); + }) + + Blank().width(40) + Button() { + Image($r('app.media.ic_public_fail')).width('20vp').height('20vp') + }.width('40%').height('30vp').backgroundColor(Color.Grey) + .onClick(() => { + router.back({ + url: 'pages/Player/Player_index', + params: { result: 'false', title: this.name, + } + }) + console.log('wwwwwwwwww' + this.Url) + prompt.showToast({ + message: '失败', duration: 1000 + }); + }) + + Blank() + }.width('100%').height('14%').backgroundColor(Color.Black).justifyContent(FlexAlign.Center) + }.width('100%').height('100%').backgroundColor(Color.Black) + } + + ClearText() { + fileio.unlinkSync(txtPath); + fileio.unlinkSync(ColorBackPath); + fileio.openSync(txtPath, 0o100 | 0o2002, 0o664); + let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + for (let i = 0; i < this.TestCaseList.length; i++) { + let log = (this.TestCaseList[i].displayName + ';' + '#ff808080' + ';').toString(); + fileio.writeSync(fd, log); + } + } + + onBackPress() { + router.replaceUrl({ + url: 'pages/Player/Player_index', + }) + } +} + +function filewrite(name1, results, titles) { + let fd = fileio.openSync(txtPath, 0o100 | 0o2002, 0o664); + let buf = new ArrayBuffer(4096); + let RD = fileio.readSync(fd, buf); + console.info("RRRRRRRRRRd" + RD); + let report = String.fromCharCode.apply(null, new Uint8Array(buf)); + let WriteTitle = (titles).toString(); + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; + let Index = report.indexOf(WriteTitle); + let Log = (titles + ";" + results + ";").toString(); + if (Index == -1) { + fileio.writeSync(fd, Log); + } + else if (Index != -1) { + let key = report.substring(Index, Index + number); + let FD = fileio.openSync(txtPath, 0o102, 0o666); + report = report.replace(key, Log); + let buffer = new ArrayBuffer(4096); + let rd = fileio.readSync(FD, buffer); + let Report = report.substring(0, rd); + fileio.closeSync(FD); + let Fd = fileio.openSync(txtPath, 0o102, 0o666); + fileio.writeSync(Fd, Report); + } +} \ No newline at end of file diff --git a/validator/acts_validator/src/main/ets/pages/Player/PlayVideo.ets b/validator/acts_validator/src/main/ets/pages/Player/PlayVideo.ets index ce7cfe043a6239e1b88ea2f166140b21a07c2a8d..900b34070d5a0dd3696e7c8a7c6874c77fcad5e7 100644 --- a/validator/acts_validator/src/main/ets/pages/Player/PlayVideo.ets +++ b/validator/acts_validator/src/main/ets/pages/Player/PlayVideo.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + import { CustomContainer } from '../common/AudioContainer'; import FirstDialog from '../model/FirstDialog'; @@ -22,14 +22,14 @@ import router from '@ohos.router'; @Component struct playVideo { @State FillColor: string = '#FF000000'; - @State name: string = 'PlayVideo'; + @State name: string = router.getParams()['audioTitle']; @State StepTips: string = '测试目的：用于测试视频播放暂停seek\n预期结果：视频播放暂停seek功能正常'; - private tag: string = 'qlw' - @State Vue: boolean = false - @State videoSrc: Resource = $rawfile('H264_AAC.mkv') - @State isAutoPlay: boolean = true - @State showControls: boolean = true - controller: VideoController = new VideoController() + private tag: string = 'qlw'; + @State Vue: boolean = false; + @State videoSrc: string = router.getParams()['audioUrl']; + @State isAutoPlay: boolean = true; + @State showControls: boolean = true; + controller: VideoController = new VideoController(); async aboutToAppear() { await FirstDialog.ChooseDialog(this.StepTips, this.name); @@ -40,10 +40,10 @@ struct playVideo { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({ left: '20vp' }) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back({ - url: 'pages/Player/Player_index', + url: 'pages/Player/PlayVideoList', params: { result: 'None', } }) }) @@ -61,25 +61,26 @@ struct playVideo { .height('60%') .autoPlay(this.isAutoPlay) .controls(this.showControls) - .onFinish(() => { - this.Vue = true - }) + .onFinish(() => { + this.Vue = true; + }) }.width('100%').height('80%').onClick(() => { this.showControls = !this.showControls }) CustomContainer({ title: this.name, - Url: 'pages/Player/Player_index', + Url: 'pages/Player/PlayVideoList', StepTips: this.StepTips, name: $name, Vue: $Vue }).height('10%').width('100%') }.width('100%').height('100%').backgroundColor(Color.Black) } - onBackPress(){ + + onBackPress() { router.replaceUrl({ - url:'pages/Player/Player_index', + url: 'pages/Player/PlayVideoList', }) } } \ No newline at end of file diff --git a/validator/acts_validator/src/main/ets/pages/Player/PlayVideoList.ets b/validator/acts_validator/src/main/ets/pages/Player/PlayVideoList.ets new file mode 100644 index 0000000000000000000000000000000000000000..3467ab431cf1d9a67a0738415369a2abf11b6f00 --- /dev/null +++ b/validator/acts_validator/src/main/ets/pages/Player/PlayVideoList.ets @@ -0,0 +1,312 @@ +/* + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import prompt from '@ohos.prompt'; +import router from '@ohos.router'; +import fileio from '@ohos.fileio'; +import mediaLibrary from '@ohos.multimedia.mediaLibrary' +import data_preferences from '@ohos.data.preferences'; +import MediaUtils from '../model/MediaUtils' + +const TAG = 'ParseXML'; +let path = globalThis.dir; +let path1 = path + '/Player'; + +let VarColor = []; +let ColorBackPath = path1 + '/PlayerVideoColorBack.txt'; +let txtPath = path1 + '/PlayerVideoReport.txt'; + +@Entry +@Component +struct videoNew { + @State ClearAll: boolean = false; + @State name: string = 'PlayerVideo'; + @State Vue: boolean = false; + private current: number = undefined; + @State MediaLib: MediaUtils = new MediaUtils(); + @State count: number = 0; + @State result: string = ''; + @State TEST: number = 0; + @State Url: string = 'pages/Player/Player_index'; + @State TestCaseList: Array = []; + @State ColorObject: string[] = VarColor; + + async onPageShow() { + let Test = null; + let context = null; + context = globalThis.getContext(); + let preferences; + + let promise = data_preferences.getPreferences(context, 'mystore'); + await promise.then((object) => { + preferences = object; + }); + promise = preferences.get('PlayerVideo', 0); + await promise.then((data) => { + Test = data; + console.info("Succeeded in getting value of 'PlayerVideo'. Data: " + data); + }); + this.TestCaseList = await this.MediaLib.getFileAssetsAlbum('Videos/ValidatorData/'); + + if (Test != 1) { + let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + for (let i = 0; i < this.TestCaseList.length; i++) { + let log = (this.TestCaseList[i].displayName + ';' + '#ff808080' + ';').toString(); + fileio.writeSync(fd, log); + } + fileio.closeSync(fd); + } + promise = preferences.put('PlayerVideo', 1); + promise.then(() => { + console.info("Succeeded in putting value of 'PlayerVideo'."); + }); + promise = preferences.flush(); + promise.then(() => { + console.info("Succeeded in flushing."); + }); + this.TEST = Test; + + let opt = fileio.openSync(ColorBackPath, 0o100 | 0o2002, 0o664); + let buff = new ArrayBuffer(40960); + fileio.readSync(opt, buff); + let ColorBack = String.fromCharCode.apply(null, new Uint8Array(buff)); + let TestList = ColorBack.split(';'); + for (let i = 0; i < Math.floor(TestList.length / 2); i++) { + VarColor[i] = TestList[i * 2+1]; + } + fileio.closeSync(opt); + + if (this.count === 1) { + this.result = router.getParams()['result']; + let titles = router.getParams()['title']; + let name1 = '刚刚点进了哪个用例：' + titles; + let results = this.result; + let WriteTitle = (titles).toString(); + let number = WriteTitle.length + 11; + let Index = ColorBack.indexOf(WriteTitle); + + if (this.result === 'true ') { + this.ColorObject[this.current] = '#ff008000'; + let Log = (titles + ';' + '#ff008000' + ';'); + let key = ColorBack.substring(Index, Index + number); + let FD = fileio.openSync(ColorBackPath, 0o102, 0o666); + ColorBack = ColorBack.replace(key, Log); + let buffer = new ArrayBuffer(4096); + let rd = fileio.readSync(FD, buffer); + let Report = ColorBack.substring(0, rd); + fileio.closeSync(FD); + let Fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + fileio.writeSync(Fd, Report); + filewrite(name1, results, titles); + } + else if (this.result === 'false') { + this.ColorObject[this.current] = '#ffff0000'; + let Log = (titles + ';' + '#ffff0000' + ';'); + let key = ColorBack.substring(Index, Index + number); + let FD = fileio.openSync(ColorBackPath, 0o102, 0o666); + ColorBack = ColorBack.replace(key, Log); + let buffer = new ArrayBuffer(4096); + let rd = fileio.readSync(FD, buffer); + let Report = ColorBack.substring(0, rd); + fileio.closeSync(FD); + let Fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + fileio.writeSync(Fd, Report); + filewrite(name1, results, titles); + } + else if (this.result === 'None') { + this.ColorObject[this.current] = this.ColorObject[this.current]; + } + } + // 所有测试项满足返回ture + let color = '#ff008000'; + let colorBol = this.ColorObject.every((item) => item === color); + this.Vue = colorBol; + } + + build() { + Column() { + Row() { + Button() { + Image($r('app.media.ic_public_back')).width('20vp').height('18vp') + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) + .onClick(() => { + router.back({ + url: 'pages/Player/Player_index', + params: { result: 'None', } + }) + }) + + Row() { + Text('Player Video') + .fontColor(Color.White) + .fontSize('22fp') + }.justifyContent(FlexAlign.SpaceAround).backgroundColor(Color.Black) + + Row() { + Button() { + Image($r('app.media.ic_public_delete')) + .width('30vp') + .height('30vp') + }.backgroundColor(Color.Black) + .onClick(() => { + AlertDialog.show( + { + message: "是否删除所有记录", + primaryButton: { + value: 'Yes', + action: () => { + this.ClearAll = true; + this.ColorObject.forEach((value, index) => { + this.ColorObject[index] = '#ff808080'; + }); + this.ClearText(); + prompt.showToast({ + message: '结果已删除', duration: 1000 + }); + } + }, + secondaryButton: { + value: 'No', + action: () => { + + } + }, + cancel: () => { + + } + } + ) + }) + + } + } + .width('100%') + .justifyContent(FlexAlign.SpaceAround) + .margin({ top: '15vp' }) + .height('6%') + .backgroundColor(Color.Black) + + List({ space: 5 }) { + ForEach(this.TestCaseList, (item: mediaLibrary.FileAsset, index) => { + ListItem() { + Row() { + Text(item.displayName).fontSize(16).fontColor(Color.Black) + } + .width('100%') + .height(50) + .alignItems(VerticalAlign.Center) + .backgroundColor(this.count === 0 && this.TEST === 0 ? '#ff808080' : this.ColorObject[index]) + .onClick(() => { + this.count = 1; + this.ClearAll = false; + this.current = index; + router.push({ + url: 'pages/Player/PlayVideo', + params: { + audioUrl: item.uri, + audioTitle: item.displayName + } + }) + }) + } + }, item => item.title) + }.width('100%').height('80%') + + Row() { + Blank() + Button({ stateEffect: this.Vue }) { + Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') + } + .width('40%') + .height('30vp') + .backgroundColor(Color.Grey) + .enabled(this.Vue) + .opacity(this.Vue ? 1 : 0.4) + .onClick(() => { + router.back({ + url: this.Url, + params: { result: 'true ', title: this.name, + } + }) + prompt.showToast({ + message: '通过', duration: 1000 + }); + }) + + Blank().width(40) + Button() { + Image($r('app.media.ic_public_fail')).width('20vp').height('20vp') + }.width('40%').height('30vp').backgroundColor(Color.Grey) + .onClick(() => { + router.back({ + url: this.Url, + params: { result: 'false', title: this.name, + } + }) + console.log('wwwwwwwwww' + this.Url) + prompt.showToast({ + message: '失败', duration: 1000 + }); + }) + + Blank() + }.width('100%').height('14%').backgroundColor(Color.Black).justifyContent(FlexAlign.Center) + }.width('100%').height('100%').backgroundColor(Color.Black) + } + + ClearText() { + fileio.unlinkSync(txtPath); + fileio.unlinkSync(ColorBackPath); + fileio.openSync(txtPath, 0o100 | 0o2002, 0o664); + let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); + for (let i = 0; i < this.TestCaseList.length; i++) { + let log = (this.TestCaseList[i].displayName + ';' + '#ff808080' + ';').toString(); + fileio.writeSync(fd, log); + } + } + + onBackPress() { + router.replaceUrl({ + url: 'pages/Player/Player_index', + }) + } +} + +function filewrite(name1, results, titles) { + let fd = fileio.openSync(txtPath, 0o100 | 0o2002, 0o664); + let buf = new ArrayBuffer(4096); + let RD = fileio.readSync(fd, buf); + console.info("RRRRRRRRRRd" + RD); + let report = String.fromCharCode.apply(null, new Uint8Array(buf)); + let WriteTitle = (titles).toString(); + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; + let Index = report.indexOf(WriteTitle); + let Log = (titles + ";" + results + ";").toString(); + if (Index == -1) { + fileio.writeSync(fd, Log); + } + else if (Index != -1) { + let key = report.substring(Index, Index + number); + let FD = fileio.openSync(txtPath, 0o102, 0o666); + report = report.replace(key, Log); + let buffer = new ArrayBuffer(4096); + let rd = fileio.readSync(FD, buffer); + let Report = report.substring(0, rd); + fileio.closeSync(FD); + let Fd = fileio.openSync(txtPath, 0o102, 0o666); + fileio.writeSync(Fd, Report); + } +} \ No newline at end of file diff --git a/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets b/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets index 45620202bcc4da1d4c837f8403c5482916f3bb7b..1104cbe989c95180c052d6760b1e98918e44363a 100644 --- a/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets @@ -20,6 +20,7 @@ import xml from '@ohos.xml'; import fileIO from '@ohos.fileio'; import util from '@ohos.util'; import data_preferences from '@ohos.data.preferences'; +import FlushData from '../model/FlushData'; const TAG = 'ParseXML'; let path = globalThis.dir; @@ -28,28 +29,29 @@ let path1 = path + '/Player'; let VarColor = []; let ColorBackPath = path + '/PlayerColorBack.txt'; let txtPath = path1 + '/PlayerReport.txt'; -let xmlPath =path1 + '/PlayerTest.xml'; +let xmlPath = path1 + '/PlayerTest.xml'; @Entry @Component struct IndexPage { - @State ClearAll : boolean = false; - private current : number = undefined; - @State count : number = 0; - @State result : string = ''; - @State TEST : number = 0; + @State ClearAll: boolean = false; + private current: number = undefined; + @State count: number = 0; + @State result: string = ''; + @State TEST: number = 0; private TestCaseList = [ - {title:'PlayAudio',uri:'pages/Player/PlayAudio'}, - {title:'PlayVideo',uri:'pages/Player/PlayVideo'}, + { title: 'PlayerAudio', uri: 'pages/Player/PlayAudioList' }, + { title: 'PlayerVideo', uri: 'pages/Player/PlayVideoList' }, ] - @State ColorObject : string[] = VarColor; - async onPageShow(){ + @State ColorObject: string[] = VarColor; + + async onPageShow() { let Test = null; - let context =null; + let context = null; context = globalThis.getContext(); let preferences; - let promise = data_preferences.getPreferences(context,'mystore'); + let promise = data_preferences.getPreferences(context, 'mystore'); await promise.then((object) => { preferences = object; }); @@ -59,11 +61,11 @@ struct IndexPage { console.info("Succeeded in getting value of 'Player'. Data: " + data); }); - if(Test != 1) { + if (Test != 1) { let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); - for(let i = 0; i < this.TestCaseList.length; i++) { - let log = (this.TestCaseList[i].title+';'+'#ff808080'+';').toString(); - fileio.writeSync(fd,log); + for (let i = 0; i < this.TestCaseList.length; i++) { + let log = (this.TestCaseList[i].title + ';' + '#ff808080' + ';').toString(); + fileio.writeSync(fd, log); } fileio.closeSync(fd); } @@ -79,72 +81,76 @@ struct IndexPage { let opt = fileio.openSync(ColorBackPath, 0o100 | 0o2002, 0o664); let buff = new ArrayBuffer(40960); - fileio.readSync(opt,buff); + fileio.readSync(opt, buff); let ColorBack = String.fromCharCode.apply(null, new Uint8Array(buff)); let TestList = ColorBack.split(';'); for (let i = 0; i < Math.floor(TestList.length / 2); i++) { - VarColor[i] = TestList[i*2+1]; + VarColor[i] = TestList[i * 2+1]; } fileio.closeSync(opt); - if (this.count === 1){ + if (this.count === 1) { + this.result = router.getParams()['result']; let titles = router.getParams()['title']; - let name1 = '刚刚点进了哪个用例：'+ titles; + let name1 = '刚刚点进了哪个用例：' + titles; let results = this.result; let WriteTitle = (titles).toString(); let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'true'){ + if (this.result === 'true ') { this.ColorObject[this.current] = '#ff008000'; - let Log = (titles+';'+'#ff008000'+';'); - let key = ColorBack.substring(Index,Index+number); + let Log = (titles + ';' + '#ff008000' + ';'); + let key = ColorBack.substring(Index, Index + number); let FD = fileio.openSync(ColorBackPath, 0o102, 0o666); - ColorBack = ColorBack.replace(key,Log); + ColorBack = ColorBack.replace(key, Log); let buffer = new ArrayBuffer(4096); - let rd = fileio.readSync(FD,buffer); - let Report = ColorBack.substring(0,rd); + let rd = fileio.readSync(FD, buffer); + let Report = ColorBack.substring(0, rd); fileio.closeSync(FD); let Fd = fileio.openSync(ColorBackPath, 0o102, 0o666); - fileio.writeSync(Fd,Report); - filewrite(name1,results,titles) + fileio.writeSync(Fd, Report); + filewrite(name1, results, titles) } - else if (this.result === 'false'){ + else if (this.result === 'false') { this.ColorObject[this.current] = '#ffff0000'; - let Log = (titles+';'+'#ffff0000'+';'); - let key = ColorBack.substring(Index,Index+number); + let Log = (titles + ';' + '#ffff0000' + ';'); + let key = ColorBack.substring(Index, Index + number); let FD = fileio.openSync(ColorBackPath, 0o102, 0o666); - ColorBack = ColorBack.replace(key,Log); + ColorBack = ColorBack.replace(key, Log); let buffer = new ArrayBuffer(4096); - let rd = fileio.readSync(FD,buffer); - let Report = ColorBack.substring(0,rd); + let rd = fileio.readSync(FD, buffer); + let Report = ColorBack.substring(0, rd); fileio.closeSync(FD); let Fd = fileio.openSync(ColorBackPath, 0o102, 0o666); - fileio.writeSync(Fd,Report); - filewrite(name1,results,titles); + fileio.writeSync(Fd, Report); + filewrite(name1, results, titles); } - else if (this.result === 'None'){ + else if (this.result === 'None') { this.ColorObject[this.current] = this.ColorObject[this.current]; } } } - build(){ - Column(){ + + build() { + Column() { Row() { Button() { Image($r('app.media.ic_public_back')).width('20vp').height('18vp') - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(() => { router.back(); }) - Row(){ + + Row() { Text('Player SubSystem') .fontColor(Color.White) .fontSize('22fp') }.justifyContent(FlexAlign.SpaceAround).backgroundColor(Color.Black) + Row() { - Button(){ + Button() { Image($r('app.media.ic_public_delete')) .width('30vp') .height('30vp') @@ -158,7 +164,7 @@ struct IndexPage { action: () => { this.ClearAll = true; this.ColorObject.forEach((value, index) => { - this.ColorObject[index] = '#ff808080'; + this.ColorObject[index] = '#ff808080'; }); this.ClearText(); prompt.showToast({ @@ -178,7 +184,8 @@ struct IndexPage { } ) }) - Button(){ + + Button() { Image($r('app.media.ic_public_save')) .width('30vp') .height('30vp') @@ -188,9 +195,9 @@ struct IndexPage { this.ReadTextParseXml(); AlertDialog.show({ message: "报告已生成，如需查看通过命令行输入'hdc_std file recv /data/app/el2/100/base/com.example.actsvalidator/haps/entry/files/Player/PlayerTest.xml -本地路径'", - confirm:{ - value:'OK', - action:()=>{ + confirm: { + value: 'OK', + action: () => { prompt.showToast({ message: '报告已生成', duration: 1000 }) @@ -204,70 +211,86 @@ struct IndexPage { }) }) } - }.width('100%').justifyContent(FlexAlign.SpaceAround).margin({top:'15vp'}).height('6%').backgroundColor(Color.Black) - List({space:5}){ - ForEach(this.TestCaseList,(item,index) => { - ListItem(){ - Row(){ + } + .width('100%') + .justifyContent(FlexAlign.SpaceAround) + .margin({ top: '15vp' }) + .height('6%') + .backgroundColor(Color.Black) + + List({ space: 5 }) { + ForEach(this.TestCaseList, (item, index) => { + ListItem() { + Row() { Text(item.title).fontSize(16).fontColor(Color.Black) - }.width('100%').height(50).alignItems(VerticalAlign.Center).backgroundColor(this.count===0&&this.TEST===0?'#ff808080':this.ColorObject[index]) - .onClick(( )=>{ + } + .width('100%') + .height(50) + .alignItems(VerticalAlign.Center) + .backgroundColor(this.count === 0 && this.TEST === 0 ? '#ff808080' : this.ColorObject[index]) + .onClick(() => { this.count = 1; - this.ClearAll=false; + this.ClearAll = false; this.current = index; router.push({ url: item.uri, }) }) } - },item => item.title) + }, item => item.title) }.width('100%').height('92%') }.width('100%').height('100%').backgroundColor(Color.Black) } - ClearText(){ + + ClearText() { fileio.rmdirSync(path1); fileio.mkdirSync(path1); let fd = fileio.openSync(ColorBackPath, 0o102, 0o666); - for(let i = 0; i < this.TestCaseList.length; i++) { - let log = (this.TestCaseList[i].title+';'+'#ff808080'+';').toString(); - fileio.writeSync(fd,log); + for (let i = 0; i < this.TestCaseList.length; i++) { + let log = (this.TestCaseList[i].title + ';' + '#ff808080' + ';').toString(); + fileio.writeSync(fd, log); } + FlushData.ResetPlayerAudio(); + FlushData.ResetPlayerVideo(); } - ReadTextParseXml(){ + + ReadTextParseXml() { let ReportPath = path1 + '/PlayerReport.txt'; let dir = fileio.opendirSync(path1); - console.info("ssssss"+dir); + console.info("ssssss" + dir); while (dir) { let OP = fileio.openSync(ReportPath, 0o100 | 0o2002, 0o664); let buf = new ArrayBuffer(40960); - let RD = fileio.readSync(OP,buf); - console.info("ddddd"+RD); + let RD = fileio.readSync(OP, buf); + console.info("ddddd" + RD); let report; + function ab2str(buf) { - return report = String.fromCharCode.apply(null,new Uint8Array(buf)); + return report = String.fromCharCode.apply(null, new Uint8Array(buf)); } + ab2str(buf); let str1 = report.split(";"); let title = []; let result = []; - for(let i=0; i{ - - }) - } - else{ - Button({stateEffect:this.Vue}) { - Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey) - .onClick(()=>{ - router.back({ - url:this.Url, - params: {result : 'true', title : this.name, - } - }) - this.getScreen(isFullScreen); - prompt.showToast({ - message: '通过', duration: 1000 - }); - }) - } - } - @Builder - FailBtn(text: Resource, isFullScreen: boolean) { - Button(){ - Image($r('app.media.ic_public_fail')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey) - .onClick(()=>{ - router.back({ - url:this.Url, - params: {result : 'false',title : this.name, - } - }) - this.getScreen(isFullScreen); - prompt.showToast({ - message: '失败', duration: 1000 - }); - }) - } - build() { - Column() { - Row() { - this.PassBtn($r('app.string.btn_fullscreen'), true); - Button(){ - Image($r('app.media.ic_public_help')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey) - .onClick(() =>{ - AlertDialog.show({ - title:'操作提示', - message: this.StepTips, - confirm:{ - value:'OK', - action:()=>{ - } - } - }) - }) - this.FailBtn($r('app.string.btn_fullscreen'), true); - }.width('100%').justifyContent(FlexAlign.SpaceEvenly).backgroundColor(Color.Black) - }.height('98%').width('100%') - } - async savePicture(data: image.PixelMap, context: any) { - Logger.info(TAG, `savePicture`); - let packOpts: image.PackingOption = { - format: "image/jpeg", quality: 100 - }; - let info = { - prefix: 'IMG_', suffix: '.jpg', directory: mediaLibrary.DirectoryType.DIR_IMAGE - }; - let name = this.name; - let displayName = `${info.prefix}${name}${info.suffix}`; - let dirPath = path + '/screenshot' + '/' + displayName; - let imagePackerApi = image.createImagePacker(); - let arrayBuffer = await imagePackerApi.packing(data, packOpts); - let fd = fileio.openSync(dirPath,0o102,0o666); - imagePackerApi.release(); - try { - await fileio.write(fd, arrayBuffer); - } catch (err) { - Logger.error(`write failed, code is ${err.code}, message is ${err.message}`); - } - await fileio.close(fd); - Logger.info(TAG, `write done`); - - } - getScreen = (isFullScreen: boolean) => { - let screenshotOptions: screenshot.ScreenshotOptions = { - screenRect: { left: 0, top: 0, width: 400, height: 400 }, - imageSize: { width: 400, height: 400 }, - rotation: 0, - displayId: 0 - }; - if (isFullScreen) { - screenshotOptions = { - rotation: 0 - } - } - try { - screenshot.save(screenshotOptions, (err, data: image.PixelMap) => { - if (err) { - Logger.info(TAG, `Failed to save the screenshot. Error:${JSON.stringify(err)}`); - } - Logger.info(TAG, 'save callback'); - this.savePicture(data, getContext(this) as any); - }) - } catch (err) { - Logger.error(`save failed, code is ${err.code}, message is ${err.message}`); - } - } -} +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import prompt from '@ohos.prompt'; +import fileio from '@ohos.fileio'; +import router from '@ohos.router'; +import screenshot from '@ohos.screenshot'; +import image from '@ohos.multimedia.image'; +import Logger from '../model/Logger'; +import mediaLibrary from '@ohos.multimedia.mediaLibrary'; + +let path = globalThis.dir; + +const TAG = '[Screenshot]'; +@Component +export struct CustomContainer { + @Link name : string; + title : string = ''; + StepTips: string = ''; + Url : string = ''; + @Link Vue : boolean; + @Builder + PassBtn(text: Resource, isFullScreen: boolean) { + if(this.Vue == false){ + Button({stateEffect:this.Vue}) { + Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey).opacity(0.4) + .onClick(()=>{ + + }) + } + else{ + Button({stateEffect:this.Vue}) { + Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey) + .onClick(()=>{ + router.back({ + url:this.Url, + params: {result : 'true ', title : this.name, + } + }) + this.getScreen(isFullScreen); + prompt.showToast({ + message: '通过', duration: 1000 + }); + }) + } + } + @Builder + FailBtn(text: Resource, isFullScreen: boolean) { + Button(){ + Image($r('app.media.ic_public_fail')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey) + .onClick(()=>{ + router.back({ + url:this.Url, + params: {result : 'false',title : this.name, + } + }) + this.getScreen(isFullScreen); + prompt.showToast({ + message: '失败', duration: 1000 + }); + }) + } + build() { + Column() { + Row() { + this.PassBtn($r('app.string.btn_fullscreen'), true); + Button(){ + Image($r('app.media.ic_public_help')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey) + .onClick(() =>{ + AlertDialog.show({ + title:'操作提示', + message: this.StepTips, + confirm:{ + value:'OK', + action:()=>{ + } + } + }) + }) + this.FailBtn($r('app.string.btn_fullscreen'), true); + }.width('100%').justifyContent(FlexAlign.SpaceEvenly).backgroundColor(Color.Black) + }.height('98%').width('100%') + } + async savePicture(data: image.PixelMap, context: any) { + Logger.info(TAG, `savePicture`); + let packOpts: image.PackingOption = { + format: "image/jpeg", quality: 100 + }; + let info = { + prefix: 'IMG_', suffix: '.jpg', directory: mediaLibrary.DirectoryType.DIR_IMAGE + }; + let name = this.name; + let displayName = `${info.prefix}${name}${info.suffix}`; + let dirPath = path + '/screenshot' + '/' + displayName; + let imagePackerApi = image.createImagePacker(); + let arrayBuffer = await imagePackerApi.packing(data, packOpts); + let fd = fileio.openSync(dirPath,0o102,0o666); + imagePackerApi.release(); + try { + await fileio.write(fd, arrayBuffer); + } catch (err) { + Logger.error(`write failed, code is ${err.code}, message is ${err.message}`); + } + await fileio.close(fd); + Logger.info(TAG, `write done`); + + } + getScreen = (isFullScreen: boolean) => { + let screenshotOptions: screenshot.ScreenshotOptions = { + screenRect: { left: 0, top: 0, width: 400, height: 400 }, + imageSize: { width: 400, height: 400 }, + rotation: 0, + displayId: 0 + }; + if (isFullScreen) { + screenshotOptions = { + rotation: 0 + } + } + try { + screenshot.save(screenshotOptions, (err, data: image.PixelMap) => { + if (err) { + Logger.info(TAG, `Failed to save the screenshot. Error:${JSON.stringify(err)}`); + } + Logger.info(TAG, 'save callback'); + this.savePicture(data, getContext(this) as any); + }) + } catch (err) { + Logger.error(`save failed, code is ${err.code}, message is ${err.message}`); + } + } +} diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets index 004da7410028643126566c3743ae5576f2b7753a..f9e7b0ec0ac3c3bf7c54ceff13eaaa6e27f2aac2 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets @@ -55,7 +55,7 @@ export struct CustomContainer { .onClick(() => { router.back({ url: this.Url, - params: { result: 'true', title: this.name, + params: { result: 'true ', title: this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets index d1f091190601f889d619e7a396006b1dc2bfc737..885b4e56abdda93448611f2edf4ebe401992f0a1 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets @@ -1,162 +1,162 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import fileio from '@ohos.fileio'; -import prompt from '@ohos.prompt'; -import router from '@ohos.router'; -import screenshot from '@ohos.screenshot'; -import image from '@ohos.multimedia.image'; -import Logger from '../model/Logger'; -import mediaLibrary from '@ohos.multimedia.mediaLibrary'; - -let path = globalThis.dir; -const TAG = '[Screenshot]'; -@Component -export struct CustomContainer { - @Link FillColor: string; - @Link name: string; - @Link Vue : boolean; - @Link isEnabled: boolean; - Url : string = ''; - title : string = ''; - StepTips: string = ''; - @Link testingFrequency: number - @Link clickFrequency: number - @Builder - PassBtn(text: Resource, isFullScreen: boolean) { - if(this.Vue == false){ - Button({stateEffect:this.Vue}) { - Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey).opacity(0.4) - .onClick(()=>{ - - }) - } - else{ - Button({stateEffect:this.Vue}) { - Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey) - .onClick(()=>{ - this.isEnabled = true - this.Vue = false - this.clickFrequency++ - Logger.info(`TAG`, `clickFrequency: ${this.clickFrequency}`) - Logger.info(`TAG`, `testingFrequency: ${this.testingFrequency}`) - if (this.clickFrequency === this.testingFrequency){ - router.back({ - url:this.Url, - params: {result : 'true', title : this.name, - } - }) - } - this.getScreen(isFullScreen); - prompt.showToast({ - message: '通过', duration: 1000 - }); - }) - } - } - @Builder - FailBtn(text: Resource, isFullScreen: boolean) { - Button(){ - Image($r('app.media.ic_public_fail')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey) - .onClick(()=>{ - router.back({ - url:this.Url, - params: {result : 'false',title : this.name, - } - }) - this.getScreen(isFullScreen); - prompt.showToast({ - message: '失败', duration: 1000 - }); - }) - } - build() { - Column() { - Flex({ - justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center - }){ - this.PassBtn($r('app.string.btn_fullscreen'), true); - Button(){ - Image($r('app.media.ic_public_help')).width('20vp').height('20vp') - }.width('30%').height('30vp').backgroundColor(Color.Grey) - .onClick(() =>{ - AlertDialog.show( - { - title:'操作提示', - message: this.StepTips, - confirm:{ - value:'OK', - action:()=>{ - } - } - } - ) - }) - this.FailBtn($r('app.string.btn_fullscreen'), true); - }.height('98%').width('100%').backgroundColor(Color.Black) - }.height('98%').width('100%') - } - - async savePicture(data: image.PixelMap, context: any) { - Logger.info(TAG, `savePicture`); - let packOpts: image.PackingOption = { - format: "image/jpeg", quality: 100 - }; - let info = { - prefix: 'IMG_', suffix: '.jpg', directory: mediaLibrary.DirectoryType.DIR_IMAGE - }; - let name = this.name; - let displayName = `${info.prefix}${name}${info.suffix}`; - let dirPath = path + '/screenshot' + '/' + displayName; - let imagePackerApi = image.createImagePacker(); - let arrayBuffer = await imagePackerApi.packing(data, packOpts); - let fd = fileio.openSync(dirPath,0o102,0o666); - imagePackerApi.release(); - try { - await fileio.write(fd, arrayBuffer); - } catch (err) { - Logger.error(`write failed, code is ${err.code}, message is ${err.message}`); - } - await fileio.close(fd); - Logger.info(TAG, `write done`); - } - getScreen = (isFullScreen: boolean) => { - let screenshotOptions: screenshot.ScreenshotOptions = { - screenRect: { left: 0, top: 0, width: 400, height: 400 }, - imageSize: { width: 400, height: 400 }, - rotation: 0, - displayId: 0 - }; - if (isFullScreen) { - screenshotOptions = { - rotation: 0 - } - } - try { - screenshot.save(screenshotOptions, (err, data: image.PixelMap) => { - if (err) { - Logger.info(TAG, `Failed to save the screenshot. Error:${JSON.stringify(err)}`); - } - Logger.info(TAG, 'save callback'); - this.savePicture(data, getContext(this) as any); - }) - } catch (err) { - Logger.error(`save failed, code is ${err.code}, message is ${err.message}`); - } - } -} +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import fileio from '@ohos.fileio'; +import prompt from '@ohos.prompt'; +import router from '@ohos.router'; +import screenshot from '@ohos.screenshot'; +import image from '@ohos.multimedia.image'; +import Logger from '../model/Logger'; +import mediaLibrary from '@ohos.multimedia.mediaLibrary'; + +let path = globalThis.dir; +const TAG = '[Screenshot]'; +@Component +export struct CustomContainer { + @Link FillColor: string; + @Link name: string; + @Link Vue : boolean; + @Link isEnabled: boolean; + Url : string = ''; + title : string = ''; + StepTips: string = ''; + @Link testingFrequency: number + @Link clickFrequency: number + @Builder + PassBtn(text: Resource, isFullScreen: boolean) { + if(this.Vue == false){ + Button({stateEffect:this.Vue}) { + Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey).opacity(0.4) + .onClick(()=>{ + + }) + } + else{ + Button({stateEffect:this.Vue}) { + Image($r('app.media.ic_public_pass')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey) + .onClick(()=>{ + this.isEnabled = true + this.Vue = false + this.clickFrequency++ + Logger.info(`TAG`, `clickFrequency: ${this.clickFrequency}`) + Logger.info(`TAG`, `testingFrequency: ${this.testingFrequency}`) + if (this.clickFrequency === this.testingFrequency){ + router.back({ + url:this.Url, + params: {result : 'true ', title : this.name, + } + }) + } + this.getScreen(isFullScreen); + prompt.showToast({ + message: '通过', duration: 1000 + }); + }) + } + } + @Builder + FailBtn(text: Resource, isFullScreen: boolean) { + Button(){ + Image($r('app.media.ic_public_fail')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey) + .onClick(()=>{ + router.back({ + url:this.Url, + params: {result : 'false',title : this.name, + } + }) + this.getScreen(isFullScreen); + prompt.showToast({ + message: '失败', duration: 1000 + }); + }) + } + build() { + Column() { + Flex({ + justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center + }){ + this.PassBtn($r('app.string.btn_fullscreen'), true); + Button(){ + Image($r('app.media.ic_public_help')).width('20vp').height('20vp') + }.width('30%').height('30vp').backgroundColor(Color.Grey) + .onClick(() =>{ + AlertDialog.show( + { + title:'操作提示', + message: this.StepTips, + confirm:{ + value:'OK', + action:()=>{ + } + } + } + ) + }) + this.FailBtn($r('app.string.btn_fullscreen'), true); + }.height('98%').width('100%').backgroundColor(Color.Black) + }.height('98%').width('100%') + } + + async savePicture(data: image.PixelMap, context: any) { + Logger.info(TAG, `savePicture`); + let packOpts: image.PackingOption = { + format: "image/jpeg", quality: 100 + }; + let info = { + prefix: 'IMG_', suffix: '.jpg', directory: mediaLibrary.DirectoryType.DIR_IMAGE + }; + let name = this.name; + let displayName = `${info.prefix}${name}${info.suffix}`; + let dirPath = path + '/screenshot' + '/' + displayName; + let imagePackerApi = image.createImagePacker(); + let arrayBuffer = await imagePackerApi.packing(data, packOpts); + let fd = fileio.openSync(dirPath,0o102,0o666); + imagePackerApi.release(); + try { + await fileio.write(fd, arrayBuffer); + } catch (err) { + Logger.error(`write failed, code is ${err.code}, message is ${err.message}`); + } + await fileio.close(fd); + Logger.info(TAG, `write done`); + } + getScreen = (isFullScreen: boolean) => { + let screenshotOptions: screenshot.ScreenshotOptions = { + screenRect: { left: 0, top: 0, width: 400, height: 400 }, + imageSize: { width: 400, height: 400 }, + rotation: 0, + displayId: 0 + }; + if (isFullScreen) { + screenshotOptions = { + rotation: 0 + } + } + try { + screenshot.save(screenshotOptions, (err, data: image.PixelMap) => { + if (err) { + Logger.info(TAG, `Failed to save the screenshot. Error:${JSON.stringify(err)}`); + } + Logger.info(TAG, 'save callback'); + this.savePicture(data, getContext(this) as any); + }) + } catch (err) { + Logger.error(`save failed, code is ${err.code}, message is ${err.message}`); + } + } +} diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets index 2d52d5bdfa9e427e3b8177824a95c5ee6ee002bf..0680cdf75d1d1baa743b88a50339ec330374ba81 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets index 2d52d5bdfa9e427e3b8177824a95c5ee6ee002bf..0680cdf75d1d1baa743b88a50339ec330374ba81 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets index 2d52d5bdfa9e427e3b8177824a95c5ee6ee002bf..0680cdf75d1d1baa743b88a50339ec330374ba81 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets index fc007fada4001fdf3f94a35ae2da29235123bd6e..7e66dd9c9521badf2af7a11f5b5e7db825d5b496 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -82,7 +82,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets index 88eb1fda51835b04427496456c9883b5b506d6ba..976448c0b37fd3b1d4b1c49202609b80ce56d551 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets @@ -52,7 +52,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -84,7 +84,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets index 0fa282de80e5e491de0f4c7eb83c43889a6737b9..de8c7d3d4612d4934140bd4f85dcaefa8aab3d70 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -80,7 +80,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets index 6e3ef3bb345f04e039a1009d6493880c8b5b3312..b7192fe49bdd7fe50cb776deb1e4a46c225c8d06 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -80,7 +80,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets index 92f8aa8627946bab07475edd6a2cc316671e2653..2b7cd7d8f8548dbbba1b77b18bd4ed2c8fd028a1 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets @@ -49,7 +49,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -81,7 +81,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets index 4ddcc144074da6e655906722ce6bf0c8fcf29c96..b10cb6aa2e7db2e7ca62f24353a5aecc88abe9e0 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -80,7 +80,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets index c3c0b5e6cdf7e46ad2c92e663e8af34b135f736e..3cf39167798dcdfb66e797df756b2beb515b13c7 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -82,7 +82,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets index b2cdf49b00b05da66c7e2658f23b46ad205b9dd8..7cdd56f4c0f1d98e7eea9c708e4ce686f5baefeb 100644 --- a/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -82,7 +82,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets index 6474a29261d31312802ed38b754cb69757712863..04eb1ed67bd7034c414afd4fd85e7d63f71fc3a3 100644 --- a/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets @@ -55,7 +55,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -87,7 +87,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets index f8d045024ad6212bafa5c03d11ef6b4868147307..913effa55c03ec3b3fe5c54aec913254599b0747 100644 --- a/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'true', title : this.name, + params: {result : 'true ', title : this.name, } }) this.getScreen(isFullScreen); @@ -82,7 +82,7 @@ export struct CustomContainer { Row() { Button(){ Image($r('app.media.ic_public_back')).width('20vp').height('18vp').margin({left:'20vp'}) - }.backgroundColor(Color.Black) + }.backgroundColor(Color.Black).size({ width: '40vp', height: '30vp' }) .onClick(()=>{ router.back({ url:this.Url, diff --git a/validator/acts_validator/src/main/ets/pages/index.ets b/validator/acts_validator/src/main/ets/pages/index.ets index 6486106ef62365015a78034d6f51e782aa93c240..9f1aa245b4008019b01b8fd20afe91c91f22c6b8 100644 --- a/validator/acts_validator/src/main/ets/pages/index.ets +++ b/validator/acts_validator/src/main/ets/pages/index.ets @@ -20,7 +20,7 @@ import fileIO from '@ohos.fileio'; import util from '@ohos.util'; import DateTimeUtil from './model/DateTimeUtil'; import data_preferences from '@ohos.data.preferences'; -import FlushData from '../pages/model/FlushData' +import FlushData from '../pages/model/FlushData'; const TAG = 'ParseXML'; let path=globalThis.dir; @@ -30,10 +30,13 @@ let path3 = path + '/Camera'; let path4 = path + '/Player'; let path5 = path + '/Experience'; let picturePath = path + '/screenshot'; +let ExperienceDataPath = path + '/ExperienceData'; let ArkUIColorBackPath = path + '/ArkUIColorBack.txt'; let AudioColorBackPath = path + '/AudioColorBack.txt'; let CameraColorBackPath = path + '/CameraColorBack.txt'; let PlayerColorBackPath = path + '/PlayerColorBack.txt'; +let PlayerAudioColorBackPath = path4 + '/PlayerAudioColorBack.txt'; +let PlayerVideoColorBackPath = path4 + '/PlayerVideoColorBack.txt'; let ExperienceColorBackPath = path + '/ExperienceColorBack.txt'; fileio.openSync(ArkUIColorBackPath, 0o100 | 0o2002, 0o664); fileio.openSync(AudioColorBackPath, 0o100 | 0o2002, 0o664); @@ -48,6 +51,8 @@ let path11 = path1 + '/ArkUIReport.txt'; let path22 = path2 + '/AudioReport.txt'; let path33 = path3 + '/CameraReport.txt'; let path44 = path4 + '/PlayerReport.txt'; +let PlayerAudioTxtPath = path4 + '/PlayerAudioReport.txt'; +let PlayerVideoTxtPath = path4 + '/PlayerVideoReport.txt'; let path55 = path5 + '/ExperienceReport.txt'; @Entry @@ -83,6 +88,7 @@ struct IndexPage { fileio.mkdirSync(path4); fileio.mkdirSync(path5); fileio.mkdirSync(picturePath); + fileio.mkdirSync(ExperienceDataPath); let promise = preferences.put('index', 1); promise.then(() => { @@ -97,6 +103,10 @@ struct IndexPage { fileio.openSync(path22, 0o100 | 0o2002, 0o664); fileio.openSync(path33, 0o100 | 0o2002, 0o664); fileio.openSync(path44, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerAudioColorBackPath, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerVideoColorBackPath, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerAudioTxtPath, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerVideoTxtPath, 0o100 | 0o2002, 0o664); fileio.openSync(path55, 0o100 | 0o2002, 0o664); } build(){ @@ -194,31 +204,43 @@ struct IndexPage { fileio.unlinkSync(path22); fileio.unlinkSync(path33); fileio.unlinkSync(path44); + fileio.unlinkSync(PlayerAudioTxtPath); + fileio.unlinkSync(PlayerVideoTxtPath); fileio.unlinkSync(path55); fileio.unlinkSync(ArkUIColorBackPath); fileio.unlinkSync(AudioColorBackPath); fileio.unlinkSync(CameraColorBackPath); fileio.unlinkSync(PlayerColorBackPath); + fileio.unlinkSync(PlayerAudioColorBackPath); + fileio.unlinkSync(PlayerVideoColorBackPath); fileio.unlinkSync(ExperienceColorBackPath); fileio.rmdirSync(picturePath); fileio.mkdirSync(picturePath); + fileio.rmdirSync(ExperienceDataPath); + fileio.mkdirSync(ExperienceDataPath); fileio.openSync(TimePath, 0o100 | 0o2002, 0o664); fileio.openSync(xmlPath, 0o100 | 0o2002, 0o664); fileio.openSync(path11, 0o100 | 0o2002, 0o664); fileio.openSync(path22, 0o100 | 0o2002, 0o664); fileio.openSync(path33, 0o100 | 0o2002, 0o664); fileio.openSync(path44, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerAudioTxtPath, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerVideoTxtPath, 0o100 | 0o2002, 0o664); fileio.openSync(path55, 0o100 | 0o2002, 0o664); fileio.openSync(ArkUIColorBackPath, 0o100 | 0o2002, 0o664); fileio.openSync(AudioColorBackPath, 0o100 | 0o2002, 0o664); fileio.openSync(CameraColorBackPath, 0o100 | 0o2002, 0o664); fileio.openSync(PlayerColorBackPath, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerAudioColorBackPath, 0o100 | 0o2002, 0o664); + fileio.openSync(PlayerVideoColorBackPath, 0o100 | 0o2002, 0o664); fileio.openSync(ExperienceColorBackPath, 0o100 | 0o2002, 0o664); FlushData.ResetArkUI(); FlushData.ResetAudio(); FlushData.ResetCamera(); FlushData.ResetPlayer(); FlushData.ResetExperience(); + FlushData.ResetPlayerAudio(); + FlushData.ResetPlayerVideo(); } SaveXml() { let dateTimeUtil = new DateTimeUtil(); @@ -229,6 +251,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; @@ -314,12 +339,12 @@ struct IndexPage { FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('true'); + let PassIndex = report.indexOf('true '); let PassNum = 0; while(PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('true',PassIndex + 1); + PassIndex = report.indexOf('true ',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); @@ -334,12 +359,12 @@ struct IndexPage { ArkUIFailIndex = ArkUIReport.indexOf('false',ArkUIFailIndex + 1); } let ArkuiFailNum = (ArkUIFailNum).toString(); - let ArkUIPassIndex = ArkUIReport.indexOf('true'); + let ArkUIPassIndex = ArkUIReport.indexOf('true '); let ArkUIPassNum = 0; while (ArkUIPassIndex != -1) { console.log(ArkUIPassIndex); ArkUIPassNum++; - ArkUIPassIndex = ArkUIReport.indexOf('true',ArkUIPassIndex + 1); + ArkUIPassIndex = ArkUIReport.indexOf('true ',ArkUIPassIndex + 1); } let ArkUITestNum = ArkUIFailNum + ArkUIPassNum; let ArkuiTestNum = (ArkUITestNum).toString(); @@ -354,12 +379,12 @@ struct IndexPage { AudioFailIndex = AudioReport.indexOf('false',AudioFailIndex + 1); } let audioFailNum = (AudioFailNum).toString(); - let AudioPassIndex = AudioReport.indexOf('true'); + let AudioPassIndex = AudioReport.indexOf('true '); let AudioPassNum = 0; while (AudioPassIndex != -1) { console.log(AudioPassIndex); AudioPassNum++; - AudioPassIndex = AudioReport.indexOf('true',AudioPassIndex + 1); + AudioPassIndex = AudioReport.indexOf('true ',AudioPassIndex + 1); } let AudioTestNum = AudioFailNum + AudioPassNum; let audioTestNum = (AudioTestNum).toString(); @@ -374,12 +399,12 @@ struct IndexPage { CameraFailIndex = CameraReport.indexOf('false',CameraFailIndex + 1); } let cameraFailNum = (CameraFailNum).toString(); - let CameraPassIndex = CameraReport.indexOf('true'); + let CameraPassIndex = CameraReport.indexOf('true '); let CameraPassNum = 0; while (CameraPassIndex != -1) { console.log(CameraPassIndex); CameraPassNum++; - CameraPassIndex = CameraReport.indexOf('true',CameraPassIndex + 1); + CameraPassIndex = CameraReport.indexOf('true ',CameraPassIndex + 1); } let CameraTestNum = CameraFailNum + CameraPassNum; let cameraTestNum = (CameraTestNum).toString(); @@ -394,12 +419,12 @@ struct IndexPage { PlayerFailIndex = PlayerReport.indexOf('false',PlayerFailIndex + 1); } let playerFailNum = (PlayerFailNum).toString(); - let PlayerPassIndex = PlayerReport.indexOf('true'); + let PlayerPassIndex = PlayerReport.indexOf('true '); let PlayerPassNum = 0; while (PlayerPassIndex != -1) { console.log(PlayerPassIndex); PlayerPassNum++; - PlayerPassIndex = PlayerReport.indexOf('true',PlayerPassIndex + 1); + PlayerPassIndex = PlayerReport.indexOf('true ',PlayerPassIndex + 1); } let PlayerTestNum = PlayerFailNum + PlayerPassNum; let playerTestNum = (PlayerTestNum).toString(); @@ -414,12 +439,12 @@ struct IndexPage { ExperienceFailIndex = ExperienceReport.indexOf('false',ExperienceFailIndex + 1); } let experienceFailNum = (ExperienceFailNum).toString(); - let ExperiencePassIndex = ExperienceReport.indexOf('true'); + let ExperiencePassIndex = ExperienceReport.indexOf('true '); let ExperiencePassNum = 0; while (ExperiencePassIndex != -1) { console.log(ExperiencePassIndex); ExperiencePassNum++; - ExperiencePassIndex = ExperienceReport.indexOf('true',ExperiencePassIndex + 1); + ExperiencePassIndex = ExperienceReport.indexOf('true ',ExperiencePassIndex + 1); } let ExperienceTestNum = ExperienceFailNum + ExperiencePassNum; let experienceTestNum = (ExperienceTestNum).toString(); diff --git a/validator/acts_validator/src/main/ets/pages/model/FlushData.ets b/validator/acts_validator/src/main/ets/pages/model/FlushData.ets index d0fba05a050a64c49de500071c0fb96b8e142f40..609ee2c20e88ca697a1219889bac0db5f525b6bc 100644 --- a/validator/acts_validator/src/main/ets/pages/model/FlushData.ets +++ b/validator/acts_validator/src/main/ets/pages/model/FlushData.ets @@ -136,4 +136,52 @@ export default class FlushData{ console.info("Succeeded in flushing."); }); } + static ResetPlayerAudio = async ()=>{ + let Test = null; + let context =null; + context = globalThis.getContext(); + let preferences; + + let promise = data_preferences.getPreferences(context,'mystore'); + await promise.then((object) => { + preferences = object; + }); + promise = preferences.get('PlayerAudio', 0); + await promise.then((data) => { + Test = data; + console.info("Succeeded in getting value of 'PlayerAudio'. Data: " + data); + }); + promise = preferences.put('PlayerAudio', 0); + promise.then(() => { + console.info("Succeeded in putting value of 'PlayerAudio'."); + }); + promise = preferences.flush(); + promise.then(() => { + console.info("Succeeded in flushing."); + }); + } + static ResetPlayerVideo = async ()=>{ + let Test = null; + let context =null; + context = globalThis.getContext(); + let preferences; + + let promise = data_preferences.getPreferences(context,'mystore'); + await promise.then((object) => { + preferences = object; + }); + promise = preferences.get('PlayerVideo', 0); + await promise.then((data) => { + Test = data; + console.info("Succeeded in getting value of 'PlayerVideo'. Data: " + data); + }); + promise = preferences.put('PlayerVideo', 0); + promise.then(() => { + console.info("Succeeded in putting value of 'PlayerVideo'."); + }); + promise = preferences.flush(); + promise.then(() => { + console.info("Succeeded in flushing."); + }); + } } \ No newline at end of file diff --git a/validator/acts_validator/src/main/ets/pages/model/MediaUtils.ts b/validator/acts_validator/src/main/ets/pages/model/MediaUtils.ts index 1499adf9478468e254c91a20c82130994aecf60f..1249a11c5c557e66670ba1739d25b261a51e4b63 100644 --- a/validator/acts_validator/src/main/ets/pages/model/MediaUtils.ts +++ b/validator/acts_validator/src/main/ets/pages/model/MediaUtils.ts @@ -37,9 +37,9 @@ export default class MediaUtils { Logger.info(this.tag, `displayName = ${displayName},mediaType = ${mediaType}`) let publicPath = await this.mediaTest.getPublicDirectory(info.directory) Logger.info(this.tag, `publicPath = ${publicPath}`) - try{ + try { return await this.mediaTest.createAsset(mediaType, displayName, publicPath) - }catch(err){ + } catch (err) { Logger.info(this.tag, `createAsset err ` + JSON.stringify(err)) } @@ -77,9 +77,26 @@ export default class MediaUtils { } } + async getFileAssetsAlbum(path){ + let fileKeyObj = mediaLibrary.FileKey + // ALBUM_NAME + let fetchOp = { + selections: `${fileKeyObj.RELATIVE_PATH}=?`, + selectionArgs: [`${path}`], + } + const fetchFileResult = await this.mediaTest.getFileAssets(fetchOp) + Logger.info(this.tag, `getFileAssetsAlbum,fetchFileResult.count = ${fetchFileResult.getCount()}`) + let fileAssets:Array = [] + if (fetchFileResult.getCount() > 0) { + fileAssets = await fetchFileResult.getAllObject() + } + return fileAssets + } + async getFileAssetsFromType(mediaType: number) { Logger.info(this.tag, `getFileAssetsFromType,mediaType = ${mediaType}`) let fileKeyObj = mediaLibrary.FileKey + // ALBUM_NAME let fetchOp = { selections: `${fileKeyObj.MEDIA_TYPE}=?`, selectionArgs: [`${mediaType}`], @@ -97,10 +114,10 @@ export default class MediaUtils { Logger.info(this.tag, 'getAlbums begin') let albums = [] const [ files, images, videos, audios ] = await Promise.all([ - this.getFileAssetsFromType(mediaLibrary.MediaType.FILE), - this.getFileAssetsFromType(mediaLibrary.MediaType.IMAGE), - this.getFileAssetsFromType(mediaLibrary.MediaType.VIDEO), - this.getFileAssetsFromType(mediaLibrary.MediaType.AUDIO) + this.getFileAssetsFromType(mediaLibrary.MediaType.FILE), + this.getFileAssetsFromType(mediaLibrary.MediaType.IMAGE), + this.getFileAssetsFromType(mediaLibrary.MediaType.VIDEO), + this.getFileAssetsFromType(mediaLibrary.MediaType.AUDIO) ]) albums.push({ albumName: 'Documents', count: files.length, mediaType: mediaLibrary.MediaType.FILE @@ -120,6 +137,7 @@ export default class MediaUtils { deleteFile(media: any) { let uri = media.uri Logger.info(this.tag, `deleteFile,uri = ${uri}`) + // @ts-ignore return this.mediaTest.deleteAsset(uri) }