diff --git a/wifi/test/wifi_testapp/AppScope/resources/base/element/string.json b/wifi/test/wifi_testapp/AppScope/resources/base/element/string.json index 1080233f0..b9174099e 100644 --- a/wifi/test/wifi_testapp/AppScope/resources/base/element/string.json +++ b/wifi/test/wifi_testapp/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "MyApplication" + "value": "WiFiTestApp" } ] } diff --git a/wifi/test/wifi_testapp/build-profile.json5 b/wifi/test/wifi_testapp/build-profile.json5 index 84b643339..a7649857e 100644 --- a/wifi/test/wifi_testapp/build-profile.json5 +++ b/wifi/test/wifi_testapp/build-profile.json5 @@ -14,26 +14,33 @@ */ { "app": { - "signingConfigs": [ - { - "name": "default", - "material": { - "certpath": "C:\\Users\\kaihong\\.ohos\\config\\openharmony\\auto_ohos_default_kaihong.sample.wifitest.cer", - "storePassword": "0000001BA241473C90A825CB41480027D18FA6CF3640ABD0F2220314E6F250D4FB17ED05A0C0B39781957C", - "keyAlias": "debugKey", - "keyPassword": "0000001B31D2FEB1E86B08E01A2D1E525B62283A49A604A4549114E2C35BF9EC1BDD4785E78E659E077314", - "profile": "C:\\Users\\kaihong\\.ohos\\config\\openharmony\\auto_ohos_default_kaihong.sample.wifitest.p7b", - "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\kaihong\\.ohos\\config\\openharmony\\auto_ohos_default_kaihong.sample.wifitest.p12" - } - } - ], - "compileSdkVersion": 9, - "compatibleSdkVersion": 9, + // "signingConfigs": [ + // + // ], + // "compileSdkVersion": 10, + // "compatibleSdkVersion": 10, "products": [ { "name": "default", "signingConfig": "default", + "compileSdkVersion": 10, + "compatibleSdkVersion": 9, + "targetSdkVersion": 10, + "runtimeOS": "OpenHarmony" + } + ], + "signingConfigs": [ + { + "name": "default", + "material": { + "certpath": "C:\\Users\\kaihong\\.ohos\\config\\openharmony\\auto_ohos_default_wifitest_kaihong.sample.wifitest.cer", + "storePassword": "0000001AA825068A821704832948DE46705A5A5998C549D28D49C970D32BDB909913CBE63E1FB860C8AD", + "keyAlias": "debugKey", + "keyPassword": "0000001A93B49F7C266CDA20213B713DD79D5645AD93794E13E5689CF620245D56A7419611D9FF56881E", + "profile": "C:\\Users\\kaihong\\.ohos\\config\\openharmony\\auto_ohos_default_wifitest_kaihong.sample.wifitest.p7b", + "signAlg": "SHA256withECDSA", + "storeFile": "C:\\Users\\kaihong\\.ohos\\config\\openharmony\\auto_ohos_default_wifitest_kaihong.sample.wifitest.p12" + } } ] }, diff --git a/wifi/test/wifi_testapp/hvigorfile.js b/wifi/test/wifi_testapp/entry/hvigorfile.ts similarity index 63% rename from wifi/test/wifi_testapp/hvigorfile.js rename to wifi/test/wifi_testapp/entry/hvigorfile.ts index 5f2735e3d..80e4ec5b8 100644 --- a/wifi/test/wifi_testapp/hvigorfile.js +++ b/wifi/test/wifi_testapp/entry/hvigorfile.ts @@ -1,2 +1,2 @@ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').appTasks \ No newline at end of file +export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/wifi/test/wifi_testapp/entry/oh-package.json5 b/wifi/test/wifi_testapp/entry/oh-package.json5 new file mode 100644 index 000000000..df02c1c2b --- /dev/null +++ b/wifi/test/wifi_testapp/entry/oh-package.json5 @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +{ + "license": "ISC", + "devDependencies": {}, + "name": "entry", + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/wifi/test/wifi_testapp/entry/package-lock.json b/wifi/test/wifi_testapp/entry/package-lock.json deleted file mode 100644 index 15bc7145b..000000000 --- a/wifi/test/wifi_testapp/entry/package-lock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "entry", - "version": "1.0.0", - "lockfileVersion": 1 -} diff --git a/wifi/test/wifi_testapp/entry/package.json b/wifi/test/wifi_testapp/entry/package.json deleted file mode 100644 index c7685ac4e..000000000 --- a/wifi/test/wifi_testapp/entry/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "license": "ISC", - "devDependencies": {}, - "name": "entry", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" - }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": {} -} diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/appTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/appTest.ets index 96d0840ea..05cb18072 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/appTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/appTest.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoContentTable.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoContentTable.ets index 7df7d25d2..f7b5521c1 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoContentTable.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoContentTable.ets @@ -15,8 +15,8 @@ // @ts-nocheck -import { TestData , TestAuto } from '../MainAbility/model/testData' -import ConfigData from '../Utils/ConfigData'; +import { TestData , TestAuto } from '../entryability/model/testData' +import ConfigData from '../utils/ConfigData'; const TAG = "[autoContentTable]" /** @@ -30,9 +30,9 @@ export struct AutoContentTable { @State currentAutoItem: TestAuto = {} @State autoItems: TestAuto[] = []; @State localName: string = 'DaYuBlue' - @Prop changeIndex: number; + @Prop changeIndex: Number; - @Builder IngredientItem( autoItem: TestAuto , index: number ) { + @Builder IngredientItem( autoItem: TestAuto , index: Number ) { Stack() { Flex() { Flex( { alignItems : ItemAlign.Center } ) { @@ -77,7 +77,7 @@ export struct AutoContentTable { .backgroundColor( $r( "app.color.white" ) ) } - getCurrentState( index: number ) { + getCurrentState( index: Number ) { if ( index <= this.changeIndex ) { this.autoItemsX[ index ].result = 'pass'; } else { @@ -100,7 +100,7 @@ export struct AutoContentTable { justifyContent : FlexAlign.SpaceBetween , alignItems : ItemAlign.Start } ) { - ForEach( this.autoItems , ( item: TestAuto , index: number ) => { + ForEach( this.autoItems , ( item: TestAuto , index: Number ) => { this.IngredientItem( item , index ) } ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoTest.ets index f8577db61..9311c52a2 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoTest.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoVerificationTable.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoVerificationTable.ets index 716f025e7..af3598c31 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoVerificationTable.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/autoVerificationTable.ets @@ -15,9 +15,9 @@ // @ts-nocheck -import { TestData , TestApi } from '../MainAbility/model/testData' +import { TestData , TestApi } from '../entryability/model/testData' import prompt from '@system.prompt'; -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * AutoVerificationTable of wifi test */ @@ -27,12 +27,12 @@ export struct AutoVerificationTable { private testItem: TestData @State currentApiItem: TestApi = {} @State apiItems: TestApi[] = []; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @State localName: string = 'DaYuBlue' - @State currentIndex: number = 1 + @State currentIndex: Number = 1 @StorageLink( 'pairedMac' ) pairedMac: string = ""; - @Builder IngredientItem( apiItem: TestApi , index: number ) { + @Builder IngredientItem( apiItem: TestApi , index: Number ) { Stack() { Flex() { Flex( { alignItems : ItemAlign.Center } ) { @@ -86,7 +86,7 @@ export struct AutoVerificationTable { } ) } - getCurrentState( index: number ) { + getCurrentState( index: Number ) { return this.apiItems[index].result } @@ -98,7 +98,7 @@ export struct AutoVerificationTable { justifyContent : FlexAlign.SpaceBetween , alignItems : ItemAlign.Start } ) { - ForEach( this.apiItems , ( item: TestApi , index: number ) => { + ForEach( this.apiItems , ( item: TestApi , index: Number ) => { this.IngredientItem( item , index ) } ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableP2p.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableP2p.ets index c23261d85..57b145c60 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableP2p.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableP2p.ets @@ -17,7 +17,7 @@ import prompt from '@ohos.prompt' import { P2pPswDialog } from '../Component/p2pPswDialog' -import { P2pModel } from '../MainAbility/model/p2pModel' +import { P2pModel } from '../entryability/model/p2pModel' import { P2pView } from '../Component/p2pView' import wifi from '@ohos.wifi' @@ -32,8 +32,8 @@ let self = null export struct AvailableP2p { private p2pModel: P2pModel = new P2pModel() @Prop p2pList: Array - @Prop p2pLinkedInfo: any - private selectIndex: number = - 1 + private p2pLinkedInfo: any + private selectIndex: Number = - 1 private p2pPswDialogController: CustomDialogController = new CustomDialogController({ builder : P2pPswDialog( { p2pScanInfo : this.p2pList[ this.selectIndex ] , action : this.onAccept } ) , autoCancel : true diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableWifi.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableWifi.ets index 898316fe1..8471f4693 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableWifi.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/availableWifi.ets @@ -17,7 +17,7 @@ import prompt from '@ohos.prompt' import { PswDialog } from '../Component/pswDialog' -import { WifiModel } from '../MainAbility/model/wifiModel' +import { WifiModel } from '../entryability/model/wifiModel' import { WifiView } from '../Component/wifiView' import wifi from '@ohos.wifi' @@ -32,8 +32,8 @@ let self = null export struct AvailableWifi { private wifiModel: WifiModel = new WifiModel() @Prop wifiList:Array - @Prop linkedInfo: any - @State selectIndex: number = -1 + private linkedInfo: any + @State selectIndex: Number = -1 private pswDialogController: CustomDialogController = new CustomDialogController({ builder: PswDialog({ scanInfo: this.wifiList[this.selectIndex], action: this.onAccept }), autoCancel: true diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/basicDataSource.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/basicDataSource.ets index 5bc2b663d..5af1d16ec 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/basicDataSource.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/basicDataSource.ets @@ -24,11 +24,11 @@ const TAG = "[basicDataSource]" class BasicDataSource implements IDataSource { private listeners: DataChangeListener[] = [] - public totalCount(): number { + public totalCount(): Number { return 0 } - public getData( index: number ): any { + public getData( index: Number ): any { return undefined } @@ -57,25 +57,25 @@ class BasicDataSource implements IDataSource { } ) } - notifyDataAdd( index: number ): void { + notifyDataAdd( index: Number ): void { this.listeners.forEach( listener => { listener.onDataAdd( index ) } ) } - notifyDataChange( index: number ): void { + notifyDataChange( index: Number ): void { this.listeners.forEach( listener => { listener.onDataChange( index ) } ) } - notifyDataDelete( index: number ): void { + notifyDataDelete( index: Number ): void { this.listeners.forEach( listener => { listener.onDataDelete( index ) } ) } - notifyDataMove( from: number , to: number ): void { + notifyDataMove( from: Number , to: Number ): void { this.listeners.forEach( listener => { listener.onDataMove( from , to ) } ) @@ -90,15 +90,15 @@ export default class WifiDataSource extends BasicDataSource { this.dataArray = data } - public totalCount(): number { + public totalCount(): Number { return this.dataArray.length } - public getData( index: number ): any { + public getData( index: Number ): any { return this.dataArray[index] } - public addData( index: number , data: wifi.WifiScanInfo ): void { + public addData( index: Number , data: wifi.WifiScanInfo ): void { this.dataArray.splice( index , 0 , data ) this.notifyDataAdd( index ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/benchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/benchmarkTest.ets index 220c9e864..db92a69f5 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/benchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/benchmarkTest.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/contentTable.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/contentTable.ets index 886a106e9..23aa3efaf 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/contentTable.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/contentTable.ets @@ -16,9 +16,9 @@ // @ts-nocheck -import { TestData , TestApi } from '../MainAbility/model/testData' +import { TestData , TestApi } from '../entryability/model/testData' import prompt from '@system.prompt'; -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; const TAG = "[contentTable]" /** @@ -33,12 +33,12 @@ export struct GetProfileConnSateDialog { { value : 'HANDS_FREE_AUDIO_GATEWAY' }, { value : 'HID_HOST' } ] - @State currentClick: number = 1; + @State currentClick: Number = 1; @Link textValue: string @Link inputValue: string @Link apiItem: TestApi - @Link currentIndex: number - @Link changeIndex: number + @Link currentIndex: Number + @Link changeIndex: Number controller: CustomDialogController cancel: () => void confirm: ( string ) => void @@ -56,7 +56,7 @@ export struct GetProfileConnSateDialog { .optionFont( { size : 17 } ) .height( 80 ) .width( ConfigData.WH_90_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( "Select:" + index ) this.currentClick = index } ) @@ -104,13 +104,13 @@ export struct SetScanModeDialog { { value : 'CONNECTABLE_GENERAL_DISCOVERABLE' }, { value : 'CONNECTABLE_LIMITED_DISCOVERABLE' } ] - @State currentClick: number = 4; + @State currentClick: Number = 4; @Link textValue: string @Link inputValue: string @Link apiItem: TestApi - @Link currentIndex: number - @Link changeIndex: number - @State duration: number = 0 + @Link currentIndex: Number + @Link changeIndex: Number + @State duration: Number = 0 controller: CustomDialogController cancel: () => void confirm: ( string ) => void @@ -128,7 +128,7 @@ export struct SetScanModeDialog { .optionFont( { size : 12 } ) .height( 60 ) .width( ConfigData.WH_90_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) this.currentClick = index } ) @@ -185,8 +185,8 @@ export struct InputDialog { @Link textValue: string @Link inputValue: string @Link apiItem: TestApi - @Link currentIndex: number - @Link changeIndex: number + @Link currentIndex: Number + @Link changeIndex: Number controller: CustomDialogController cancel: () => void confirm: ( string ) => void @@ -240,9 +240,9 @@ export struct ContentTable { private testItem: TestData @State currentApiItem: TestApi = {} @State apiItems: TestApi[] = []; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @State localName: string = 'MyTestDevice' - @State currentIndex: number = 1 + @State currentIndex: Number = 1 @StorageLink( 'pairedMac' ) pairedMac: string = ""; getProfileConnSateDialog: CustomDialogController = new CustomDialogController({ builder : GetProfileConnSateDialog( { @@ -295,15 +295,16 @@ export struct ContentTable { console.log( TAG , 'input text:' , text ) } - @Builder IngredientItem( apiItem: TestApi , index: number ) { + @Builder IngredientItem( apiItem: TestApi , index: Number ) { Stack() { Flex() { Flex( { alignItems : ItemAlign.Center } ) { Image( $r( 'app.media.WLAN' ) ) .objectFit( ImageFit.Contain ) .autoResize( false ) - .height( 30 ) - .width( 30 ) + .height( 50 ) + .width( 40 ) + .padding( { top : "15vp" } ) } .layoutWeight( 1 ) .padding( { left : 10 } ) @@ -313,12 +314,12 @@ export struct ContentTable { .fontSize( 17.4 ) .fontWeight( FontWeight.Bold ) .layoutWeight( 1 ) - .padding( { left : 10 , top : 15 } ) + .padding( { left : "10vp" , top : "10vp" } ) Text( apiItem.method ) .fontSize( 17.4 ) .fontWeight( FontWeight.Bold ) .layoutWeight( 1 ) - .padding( { left : 10 , top : 5 } ) + .padding( { left : "10vp" , top : "5vp" } ) } .layoutWeight( 6 ) .width( ConfigData.WH_80_100 ) @@ -327,6 +328,7 @@ export struct ContentTable { Text( this.changeIndex >= 0 ? this.getCurrentState( index ) : apiItem.result ) .fontSize( 17.4 ) .flexGrow( 1 ) + .padding( { top : "15vp" } ) } .layoutWeight( 3 ) .padding( { left : 25 } ) @@ -406,7 +408,7 @@ export struct ContentTable { } ) } - getCurrentState( index: number ) { + getCurrentState( index: Number ) { return this.apiItems[ index ].result } @@ -418,7 +420,7 @@ export struct ContentTable { justifyContent : FlexAlign.SpaceBetween , alignItems : ItemAlign.Start } ) { - ForEach( this.apiItems , ( item: TestApi , index: number ) => { + ForEach( this.apiItems , ( item: TestApi , index: Number ) => { this.IngredientItem( item , index ) } ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/entryComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/entryComponent.ets index fbd4608c5..14a815965 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/entryComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/entryComponent.ets @@ -16,7 +16,7 @@ // @ts-nocheck import ComponentConfig from './componentconfig'; -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * entry contentTable Component Page Of Wifi test */ diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTable.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTable.ets index a8c182cb0..9a7f96ee5 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTable.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTable.ets @@ -15,9 +15,9 @@ // @ts-nocheck -import { TestData , TestApi } from '../MainAbility/model/testData' -import { initHotspotApIData } from '../MainAbility/model/testDataModels' -import ConfigData from '../Utils/ConfigData'; +import { TestData , TestApi } from '../entryability/model/testData' +import { initHotspotApIData } from '../entryability/model/testDataModels' +import ConfigData from '../utils/ConfigData'; const TAG = "[filterTable]" /** @@ -28,18 +28,18 @@ const TAG = "[filterTable]" export struct FilterTable { private testItem: TestData @State apiItems: TestApi[] = initHotspotApIData() - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // input ble scan parameters: /*ScanFilter*/ @State cbxBleScanFilter: boolean = false; @State h_ssid: string = "testApp1"; - @State h_securityType: number = 3; - @State h_band: number = 2; + @State h_securityType: Number = 3; + @State h_band: Number = 2; @State h_preSharedKey: string = "12345678"; - @State h_maxConn: number = 3; - @State h_channel: number = 36; + @State h_maxConn: Number = 3; + @State h_channel: Number = 36; - getCurrentState( index: number ) { + getCurrentState( index: Number ) { return this.apiItems[ index ].result } @@ -68,6 +68,7 @@ export struct FilterTable { .width( ConfigData.WH_80_100 ) .borderRadius( 1 ) } + .backgroundColor( $r( "app.color.moon" ) ) .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) @@ -86,6 +87,7 @@ export struct FilterTable { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { Text( "maxConn" ).fontSize( 17 ).width( 80 ) @@ -101,7 +103,7 @@ export struct FilterTable { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) AppStorage.SetOrCreate( 'h_maxConn' , index ); } ) @@ -111,6 +113,7 @@ export struct FilterTable { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { Text( "band" ).fontSize( 17 ).width( 60 ); @@ -126,6 +129,7 @@ export struct FilterTable { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { @@ -141,6 +145,7 @@ export struct FilterTable { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { Text( "channel" ).fontSize( 17 ).width( 120 ) @@ -155,6 +160,7 @@ export struct FilterTable { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) } .height( 300 ) .width( ConfigData.WH_100_100 ) @@ -164,7 +170,7 @@ export struct FilterTable { .borderWidth( 1 ) } .height( ConfigData.WH_100_100 ) - .backgroundColor( $r( "app.color.white" ) ) + .backgroundColor( $r( "app.color.lead" ) ) } .scrollBarWidth( 20 ) .padding( { bottom : 10 } ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTableManager.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTableManager.ets index 7679681a9..267b8e2d9 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTableManager.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/filterTableManager.ets @@ -15,9 +15,9 @@ // @ts-nocheck -import { TestData , TestApi } from '../MainAbility/model/testData' -import { initHotspotManagerApIData } from '../MainAbility/model/testDataModels' -import ConfigData from '../Utils/ConfigData'; +import { TestData , TestApi } from '../entryability/model/testData' +import { initHotspotManagerApIData } from '../entryability/model/testDataModels' +import ConfigData from '../utils/ConfigData'; const TAG = "[filterTableManager]" /** @@ -28,18 +28,18 @@ const TAG = "[filterTableManager]" export struct FilterTableManager { private testItem: TestData @State apiItems: TestApi[] = initHotspotManagerApIData() - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // input ble scan parameters: /*ScanFilter*/ @State cbxBleScanFilter: boolean = false; @State h_ssid1: string = "testApp1"; - @State h_securityType1: number = 3; - @State h_band1: number = 2; + @State h_securityType1: Number = 3; + @State h_band1: Number = 2; @State h_preSharedKey1: string = "12345678"; - @State h_maxConn1: number = 3; - @State h_channel1: number = 36; + @State h_maxConn1: Number = 3; + @State h_channel1: Number = 36; - getCurrentState( index: number ) { + getCurrentState( index: Number ) { return this.apiItems[ index ].result } @@ -68,6 +68,7 @@ export struct FilterTableManager { .width( ConfigData.WH_80_100 ) .borderRadius( 1 ) } + .backgroundColor( $r( "app.color.moon" ) ) .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) @@ -86,6 +87,7 @@ export struct FilterTableManager { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { Text( "maxConn" ).fontSize( 17 ).width( 80 ) @@ -101,7 +103,7 @@ export struct FilterTableManager { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) AppStorage.SetOrCreate( 'h_maxConn1' , index ); } ) @@ -111,6 +113,7 @@ export struct FilterTableManager { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { Text( "band" ).fontSize( 17 ).width( 60 ); @@ -126,6 +129,7 @@ export struct FilterTableManager { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { @@ -141,6 +145,7 @@ export struct FilterTableManager { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) Row() { Text( "channel" ).fontSize( 17 ).width( 120 ) @@ -155,6 +160,7 @@ export struct FilterTableManager { .padding( 5 ) .justifyContent( FlexAlign.Start ) .alignItems( VerticalAlign.Center ) + .backgroundColor( $r( "app.color.spring" ) ) } .height( 300 ) .width( ConfigData.WH_100_100 ) @@ -164,7 +170,7 @@ export struct FilterTableManager { .borderWidth( 1 ) } .height( ConfigData.WH_100_100 ) - .backgroundColor( $r( "app.color.white" ) ) + .backgroundColor( $r( "app.color.lead" ) ) } .scrollBarWidth( 20 ) .padding( { bottom : 10 } ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/headComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/headComponent.ets index 4a62d8c1a..42446e6d7 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/headComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/headComponent.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; import Router from '@system.router'; const TAG = "[headComponent]" diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/headerComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/headerComponent.ets index 6a1bf314d..2134f130d 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/headerComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/headerComponent.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; import Router from '@system.router'; const TAG = "[headerComponent]" /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/imageAnimatorComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/imageAnimatorComponent.ets index 0b0cf6eae..df7e67683 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/imageAnimatorComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/imageAnimatorComponent.ets @@ -16,58 +16,58 @@ // @ts-nocheck import ComponentConfig from './componentConfig'; -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * ImageAnimator component Of WiFi test */ @Component export default struct ImageAnimatorComponent { - private imageWidth: number | Resource = 0 - private imageHeight: number | Resource = 0 - private whtl: number | string = ComponentConfig.value_20; + private imageWidth: Number | Resource = 0 + private imageHeight: Number | Resource = 0 + private whtl: Number | string = ComponentConfig.value_20; build() { Column() { ImageAnimator() .images( [ { - src : '../MainAbility/res/image/hdpi/ic_loading01.png' , + src : '../entryability/res/image/hdpi/ic_loading01.png' , duration : ComponentConfig.DURATION_TIME , width : this.whtl , height : this.whtl , top : this.whtl , left : this.whtl }, { - src : '../MainAbility/res/image/hdpi/ic_loading02.png' , + src : '../entryability/res/image/hdpi/ic_loading02.png' , duration : ComponentConfig.DURATION_TIME , width : this.whtl , height : this.whtl , top : this.whtl , left : this.whtl }, { - src : '../MainAbility/res/image/hdpi/ic_loading03.png' , + src : '../entryability/res/image/hdpi/ic_loading03.png' , duration : ComponentConfig.DURATION_TIME , width : this.whtl , height : this.whtl , top : this.whtl , left : this.whtl }, { - src : '../MainAbility/res/image/hdpi/ic_loading04.png' , + src : '../entryability/res/image/hdpi/ic_loading04.png' , duration : ComponentConfig.DURATION_TIME , width : this.whtl , height : this.whtl , top : this.whtl , left : this.whtl }, { - src : '../MainAbility/res/image/hdpi/ic_loading05.png' , + src : '../entryability/res/image/hdpi/ic_loading05.png' , duration : ComponentConfig.DURATION_TIME , width : this.whtl , height : this.whtl , top : this.whtl , left : this.whtl }, { - src : '../MainAbility/res/image/hdpi/ic_loading06.png' , + src : '../entryability/res/image/hdpi/ic_loading06.png' , duration : ComponentConfig.DURATION_TIME , width : this.whtl , height : this.whtl , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/mainPageTitle.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/mainPageTitle.ets index a99e8737f..434f6e4b7 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/mainPageTitle.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/mainPageTitle.ets @@ -17,24 +17,24 @@ import screenshot from '@ohos.screenshot' import image from '@ohos.multimedia.image' -import MediaUtils from '../MainAbility/model/MediaUtils' +import MediaUtils from '../entryability/model/MediaUtils' const TAG = "[mainPageTitle]" -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * Main-Page Title Of WiFi test */ @Component export struct MainPageTitle { - @State colOpacity: number = 1 - @State count: number = 0 - @State myborderWidth: number = 0 - @State myborderRadius: number = 0 - @State offsetX: number = 0 - @State offsetY: number = 0 - @State myscale: number = 1 - @State angle: number = 0 + @State colOpacity: Number = 1 + @State count: Number = 0 + @State myborderWidth: Number = 0 + @State myborderRadius: Number = 0 + @State offsetX: Number = 0 + @State offsetY: Number = 0 + @State myscale: Number = 1 + @State angle: Number = 0 getScreen = ( isFullScreen: boolean ) => { let screenshotOptions: screenshot.ScreenshotOptions = { screenRect : { left : 0 , top : 0 , width : 400 , height : 400 } , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualApiTestComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualApiTestComponent.ets index 2152edeb6..6aef69861 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualApiTestComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualApiTestComponent.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualSceneTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualSceneTest.ets index 7adcc9903..5598ef059 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualSceneTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/manualSceneTest.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pPswDialog.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pPswDialog.ets index 50d9f026d..2aed9ee5a 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pPswDialog.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pPswDialog.ets @@ -16,7 +16,7 @@ // @ts-nocheck import wifi from '@ohos.wifi' -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * PswDialog page of WiFi test */ diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pTitleBar.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pTitleBar.ets index a89d5a00e..f57ce7457 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pTitleBar.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pTitleBar.ets @@ -15,12 +15,12 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import Router from '@system.router'; import screenshot from '@ohos.screenshot' import image from '@ohos.multimedia.image' -import MediaUtils from '../MainAbility/model/MediaUtils' -import ConfigData from '../Utils/ConfigData'; +import MediaUtils from '../entryability/model/MediaUtils' +import ConfigData from '../utils/ConfigData'; const TAG = "[p2pTitleBar]" @@ -32,14 +32,14 @@ const TAG = "[p2pTitleBar]" export struct P2pTitleBar { private testItem: TestData = null private detail: string - @State colOpacity: number = 1 - @State count: number = 0 - @State myborderWidth: number = 0 - @State myborderRadius: number = 0 - @State offsetX: number = 0 - @State offsetY: number = 0 - @State myscale: number = 1 - @State angle: number = 0 + @State colOpacity: Number = 1 + @State count: Number = 0 + @State myborderWidth: Number = 0 + @State myborderRadius: Number = 0 + @State offsetX: Number = 0 + @State offsetY: Number = 0 + @State myscale: Number = 1 + @State angle: Number = 0 getScreen = ( isFullScreen: boolean ) => { let screenshotOptions: screenshot.ScreenshotOptions = { screenRect : { left : 0 , top : 0 , width : 400 , height : 400 } , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pView.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pView.ets index 22759cd28..665e83dce 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pView.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/p2pView.ets @@ -16,8 +16,8 @@ // @ts-nocheck const TAG = "[P2pView]" -import ConfigData from '../Utils/ConfigData'; -import { testOnP2pConnectionChange , testGetCurrentGroupCallback } from '../MainAbility/model/p2pInterface' +import ConfigData from '../utils/ConfigData'; +import { testOnP2pConnectionChange , testGetCurrentGroupCallback } from '../entryability/model/p2pInterface' /** * P2pView Component of p2p test */ @@ -26,7 +26,7 @@ import { testOnP2pConnectionChange , testGetCurrentGroupCallback } from '../Main export struct P2pView { private p2p: any = null private securityString: Resource = $r( 'app.string.useful' ) - private p2pConnectState: number = 0 + private p2pConnectState: Number = 0 private p2pLinkedDeviceName: string = "" @State isLock: boolean = true diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/pageTitle.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/pageTitle.ets index e8db421fa..c5823237e 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/pageTitle.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/pageTitle.ets @@ -15,12 +15,12 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import Router from '@system.router'; import screenshot from '@ohos.screenshot' import image from '@ohos.multimedia.image' -import MediaUtils from '../MainAbility/model/MediaUtils' -import ConfigData from '../Utils/ConfigData'; +import MediaUtils from '../entryability/model/MediaUtils' +import ConfigData from '../utils/ConfigData'; const TAG = "[pageTitle]" @@ -32,14 +32,14 @@ const TAG = "[pageTitle]" export struct PageTitle { private testItem: TestData = null private detail: string - @State colOpacity: number = 1 - @State count: number = 0 - @State myborderWidth: number = 0 - @State myborderRadius: number = 0 - @State offsetX: number = 0 - @State offsetY: number = 0 - @State myscale: number = 1 - @State angle: number = 0 + @State colOpacity: Number = 1 + @State count: Number = 0 + @State myborderWidth: Number = 0 + @State myborderRadius: Number = 0 + @State offsetX: Number = 0 + @State offsetY: Number = 0 + @State myscale: Number = 1 + @State angle: Number = 0 getScreen = ( isFullScreen: boolean ) => { let screenshotOptions: screenshot.ScreenshotOptions = { screenRect : { left : 0 , top : 0 , width : 400 , height : 400 } , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/phoneLayout.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/phoneLayout.ets new file mode 100644 index 000000000..0846bbe10 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/phoneLayout.ets @@ -0,0 +1,194 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 { Browser } from '../entryability/model/bowser'; +import { WebTab } from './webTitleBar'; +import Logger from '../entryability/model/Logger'; + +const TAG: string = '[PhoneLayout]'; +const BUTTON_WIDTH: number = 22; +const BUTTON_RADIUS: number = 4; +const DOWN_COLOR: string = '#e4e4e4'; +const UP_COLOR: string = '#00000000'; + +@Component +export struct PhoneLayout { + @Link browser: Browser; + @State isPhone: boolean = true; + @State hasDown: boolean = false; + @State pageCount: string = '1'; + @State arrayIndex: Number = 0; + private addr: string = ''; + private toolPoneArray: Array<{ + imageSrc: Resource, + id: Number + }> = [ + { + imageSrc: $r('app.media.ic_public_back'), + id: 1 + }, + { + imageSrc: $r('app.media.ic_public_advance'), + id: 2 + }, + { + imageSrc: $r('app.media.ic_public_home'), + id: 5 + }, + { + imageSrc: $r('app.media.ic_public_refresh'), + id: 3 + } + ]; + + @Builder ToolBar() { + Column() { + if (!this.browser.hideProgress) { + Progress({ value: this.browser.progress, total: 100 }) + .color('#0000ff') + } + Row() { + ForEach(this.toolPoneArray, (item: any, index: Number) => { + Column() { + Divider().color('#e9eaec') + Button({ type: ButtonType.Normal }) { + Column() { + if (item.id !== 4) { + Image(item.imageSrc) + } else { + Column() { + Text(this.pageCount) + .fontSize(16) + } + .border({ width: 2 }) + .width(22) + .height(22) + .borderRadius(5) + .justifyContent(FlexAlign.Center) + } + } + .width(BUTTON_WIDTH) + .height(BUTTON_WIDTH) + .justifyContent(FlexAlign.Center) + } + .height('100%') + .width('100%') + .backgroundColor(this.arrayIndex === item.id ? DOWN_COLOR : UP_COLOR) + .borderRadius(BUTTON_RADIUS) + .flexShrink(0) + .onTouch((event: TouchEvent) => { + if (event.type === TouchType.Down) { + this.arrayIndex = item.id; + } else if (event.type === TouchType.Up) { + this.arrayIndex = 0; + } + }) + .onClick((event: ClickEvent) => { + switch (item.id) { + case 1: + this.browser.Back(); + break; + case 2: + this.browser.Forward(); + break; + case 3: + this.browser.Refresh(); + break; + case 5: + this.browser.webControllerArray[this.browser.tabArrayIndex].controller.loadUrl({ + url: $rawfile('phone.html') + }); + break; + default: + break; + } + }) + } + .width('20%') + .id(`navigationButton${index}`) + }) + } + .justifyContent(FlexAlign.SpaceAround) + .width('100%') + .height('100%') + .backgroundColor('#fdfdfd') + } + .height('100%') + } + + @Builder TitleBar() { + Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { + Column() { + TextInput({ placeholder: $r('app.string.Input_url'), text: this.browser.inputValue }) + .placeholderFont({ size: 16, weight: 500 }) + .fontSize(16) + .height(34) + .margin({ left: 6 }) + .id('inputUrl') + .onChange((value: string) => { + console.log(TAG, `onChange`); + this.addr = value; + }) + .onSubmit((enterKey: EnterKeyType) => { + console.log(TAG, `onSubmit`); + this.browser.webControllerArray[this.browser.tabArrayIndex].controller.loadUrl({ + url: `https://${this.addr}` + }); + this.addr = ''; + }) + } + + Column() { + Button({ type: ButtonType.Normal }) { + Image($r('app.media.submit')) + } + .width(BUTTON_WIDTH) + .height(BUTTON_WIDTH) + .backgroundColor(this.hasDown ? DOWN_COLOR : UP_COLOR) + .margin({ top: 6 }) + .id(`actionButton0`) + } + .width('10%') + .height(34) + .flexShrink(0) + .backgroundColor(this.hasDown ? DOWN_COLOR : UP_COLOR) + .borderRadius(BUTTON_RADIUS) + .margin({ left: 6, right: 6 }) + .onTouch((event: TouchEvent) => { + if (event.type === TouchType.Down) { + this.hasDown = true; + } else if (event.type === TouchType.Up) { + this.hasDown = false; + } + }) + .onClick((event: ClickEvent) => { + this.browser.loadUrl(this.addr); + this.addr = ''; + }) + } + .position({ x: 0, y: 3 }) + } + + build() { + Column() { + Navigation() { + WebTab({ browser: $browser, isPhone: $isPhone }).height("100%") + } + // .title({ builder: this.TitleBar, height: 40 }) + .toolBar(this.ToolBar) + .hideBackButton(true) + } + .height("100%") + } +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/profileTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/profileTest.ets index dc4fd81ef..58d7ab6d4 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/profileTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/profileTest.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/pswDialog.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/pswDialog.ets index 3da8748a2..cdce734f8 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/pswDialog.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/pswDialog.ets @@ -16,14 +16,14 @@ // @ts-nocheck import wifi from '@ohos.wifi' -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * PswDialog page of WiFi test */ @CustomDialog export struct PswDialog { - @State scanInfo: any = null + private scanInfo: any = null private psw: string = '' private controller: CustomDialogController private action: ( scanInfo , psw ) => void diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/scenarioContentTable.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/scenarioContentTable.ets index f44435495..cba1b1458 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/scenarioContentTable.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/scenarioContentTable.ets @@ -14,8 +14,8 @@ */ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; -import { TestScenario } from '../MainAbility/model/testData' +import ConfigData from '../utils/ConfigData'; +import { TestScenario } from '../entryability/model/testData' import prompt from '@system.prompt'; const TAG = "[scenarioContentTable]" @@ -27,10 +27,10 @@ const TAG = "[scenarioContentTable]" export struct ScenarioContentTable { @State scenarioItems: TestScenario[] = []; private scenarioItemsX: TestScenario[] - @Prop changeIndex: number; + @Prop changeIndex: Number; @State localName: string = 'DaYuBlue' - @Builder IngredientItem( scenarioItem: TestScenario , index: number ) { + @Builder IngredientItem( scenarioItem: TestScenario , index: Number ) { Stack() { Flex() { Flex( { direction : FlexDirection.Column , alignItems : ItemAlign.Start } ) { @@ -72,7 +72,7 @@ export struct ScenarioContentTable { .backgroundColor( $r( "app.color.white" ) ) } - getCurrentState( index: number ) { + getCurrentState( index: Number ) { if ( index <= this.changeIndex ) { this.scenarioItemsX[ index ].result = 'pass'; } else { @@ -95,7 +95,7 @@ export struct ScenarioContentTable { justifyContent : FlexAlign.SpaceBetween , alignItems : ItemAlign.Start } ) { - ForEach( this.scenarioItems , ( item: TestScenario , index: number ) => { + ForEach( this.scenarioItems , ( item: TestScenario , index: Number ) => { this.IngredientItem( item , index ) } ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/stabilityTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/stabilityTest.ets index d0dd28b98..bc8be4c0c 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/stabilityTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/stabilityTest.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressContentTable.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressContentTable.ets index aa0889e3c..85e1a3561 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressContentTable.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressContentTable.ets @@ -15,8 +15,8 @@ */ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; -import { TestData , TestApi } from '../MainAbility/model/testData' +import ConfigData from '../utils/ConfigData'; +import { TestData , TestApi } from '../entryability/model/testData' import prompt from '@system.prompt'; const TAG = "[stressContentTable]" @@ -32,12 +32,12 @@ export struct GetProfileConnSateDialog { { value : 'HANDS_FREE_AUDIO_GATEWAY' }, { value : 'HID_HOST' } ] - @State currentClick: number = 1; + @State currentClick: Number = 1; @Link textValue: string @Link inputValue: string @Link apiItem: TestApi - @Link currentIndex: number - @Link changeIndex: number + @Link currentIndex: Number + @Link changeIndex: Number controller: CustomDialogController cancel: () => void confirm: ( string ) => void @@ -55,7 +55,7 @@ export struct GetProfileConnSateDialog { .optionFont( { size : 17 } ) .height( 80 ) .width( ConfigData.WH_90_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( "Select:" + index ) this.currentClick = index } ) @@ -103,13 +103,13 @@ export struct SetScanModeDialog { { value : 'CONNECTABLE_GENERAL_DISCOVERABLE' }, { value : 'CONNECTABLE_LIMITED_DISCOVERABLE' } ] - @State currentClick: number = 4; + @State currentClick: Number = 4; @Link textValue: string @Link inputValue: string @Link apiItem: TestApi - @Link currentIndex: number - @Link changeIndex: number - @State duration: number = 0 + @Link currentIndex: Number + @Link changeIndex: Number + @State duration: Number = 0 controller: CustomDialogController cancel: () => void confirm: ( string ) => void @@ -127,7 +127,7 @@ export struct SetScanModeDialog { .optionFont( { size : 12 } ) .height( 60 ) .width( ConfigData.WH_90_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) this.currentClick = index } ) @@ -184,8 +184,8 @@ export struct InputDialog { @Link textValue: string @Link inputValue: string @Link apiItem: TestApi - @Link currentIndex: number - @Link changeIndex: number + @Link currentIndex: Number + @Link changeIndex: Number controller: CustomDialogController cancel: () => void confirm: ( string ) => void @@ -239,9 +239,9 @@ export struct StressContentTable { private testItem: TestData @State currentApiItem: TestApi = {} @State apiItems: TestApi[] = []; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @State localName: string = 'DaYuBlue1' - @State currentIndex: number = 1 + @State currentIndex: Number = 1 @StorageLink( 'pairedMac' ) pairedMac: string = ""; getProfileConnSateDialog: CustomDialogController = new CustomDialogController({ builder : GetProfileConnSateDialog( { @@ -294,7 +294,7 @@ export struct StressContentTable { console.log( 'input text:' , text ) } - @Builder IngredientItem( apiItem: TestApi , index: number ) { + @Builder IngredientItem( apiItem: TestApi , index: Number ) { Stack() { Flex() { Flex( { alignItems : ItemAlign.Center } ) { @@ -367,7 +367,7 @@ export struct StressContentTable { } ) } - getCurrentState( index: number ) { + getCurrentState( index: Number ) { return this.apiItems[ index ].result } @@ -379,7 +379,7 @@ export struct StressContentTable { justifyContent : FlexAlign.SpaceBetween , alignItems : ItemAlign.Start } ) { - ForEach( this.apiItems , ( item: TestApi , index: number ) => { + ForEach( this.apiItems , ( item: TestApi , index: Number ) => { this.IngredientItem( item , index ) } ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressTest.ets index 70b4b046c..8660c6569 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/stressTest.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestList } from './testList'; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/subEntryComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/subEntryComponent.ets index 1e362e34d..08c06c29c 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/subEntryComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/subEntryComponent.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; const TAG = "[subEntryComponent]" /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGrid.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGrid.ets index 48a233622..4fe5bb0fd 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGrid.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGrid.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestGridItem } from './testGridItem' /** * TestGrid component page of wifi test @@ -25,7 +25,7 @@ import { TestGridItem } from './testGridItem' export struct TestGrid { private testItems: TestData[] private gridRowTemplate: string = '' - private heightValue: number + private heightValue: Number aboutToAppear() { var rows = Math.round( this.testItems.length / 2 ); diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGridItem.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGridItem.ets index 3b9c8c9b8..5e464fe77 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGridItem.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testGridItem.ets @@ -15,9 +15,9 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import router from '@system.router' -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * Test-GridItem page of wifi test */ diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testImageDisplay.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testImageDisplay.ets index ca637d2b8..29e9307f9 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testImageDisplay.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testImageDisplay.ets @@ -15,8 +15,8 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' -import ConfigData from '../Utils/ConfigData'; +import { TestData } from '../entryability/model/testData' +import ConfigData from '../utils/ConfigData'; /** * Test-ImageDisplay page of wifi test @@ -31,9 +31,9 @@ export struct TestImageDisplay { Flex( { alignItems : ItemAlign.Start } ) { Stack() { Image( this.testItem.image ) - .height( 80 ) - .width( 80 ) - .margin( { left : 10 , bottom : 10 } ) + .height( 100 ) + .width( 100 ) + .margin( { left : "20vp" , top : "20vp" } ) } .width( ConfigData.WH_20_100 ) @@ -41,16 +41,16 @@ export struct TestImageDisplay { Text( this.testItem.name ) .fontSize( 26 ) .fontWeight( 500 ) - .margin( { left : 26 , top : 10 } ) + .margin( { left : "26vp" , top : "20vp" } ) .width( ConfigData.WH_90_100 ) Text( this.testItem.detail ) .fontSize( 18 ) .fontWeight( 500 ) - .margin( { top : 8 } ) + .margin( { top : "8vp" } ) .width( ConfigData.WH_80_100 ) } - .width( ConfigData.WH_80_100 ) - .padding( { left : 20 } ) + .width( ConfigData.WH_70_100 ) + .padding( { left : "20vp" , top : "15vp"} ) } } .backgroundColor( '#FFedf2f5' ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testList.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testList.ets index 8c5e9643f..caa1c36f7 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testList.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testList.ets @@ -15,9 +15,9 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import { TestListItem } from './testListItems'; -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * Test-List component page of wifi test */ @@ -37,7 +37,7 @@ export struct TestList { } } , item => item.id.toString() ) } - .height( ConfigData.WH_93_100 ) + .height( ConfigData.WH_100_100 ) .backgroundColor( $r( "app.color.lead" ) ) } } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testListItems.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testListItems.ets index 51fa20ece..0ad5f2e97 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/testListItems.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/testListItems.ets @@ -14,8 +14,8 @@ */ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; -import { TestData } from '../MainAbility/model/testData' +import ConfigData from '../utils/ConfigData'; +import { TestData } from '../entryability/model/testData' /** * Test-ListItem component of wifi test diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleBar.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleBar.ets index cfc1c609c..f79093df0 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleBar.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleBar.ets @@ -15,13 +15,13 @@ // @ts-nocheck -import { TestData } from '../MainAbility/model/testData' +import { TestData } from '../entryability/model/testData' import Router from '@system.router'; import screenshot from '@ohos.screenshot' import image from '@ohos.multimedia.image' -import MediaUtils from '../MainAbility/model/MediaUtils' +import MediaUtils from '../entryability/model/MediaUtils' -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; const TAG = "[titleBar]" const PAGE_URI_ABOUT_MODE = 'pages/subManualApiTest/subWifiTest/about' @@ -34,14 +34,14 @@ const PAGE_URI_ABOUT_MODE = 'pages/subManualApiTest/subWifiTest/about' export struct TitleBar { private testItem: TestData = null private detail: string - @State colOpacity: number = 1 - @State count: number = 0 - @State myborderWidth: number = 0 - @State myborderRadius: number = 0 - @State offsetX: number = 0 - @State offsetY: number = 0 - @State myscale: number = 1 - @State angle: number = 0 + @State colOpacity: Number = 1 + @State count: Number = 0 + @State myborderWidth: Number = 0 + @State myborderRadius: Number = 0 + @State offsetX: Number = 0 + @State offsetY: Number = 0 + @State myscale: Number = 1 + @State angle: Number = 0 getScreen = ( isFullScreen: boolean ) => { let screenshotOptions: screenshot.ScreenshotOptions = { screenRect : { left : 0 , top : 0 , width : 400 , height : 400 } , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleComponent.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleComponent.ets index b8f157ac9..e36423fd6 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleComponent.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/titleComponent.ets @@ -15,7 +15,7 @@ // @ts-nocheck -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * TitleComponent of wifi test diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/webTitleBar.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/webTitleBar.ets new file mode 100644 index 000000000..5460ef6ae --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/webTitleBar.ets @@ -0,0 +1,329 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 { Browser , LoadingStatus , WebObject } from '../entryability/model/bowser' +import Logger from '../entryability/model/Logger' +import fs from '@ohos.file.fs'; + +const TAG: string = '[webTitleBar]' +const BUTTON_WIDTH: number = 22 +const BUTTON_RADIUS: number = 4 +const DOWN_COLOR: string = '#e4e4e4' +const UP_COLOR: string = '#00000000' +const PAD_USER_AGENT: string = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTMl, like Gecko) Chrome/92.0.4515.105 Safari/537.36' +const PHONE_USER_AGENT: string = 'Mozilla/5.0 (Linux; Android 9; VRD-AL10; HMSCore 6.3.0.331) AppleWebKit/537.36 (KHTMl, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.4.1 Mobile Safari/537.36' + +@Component +export struct TabletTitle { + @Link browser: Browser; + @State inputValue: string = '' + @State arrayIndex: Number = 0 + @State addr: string = 'www.baidu.com' + private navigationButton: Array<{ + imageSrc: Resource, + id: Number + }> = [ + { + imageSrc : $r( 'app.media.ic_public_back' ) , + id : 1 + }, + { + imageSrc : $r( 'app.media.ic_public_advance' ) , + id : 2 + }, + { + imageSrc : $r( 'app.media.ic_public_refresh' ) , + id : 3 + }, + { + imageSrc : $r( 'app.media.ic_public_home' ) , + id : 4 + }, + ] + private actionButton: Array<{ + imageSrc: Resource, + id: Number + }> = [ + { + imageSrc : $r( 'app.media.submit' ) , + id : 5 + }, + { + imageSrc : $r( 'app.media.ic_public_add' ) , + id : 6 + }, + ] + + build() { + Row() { + ForEach( this.navigationButton , ( item , index ) => { + Button( { type : ButtonType.Normal } ) { + Image( item.imageSrc ) + } + .margin( 8 ) + .id( `navigationButton${ index }` ) + .width( BUTTON_WIDTH ) + .height( BUTTON_WIDTH ) + .backgroundColor( this.arrayIndex === item.id ? DOWN_COLOR : UP_COLOR ) + .borderRadius( BUTTON_RADIUS ) + .flexShrink( 0 ) + .onTouch( ( event: TouchEvent ) => { + if ( event.type === TouchType.Down ) { + this.arrayIndex = item.id + } + + if ( event.type === TouchType.Up ) { + this.arrayIndex = 0 + } + } ) + .onClick( ( event: ClickEvent ) => { + switch ( item.id ) { + case 1: + this.browser.Back() + break; + case 2: + this.browser.Forward() + break; + case 3: + this.browser.Refresh() + break; + case 4: + this.browser.webControllerArray[ this.browser.tabArrayIndex ].controller.loadUrl( { + url : $rawfile( 'phone.html' ) // pad.html + } ) + break; + } + } ) + } , item => item.id ) + + TextInput( { placeholder : '默认网址:www.baidu.com' , text : this.browser.inputValue } ) + .placeholderFont( { size : 18 , weight : "50%" } ) + .fontSize( 18 ) + .margin( 2 ) + .id( 'inputUrl' ) + .width( '51%' ) + .layoutWeight( 1 ) + .onChange( ( value: string ) => { + this.addr = value + AppStorage.setOrCreate( "addr" , this.addr ) + } ) + .onSubmit( ( enterKey: EnterKeyType ) => { + console.log( TAG , `onSubmit` ) + if ( this.addr.length !== 0 ) { + this.browser.webControllerArray[ this.browser.tabArrayIndex ].controller.loadUrl( { + url : `https://${ this.addr }` + } ) + this.addr = '' + } + } ) + + ForEach( this.actionButton , ( item , index ) => { + Button( { type : ButtonType.Normal } ) { + Image( item.imageSrc ) + } + .margin( 8 ) + .id( `actionButton${ index }` ) + .width( BUTTON_WIDTH ) + .height( BUTTON_WIDTH ) + .backgroundColor( this.arrayIndex === item.id ? DOWN_COLOR : UP_COLOR ) + .borderRadius( BUTTON_RADIUS ) + .flexShrink( 0 ) + .onTouch( ( event: TouchEvent ) => { + if ( event.type === TouchType.Down ) { + this.arrayIndex = item.id + } + if ( event.type === TouchType.Up ) { + this.arrayIndex = 0 + } + } ) + .onClick( ( event: ClickEvent ) => { + if ( item.id === 5 ) { + this.browser.loadUrl( this.addr ) + this.addr = '' + } else if ( item.id === 6 ) { + console.log( TAG , `add tab index = ` + this.arrayIndex ) + this.browser.addTab() + } + } ) + } , item => item.id ) + } + .width( '100%' ) + .padding( { right : 5 } ) + } +} + +@Component +export struct BrowserTabs { + @Link browser: Browser; + @State tabButtonIndex: Number = - 1; + + build() { + Flex( { direction : FlexDirection.Row , alignItems : ItemAlign.Start } ) { + ForEach( this.browser.webArray , item => { + Row() { + Row() { + Text( "网页" ) + }.width( '100%' ).flexShrink( 1 ).justifyContent( FlexAlign.Center ).height( '100%' ) + + Button( { type : ButtonType.Normal } ) { + Image( $r( 'app.media.ic_public_cancel_filled' ) ).width( 24 ).height( 24 ) + } + .backgroundColor( this.tabButtonIndex == item.key ? DOWN_COLOR : '#00000000' ) + .id( 'cancelBtn' ) + .margin( { right : 2 } ) + .width( 33 ) + .height( 33 ) + .borderRadius( 5 ) + .onTouch( ( event: TouchEvent ) => { + if ( event.type === TouchType.Down ) { + this.tabButtonIndex = item.key + } else if ( event.type == TouchType.Up ) { + this.tabButtonIndex = - 1 + } + } ) + .onClick( ( event: ClickEvent ) => { + if ( this.browser.webArray.length > 1 ) { + this.browser.deleteTab( item.key ) + } + } ) + } + .width( 180 ) + .height( '100%' ) + .backgroundColor( this.browser.tabArrayIndex == item.key ? '#ffffff' : '#ececec' ) + .onClick( ( event: ClickEvent ) => { + console.log( TAG , `key= ${ item.key }` ) + this.browser.setTabArrayIndex( item.key ) + this.browser.tabsController.changeIndex( item.key ) + } ) + + Divider().vertical( true ).color( '#c6c6c6' ) + } , item => item.timestamp.toString() ) + }.height( 33 ).flexShrink( 0 ).backgroundColor( '#ececec' ) + } +} + +@Component +export struct WebTab { + @Link browser: Browser; + @Link isPhone: boolean; + @State progressStartTime: number = 0; + @State progressEndTime: number = 0; + @State progressCostTime: number = 0; + @State pageStartTime: number = 0; + @State pageEndTime: number = 0; + @State pageCostTime: number = 0; + @State Time: Number = 11 + @State fileData: string = ""; + @State onPageBeginNumber: number = 0 + @State onPageEndNumber: number = 0 + @State onProgressChangeNumber: number = 0 + @StorageLink( "openWebNumber" ) openWebNumber: number = 0 + @StorageLink( "fsFile" ) file: fs.File = null + isRegistered: boolean = false + testObj = { + test : ( addr ) => { + console.log( TAG , `addr= ${ this.browser.tabArrayIndex }` ) + this.browser.webControllerArray[ this.browser.tabArrayIndex ].controller.loadUrl( { url : `https://${ addr }` } ) + } , + searchWord : ( word: string ) => { + console.log( `search word= ${ word }` ) + let code = encodeURI( word ) + this.browser.webControllerArray[ this.browser.tabArrayIndex ].controller.loadUrl( { + url : `https://www.bing.com/search?q=${ code }` + } ) + } + } + + build() { + Tabs( { barPosition : BarPosition.Start , controller : this.browser.tabsController } ) { + ForEach( this.browser.webArray , item => { + TabContent() { + Web( { + src : this.isPhone ? $rawfile( 'phone.html' ) : $rawfile( 'pad.html' ) , + controller : this.browser.webControllerArray[ item.key ] !== undefined ? + this.browser.webControllerArray[ item.key ].controller : undefined + } ) + .javaScriptAccess( true ) + .fileAccess( true ) + .domStorageAccess( true ) + .userAgent( this.isPhone ? PHONE_USER_AGENT : PAD_USER_AGENT ) + .onPageBegin( ( event ) => { + console.log( TAG , `onPageBegin= ${ JSON.stringify( event ) }` ) + this.pageStartTime = new Date().getTime() + console.log( TAG , "onPageBegin,开始加载页面,开始时间：" + this.pageStartTime ) + this.browser.loadingStatus = LoadingStatus.LOADING + this.fileData = "第" + ( this.openWebNumber + 1 ) + "次onPageBegin,开始加载页面,开始时间：" + this.pageStartTime + "\n" + fs.writeSync( this.file.fd , this.fileData ); + } ) + .onPageEnd( ( event ) => { + console.log( TAG , `onPageEnd= ${ JSON.stringify( event ) }` ) + this.pageEndTime = new Date().getTime() + console.log( TAG , "onPageEnd,结束加载页面,开始时间：" + this.pageEndTime ) + this.pageCostTime = this.pageEndTime - this.pageStartTime + console.log( TAG , "onPageEnd,加载页面耗时：" + this.pageCostTime ) + this.fileData = "第" + ( this.openWebNumber + 1 ) + "次onPageEnd,结束加载页面,开始时间：" + this.pageEndTime + "\n" + this.fileData += "第" + ( this.openWebNumber + 1 ) + "次onPageEnd,加载页面耗时：" + this.pageCostTime + "ms" + "\n" + fs.writeSync( this.file.fd , this.fileData ); + + if ( item.key < this.browser.webControllerArray.length && this.browser.webControllerArray[ item.key ].controller ) { + this.browser.webControllerArray[ item.key ].controller.runJavaScript( { script : 'adapterDevice()' } ) + this.browser.loadingStatus = LoadingStatus.END + this.registerFunc( this.browser.webControllerArray[ item.key ] ) + if ( event.url.startsWith( 'http' ) ) { + this.browser.inputValue = event.url + } else { + this.browser.inputValue = '' + } + } + } ) + .onProgressChange( ( event ) => { + console.log( TAG , `onProgressChange` ) + this.browser.progress = event.newProgress + console.log( TAG , `onProgressChange,progress:` + this.browser.progress ) + if ( this.browser.progress === 10 ) { + this.progressStartTime = new Date().getTime() + console.log( TAG , "onProgressChange,开始加载页面,开始时间：" + this.progressStartTime ) + this.fileData = "第" + ( this.openWebNumber + 1 ) + "次onProgressChange,开始加载页面,开始时间：" + this.progressStartTime + "\n" + fs.writeSync( this.file.fd , this.fileData ); + } else if ( this.browser.progress === 100 ) { + this.progressEndTime = new Date().getTime() + this.browser.hideProgress = true + console.log( TAG , "onProgressChange,结束加载页面,开始时间：" + this.progressEndTime ) + this.progressCostTime = this.progressEndTime - this.progressStartTime + console.log( TAG , "onProgressChange,加载页面耗时：" + this.progressCostTime ) + this.fileData = "第" + ( this.openWebNumber + 1 ) + "次onProgressChange,结束加载页面,开始时间：" + this.progressEndTime + "\n" + this.fileData += "第" + ( this.openWebNumber + 1 ) + "次onProgressChange,加载页面耗时：" + this.progressCostTime + "\n" + fs.writeSync( this.file.fd , this.fileData ); + } else { + this.browser.hideProgress = false + } + } ) + } + } , item => item.timestamp.toString() ) + } + .barHeight( 0 ) + .scrollable( false ) + } + + registerFunc( webObject: WebObject ) { + if ( !webObject.isRegistered ) { + console.log( TAG , `registerFunc` ) + webObject.controller.registerJavaScriptProxy( { + object : this.testObj , name : 'etsObj' , methodList : [ 'test', 'searchWord' ] + } ) + webObject.isRegistered = true + webObject.controller.refresh() + } + } +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Component/wifiView.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Component/wifiView.ets index 527fece62..820f2e0fb 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/Component/wifiView.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Component/wifiView.ets @@ -16,14 +16,14 @@ // @ts-nocheck const TAG = "[wifiView]" -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; /** * WifiView Component of wifi test */ @Component export struct WifiView { - @State wifi: any = null + private wifi: any = null private securityString: Resource = $r( 'app.string.encryption' ) @State isLock: boolean = true diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/MainAbility.ts b/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index 23aae175d..000000000 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/MainAbility.ts +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 hilog from '@ohos.hilog'; -import Ability from '@ohos.application.Ability' -import Window from '@ohos.window' - -/* - mainAbility of wifi test - */ - -export default class MainAbility extends Ability { - onCreate(want, launchParam) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); - hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); - hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:' + JSON.stringify(launchParam) ?? ''); - } - - onDestroy() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); - } - - onWindowStageCreate(windowStage: Window.WindowStage) { - // Main window is created, set main page for this ability - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); - - windowStage.loadContent('pages/homePage', (err, data) => { - if (err.code) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR); - hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); - return; - } - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); - }); - } - - onWindowStageDestroy() { - // Main window is destroyed, release UI related resources - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy'); - } - - onForeground() { - // Ability has brought to foreground - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground'); - } - - onBackground() { - // Ability has back to background - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground'); - } -} diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/Utils/globalThis.ets b/wifi/test/wifi_testapp/entry/src/main/ets/Utils/globalThis.ets new file mode 100644 index 000000000..1462ce98c --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/Utils/globalThis.ets @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ +// @ts-ignore +import { Context } from '@ohos.abilityAccessCtrl'; + +// 构造单例对象 +export class GlobalThis { + private constructor() {} + private static instance: GlobalThis; + private _uiContexts = new Map(); + + public static getInstance(): GlobalThis { + if (!GlobalThis.instance) { + GlobalThis.instance = new GlobalThis(); + } + return GlobalThis.instance; + } + + getContext(key: string): Context | undefined { + return this._uiContexts.get(key); + } + + setContext(key: string, value: Context): void { + this._uiContexts.set(key, value); + } + + // 其他需要传递的内容依此扩展 +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/entryability/EntryAbility.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/EntryAbility.ets new file mode 100644 index 000000000..98a2d0885 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/EntryAbility.ets @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 UIAbility from '@ohos.app.ability.UIAbility'; +import hilog from '@ohos.hilog'; +import window from '@ohos.window'; +import { GlobalThis } from "../utils/globalThis" +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' + +export default class EntryAbility extends UIAbility { + onCreate( want , launchParam ) { + hilog.info( 0x0000 , 'testTag' , '%{public}s' , 'Ability onCreate' ); + GlobalThis.getInstance().setContext( 'context' , this.context ) + // this.context.request + // abilityAccessCtrl.createAtManager().requestPermissionsFromUser(this.context, []) + } + + onDestroy() { + hilog.info( 0x0000 , 'testTag' , '%{public}s' , 'Ability onDestroy' ); + } + + onWindowStageCreate( windowStage: window.WindowStage ) { + // Main window is created, set main page for this ability + hilog.info( 0x0000 , 'testTag' , '%{public}s' , 'Ability onWindowStageCreate' ); + + windowStage.loadContent( 'pages/homePage' , ( err , data ) => { + if ( err.code ) { + hilog.error( 0x0000 , 'testTag' , 'Failed to load the content. Cause: %{public}s' , JSON.stringify( err ) ?? '' ); + return; + } + hilog.info( 0x0000 , 'testTag' , 'Succeeded in loading the content. Data: %{public}s' , JSON.stringify( data ) ?? '' ); + } ); + + let context = this.context; + let pathDir = context.filesDir; + AppStorage.setOrCreate( "pathDir" , pathDir ) + } + + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + hilog.info( 0x0000 , 'testTag' , '%{public}s' , 'Ability onWindowStageDestroy' ); + } + + onForeground() { + // Ability has brought to foreground + hilog.info( 0x0000 , 'testTag' , '%{public}s' , 'Ability onForeground' ); + } + + onBackground() { + // Ability has back to background + hilog.info( 0x0000 , 'testTag' , '%{public}s' , 'Ability onBackground' ); + } +} diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/bean/TaskItemBean.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/bean/TaskItemBean.ets similarity index 83% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/bean/TaskItemBean.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/bean/TaskItemBean.ets index a40a0df93..31d8d0cdb 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/bean/TaskItemBean.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/bean/TaskItemBean.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/constant/CommonConstant.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/constant/CommonConstant.ets similarity index 87% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/constant/CommonConstant.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/constant/CommonConstant.ets index 57a4fdaf2..133e6bf28 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/constant/CommonConstant.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/constant/CommonConstant.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -56,12 +56,12 @@ export class CommonConstants { /** * Toast Duration. */ - static readonly TOAST_TIME: number = 3000; + static readonly TOAST_TIME: Number = 3000; /** * Bottom toast. */ - static readonly TOAST_MARGIN_BOTTOM: number = 64; + static readonly TOAST_MARGIN_BOTTOM: Number = 64; /** * Width of title. @@ -76,7 +76,7 @@ export class CommonConstants { /** * Radius of bookInfo area. */ - static readonly IMAGE_BORDER_RADIUS: number = 12; + static readonly IMAGE_BORDER_RADIUS: Number = 12; /** * Margin left of book item. @@ -96,7 +96,7 @@ export class CommonConstants { /** * Radius of dialog. */ - static readonly DIALOG_BORDER_RADIUS: number = 32; + static readonly DIALOG_BORDER_RADIUS: Number = 32; /** * Button width of dialog. @@ -121,7 +121,7 @@ export class CommonConstants { /** * Horizontal offset of dialog. */ - static readonly DIALOG_OFFSET_X: number = 0; + static readonly DIALOG_OFFSET_X: Number = 0; /** * TextInput offset of dialog. @@ -216,7 +216,7 @@ export class CommonConstants { /** * The fraction or number of seconds is less than 10. */ - static readonly TEN: number = 10; + static readonly TEN: Number = 10; /** * One task of data. @@ -231,17 +231,17 @@ export class CommonConstants { /** * default click index. */ - static readonly DEFAULT_CLICK_INDEX: number = -1; + static readonly DEFAULT_CLICK_INDEX: Number = -1; /** * default SliderChangeMode. */ - static readonly DEFAULT_SLIDER_MODE: number = -1; + static readonly DEFAULT_SLIDER_MODE: Number = -1; /** * click SliderChangeMode. */ - static readonly CLICK_SLIDER_MODE: number = 3; + static readonly CLICK_SLIDER_MODE: Number = 3; /** * x-axis transition animation. diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/utils/DateUtil.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/utils/DateUtil.ets similarity index 84% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/utils/DateUtil.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/utils/DateUtil.ets index 062d6e6df..517c771e5 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/utils/DateUtil.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/utils/DateUtil.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/utils/Logger.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/utils/Logger.ets similarity index 91% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/utils/Logger.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/utils/Logger.ets index 3f639f0b4..a82cb8ad8 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/common/utils/Logger.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/common/utils/Logger.ets @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/AddTargetDialog.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/AddTargetDialog.ets similarity index 96% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/AddTargetDialog.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/AddTargetDialog.ets index 80eccf2fd..ce66f802c 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/AddTargetDialog.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/AddTargetDialog.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -130,7 +130,7 @@ export default struct AddTargetDialog { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( "100%" ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { this.wifiCandidateConfig.securityType = index; } ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/ProgressEditPanel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/ProgressEditPanel.ets similarity index 91% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/ProgressEditPanel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/ProgressEditPanel.ets index 7ebfaa17b..55cf8e6bb 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/ProgressEditPanel.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/ProgressEditPanel.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -17,10 +17,10 @@ import { CommonConstants } from '../common/constant/CommonConstant'; @Component export default struct ProgressEditPanel { - @Link sliderMode: number; + @Link sliderMode: Number; @Prop slidingProgress: number; onCancel: () => void; - onClickOK: (progress: number) => void; + onClickOK: (progress: Number) => void; build() { Column() { diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetInformation.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetInformation.ets similarity index 94% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetInformation.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetInformation.ets index 06c4facd4..42892fd10 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetInformation.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetInformation.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetList.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetList.ets similarity index 95% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetList.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetList.ets index d632c7138..9f8c14f2a 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetList.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetList.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -23,7 +23,7 @@ export default struct TargetList { @Consume overAllProgressChanged: boolean; @State isEditMode: boolean = false; @State selectArray: Array = []; - @State clickIndex: number = CommonConstants.DEFAULT_CLICK_INDEX; + @State clickIndex: Number = CommonConstants.DEFAULT_CLICK_INDEX; @State selectAll: boolean = false; @Link targetData: Array; onAddClick: () => void; diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetListItem.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetListItem.ets similarity index 93% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetListItem.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetListItem.ets index 0e7c4befe..02bbacdb5 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/view/TargetListItem.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/view/TargetListItem.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -25,10 +25,10 @@ export default struct TargetListItem { @State updateDate: string = ''; @Link selectArr: Array; @Prop isEditMode: boolean; - @Link @Watch('onClickIndexChanged') clickIndex: number; + @Link @Watch('onClickIndexChanged') clickIndex: Number; @State isExpanded: boolean = false; @Consume overAllProgressChanged: boolean; - @State sliderMode: number = CommonConstants.DEFAULT_SLIDER_MODE; + @State sliderMode: Number = CommonConstants.DEFAULT_SLIDER_MODE; private index: number; aboutToAppear() { diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/DataModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/DataModel.ets similarity index 94% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/DataModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/DataModel.ets index f4c8b4d57..41c5bf03c 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/DataModel.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/DataModel.ets @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 @@ -69,7 +69,7 @@ export class DataModel { /** * Get the latest progress. */ - getLatestProgressValue(): number { + getLatestProgressValue(): Number { if (this.targetData.length === 0) { return 0; } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/MainPageModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/MainPageModel.ets similarity index 87% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/MainPageModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/MainPageModel.ets index e90c10c81..958d97857 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/MainPageModel.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/MainPageModel.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/TaskListItemModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/TaskListItemModel.ets similarity index 78% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/TaskListItemModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/TaskListItemModel.ets index 6027799c7..c42d2f4ae 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/TaskListItemModel.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/TaskListItemModel.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -21,7 +21,7 @@ import DataModel from '../viewmodel/DataModel'; * * @param progress progress value saved. */ -export function changeProgress(progress: number) { +export function changeProgress(progress: Number) { this.latestProgress = progress; this.updateDate = getCurrentTime(); let result = DataModel.updateProgress(this.index, this.latestProgress, this.updateDate); diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/TaskListViewModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/TaskListViewModel.ets similarity index 88% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/TaskListViewModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/TaskListViewModel.ets index de9aaaa6f..3147d2fd7 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/candidateWifiModel/viewmodel/TaskListViewModel.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/candidateWifiModel/viewmodel/TaskListViewModel.ets @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License,Version 2.0 (the "License"); +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/DateTimeUtil.ts b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/DateTimeUtil.ts similarity index 91% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/DateTimeUtil.ts rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/DateTimeUtil.ts index 92dfa9fe3..05e830b95 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/DateTimeUtil.ts +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/DateTimeUtil.ts @@ -38,7 +38,7 @@ export default class DateTimeUtil { * 日期不足两位补充0 * @param value-数据值 */ - fill(value: number) { + fill(value: Number) { return (value > 9 ? '' : '0') + value } @@ -48,7 +48,7 @@ export default class DateTimeUtil { * @param month * @param date */ - concatDate(year: number, month: number, date: number) { + concatDate(year: Number, month: Number, date: Number) { return `${year}${this.fill(month)}${this.fill(date)}` } @@ -58,7 +58,7 @@ export default class DateTimeUtil { * @param minutes * @param seconds */ - concatTime(hours: number, minutes: number, seconds: number) { + concatTime(hours: Number, minutes: Number, seconds: Number) { return `${this.fill(hours)}${this.fill(minutes)}${this.fill(seconds)}` } } \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/Logger.ts b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/Logger.ts similarity index 95% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/Logger.ts rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/Logger.ts index 5eaf3b3df..628b5d285 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/Logger.ts +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/Logger.ts @@ -22,7 +22,7 @@ import hilog from '@ohos.hilog' */ class Logger { - private domain: number + private domain: Number private prefix: string private format: string = "%{public}s, %{public}s" diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/MediaUtils.ts b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/MediaUtils.ts similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/MediaUtils.ts rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/MediaUtils.ts diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/autoTestDataModels.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/autoTestDataModels.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/autoTestDataModels.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/autoTestDataModels.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/benchmarkTestDataModels.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/benchmarkTestDataModels.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/benchmarkTestDataModels.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/benchmarkTestDataModels.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/bowser.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/bowser.ets new file mode 100644 index 000000000..ecdf0c615 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/bowser.ets @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 Logger from './Logger' +import prompt from '@ohos.prompt'; + +export class WebObject { + controller: WebController; + isRegistered: boolean; + constructor(controller: WebController, isRegistered: boolean) { + this.controller = controller + this.isRegistered = isRegistered + } +} + +@Observed +class WebKey { + key: number; + timestamp: Number; + + constructor(key: number, timestamp: Number) { + this.key = key + this.timestamp = timestamp + } +} + +export enum LoadingStatus { + LOADING, + END +} + +const TAG: string = '[browser]' + +export class Browser { + inputValue: string = "" + tabArrayIndex: number = 0 + progress: number = 0 + hideProgress: boolean = true + loadingStatus: LoadingStatus = LoadingStatus.END + + webArray: Array = [new WebKey(0, new Date().getTime())] + tabsController: TabsController = new TabsController() + webControllerArray: Array = [new WebObject(new WebController(), false)] + + deleteTab(index: number) { + console.log(TAG, `delete before tab index= ${index} controller length ${this.webControllerArray.length} tabArrayIndex= ${this.tabArrayIndex}`) + this.webArray.splice(index, 1) + this.webControllerArray.splice(index, 1) + if (this.tabArrayIndex > index || this.tabArrayIndex === this.webArray.length) { + this.tabArrayIndex -= 1 + } + for (let i = index;i < this.webArray.length; ++i) { + this.webArray[i].key -= 1 + } + for (let i = 0;i < this.webArray.length; ++i) { + console.log(TAG, `key ${this.webArray[i].key}, time=${this.webArray[i].timestamp}`) + } + console.log(`delete after tab index=${index}, controller length=${this.webControllerArray.length}, tabArrayIndex=${this.tabArrayIndex}`) + this.tabsController.changeIndex(this.tabArrayIndex) + } + + getWebArray() { + return this.webArray + } + + addTab() { + if (this.webArray.length > 10) { + prompt.showToast({ + message: '页签数量已满' + }) + return; + } + let webController: WebController = new WebController(); + let object = new WebObject(webController, false) + this.webControllerArray.push(object) + this.webArray.push(new WebKey(this.webArray.length, new Date().getTime())) + this.tabArrayIndex = this.webArray.length - 1 + console.log(TAG, `add tab index= ${this.tabArrayIndex}`) + setTimeout(() => { + this.tabsController.changeIndex(this.tabArrayIndex) + }, 50) + } + + setTabArrayIndex(tabArrayIndex: number) { + this.tabArrayIndex = tabArrayIndex + } + + getTabArrayIndex() { + return this.tabArrayIndex + } + + setInputVal(inputValue: string) { + this.inputValue = inputValue + } + + getInputVal() { + return this.inputValue + } + + loadUrl(addr: string) { + addr = "https://" + addr; + this.webControllerArray[this.tabArrayIndex].controller.loadUrl({ url: addr }) + } + + Back() { + if (this.webControllerArray[this.tabArrayIndex].controller.accessBackward()) { + this.webControllerArray[this.tabArrayIndex].controller.backward() + } + } + + Forward() { + if (this.webControllerArray[this.tabArrayIndex].controller.accessForward()) { + this.webControllerArray[this.tabArrayIndex].controller.forward() + } + } + + Refresh() { + this.webControllerArray[this.tabArrayIndex].controller.refresh() + } +} diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/hotspotInterface.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/hotspotInterface.ets similarity index 97% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/hotspotInterface.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/hotspotInterface.ets index 85bfb1b7d..c21c6a438 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/hotspotInterface.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/hotspotInterface.ets @@ -18,9 +18,9 @@ import prompt from '@system.prompt'; import Router from '@system.router'; import wifi from '@ohos.wifi'; -import ConfigData from "../../Utils/ConfigData" -import LogData from "../../Utils/LogData" -import MessageData from "../../Utils/MessageData" +import ConfigData from "../../utils/ConfigData" +import LogData from "../../utils/LogData" +import MessageData from "../../utils/MessageData" const TAG = "[hotspotInterface]" /** @@ -138,7 +138,7 @@ export function testSetHotspotConfig(): string { ssid = AppStorage.Get( "h_ssid" ) // let securityType=AppStorage.Get("h_securityType") // let band = AppStorage.Get("h_band") - // preSharedKey = AppStorage.Get("h_preSharedKey") + preSharedKey = AppStorage.Get( "h_preSharedKey" ) // let maxConn = AppStorage.Get("h_maxConn") // let channel = AppStorage.Get("h_channel") let hotspotConfigs = { @@ -169,6 +169,8 @@ export function testGetHotspotConfig(): string { let ret = wifi.getHotspotConfig() message = "HotspotConfig: " + JSON.stringify( ret ) console.log( TAG , "HotspotConfig is: " + JSON.stringify( ret ) ) + let hotspotSsid = ret.ssid + AppStorage.setOrCreate( "hotspotSsid" , hotspotSsid ) let getHotspotConfigMessage = JSON.stringify( ret ) AppStorage.SetOrCreate( "getHotspotConfigMessage" , getHotspotConfigMessage ) prompt.showToast( { message : message } ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/hotspotManagerInterface.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/hotspotManagerInterface.ets similarity index 97% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/hotspotManagerInterface.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/hotspotManagerInterface.ets index 836dbe933..d23a17ea3 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/hotspotManagerInterface.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/hotspotManagerInterface.ets @@ -19,9 +19,9 @@ import prompt from '@system.prompt'; import Router from '@system.router'; import wifiManager from '@ohos.wifiManager'; -import ConfigData from "../../Utils/ConfigData" -import LogData from "../../Utils/LogData" -import MessageData from "../../Utils/MessageData" +import ConfigData from "../../utils/ConfigData" +import LogData from "../../utils/LogData" +import MessageData from "../../utils/MessageData" const TAG = "[hotspotManagerInterface]" /** @@ -134,7 +134,7 @@ export function testSetHotspotConfigManager(): string { ssid = AppStorage.Get( "h_ssid1" ) // let securityType=AppStorage.Get("h_securityType1") // let band = AppStorage.Get("h_band1") - // let preSharedKey = AppStorage.Get("h_preSharedKey1") + preSharedKey = AppStorage.Get("h_preSharedKey1") // let maxConn = AppStorage.Get("h_maxConn1") let config = { ssid : ssid , @@ -163,6 +163,8 @@ export function testGetHotspotConfigManager(): string { let message = "getHotspotConfig test" let ret = wifiManager.getHotspotConfig() message = "HotspotConfig is " + JSON.stringify( ret ) + let hotspotManagerSsid = ret.ssid + AppStorage.setOrCreate( "hotspotManagerSsid" , hotspotManagerSsid ) console.log( TAG , "HotspotConfig is" + JSON.stringify( ret ) ) let getHotspotConfigManagerMessage = JSON.stringify( ret ) AppStorage.SetOrCreate( "getHotspotConfigManagerMessage" , getHotspotConfigManagerMessage ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pInterface.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pInterface.ets similarity index 98% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pInterface.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pInterface.ets index af17223da..069375851 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pInterface.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pInterface.ets @@ -18,12 +18,13 @@ import prompt from '@system.prompt'; import Router from '@system.router'; import wifi from '@ohos.wifi'; -import ConfigData from "../../Utils/ConfigData" -import LogData from "../../Utils/LogData" -import MessageData from "../../Utils/MessageData" +import ConfigData from "../../utils/ConfigData" +import LogData from "../../utils/LogData" +import MessageData from "../../utils/MessageData" const PAGE_URI_P2P_FOUND_MODE = 'pages/subManualApiTest/subP2pTest/p2pFound'; const TAG = "[p2pInterface]" + /** * p2p Test Page Of Wifi test */ @@ -174,7 +175,7 @@ export function testGetP2pPeerDevicesCallback() { console.log( TAG , LogData.testGetP2pPeerDevicesCallback_EndLog ); prompt.showToast( { message : message } ) let len = Object.keys( WifiP2pDevice ).length; - for ( let i = 0 ; i < len ; ++i ) { + for ( let i = 0 ; i < len ; ++ i ) { if ( WifiP2pDevice[ i ].deviceName === "MyTestDevice" ) { console.log( TAG , "p2p connect to test device: " + WifiP2pDevice[ i ].deviceAddress ); let config = { @@ -342,6 +343,7 @@ export function testSetDeviceName( deviceName: string ): string { let ret = wifi.setDeviceName( deviceName ) message = "设置：" + ret + ",设备名称为：" + deviceName; console.log( TAG , "设置：" + ret + ",设备名称为：" + deviceName ); + AppStorage.setOrCreate( "p2pDeviceName" , deviceName ) prompt.showToast( { message : message } ) console.log( TAG , LogData.testSetDeviceName_EndLog ); return message @@ -493,10 +495,10 @@ export function testOnP2pDeviceChange(): string { } console.log( TAG , "info:" + JSON.stringify( data ) ) message = "deviceName: " + deviceName + "\n" + - "deviceAddress: " + deviceAddress + "\n" + - "primaryDeviceType: " + primaryDeviceType + "\n" + - "deviceStatus: " + p2pDeviceStatusMessage + "\n" + - "groupCapabilitys: " + groupCapabilitys + "\n" + "deviceAddress: " + deviceAddress + "\n" + + "primaryDeviceType: " + primaryDeviceType + "\n" + + "deviceStatus: " + p2pDeviceStatusMessage + "\n" + + "groupCapabilitys: " + groupCapabilitys + "\n" AppStorage.SetOrCreate( "p2pDeviceMessage" , message ) prompt.showToast( { message : message } ) console.log( TAG , LogData.testOnP2pDeviceChange_EndLog ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pManagerInterface.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pManagerInterface.ets similarity index 98% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pManagerInterface.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pManagerInterface.ets index 00da9b0e1..70f2677df 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pManagerInterface.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pManagerInterface.ets @@ -18,9 +18,9 @@ import prompt from '@system.prompt'; import Router from '@system.router'; import wifiManager from '@ohos.wifiManager'; -import ConfigData from "../../Utils/ConfigData" -import LogData from "../../Utils/LogData" -import MessageData from "../../Utils/MessageData" +import ConfigData from "../../utils/ConfigData" +import LogData from "../../utils/LogData" +import MessageData from "../../utils/MessageData" const TAG = "[p2pManagerInterface]" /** @@ -377,6 +377,8 @@ export function testSetP2pDeviceNameManager(): string { let ret = wifiManager.setP2pDeviceName( devName ) // setP2pDeviceName的返回值为void // message = "setDeviceName: " + ret + let p2pManagerDeviceName = devName + AppStorage.setOrCreate( "p2pManagerDeviceName" , p2pManagerDeviceName ) message = "setP2pDeviceName 调用成功" prompt.showToast( { message : message } ) return message @@ -524,10 +526,10 @@ export function testOnP2pDeviceChangeManager(): string { } console.log( TAG , "info:" + JSON.stringify( data ) ) message = "deviceName: " + deviceName + "\n" + - "deviceAddress: " + deviceAddress + "\n" + - "primaryDeviceType: " + primaryDeviceType + "\n" + - "deviceStatus: " + p2pDeviceStatusMessage + "\n" + - "groupCapabilitys: " + groupCapabilitys + "\n" + "deviceAddress: " + deviceAddress + "\n" + + "primaryDeviceType: " + primaryDeviceType + "\n" + + "deviceStatus: " + p2pDeviceStatusMessage + "\n" + + "groupCapabilitys: " + groupCapabilitys + "\n" prompt.showToast( { message : message } ) } ) message = "打开注册WLAN连接状态变化" diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pModel.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/p2pModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/p2pModel.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/scenarioTestDataModels.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/scenarioTestDataModels.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/scenarioTestDataModels.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/scenarioTestDataModels.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/stressTestDataModels.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/stressTestDataModels.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/stressTestDataModels.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/stressTestDataModels.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/testData.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/testData.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/testData.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/testData.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/testDataModels.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/testDataModels.ets similarity index 99% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/testDataModels.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/testDataModels.ets index dacbec4e1..8d57edd6f 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/testDataModels.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/testDataModels.ets @@ -1379,6 +1379,41 @@ const TestComposition: any[] = [ 'image' : $r( 'app.media.WLAN' ) , 'category' : Category.API }, + { + 'name' : 'WiFiSwitchStabilityTest' , + 'detail' : 'WiFi开关稳定性测试' , + 'url' : 'pages/subStabilityTest/wifiSwitchStabilityTest' , + 'image' : $r( 'app.media.ScenarioTest' ) , + 'category' : Category.Stability + }, + { + 'name' : 'WiFiScanStabilityTest' , + 'detail' : 'WiFi搜索稳定性测试' , + 'url' : 'pages/subStabilityTest/wifiScanStabilityTest' , + 'image' : $r( 'app.media.ScenarioTest' ) , + 'category' : Category.Stability + }, + { + 'name' : 'WiFiConnectStabilityTest' , + 'detail' : 'WiFi连接稳定性测试' , + 'url' : 'pages/subStabilityTest/wifiConnectStabilityTest' , + 'image' : $r( 'app.media.ScenarioTest' ) , + 'category' : Category.Stability + }, + { + 'name' : 'HotspotStabilityTest' , + 'detail' : '热点稳定性测试' , + 'url' : 'pages/subStabilityTest/hotspotStabilityTest' , + 'image' : $r( 'app.media.ScenarioTest' ) , + 'category' : Category.Stability + }, + { + 'name' : 'WebLatencyTest' , + 'detail' : '网页时延测试' , + 'url' : 'pages/subStabilityTest/webLatencyTest' , + 'image' : $r( 'app.media.ScenarioTest' ) , + 'category' : Category.Stability + }, { 'name' : 'WifiAutoTest' , 'detail' : 'wifi自动测试' , @@ -1463,27 +1498,6 @@ const TestComposition: any[] = [ 'image' : $r( 'app.media.ScenarioTest' ) , 'category' : Category.Scenario }, - { - 'name' : 'WiFiSwitchStabilityTest' , - 'detail' : 'WiFi开关稳定性测试' , - 'url' : 'pages/subStabilityTest/wifiSwitchStabilityTest' , - 'image' : $r( 'app.media.ScenarioTest' ) , - 'category' : Category.Stability - }, - { - 'name' : 'WiFiScanStabilityTest' , - 'detail' : 'WiFi搜索稳定性测试' , - 'url' : 'pages/subStabilityTest/wifiScanStabilityTest' , - 'image' : $r( 'app.media.ScenarioTest' ) , - 'category' : Category.Stability - }, - { - 'name' : 'WiFiConnectStabilityTest' , - 'detail' : 'WiFi连接稳定性测试' , - 'url' : 'pages/subStabilityTest/wifiConnectStabilityTest' , - 'image' : $r( 'app.media.ScenarioTest' ) , - 'category' : Category.Stability - }, { 'name' : 'WifiBenchmarkTest' , 'detail' : 'Wifi性能测试' , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiInterface.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiInterface.ets similarity index 99% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiInterface.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiInterface.ets index 8763f9439..4bbe24116 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiInterface.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiInterface.ets @@ -18,8 +18,8 @@ import prompt from '@system.prompt'; import Router from '@system.router'; import wifi from '@ohos.wifi'; -import LogData from "../../Utils/LogData" -import MessageData from "../../Utils/MessageData" +import LogData from "../../utils/LogData" +import MessageData from "../../utils/MessageData" const TAG = "[wifiInterface]"; /** diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiManagerInterface.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiManagerInterface.ets similarity index 99% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiManagerInterface.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiManagerInterface.ets index 3470b2827..8bda54e8e 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiManagerInterface.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiManagerInterface.ets @@ -18,8 +18,8 @@ import prompt from '@system.prompt'; import Router from '@system.router'; import wifiManager from '@ohos.wifiManager'; -import LogDataManager from "../../Utils/LogDataManager" -import MessageDataManager from "../../Utils/MessageDataManager" +import LogDataManager from "../../utils/LogDataManager" +import MessageDataManager from "../../utils/MessageDataManager" const TAG = "[wifiManagerInterface]"; /** @@ -278,7 +278,7 @@ export function testRemoveCandidateConfigManagerPromise() { if ( !wifiManagerEnable ) { message = ( MessageDataManager.testIsInactive ); } else { - let networkId: number = AppStorage.Get( "w_networkIdM" ) + let networkId: Number = AppStorage.Get( "w_networkIdM" ) wifiManager.removeCandidateConfig( networkId ).then( result => { // @returns Returns {@code true} if the Candidate hotspot configuration is removed, returns {@code false} otherwise. console.log( TAG , LogDataManager.testRemoveCandidateConfigPromiseManager_successfulLog ) @@ -307,7 +307,7 @@ export function testRemoveCandidateConfigManagerCallback() { if ( !wifiManagerEnable ) { message = ( MessageDataManager.testIsInactive ); } else { - let networkId: number = AppStorage.Get( "w_networkIdM" ) + let networkId: Number = AppStorage.Get( "w_networkIdM" ) wifiManager.removeCandidateConfig( networkId , ( err , result ) => { // @returns Returns {@code true} if the Candidate hotspot configuration is removed, returns {@code false} otherwise. if ( err ) { @@ -378,7 +378,7 @@ export function testConnectToNetworkManager() { try { let message = ( MessageDataManager.testConnectToNetwork ) console.log( TAG , LogDataManager.testConnectToNetworkManager_StartLog ) - let networkId: number = AppStorage.Get( "w_networkIdM" ) + let networkId: Number = AppStorage.Get( "w_networkIdM" ) if ( !wifiManagerEnable ) { message = ( MessageDataManager.testIsInactive ); } else { @@ -455,8 +455,8 @@ export function testGetSignalLevelManager() { if ( !wifiManagerEnable ) { message = ( MessageDataManager.testIsInactive ) } else { - let rssi: number = AppStorage.Get( "w_rssi1" ) - let band: number = AppStorage.Get( "w_band1" ) + let rssi: Number = AppStorage.Get( "w_rssi1" ) + let band: Number = AppStorage.Get( "w_band1" ) let number = wifiManager.getSignalLevel( rssi , band ) message = "getSignalLevel is: " + number console.log( TAG , "getSignalLevel is: " + number ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiModel.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiModel.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiTestModel.ets b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiTestModel.ets similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/model/wifiTestModel.ets rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/model/wifiTestModel.ets diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading01.png b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading01.png similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading01.png rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading01.png diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading02.png b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading02.png similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading02.png rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading02.png diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading03.png b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading03.png similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading03.png rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading03.png diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading04.png b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading04.png similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading04.png rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading04.png diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading05.png b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading05.png similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading05.png rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading05.png diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading06.png b/wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading06.png similarity index 100% rename from wifi/test/wifi_testapp/entry/src/main/ets/MainAbility/res/image/hdpi/ic_loading06.png rename to wifi/test/wifi_testapp/entry/src/main/ets/entryability/res/image/hdpi/ic_loading06.png diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/homePage.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/homePage.ets index b090c48bd..f479adea1 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/homePage.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/homePage.ets @@ -15,8 +15,8 @@ // @ts-nocheck -import { Category , TestData } from '../MainAbility/model/testData' -import { initTestData } from '../MainAbility/model/testDataModels' +import { Category , TestData } from '../entryability/model/testData' +import { initTestData } from '../entryability/model/testDataModels' import { MainPageTitle } from '../Component/mainPageTitle'; import { ManualApiTest } from '../Component/manualApiTestComponent'; import { ManualSceneTest } from '../Component/manualSceneTest'; @@ -25,7 +25,7 @@ import { AppTest } from '../Component/appTest'; import { StabilityTest } from "../Component/stabilityTest" import { BenchmarkTest } from '../Component/benchmarkTest'; import { StressTest } from "../Component/stressTest" -import ConfigData from '../Utils/ConfigData'; +import ConfigData from '../utils/ConfigData'; const TAG = '[homePage]' @@ -42,11 +42,15 @@ struct TestCategory { Tabs() { TabContent() { AppTest( { testItems : this.testItems.filter( item => ( item.category === Category.App ) ) } ) - }.tabBar( $r( "app.string.App" ) ).margin( { top : $r( "app.float.distance_20" ) } ) + }.tabBar( $r( "app.string.App" ) ).margin( { top : $r( "app.float.distance_5" ) } ) TabContent() { ManualApiTest( { testItems : this.testItems.filter( item => ( item.category === Category.API ) ) } ) - }.tabBar( $r( "app.string.api" ) ).margin( { top : $r( "app.float.distance_20" ) } ) + }.tabBar( $r( "app.string.api" ) ).margin( { top : $r( "app.float.distance_5" ) } ) + + TabContent() { + StabilityTest( { testItems : this.testItems.filter( item => ( item.category === Category.Stability ) ) } ) + }.tabBar( $r( "app.string.stability" ) ).margin( { top : $r( "app.float.distance_5" ) } ) TabContent() { AutoTest( { testItems : this.testItems.filter( item => ( item.category === Category.AutoTest ) ) } ) @@ -56,10 +60,6 @@ struct TestCategory { ManualSceneTest( { testItems : this.testItems.filter( item => ( item.category === Category.Scenario ) ) } ) }.tabBar( $r( "app.string.scenario" ) ).margin( { top : $r( "app.float.distance_5" ) } ) - TabContent() { - StabilityTest( { testItems : this.testItems.filter( item => ( item.category === Category.Stability ) ) } ) - }.tabBar( $r( "app.string.stability" ) ).margin( { top : $r( "app.float.distance_5" ) } ) - TabContent() { BenchmarkTest( { testItems : this.testItems.filter( item => ( item.category === Category.BenchMark ) ) } ) }.tabBar( $r( "app.string.benchmark" ) ).margin( { top : $r( "app.float.distance_5" ) } ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/p2pDiscoveryTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/p2pDiscoveryTest.ets index 63877e329..e250b2395 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/p2pDiscoveryTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/p2pDiscoveryTest.ets @@ -18,12 +18,12 @@ import featureAbility from '@ohos.ability.featureAbility' import wifi from '@ohos.wifi' import { AvailableP2p } from '../../Component/availableP2p' -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import router from '@system.router'; import { P2pTitleBar } from '../../Component/p2pTitleBar' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay' -import { P2pModel } from '../../MainAbility/model/p2pModel' +import { P2pModel } from '../../entryability/model/p2pModel' const TAG = '[p2pScan]' const PERMISSION_P2P_NAME: string = 'ohos.permission.LOCATION' @@ -36,7 +36,7 @@ struct P2pFound { private p2pModel: P2pModel = new P2pModel() private testItem: TestData = router.getParams().testId; // private testItem: string = "p2p扫描" - @State p2pLinkedInfo: any = { + private p2pLinkedInfo: any = { deviceName : "" , deviceAddress : "" , groupOwnerAddr : "" , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiCandidateTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiCandidateTest.ets index 1740fcd26..eaf36e6be 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiCandidateTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiCandidateTest.ets @@ -18,20 +18,22 @@ import wifi from '@ohos.wifi' import { TitleBar } from '../../Component/titleBar' import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' -import { WifiModel } from '../../MainAbility/model/wifiModel' -import ConfigData from '../../Utils/ConfigData'; +import { TestData } from '../../entryability/model/testData' +import { WifiModel } from '../../entryability/model/wifiModel' +import ConfigData from '../../utils/ConfigData'; import wifiManager from '@ohos.wifiManager' import { TestImageDisplay } from '../../Component/testImageDisplay'; import { PageTitle } from '../../Component/pageTitle'; -import TargetInformation from '../../MainAbility/candidateWifiModel/view/TargetInformation'; -import TargetList from '../../MainAbility/candidateWifiModel/view/TargetList'; -import { CommonConstants } from '../../MainAbility/candidateWifiModel/common/constant/CommonConstant'; -import DataModel from '../../MainAbility/candidateWifiModel/viewmodel/DataModel'; -import AddTargetDialog from '../../MainAbility/candidateWifiModel/view/AddTargetDialog'; -import { saveTask } from '../../MainAbility/candidateWifiModel/viewmodel/MainPageModel'; -import getCurrentTime from '../../MainAbility/candidateWifiModel/common/utils/DateUtil'; +import TargetInformation from '../../entryability/candidateWifiModel/view/TargetInformation'; +import TargetList from '../../entryability/candidateWifiModel/view/TargetList'; +import { CommonConstants } from '../../entryability/candidateWifiModel/common/constant/CommonConstant'; +import DataModel from '../../entryability/candidateWifiModel/viewmodel/DataModel'; +import AddTargetDialog from '../../entryability/candidateWifiModel/view/AddTargetDialog'; +import { saveTask } from '../../entryability/candidateWifiModel/viewmodel/MainPageModel'; +import getCurrentTime from '../../entryability/candidateWifiModel/common/utils/DateUtil'; +import TargetListItem from '../../entryability/candidateWifiModel/view/TargetListItem'; +import TargetInformation from '../../entryability/candidateWifiModel/view/TargetInformation'; const TAG = '[wifiCandidate]' @@ -44,8 +46,8 @@ struct WifiCandidate { @State targetData: Array = DataModel.getData(); private wifiModel: WifiModel = new WifiModel() private testItem: TestData = router.getParams().testId; - @State totalTasksNumber: number = 0; - @State completedTasksNumber: number = 0; + @State totalTasksNumber: Number = 0; + @State completedTasksNumber: Number = 0; @State latestUpdateDate: string = CommonConstants.DEFAULT_PROGRESS_VALUE; @Provide @Watch('onProgressChanged') overAllProgressChanged: boolean = false; dialogController: CustomDialogController = new CustomDialogController({ diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiScanTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiScanTest.ets index 5ae49c5de..8169706b3 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiScanTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAppTest/wifiScanTest.ets @@ -18,7 +18,7 @@ import wifi from '@ohos.wifi' import { AvailableWifi } from '../../Component/availableWifi' import { TitleBar } from '../../Component/titleBar' -import { WifiModel } from '../../MainAbility/model/wifiModel' +import { WifiModel } from '../../entryability/model/wifiModel' const TAG = '[wifiScan]' @@ -30,7 +30,7 @@ const TAG = '[wifiScan]' struct WifiScan { private wifiModel: WifiModel = new WifiModel() private testItem: string = "Wlan扫描" - @State linkedInfo: any = { + private linkedInfo: any = { ssid : "" , bssid : "" , networkId : 0 , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotAutoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotAutoTest.ets index 03742a0c4..5b513fc02 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotAutoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotAutoTest.ets @@ -15,14 +15,14 @@ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { HotspotAutoTestCase , initHotspotAutoData } from '../../MainAbility/model/autoTestDataModels' +import { HotspotAutoTestCase , initHotspotAutoData } from '../../entryability/model/autoTestDataModels' import { AutoContentTable } from '../../Component/autoContentTable' -import * as hotspotInterface from '../../MainAbility/model/hotspotInterface' +import * as hotspotInterface from '../../entryability/model/hotspotInterface' import prompt from '@system.prompt'; import emitter from '@ohos.events.emitter' @@ -36,15 +36,15 @@ struct HotspotAutoTest { // @State textMessage: string = 'null'; // @State testState: boolean = false; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // @State autoTextMessage: string ="None"; @StorageLink( "hotspotAutoTestMessage" ) hotspotAutoTestMessage: string = "" @State h_ssid: string = "testApp1"; - @State h_securityType: number = 3; - @State h_band: number = 2; + @State h_securityType: Number = 3; + @State h_band: Number = 2; @State h_preSharedKey: string = "12345678"; - @State h_maxConn: number = 3 ; - @State h_channel: number = 36 ; + @State h_maxConn: Number = 3 ; + @State h_channel: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid" , this.h_ssid ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotManagerAutoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotManagerAutoTest.ets index ff4c8c4dd..c47b181e8 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotManagerAutoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/hotspotManagerAutoTest.ets @@ -15,14 +15,14 @@ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { HotspotManagerAutoTestCase , initHotspotManagerAutoData } from '../../MainAbility/model/autoTestDataModels' +import { HotspotManagerAutoTestCase , initHotspotManagerAutoData } from '../../entryability/model/autoTestDataModels' import { AutoContentTable } from '../../Component/autoContentTable' -import * as hotspotManagerInterface from '../../MainAbility/model/hotspotManagerInterface' +import * as hotspotManagerInterface from '../../entryability/model/hotspotManagerInterface' import prompt from '@system.prompt'; import emitter from '@ohos.events.emitter' @@ -36,15 +36,15 @@ struct HotspotManagerAutoTest { // @State textMessage: string = 'null'; // @State testState: boolean = false; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // @State autoTextMessage: string ="None"; @StorageLink( "hotspotManagerAutoTestMessage" ) hotspotManagerAutoTestMessage: string = "" @State h_ssid1: string = "testApp1"; - @State h_securityType1: number = 3; - @State h_band1: number = 2; + @State h_securityType1: Number = 3; + @State h_band1: Number = 2; @State h_preSharedKey1: string = "12345678"; - @State h_maxConn1: number = 3 ; - @State h_channel1: number = 36 ; + @State h_maxConn1: Number = 3 ; + @State h_channel1: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid1" , this.h_ssid1 ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pAutoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pAutoTest.ets index 2da837e11..f63c12970 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pAutoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pAutoTest.ets @@ -15,14 +15,14 @@ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { P2pAutoTestCase , initP2pAutoData } from '../../MainAbility/model/autoTestDataModels' +import { P2pAutoTestCase , initP2pAutoData } from '../../entryability/model/autoTestDataModels' import { AutoContentTable } from '../../Component/autoContentTable' -import * as p2pInterface from '../../MainAbility/model/p2pInterface' +import * as p2pInterface from '../../entryability/model/p2pInterface' import prompt from '@system.prompt'; import emitter from '@ohos.events.emitter' @@ -37,14 +37,14 @@ struct P2pAutoTest { // @State textMessage: string = 'null'; // @State testState: boolean = false; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // @State autoTextMessage: string ="None"; @StorageLink( "p2pAutoTestMessage" ) p2pAutoTestMessage: string = "" @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; + @State netId: Number = - 2 ; @State passphrase: string = "12345678" ; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0 ; @State deviceName: string = "MyTestDevice" aboutToAppear() { diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pManagerAutoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pManagerAutoTest.ets index 7aeae90b3..5650b3c3e 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pManagerAutoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/p2pManagerAutoTest.ets @@ -14,15 +14,15 @@ */ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { P2pManagerAutoTestCase , initP2pManagerAutoData } from '../../MainAbility/model/autoTestDataModels' +import { P2pManagerAutoTestCase , initP2pManagerAutoData } from '../../entryability/model/autoTestDataModels' import { AutoContentTable } from '../../Component/autoContentTable' -import * as P2pManagerInterface from '../../MainAbility/model/p2pManagerInterface' +import * as P2pManagerInterface from '../../entryability/model/p2pManagerInterface' import prompt from '@system.prompt'; import emitter from '@ohos.events.emitter' @@ -37,14 +37,14 @@ struct P2pManagerAutoTest { // @State textMessage: string = 'null'; // @State testState: boolean = false; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // @State autoTextMessage: string ="None"; @StorageLink( "p2pManagerAutoTestMessage" ) p2pManagerAutoTestMessage: string = "" @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "MyTestDevice" aboutToAppear() { diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiAutoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiAutoTest.ets index 6dd625e4a..542be9168 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiAutoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiAutoTest.ets @@ -15,15 +15,15 @@ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { WifiAutoTestCase , initWifiAutoData } from '../../MainAbility/model/autoTestDataModels' +import { WifiAutoTestCase , initWifiAutoData } from '../../entryability/model/autoTestDataModels' import { AutoContentTable } from '../../Component/autoContentTable' -import * as wifiInterface from '../../MainAbility/model/wifiInterface' +import * as wifiInterface from '../../entryability/model/wifiInterface' import prompt from '@system.prompt'; import emitter from '@ohos.events.emitter' @@ -38,26 +38,26 @@ struct WifiAutoTest { // @State textMessage: string = 'null'; // @State testState: boolean = false; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // @State autoTextMessage: string ="None"; @StorageLink( "wifiAutoTestMessage" ) wifiAutoTestMessage: string = "" @State w_ssid: string = "TP-LINK_6365"; @State w_bssid: string = "6C:B1:58:75:63:65"; @State w_preSharedKey: string = "12345678"; @State w_isHiddenSsid: boolean = false; - @State w_securityType: number = 3 - @State w_creatorUid: number = 1; - @State w_disableReason: number = 0; - @State w_netId: number = 100 ; - @State w_randomMacType: number = 0 ; + @State w_securityType: Number = 3 + @State w_creatorUid: Number = 1; + @State w_disableReason: Number = 0; + @State w_netId: Number = 100 ; + @State w_randomMacType: Number = 0 ; @State w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @State w_ipType: number = 1 ; - @State w_staticIp_ipAddress: number = 3232235880 ; - @State w_staticIp_gateway: number = 3232235777 ; - @State w_staticIp_dnsServers: number = 3716386629 ; + @State w_ipType: Number = 1 ; + @State w_staticIp_ipAddress: Number = 3232235880 ; + @State w_staticIp_gateway: Number = 3232235777 ; + @State w_staticIp_dnsServers: Number = 3716386629 ; @State w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @State w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @State w_featureId: number = 1 ; + @State w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @State w_featureId: Number = 1 ; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid' , this.w_ssid ); diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiManagerAutoTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiManagerAutoTest.ets index ca54b2c63..cf9959fbf 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiManagerAutoTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subAutoTest/wifiManagerAutoTest.ets @@ -14,14 +14,14 @@ */ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import router from '@system.router'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { WifiManagerAutoTestCase , initWifiManagerAutoData } from '../../MainAbility/model/autoTestDataModels' +import { WifiManagerAutoTestCase , initWifiManagerAutoData } from '../../entryability/model/autoTestDataModels' import { AutoContentTable } from '../../Component/autoContentTable' -import * as WifiManagerInterface from '../../MainAbility/model/wifiManagerInterface' +import * as WifiManagerInterface from '../../entryability/model/wifiManagerInterface' import prompt from '@system.prompt'; import emitter from '@ohos.events.emitter' @@ -35,26 +35,26 @@ struct WifiManagerAutoTest { // @State textMessage: string = 'null'; // @State testState: boolean = false; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 // @State autoTextMessage: string ="None"; @StorageLink( "wifiManagerAutoTestMessage" ) wifiManagerAutoTestMessage: string = "" @State w_ssid1: string = "TP-LINK_6365"; @State w_bssid1: string = "6C:B1:58:75:63:65"; @State w_preSharedKey1: string = "12345678"; @State w_isHiddenSsid1: boolean = false; - @State w_securityType1: number = 3; - @State w_creatorUid1: number = 1; - @State w_disableReason1: number = 0; - @State w_netId1: number = 0 ; - @State w_randomMacType1: number = 0 ; + @State w_securityType1: Number = 3; + @State w_creatorUid1: Number = 1; + @State w_disableReason1: Number = 0; + @State w_netId1: Number = 0 ; + @State w_randomMacType1: Number = 0 ; @State w_randomMacAddr1: string = "08:fb:ea:1b:38:aa" - @State w_ipType1: number = 1 ; - @State w_staticIp_ipAddress1: number = 3232235880 ; - @State w_staticIp_gateway1: number = 3232235777 ; - @State w_staticIp_dnsServers1: number = 3716386629 ; + @State w_ipType1: Number = 1 ; + @State w_staticIp_ipAddress1: Number = 3232235880 ; + @State w_staticIp_gateway1: Number = 3232235777 ; + @State w_staticIp_dnsServers1: Number = 3716386629 ; @State w_staticIp_domains1: Array = [ "0", "1", "2" ] ; - @State w_networkIdM: number = 0 ; - @State w_featureIdM: number = 1 ; + @State w_networkIdM: Number = 0 ; + @State w_featureIdM: Number = 1 ; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid1' , this.w_ssid1 ); diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotBenchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotBenchmarkTest.ets index 1728e58f2..3e5a141ed 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotBenchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotBenchmarkTest.ets @@ -19,13 +19,13 @@ import prompt from '@ohos.prompt'; import router from '@system.router' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' -import { initHotspotBenchmarkData } from '../../MainAbility/model/benchmarkTestDataModels' -import * as HotspotInterface from '../../MainAbility/model/hotspotInterface' -import { HotspotBenchmarkTestCase } from '../../MainAbility/model/benchmarkTestDataModels' -import ConfigData from "../../Utils/ConfigData" +import { TestData } from '../../entryability/model/testData' +import { initHotspotBenchmarkData } from '../../entryability/model/benchmarkTestDataModels' +import * as HotspotInterface from '../../entryability/model/hotspotInterface' +import { HotspotBenchmarkTestCase } from '../../entryability/model/benchmarkTestDataModels' +import ConfigData from "../../utils/ConfigData" import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -59,7 +59,7 @@ struct HotspotBenchmarkTest { @State showList: boolean = false; @State message: string = 'hotspotBenchmarkTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "hotspotBenchmarkTestMessage" ) hotspotBenchmarkTestMessage: string = "" // @State login_feng: boolean = false // @State login_wen: boolean = false @@ -72,18 +72,18 @@ struct HotspotBenchmarkTest { // @State warnText: string = '' // @State roomNumber: string = '' // @State receiveMsg: string = '待接收数据' - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] - @StorageLink( 'hotspotBenchmarkTime' ) hotspotBenchmarkTime: number = 0; + @StorageLink( 'hotspotBenchmarkTime' ) hotspotBenchmarkTime: Number = 0; @State h_ssid: string = "testApp1"; - @State h_securityType: number = 3; - @State h_band: number = 2; + @State h_securityType: Number = 3; + @State h_band: Number = 2; @State h_preSharedKey: string = "12345678"; - @State h_maxConn: number = 3 ; - @State h_channel: number = 36 ; + @State h_maxConn: Number = 3 ; + @State h_channel: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid" , this.h_ssid ) @@ -362,8 +362,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotManagerBenchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotManagerBenchmarkTest.ets index e159c6217..d619cb2e6 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotManagerBenchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/hotspotManagerBenchmarkTest.ets @@ -19,14 +19,14 @@ import prompt from '@ohos.prompt'; import router from '@system.router' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' -import { initHotspotManagerBenchmarkData } from '../../MainAbility/model/benchmarkTestDataModels' -import * as HotspotManagerInterface from '../../MainAbility/model/hotspotManagerInterface' -import { HotspotManagerBenchmarkTestCase } from '../../MainAbility/model/benchmarkTestDataModels' -import ConfigData from "../../Utils/ConfigData" +import { TestData } from '../../entryability/model/testData' +import { initHotspotManagerBenchmarkData } from '../../entryability/model/benchmarkTestDataModels' +import * as HotspotManagerInterface from '../../entryability/model/hotspotManagerInterface' +import { HotspotManagerBenchmarkTestCase } from '../../entryability/model/benchmarkTestDataModels' +import ConfigData from "../../utils/ConfigData" import wifi from '@ohos.wifi'; import wifiManager from '@ohos.wifiManager'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -62,7 +62,7 @@ struct HotspotManagerBenchmarkTest { @State showList: boolean = false; @State message: string = 'hotspotManagerBenchmarkTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "hotspotManagerBenchmarkTestMessage" ) hotspotManagerBenchmarkTestMessage: string = "" // @State login_feng: boolean = false // @State login_wen: boolean = false @@ -75,18 +75,18 @@ struct HotspotManagerBenchmarkTest { // @State warnText: string = '' // @State roomNumber: string = '' // @State receiveMsg: string = '待接收数据' - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] - @StorageLink( 'hotspotManagerBenchmarkTime' ) hotspotManagerBenchmarkTime: number = 0; + @StorageLink( 'hotspotManagerBenchmarkTime' ) hotspotManagerBenchmarkTime: Number = 0; @State h_ssid1: string = "testApp1"; - @State h_securityType1: number = 3; - @State h_band1: number = 2; + @State h_securityType1: Number = 3; + @State h_band1: Number = 2; @State h_preSharedKey1: string = "12345678"; - @State h_maxConn1: number = 3 ; - @State h_channel1: number = 36 ; + @State h_maxConn1: Number = 3 ; + @State h_channel1: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid1" , this.h_ssid1 ) @@ -366,8 +366,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pBenchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pBenchmarkTest.ets index 20eef8613..fc8c5b238 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pBenchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pBenchmarkTest.ets @@ -19,13 +19,13 @@ import prompt from '@ohos.prompt'; import router from '@system.router' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' -import { initP2pBenchmarkData } from '../../MainAbility/model/benchmarkTestDataModels' -import * as P2pInterface from '../../MainAbility/model/p2pInterface' -import { P2pBenchmarkTestCase } from '../../MainAbility/model/benchmarkTestDataModels' -import ConfigData from "../../Utils/ConfigData" +import { TestData } from '../../entryability/model/testData' +import { initP2pBenchmarkData } from '../../entryability/model/benchmarkTestDataModels' +import * as P2pInterface from '../../entryability/model/p2pInterface' +import { P2pBenchmarkTestCase } from '../../entryability/model/benchmarkTestDataModels' +import ConfigData from "../../utils/ConfigData" import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -59,7 +59,7 @@ struct P2PBenchmarkTest { @State showList: boolean = false; @State message: string = 'P2PBenchmarkTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "p2pBenchmarkTestMessage" ) p2pBenchmarkTestMessage: string = "" // @State login_feng: boolean = false // @State login_wen: boolean = false @@ -72,17 +72,17 @@ struct P2PBenchmarkTest { // @State warnText: string = '' // @State roomNumber: string = '' // @State receiveMsg: string = '待接收数据' - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] - @StorageLink( 'p2pBenchmarkTime' ) p2pBenchmarkTime: number = 0; + @StorageLink( 'p2pBenchmarkTime' ) p2pBenchmarkTime: Number = 0; @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; + @State netId: Number = - 2 ; @State passphrase: string = "12345678" ; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0 ; @State deviceName: string = "MyTestDevice" aboutToAppear() { @@ -345,8 +345,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pManagerBenchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pManagerBenchmarkTest.ets index 55fff736b..d5d86aca6 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pManagerBenchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/p2pManagerBenchmarkTest.ets @@ -19,14 +19,14 @@ import prompt from '@ohos.prompt'; import router from '@system.router' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' -import { initP2pManagerBenchmarkData } from '../../MainAbility/model/benchmarkTestDataModels' -import * as WifiInterface from '../../MainAbility/model/wifiInterface' -import { P2pManagerBenchmarkTestCase } from '../../MainAbility/model/benchmarkTestDataModels' -import ConfigData from "../../Utils/ConfigData" +import { TestData } from '../../entryability/model/testData' +import { initP2pManagerBenchmarkData } from '../../entryability/model/benchmarkTestDataModels' +import * as WifiInterface from '../../entryability/model/wifiInterface' +import { P2pManagerBenchmarkTestCase } from '../../entryability/model/benchmarkTestDataModels' +import ConfigData from "../../utils/ConfigData" import wifi from '@ohos.wifi'; import wifiManager from '@ohos.wifiManager'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -62,7 +62,7 @@ struct P2PManagerBenchmarkTest { @State showList: boolean = false; @State message: string = 'P2pManagerBenchmarkTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "p2pManagerBenchmarkTestMessage" ) p2pManagerBenchmarkTestMessage: string = "" // @State login_feng: boolean = false // @State login_wen: boolean = false @@ -75,17 +75,17 @@ struct P2PManagerBenchmarkTest { // @State warnText: string = '' // @State roomNumber: string = '' // @State receiveMsg: string = '待接收数据' - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] - @StorageLink( 'p2pManagerBenchmarkTime' ) p2pManagerBenchmarkTime: number = 0; + @StorageLink( 'p2pManagerBenchmarkTime' ) p2pManagerBenchmarkTime: Number = 0; @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "MyTestDevice" aboutToAppear() { @@ -367,8 +367,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiBenchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiBenchmarkTest.ets index 0f67b093d..4ac4d3f4e 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiBenchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiBenchmarkTest.ets @@ -19,13 +19,13 @@ import prompt from '@ohos.prompt'; import router from '@system.router' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' -import { initWifiBenchmarkData } from '../../MainAbility/model/benchmarkTestDataModels' -import * as WifiInterface from '../../MainAbility/model/wifiInterface' -import { WifiBenchmarkTestCase } from '../../MainAbility/model/benchmarkTestDataModels' -import ConfigData from "../../Utils/ConfigData" +import { TestData } from '../../entryability/model/testData' +import { initWifiBenchmarkData } from '../../entryability/model/benchmarkTestDataModels' +import * as WifiInterface from '../../entryability/model/wifiInterface' +import { WifiBenchmarkTestCase } from '../../entryability/model/benchmarkTestDataModels' +import ConfigData from "../../utils/ConfigData" import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -59,25 +59,25 @@ struct WifiBenchmarkTest { @State showList: boolean = false; @State message: string = 'WifiBenchmarkTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "wifiBenchmarkTestMessage" ) wifiBenchmarkTestMessage: string = "" @State w_ssid: string = "TP-LINK_6365"; @State w_bssid: string = "6C:B1:58:75:63:65"; @State w_preSharedKey: string = "12345678"; @State w_isHiddenSsid: boolean = false; - @State w_securityType: number = 3 - @State w_creatorUid: number = 1; - @State w_disableReason: number = 0; - @State w_netId: number = 100 ; - @State w_randomMacType: number = 0 ; + @State w_securityType: Number = 3 + @State w_creatorUid: Number = 1; + @State w_disableReason: Number = 0; + @State w_netId: Number = 100 ; + @State w_randomMacType: Number = 0 ; @State w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @State w_ipType: number = 1 ; - @State w_staticIp_ipAddress: number = 3232235880 ; - @State w_staticIp_gateway: number = 3232235777 ; - @State w_staticIp_dnsServers: number = 3716386629 ; + @State w_ipType: Number = 1 ; + @State w_staticIp_ipAddress: Number = 3232235880 ; + @State w_staticIp_gateway: Number = 3232235777 ; + @State w_staticIp_dnsServers: Number = 3716386629 ; @State w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @State w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @State w_featureId: number = 1 ; + @State w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @State w_featureId: Number = 1 ; // @State login_feng: boolean = false // @State login_wen: boolean = false // @State user: string = '' @@ -89,12 +89,12 @@ struct WifiBenchmarkTest { // @State warnText: string = '' // @State roomNumber: string = '' // @State receiveMsg: string = '待接收数据' - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] - @StorageLink( 'wifiBenchmarkTime' ) wifiBenchmarkTime: number = 0; + @StorageLink( 'wifiBenchmarkTime' ) wifiBenchmarkTime: Number = 0; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid' , this.w_ssid ); @@ -385,8 +385,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiManagerBenchmarkTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiManagerBenchmarkTest.ets index b98c31bd6..a6e34d310 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiManagerBenchmarkTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subBenchmarkTest/wifiManagerBenchmarkTest.ets @@ -19,14 +19,14 @@ import prompt from '@ohos.prompt'; import router from '@system.router' import { PageTitle } from '../../Component/pageTitle' import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' -import { initWifiManagerBenchmarkData } from '../../MainAbility/model/scenarioTestDataModels' -import * as WifiManagerInterface from '../../MainAbility/model/wifiManagerInterface' -import { WifiManagerBenchmarkTestCase } from '../../MainAbility/model/benchmarkTestDataModels' -import ConfigData from "../../Utils/ConfigData" +import { TestData } from '../../entryability/model/testData' +import { initWifiManagerBenchmarkData } from '../../entryability/model/scenarioTestDataModels' +import * as WifiManagerInterface from '../../entryability/model/wifiManagerInterface' +import { WifiManagerBenchmarkTestCase } from '../../entryability/model/benchmarkTestDataModels' +import ConfigData from "../../utils/ConfigData" import wifi from '@ohos.wifi'; import wifiManager from '@ohos.wifiManager'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' import request from '@ohos.request' @@ -61,25 +61,25 @@ struct WifiManagerBenchmarkTest { @State showList: boolean = false; @State message: string = 'WifiManagerBenchmarkTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "wifiManagerBenchmarkTestMessage" ) wifiManagerBenchmarkTestMessage: string = "" @State w_ssid1: string = "TP-LINK_6365"; @State w_bssid1: string = "6C:B1:58:75:63:65"; @State w_preSharedKey1: string = "12345678"; @State w_isHiddenSsid1: boolean = false; - @State w_securityType1: number = 3 - @State w_creatorUid1: number = 1; - @State w_disableReason1: number = 0; - @State w_netId1: number = 0 ; - @State w_randomMacType1: number = 0 ; + @State w_securityType1: Number = 3 + @State w_creatorUid1: Number = 1; + @State w_disableReason1: Number = 0; + @State w_netId1: Number = 0 ; + @State w_randomMacType1: Number = 0 ; @State w_randomMacAddr1: string = "08:fb:ea:1b:38:aa" - @State w_ipType1: number = 1 ; - @State w_staticIp_ipAddress1: number = 3232235880 ; - @State w_staticIp_gateway1: number = 3232235777 ; - @State w_staticIp_dnsServers1: number = 3716386629 ; + @State w_ipType1: Number = 1 ; + @State w_staticIp_ipAddress1: Number = 3232235880 ; + @State w_staticIp_gateway1: Number = 3232235777 ; + @State w_staticIp_dnsServers1: Number = 3716386629 ; @State w_staticIp_domains1: Array = [ "0", "1", "2" ] ; - @State w_networkIdM: number = 0 ; - @State w_featureIdM: number = 1 ; + @State w_networkIdM: Number = 0 ; + @State w_featureIdM: Number = 1 ; // @State login_feng: boolean = false // @State login_wen: boolean = false // @State user: string = '' @@ -91,12 +91,12 @@ struct WifiManagerBenchmarkTest { // @State warnText: string = '' // @State roomNumber: string = '' // @State receiveMsg: string = '待接收数据' - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] - @StorageLink( 'wifiManagerBenchmarkTime' ) wifiManagerBenchmarkTime: number = 0; + @StorageLink( 'wifiManagerBenchmarkTime' ) wifiManagerBenchmarkTime: Number = 0; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid1' , this.w_ssid1 ); @@ -388,8 +388,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotInterfaceTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotInterfaceTest.ets index 79f6d36f7..8269c9fb5 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotInterfaceTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotInterfaceTest.ets @@ -19,9 +19,9 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import { initHotspotApIData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import { initHotspotApIData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' import { FilterTable } from '../../Component/filterTable'; /** @@ -35,11 +35,11 @@ struct hotspotInterfaceTest { private testItem: TestData = Router.getParams().testId; @State message: string = ""; @State h_ssid: string = "testApp1"; - @State h_securityType: number = 3; - @State h_band: number = 2; + @State h_securityType: Number = 3; + @State h_band: Number = 2; @State h_preSharedKey: string = "12345678"; - @State h_maxConn: number = 3 ; - @State h_channel: number = 36 ; + @State h_maxConn: Number = 3 ; + @State h_channel: Number = 36 ; @StorageLink( 'hotspotSsid' ) hotspotSsid: string = ""; @StorageLink( 'hotspotStateMessage' ) hotspotStateMessage: string = ""; @StorageLink( 'getStationsMessage' ) getStationsMessage: string = ""; @@ -68,23 +68,24 @@ struct hotspotInterfaceTest { } Stack().height( "0.5vp" ).backgroundColor( "#000000" ); + Column() { Row() { Text( "本设备热点名:" ) .fontSize( "17vp" ) .height( 60 ) .width( ConfigData.WH_30_100 ) + .padding( { left : 10 } ) TextInput( { text : this.hotspotSsid , placeholder : "在右侧输入热点的配置" } ) .fontSize( "17vp" ) + .backgroundColor( $r( "app.color.white" ) ) .onChange( ( strInput ) => { this.hotspotSsid = strInput; - AppStorage.SetOrCreate( "hotspotSsid" , strInput ) } ) .width( ConfigData.WH_50_100 ) Image( $r( 'app.media.Switch' ) ) - .height( 40 ) - .width( 40 ) - .padding( { top : 10 , bottom : 10 , left : 2 } ) + .height( 50 ) + .padding( { top : 5 , bottom : 5 , left : 10 } ) .width( ConfigData.WH_15_100 ) .onClick( () => { this.showList = !this.showList; @@ -92,7 +93,6 @@ struct hotspotInterfaceTest { } .margin( { top : "10vp" , left : "20vp" , right : "20vp" } ) .alignItems( VerticalAlign.Center ) - .backgroundColor( $r( "app.color.white" ) ) .width( ConfigData.WH_100_100 ) .height( 60 ) } @@ -109,27 +109,27 @@ struct hotspotInterfaceTest { // .width(ConfigData.WH_100_100) Text( "热点状态:" + this.hotspotStateMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "热点配置:" + this.getHotspotConfigMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "连接设备:" + this.getStationsMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "加入状态:" + this.hotspotStaJoinMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "离开状态:" + this.hotspotStaLeaveMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotManagerInterfaceTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotManagerInterfaceTest.ets index 362c5b4c9..d4d52af6c 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotManagerInterfaceTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/hotspotManagerInterfaceTest.ets @@ -19,10 +19,10 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initHotspotManagerApIData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initHotspotManagerApIData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' import { FilterTableManager } from '../../Component/filterTableManager'; /** @@ -36,11 +36,12 @@ struct hotspotManagerInterfaceTest { private testItem: TestData = Router.getParams().testId; @State message: string = ""; @State h_ssid1: string = "testApp1"; - @State h_securityType1: number = 3; - @State h_band1: number = 2; + @State h_securityType1: Number = 3; + @State h_band1: Number = 2; @State h_preSharedKey1: string = "12345678"; - @State h_maxConn1: number = 3 ; - @State h_channel1: number = 36 ; + @State h_maxConn1: Number = 3 ; + @State h_channel1: Number = 36 ; + @StorageLink( 'hotspotManagerSsid' ) hotspotManagerSsid: string = ""; @StorageLink( 'hotspotStateManagerMessage' ) hotspotStateManagerMessage: string = ""; @StorageLink( 'getStationsManagerMessage' ) getStationsManagerMessage: string = ""; @StorageLink( 'getHotspotConfigManagerMessage' ) getHotspotConfigManagerMessage: string = ""; @@ -70,29 +71,28 @@ struct hotspotManagerInterfaceTest { Stack().height( "0.5vp" ).backgroundColor( "#000000" ); Column() { Row() { - Text( "热点IP" ) + Text( "本设备热点名:" ) .fontSize( "18vp" ) .height( 60 ) - .width( ConfigData.WH_20_100 ) + .width( ConfigData.WH_30_100 ) .padding( { left : 10 } ) - TextInput( { text : this.peripheralDeviceId , placeholder : "input peripheral deviceId." } ) + TextInput( { text : this.hotspotManagerSsid , placeholder : "在右侧输入热点的配置" } ) .fontSize( "18vp" ) + .backgroundColor( $r( "app.color.white" ) ) .onChange( ( strInput ) => { - this.peripheralDeviceId = strInput; - AppStorage.SetOrCreate( "peripheralDeviceId" , strInput ) + this.hotspotManagerSsid = strInput; } ) - .width( ConfigData.WH_65_100 ) + .width( ConfigData.WH_50_100 ) Image( $r( 'app.media.Switch' ) ) - .height( 40 ) - .width( 40 ) - .padding( { top : 10 , bottom : 10 , left : 2 } ) + .height( 50 ) + .padding( { top : 5 , bottom : 5 , left : 10 } ) + .width( ConfigData.WH_15_100 ) .onClick( () => { this.showList = !this.showList; } ) } .margin( { top : "10vp" , left : "20vp" , right : "20vp" } ) .alignItems( VerticalAlign.Center ) - .backgroundColor( $r( "app.color.white" ) ) .width( ConfigData.WH_100_100 ) .height( 60 ) } @@ -109,27 +109,27 @@ struct hotspotManagerInterfaceTest { // .width(ConfigData.WH_100_100) Text( "热点状态:" + this.hotspotStateManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "热点配置:" + this.getHotspotConfigManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "连接设备:" + this.getStationsManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "加入状态:" + this.hotspotStaJoinManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "离开状态:" + this.hotspotStaLeaveManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pInterfaceTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pInterfaceTest.ets index 037b55cc0..04d827f7c 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pInterfaceTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pInterfaceTest.ets @@ -19,10 +19,10 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initP2pApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initP2pApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' /** * p2p Test Page Of Wifi test @@ -31,10 +31,10 @@ import { TestData } from '../../MainAbility/model/testData' @Component struct p2pSetting { @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; - @State passphrase: string = "12345678" ; + @State netId: Number = - 2; + @State passphrase: string = "12345678"; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0; @State deviceName: string = "MyTestDevice" aboutToAppear() { @@ -176,16 +176,17 @@ struct P2pInterfaceTest { private testItem: TestData = Router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @State pairPinCode: string = ''; @State isStateChangeClick: boolean = false; @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; - @State passphrase: string = "12345678" ; + @State netId: Number = - 2; + @State passphrase: string = "12345678"; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0; @State deviceName: string = "MyTestDevice" @State connectedIp: sting = "192.168.1.107" + @StorageLink( 'p2pDeviceName' ) p2pDeviceName: String = ""; @StorageLink( 'p2pStateMessage' ) p2pStateMessage: string = ""; @StorageLink( 'p2pDeviceMessage' ) p2pDeviceMessage: string = ""; @StorageLink( 'p2pLinkStateMessage' ) p2pLinkStateMessage: string = ""; @@ -219,19 +220,19 @@ struct P2pInterfaceTest { Column() { Row() { - Text( "目标设备IP：" ) + Text( "本设备名称：" ) .fontSize( "20vp" ) .height( 40 ) .padding( { top : 5 } ) .width( ConfigData.WH_28_100 ) .align( Alignment.Start ) - TextInput( { text : this.connectedIp , placeholder : "192.168.1.107" } ) + TextInput( { text : this.p2pDeviceName , placeholder : "请在右侧输入p2p的配置" } ) .height( 40 ) .borderStyle( BorderStyle.Dashed ) .backgroundColor( $r( "app.color.white" ) ) .onChange( ( str ) => { - this.deviceId = str; + this.p2pDeviceName = str; } ) .width( ConfigData.WH_45_100 ) .padding( { top : 5 , left : 5 } ) @@ -254,42 +255,42 @@ struct P2pInterfaceTest { Column() { Text( "开关结果:" + this.p2pStateMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "本机信息:" + this.p2pDeviceMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "发现信息:" + this.p2pDiscoveryMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "连接状态:" + this.p2pLinkStateMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "连接信息:" + this.p2pLinkMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "对端设备:" + this.p2pPeerDeviceMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "对端设备[]:" + this.p2pPeerDeviceMessages ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "组信息:" + this.p2pGroupMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pManagerInterfaceTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pManagerInterfaceTest.ets index c878ab3ef..da62f0e17 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pManagerInterfaceTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/p2pManagerInterfaceTest.ets @@ -19,10 +19,10 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initP2pApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initP2pApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' /** * p2pManager Test Page Of Wifi test @@ -31,10 +31,10 @@ import { TestData } from '../../MainAbility/model/testData' @Component struct p2pManagerSetting { @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "MyTestDevice" aboutToAppear() { @@ -175,15 +175,16 @@ struct P2pManagerInterfaceTest { private testItem: TestData = Router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @StorageLink( 'pairedDeviceId' ) pairedDeviceId: string = ''; @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "test" @State connectedIp: sting = "192.168.1.107" + @StorageLink( 'p2pManagerDeviceName' ) p2pManagerDeviceName: String = ""; @StorageLink( 'p2pStateManagerMessage' ) p2pStateManagerMessage: string = ""; @StorageLink( 'p2pDeviceManagerMessage' ) p2pDeviceManagerMessage: string = ""; @StorageLink( 'p2pLinkStateManagerMessage' ) p2pLinkStateManagerMessage: string = ""; @@ -217,19 +218,19 @@ struct P2pManagerInterfaceTest { Column() { Row() { - Text( "目标设备IP：" ) + Text( "本设备名称：" ) .fontSize( "20vp" ) .height( 40 ) .padding( { top : 5 } ) .width( ConfigData.WH_28_100 ) .align( Alignment.Start ) - TextInput( { text : this.connectedIp , placeholder : "192.168.1.107" } ) + TextInput( { text : this.p2pManagerDeviceName , placeholder : "请在右侧输入p2p的配置" } ) .height( 40 ) .borderStyle( BorderStyle.Dashed ) .backgroundColor( $r( "app.color.white" ) ) .onChange( ( str ) => { - this.deviceId = str; + this.p2pManagerDeviceName = str; } ) .width( ConfigData.WH_45_100 ) .padding( { top : 5 , left : 5 } ) @@ -252,42 +253,42 @@ struct P2pManagerInterfaceTest { Column() { Text( "开关结果:" + this.p2pStateManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "本机信息:" + this.p2pDeviceManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "发现信息:" + this.p2pDiscoveryManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "连接状态:" + this.p2pLinkStateManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "连接信息:" + this.p2pLinkManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "对端设备:" + this.p2pPeerDeviceManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "对端设备[]:" + this.p2pPeerDeviceManagerMessages ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "组信息:" + this.p2pGroupManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subP2pTest/p2pFound.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subP2pTest/p2pFound.ets index 599ac8ff6..84f9e105f 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subP2pTest/p2pFound.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subP2pTest/p2pFound.ets @@ -19,7 +19,7 @@ import featureAbility from '@ohos.ability.featureAbility' import wifi from '@ohos.wifi' import { AvailableP2p } from '../../../Component/availableP2p' import { P2pTitleBar } from '../../../Component/p2pTitleBar' -import { P2pModel } from '../../../MainAbility/model/p2pModel' +import { P2pModel } from '../../../entryability/model/p2pModel' const TAG = '[p2pFound]' const PERMISSION_P2P_NAME: string = 'ohos.permission.LOCATION' @@ -31,7 +31,7 @@ const PERMISSION_P2P_NAME: string = 'ohos.permission.LOCATION' struct P2pFound { private p2pModel: P2pModel = new P2pModel() private testItem: string = "p2p扫描" - @State p2pLinkedInfo: any = { + private p2pLinkedInfo: any = { deviceName : "" , deviceAddress : "" , groupOwnerAddr: "" , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/Login.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/Login.ets index 78f0d3583..710eb2195 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/Login.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/Login.ets @@ -15,7 +15,7 @@ import wifi from '@ohos.wifi'; import router from '@ohos.router'; -import { resolveIP } from '../../../Utils/Util' +import { resolveIP } from '../../../utils/Util' import socket from '@ohos.net.socket'; diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/about.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/about.ets index 68a7d695b..ee2325a80 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/about.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/about.ets @@ -15,9 +15,9 @@ // @ts-nocheck -import { WifiModel } from '../../../MainAbility/model/wifiModel' +import { WifiModel } from '../../../entryability/model/wifiModel' import { InfoView } from '../../../Component/infoView' -import ConfigData from '../../../Utils/ConfigData'; +import ConfigData from '../../../utils/ConfigData'; import Router from '@system.router'; /** * about Test Page Of Wifi test diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets index 5c2ac3b1f..8a802af0f 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets @@ -29,7 +29,7 @@ const PERMISSION_NAME: string = 'ohos.permission.LOCATION' @Component struct WifiFound { private testItem: string = "Wlan扫描" - @State linkedInfo: any = { + private linkedInfo: any = { ssid : "" , bssid : "" , networkId : 0 , diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiInterfaceTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiInterfaceTest.ets index 7709a8189..c72ecb903 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiInterfaceTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiInterfaceTest.ets @@ -20,9 +20,9 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import { initWifiApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import { initWifiApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' const TAG = "[Wifi]" @@ -36,19 +36,19 @@ struct WifiDeviceSetting { @StorageLink( 'w_bssid' ) w_bssid: string = "6C:B1:58:75:63:65"; //6C:B1:58:75:63:65 @StorageLink( 'w_preSharedKey' ) w_preSharedKey: string = "12345678"; //kaihong123 @StorageLink( 'w_isHiddenSsid' ) w_isHiddenSsid: boolean = false; - @StorageLink( 'w_securityType' ) w_securityType: number = 3 - @StorageLink( 'w_creatorUid' ) w_creatorUid: number = 1; - @StorageLink( 'w_disableReason' ) w_disableReason: number = 0; - @StorageLink( 'w_netId' ) w_netId: number = 100 ; - @StorageLink( 'w_randomMacType' ) w_randomMacType: number = 0 ; + @StorageLink( 'w_securityType' ) w_securityType: Number = 3 + @StorageLink( 'w_creatorUid' ) w_creatorUid: Number = 1; + @StorageLink( 'w_disableReason' ) w_disableReason: Number = 0; + @StorageLink( 'w_netId' ) w_netId: Number = 100 ; + @StorageLink( 'w_randomMacType' ) w_randomMacType: Number = 0 ; @StorageLink( 'w_randomMacAddr' ) w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @StorageLink( 'w_ipType' ) w_ipType: number = 1 ; - @StorageLink( 'w_staticIp_ipAddress' ) w_staticIp_ipAddress: number = 3232235880 ; - @StorageLink( 'w_staticIp_gateway' ) w_staticIp_gateway: number = 3232235777 ; - @StorageLink( 'w_staticIp_dnsServers' ) w_staticIp_dnsServers: number = 3716386629 ; + @StorageLink( 'w_ipType' ) w_ipType: Number = 1 ; + @StorageLink( 'w_staticIp_ipAddress' ) w_staticIp_ipAddress: Number = 3232235880 ; + @StorageLink( 'w_staticIp_gateway' ) w_staticIp_gateway: Number = 3232235777 ; + @StorageLink( 'w_staticIp_dnsServers' ) w_staticIp_dnsServers: Number = 3716386629 ; @StorageLink( 'w_staticIp_domains' ) w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @StorageLink( 'w_networkId' ) w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @StorageLink( 'w_featureId' ) w_featureId: number = 1 ; + @StorageLink( 'w_networkId' ) w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @StorageLink( 'w_featureId' ) w_featureId: Number = 1 ; aboutToAppear() { // AppStorage.SetOrCreate( 'w_ssid' , this.w_ssid ); @@ -181,7 +181,7 @@ struct WifiDeviceSetting { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) this.w_securityType = index; AppStorage.SetOrCreate( 'w_securityType' , this.w_securityType ); @@ -398,25 +398,25 @@ struct WifiInterfaceTest { private testItem: TestData = Router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @StorageLink( 'pairedSsid' ) pairedSsid: string = ""; @State w_ssid: string = "TP-LINK_6365"; //TP-LINK_6365 @State w_bssid: string = "6C:B1:58:75:63:65"; //6C:B1:58:75:63:65 @State w_preSharedKey: string = "12345678"; //kaihong123 @State w_isHiddenSsid: boolean = false; - @State w_securityType: number = 3 - @State w_creatorUid: number = 1; - @State w_disableReason: number = 0; - @State w_netId: number = 100 ; - @State w_randomMacType: number = 0 ; + @State w_securityType: Number = 3 + @State w_creatorUid: Number = 1; + @State w_disableReason: Number = 0; + @State w_netId: Number = 100 ; + @State w_randomMacType: Number = 0 ; @State w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @State w_ipType: number = 1 ; - @State w_staticIp_ipAddress: number = 3232235880 ; - @State w_staticIp_gateway: number = 3232235777 ; - @State w_staticIp_dnsServers: number = 3716386629 ; + @State w_ipType: Number = 1 ; + @State w_staticIp_ipAddress: Number = 3232235880 ; + @State w_staticIp_gateway: Number = 3232235777 ; + @State w_staticIp_dnsServers: Number = 3716386629 ; @State w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @State w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @State w_featureId: number = 1 ; + @State w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @State w_featureId: Number = 1 ; @StorageLink( 'linkedInfoMessage' ) linkedInfoMessage: string = ''; @StorageLink( 'ipInfoMessage' ) ipInfoMessage: string = ''; @StorageLink( 'getDeviceConfigsMessage' ) getDeviceConfigsMessage: string = ''; @@ -473,7 +473,7 @@ struct WifiInterfaceTest { .padding( { top : 5 , left : 5 } ) Image( $r( 'app.media.Switch' ) ) .height( 50 ) - .padding( { top : 5 , bottom : 5 , left : 5 } ) + .padding( { top : 5 , bottom : 5 , left : 10 } ) .width( ConfigData.WH_15_100 ) .onClick( () => { this.showList = !this.showList; @@ -490,22 +490,22 @@ struct WifiInterfaceTest { Column() { Text( "WLAN连接信息:" + this.linkedInfoMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "IP信息:" + this.ipInfoMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "获取网络配置:" + this.getDeviceConfigsMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "扫描结果:" + this.getScanInfoMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiManagerInterfaceTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiManagerInterfaceTest.ets index 0397712df..4895fda1f 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiManagerInterfaceTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/wifiManagerInterfaceTest.ets @@ -19,9 +19,9 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import { initWifiManagerApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import { initWifiManagerApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' const TAG = '[WifiManager]' @@ -31,8 +31,8 @@ const TAG = '[WifiManager]' @Component struct WifiManagerDeviceSetting { - @StorageLink( 'w_networkIdM' ) w_networkIdM: number = 0; // id,netId,networkId是一个值嘛？ - @StorageLink( 'w_featureIdM' ) w_featureIdM: number = 1; + @StorageLink( 'w_networkIdM' ) w_networkIdM: Number = 0; // id,netId,networkId是一个值嘛？ + @StorageLink( 'w_featureIdM' ) w_featureIdM: Number = 1; @StorageLink( 'wifiDeviceConfigManager' ) wifiDeviceConfigManager: Object = { ssid : String = "TP-LINK_6365" , bssid : String = "6C:B1:58:75:63:65" , @@ -151,7 +151,7 @@ struct WifiManagerDeviceSetting { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) this.wifiDeviceConfigManager.securityType = index; } ) @@ -361,10 +361,10 @@ struct WifiManagerInterfaceTest { private testItem: TestData = Router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @StorageLink( 'pairedSsidM' ) pairedSsidM: string = ""; - @StorageLink( 'w_networkIdM' ) w_networkIdM: number = 0; - @StorageLink( 'w_featureIdM' ) w_featureIdM: number = 1; + @StorageLink( 'w_networkIdM' ) w_networkIdM: Number = 0; + @StorageLink( 'w_featureIdM' ) w_featureIdM: Number = 1; @StorageLink( 'ipInfoManagerMessage' ) ipInfoManagerMessage: string = ''; @StorageLink( 'linkedInfoManagerMessage' ) linkedInfoManagerMessage: string = ''; @StorageLink( 'getDeviceConfigsManagerMessage' ) getDeviceConfigsManagerMessage: string = ''; @@ -441,22 +441,22 @@ struct WifiManagerInterfaceTest { Column() { Text( "WLAN连接信息:" + this.linkedInfoManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "IP信息:" + this.ipInfoManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "获取网络配置:" + this.getDeviceConfigsManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) Text( "扫描结果:" + this.getScanInfoManagerMessage ) .fontSize( "17vp" ) - .margin( { top : "5vp" , left : "15vp" } ) + .margin( { top : "5vp" , left : "10vp" } ) .textAlign( TextAlign.Start ) .width( ConfigData.WH_90_100 ) } diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotCreateScenarioTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotCreateScenarioTest.ets index 0f328c2c5..89ee006b4 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotCreateScenarioTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotCreateScenarioTest.ets @@ -19,14 +19,14 @@ import prompt from '@system.prompt'; import router from '@system.router'; import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { ScenarioContentTable } from '../../Component/scenarioContentTable' import { HotspotCreateScenarioTestCase , initHotspotCreateScenarioData -} from '../../MainAbility/model/scenarioTestDataModels' -import * as HotspotInterface from '../../MainAbility/model/hotspotInterface' -import ConfigData from '../../Utils/ConfigData'; +} from '../../entryability/model/scenarioTestDataModels' +import * as HotspotInterface from '../../entryability/model/hotspotInterface' +import ConfigData from '../../utils/ConfigData'; /** * hotspot Create Scenario Test Page Of WiFi test */ @@ -36,14 +36,14 @@ import ConfigData from '../../Utils/ConfigData'; struct hotspotCreateScenarioTest { @State message: string = 'hotspotCreateScenarioTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "hotspotCreateScenarioMessage" ) hotspotCreateScenarioMessage: string = "" @State h_ssid: string = "testApp1"; - @State h_securityType: number = 3; - @State h_band: number = 2; + @State h_securityType: Number = 3; + @State h_band: Number = 2; @State h_preSharedKey: string = "12345678"; - @State h_maxConn: number = 3 ; - @State h_channel: number = 36 ; + @State h_maxConn: Number = 3 ; + @State h_channel: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid" , this.h_ssid ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotManagerCreateScenarioTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotManagerCreateScenarioTest.ets index b797c876c..16e1f5e32 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotManagerCreateScenarioTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/hotspotManagerCreateScenarioTest.ets @@ -19,14 +19,14 @@ import prompt from '@system.prompt'; import router from '@system.router'; import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { ScenarioContentTable } from '../../Component/scenarioContentTable' import { HotspotManagerCreateScenarioTestCase , initHotspotManagerCreateScenarioData -} from '../../MainAbility/model/scenarioTestDataModels' -import * as HotspotManagerInterface from '../../MainAbility/model/hotspotManagerInterface' -import ConfigData from '../../Utils/ConfigData'; +} from '../../entryability/model/scenarioTestDataModels' +import * as HotspotManagerInterface from '../../entryability/model/hotspotManagerInterface' +import ConfigData from '../../utils/ConfigData'; /** * hotspotManager Create Scenario Test Page Of WiFi test */ @@ -36,14 +36,14 @@ import ConfigData from '../../Utils/ConfigData'; struct hotspotManagerCreateScenarioTest { @State message: string = 'hotspotManagerCreateScenarioTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "hotspotManagerCreateScenarioMessage" ) hotspotManagerCreateScenarioMessage: string = "" @State h_ssid1: string = "testApp1"; - @State h_securityType1: number = 3; - @State h_band1: number = 2; + @State h_securityType1: Number = 3; + @State h_band1: Number = 2; @State h_preSharedKey1: string = "12345678"; - @State h_maxConn1: number = 3 ; - @State h_channel1: number = 36 ; + @State h_maxConn1: Number = 3 ; + @State h_channel1: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid1" , this.h_ssid1 ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pConnectScenarioTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pConnectScenarioTest.ets index e6e603920..05af3aaeb 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pConnectScenarioTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pConnectScenarioTest.ets @@ -15,15 +15,15 @@ // @ts-nocheck -import ConfigData from '../../Utils/ConfigData'; +import ConfigData from '../../utils/ConfigData'; import prompt from '@system.prompt'; import router from '@system.router'; import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { ScenarioContentTable } from '../../Component/scenarioContentTable' -import { P2pConnectScenarioTestCase , initP2pConnectScenarioData } from '../../MainAbility/model/scenarioTestDataModels' -import * as P2pInterface from '../../MainAbility/model/p2pInterface' +import { P2pConnectScenarioTestCase , initP2pConnectScenarioData } from '../../entryability/model/scenarioTestDataModels' +import * as P2pInterface from '../../entryability/model/p2pInterface' /** * Classic p2p Connect Scenario Test Page Of WiFi test @@ -34,13 +34,13 @@ import * as P2pInterface from '../../MainAbility/model/p2pInterface' struct p2pConnectScenarioTest { @State message: string = 'p2pConnectScenarioTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "p2pConnectScenarioMessage" ) p2pConnectScenarioMessage: string = "" @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; + @State netId: Number = - 2 ; @State passphrase: string = "12345678" ; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0 ; @State deviceName: string = "MyTestDevice" aboutToAppear() { diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pManagerConnectScenarioTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pManagerConnectScenarioTest.ets index 839988868..0c41516d8 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pManagerConnectScenarioTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/p2pManagerConnectScenarioTest.ets @@ -19,14 +19,14 @@ import prompt from '@system.prompt'; import router from '@system.router'; import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { ScenarioContentTable } from '../../Component/scenarioContentTable' import { P2pManagerConnectScenarioTestCase , initP2pManagerConnectScenarioData -} from '../../MainAbility/model/scenarioTestDataModels' -import * as P2pManagerInterface from '../../MainAbility/model/p2pManagerInterface' -import ConfigData from '../../Utils/ConfigData'; +} from '../../entryability/model/scenarioTestDataModels' +import * as P2pManagerInterface from '../../entryability/model/p2pManagerInterface' +import ConfigData from '../../utils/ConfigData'; /** * p2pManager Connect Scenario Test Page Of WiFi test @@ -36,13 +36,13 @@ import ConfigData from '../../Utils/ConfigData'; struct p2pManagerConnectScenarioTest { @State message: string = 'p2pManagerConnectScenarioTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "p2pManagerConnectScenarioMessage" ) p2pManagerConnectScenarioMessage: string = "" @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "MyTestDevice" aboutToAppear() { diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiConnectScenarioTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiConnectScenarioTest.ets index 8700bec33..89aa93aeb 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiConnectScenarioTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiConnectScenarioTest.ets @@ -19,14 +19,14 @@ import prompt from '@system.prompt'; import router from '@system.router'; import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { ScenarioContentTable } from '../../Component/scenarioContentTable' import { WifiConnectScenarioTestCase , initWifiConnectScenarioData -} from '../../MainAbility/model/scenarioTestDataModels' -import * as WifiInterface from '../../MainAbility/model/wifiInterface' -import ConfigData from '../../Utils/ConfigData'; +} from '../../entryability/model/scenarioTestDataModels' +import * as WifiInterface from '../../entryability/model/wifiInterface' +import ConfigData from '../../utils/ConfigData'; /** * WiFi Connect Scenario Test Page Of WiFi test @@ -37,25 +37,25 @@ import ConfigData from '../../Utils/ConfigData'; struct wifiConnectScenarioTest { @State message: string = 'wifiConnectScenarioTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "wifiConnectScenarioMessage" ) wifiConnectScenarioMessage: string = "" @State w_ssid: string = "TP-LINK_6365"; @State w_bssid: string = "6C:B1:58:75:63:65"; @State w_preSharedKey: string = "12345678"; @State w_isHiddenSsid: boolean = false; - @State w_securityType: number = 3 - @State w_creatorUid: number = 1; - @State w_disableReason: number = 0; - @State w_netId: number = 100 ; - @State w_randomMacType: number = 0 ; + @State w_securityType: Number = 3 + @State w_creatorUid: Number = 1; + @State w_disableReason: Number = 0; + @State w_netId: Number = 100 ; + @State w_randomMacType: Number = 0 ; @State w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @State w_ipType: number = 1 ; - @State w_staticIp_ipAddress: number = 3232235880 ; - @State w_staticIp_gateway: number = 3232235777 ; - @State w_staticIp_dnsServers: number = 3716386629 ; + @State w_ipType: Number = 1 ; + @State w_staticIp_ipAddress: Number = 3232235880 ; + @State w_staticIp_gateway: Number = 3232235777 ; + @State w_staticIp_dnsServers: Number = 3716386629 ; @State w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @State w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @State w_featureId: number = 1 ; + @State w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @State w_featureId: Number = 1 ; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid' , this.w_ssid ); diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiManagerConnectScenarioTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiManagerConnectScenarioTest.ets index ec6bffc6b..1e615e17a 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiManagerConnectScenarioTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subScenarioTest/wifiManagerConnectScenarioTest.ets @@ -19,14 +19,14 @@ import prompt from '@system.prompt'; import router from '@system.router'; import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; -import { TestData } from '../../MainAbility/model/testData' +import { TestData } from '../../entryability/model/testData' import { ScenarioContentTable } from '../../Component/scenarioContentTable' import { WifiManagerConnectScenarioTestCase , initWifiManagerConnectScenarioData -} from '../../MainAbility/model/scenarioTestDataModels' -import * as WifiManagerInterface from '../../MainAbility/model/wifiManagerInterface' -import ConfigData from '../../Utils/ConfigData'; +} from '../../entryability/model/scenarioTestDataModels' +import * as WifiManagerInterface from '../../entryability/model/wifiManagerInterface' +import ConfigData from '../../utils/ConfigData'; /** * WiFiManager Connect Scenario Test Page Of WiFi test @@ -37,25 +37,25 @@ import ConfigData from '../../Utils/ConfigData'; struct wifiManagerConnectScenarioTest { @State message: string = 'wifiManagerConnectScenarioTest'; private testItem: TestData = router.getParams().testId; - @State changeIndex: number = - 1 + @State changeIndex: Number = - 1 @StorageLink( "wifiManagerConnectScenarioMessage" ) wifiManagerConnectScenarioMessage: string = "" @State w_ssid1: string = "TP-LINK_6365"; @State w_bssid1: string = "6C:B1:58:75:63:65"; @State w_preSharedKey1: string = "12345678"; @State w_isHiddenSsid1: boolean = false; - @State w_securityType1: number = 3; - @State w_creatorUid1: number = 1 ; - @State w_disableReason1: number = 0; - @State w_netId1: number = 0 ; - @State w_randomMacType1: number = 0 ; + @State w_securityType1: Number = 3; + @State w_creatorUid1: Number = 1 ; + @State w_disableReason1: Number = 0; + @State w_netId1: Number = 0 ; + @State w_randomMacType1: Number = 0 ; @State w_randomMacAddr1: string = "08:fb:ea:1b:38:aa" - @State w_ipType1: number = 1 ; - @State w_staticIp_ipAddress1: number = 3232235880 ; - @State w_staticIp_gateway1: number = 3232235777 ; - @State w_staticIp_dnsServers1: number = 3716386629 ; + @State w_ipType1: Number = 1 ; + @State w_staticIp_ipAddress1: Number = 3232235880 ; + @State w_staticIp_gateway1: Number = 3232235777 ; + @State w_staticIp_dnsServers1: Number = 3716386629 ; @State w_staticIp_domains1: Array = [ "0", "1", "2" ] ; - @State w_networkIdM: number = 0 ; - @State w_featureIdM: number = 1 ; + @State w_networkIdM: Number = 0 ; + @State w_featureIdM: Number = 1 ; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid1' , this.w_ssid1 ); diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/hotspotStabilityTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/hotspotStabilityTest.ets new file mode 100644 index 000000000..0e2e8e4bd --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/hotspotStabilityTest.ets @@ -0,0 +1,312 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +// @ts-nocheck + +import { PageTitle } from '../../Component/pageTitle'; +import { TestImageDisplay } from '../../Component/testImageDisplay'; +import { ContentTable } from '../../Component/contentTable'; +import Router from '@system.router'; +import ConfigData from '../../Utils/ConfigData'; +import { TestData } from '../../entryability/model/testData' +import wifi from '@ohos.wifi'; +import wifiManager from '@ohos.wifiManager'; +import prompt from '@system.prompt'; + +/** + * WiFiSwitchStabilityTest Page Of wifi test + */ +const TAG = '[HotspotStabilityTest]' + +@Entry +@Component +struct HotspotStabilityTest { + private testItem: TestData = Router.getParams().testId; + @State open_StartTime: Number = 0 + @State open_EndTime: Number = 0 + @State open_SpendTime: Number = 0 + @State close_StartTime: Number = 0 + @State close_EndTime: Number = 0 + @State close_SpendTime: Number = 0 + @State openHotspotNumber: Number = 0 // 打开Hotspot的次数 + @State closeHotspotNumber: Number = 0 // 关闭Hotspot的次数 + @State openSuccessNumber: Number = 0 // 打开Hotspot的成功次数 + @State openFailNumber: Number = 0 // 打开Hotspot的失败次数 + @State closeSuccessNumber: Number = 0 // 关闭Hotspot的成功次数 + @State closeFailNumber: Number = 0 // 关闭Hotspot的失败次数 + + @State message: string = "测试结果:" + @State testNumbers: Number = 30 //测试次数 + @State successTimes: Number = 0 + @State failTimes: Number = 0 + @State hotspotMessage: String = "" + @State hotspotMessageLog: String = "" + @State hotspotLoopState: Boolean = true + + build() { + Column() { + Stack( { alignContent : Alignment.TopStart } ) { + TestImageDisplay( { testItem : this.testItem } ) + PageTitle( { testItem : this.testItem } ) + } + + Stack().height( "1vp" ).backgroundColor( $r( "app.color.black" ) ); + + Column() { + Row() { + Text( "测试次数：" ).fontSize( $r( 'app.float.font_18' ) ).width( "25%" ).padding( { left : "10vp" } ) + TextInput( { placeholder : "请输入循环次数，默认为：30" } ) + .placeholderColor( Color.Grey ) + .placeholderFont( { size : $r( 'app.float.font_16' ) } ) + .caretColor( Color.Blue ) + .width( "70%" ) + .fontSize( $r( 'app.float.font_16' ) ) + .fontColor( $r( 'app.color.title_black_color' ) ) + .onChange( ( value: string ) => { + this.testNumbers = Number( value ); + } ) + } + + Column() { + Text( "测试结果：" ) + .fontSize( "22vp" ) + .width( ConfigData.WH_95_100 ) + .align( Alignment.TopStart ) + .padding( { top : "10vp" } ) + Scroll() { + Column() { + Text( "测试次数：" + this.testNumbers ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "10vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + Text( "打开热点的成功次数：" + this.openSuccessNumber ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "10vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + Text( "打开热点的失败次数：" + this.openFailNumber ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "10vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + Text( "关闭热点的成功次数：" + this.closeSuccessNumber ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "10vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + Text( "关闭热点的失败次数：" + this.closeFailNumber ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "10vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + } + .width( ConfigData.WH_95_100 ) + .backgroundColor( $r( "sys.color.ohos_id_color_foreground_contrary" ) ) + } + .scrollBarWidth( 10 ) + .scrollBar( BarState.Auto ) + }.width( "100%" ).height( "30%" ) + + Column() { + Text( "log显示：" ) + .fontSize( "22vp" ) + .height( ConfigData.WH_15_100 ) + .width( ConfigData.WH_95_100 ) + .align( Alignment.TopStart ) + .padding( { top : "18vp" } ) + List() { + ListItem() { + Text( this.hotspotMessageLog ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "20vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + } + } + .height( ConfigData.WH_83_100 ) + .width( ConfigData.WH_95_100 ) + .backgroundColor( $r( "sys.color.ohos_id_color_foreground_contrary" ) ) + }.width( ConfigData.WH_100_100 ).height( ConfigData.WH_60_100 ) + + }.width( "100%" ).height( "67%" ).backgroundColor( $r( "app.color.lead" ) ) + + Stack().height( "1vp" ).backgroundColor( $r( "app.color.black" ) ); + + Column() { + Row() { + Button( "开始热点测试" ) + .operateButtonStyle( $r( 'app.color.main_blue' ) ) + .padding( { right : "10vp" } ) + .onClick( async( event: ClickEvent ) => { + console.log( TAG , "start HotspotSwitch test-------------" ) + let self = this + self.hotspotLoopState = true + + async function forLoop() { + self.hotspotMessageLog = "" + self.onHotspotStateChange() // 监听函数 + let funcMessage = "" // 函数信息 + for ( self.openHotspotNumber ; self.openHotspotNumber < self.testNumbers ; self.openHotspotNumber ++ ) { + if ( !self.hotspotLoopState ) { + console.log( TAG , "测试结束------------" ) + break; + } else { + let wifiState = wifiManager.isWifiActive() + if ( wifiState ) { + wifi.disableWifi() + console.log( TAG , "wifi当前已使能，已经去使能，正常开始测试------" ) + } else { + console.log( TAG , "wifi当前未使能，正常开始测试------" ) + } + await sleep( 3 ) + + funcMessage = wifi.enableHotspot() + // 打时间戳 + self.open_StartTime = new Date().getTime() + console.log( TAG , "第" + ( self.openHotspotNumber + 1 ) + "次热点使能-----" ) + console.log( TAG , "第" + ( self.openHotspotNumber + 1 ) + "次热点使能开始时间: " + self.open_StartTime + "ms" ) + self.hotspotMessageLog += "第" + ( self.openHotspotNumber + 1 ) + "次热点使能结果：" + funcMessage + "\n" + console.log( TAG , "第" + ( self.openHotspotNumber + 1 ) + "次热点使能结果：" + funcMessage ) + await sleep( 10 ) + self.hotspotMessage = AppStorage.Get( "hotspotMessage" ) + // prompt.showToast( { message : funcMessage } ) + if ( self.hotspotMessage == "active" ) { + self.open_SpendTime = self.open_EndTime - self.open_StartTime + self.hotspotMessageLog += "第" + ( self.openHotspotNumber + 1 ) + "次热点使能耗时: " + self.open_SpendTime + "ms" + "\n" + console.log( TAG , "第" + ( self.openHotspotNumber + 1 ) + "次热点使能耗时: " + self.open_SpendTime + "ms" ) + self.openSuccessNumber = self.openSuccessNumber + 1 + self.hotspotMessageLog += "热点使能成功的次数：" + self.openSuccessNumber + "\n" + console.log( TAG , "热点使能成功的次数：" + self.openSuccessNumber ) + funcMessage = wifi.disableHotspot() + self.closeHotspotNumber = self.closeHotspotNumber + 1 + self.close_StartTime = new Date().getTime() + console.log( TAG , "第" + self.closeHotspotNumber + "次热点去使能-----" ) + console.log( TAG , "第" + self.closeHotspotNumber + "次热点去使能开始时间: " + self.close_StartTime + "ms" ) + self.hotspotMessageLog += "第" + self.closeHotspotNumber + "次热点去使能结果：" + funcMessage + "\n" + console.log( TAG , "第" + self.closeHotspotNumber + "次热点去使能结果：" + funcMessage ) + console.log( TAG , "closeHotspotNumber: " + self.closeHotspotNumber ) + await sleep( 10 ) + // prompt.showToast( { message : funcMessage } ) + self.hotspotMessage = AppStorage.Get( "hotspotMessage" ) + if ( self.hotspotMessage == "inactive" ) { + self.close_SpendTime = self.close_EndTime - self.close_StartTime + self.hotspotMessageLog += "第" + self.closeHotspotNumber + "次热点去使能耗时: " + self.close_SpendTime + "ms" + "\n" + console.log( TAG , "第" + self.closeHotspotNumber + "次热点去使能耗时: " + self.close_SpendTime + "ms" ) + self.closeSuccessNumber = self.closeSuccessNumber + 1 + self.hotspotMessageLog += "热点去使能成功的次数：" + self.closeSuccessNumber + "\n" + console.log( TAG , "热点去使能成功的次数：" + self.closeSuccessNumber ) + await sleep( 7 ) + } else { + self.closeFailNumber = self.closeFailNumber + 1 + console.log( TAG , "热点去使能失败的次数：" + self.closeFailNumber ) + console.log( TAG , "第" + self.closeHotspotNumber + "次热点去使能失败" ) + } + } else if ( self.hotspotMessage == "inactive" ) { + self.openFailNumber = self.openFailNumber + 1 + console.log( TAG , "热点使能失败的次数：" + self.openFailNumber ) + console.log( TAG , "第" + ( self.openHotspotNumber + 1 ) + "次热点使能失败" ) + break; + } else { + console.log( "第" + ( self.openHotspotNumber + 1 ) + "次开热点后状态不清楚" ); + break; + } + } + } + } + + forLoop() + + } ) + + Blank().width( "10%" ) + + Button( "关闭热点测试" ) + .operateButtonStyle( $r( 'app.color.main_blue' ) ) + .padding( { right : "10vp" } ) + .onClick( async( event: ClickEvent ) => { + let self = this + self.hotspotLoopState = false + console.log( TAG , "准备测试停止 -------------" ) + self.hotspotMessageLog = "" + } ) + } + + }.width( "100%" ).height( "25%" ).backgroundColor( $r( "app.color.lead" ) ) + + }.height( "100%" ).width( "100%" ).backgroundColor( $r( "app.color.lead" ) ) + } + + onHotspotStateChange() { + console.log( TAG , "on.hotspotStateChange start--------" ) + wifiManager.on( "hotspotStateChange" , ( number ) => { + console.log( TAG , " on.hotspotStateChange --------" ) + let hotspotStateMessage = "" + switch ( number ) { + case 0: + hotspotStateMessage = "inactive"; + break; + case 1: + hotspotStateMessage = "active"; + break; + case 2: + hotspotStateMessage = "activating"; + break; + case 3: + hotspotStateMessage = "de-activating"; + break; + default: + hotspotStateMessage = '未知状态'; + break; + } + console.log( TAG , "热点开关状态为:" + hotspotStateMessage ) + if ( number == 1 ) { + // 打时间戳 + this.open_EndTime = new Date().getTime() + console.log( TAG , "热点使能结束时间: " + this.open_EndTime + "ms" ) + } else if ( number == 0 ) { + this.close_EndTime = new Date().getTime() + console.log( TAG , "热点去使能结束时间: " + this.close_EndTime + "ms" ) + } + console.log( TAG , " on.hotspotStateChange callback success --------" ) + prompt.showToast( { message : "热点状态: " + hotspotStateMessage } ) + this.hotspotMessage = hotspotStateMessage + AppStorage.SetOrCreate( "hotspotMessage" , this.hotspotMessage ) + console.log( TAG , " on.hotspotStateChange callback end--------" ) + return this.hotspotMessage + } ) + return this.hotspotMessage + } +} + +/** + * Custom button style. + */ +@Extend( Button ) function operateButtonStyle( color: Resource ) { + .width( $r( 'app.float.button_width' ) ) + .height( $r( 'app.float.button_height' ) ) + .fontSize( $r( 'app.float.font_16' ) ) + .fontWeight( 500 ) + .fontColor( color ) + .backgroundColor( $r( 'app.color.button_background' ) ) +} + +function sleep( time ) { + return new Promise(( resolve , reject ) => { + setTimeout( () => { + resolve() + } , time * 1000 ) + }) +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/webLatencyTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/webLatencyTest.ets new file mode 100644 index 000000000..4caaea8ee --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/webLatencyTest.ets @@ -0,0 +1,373 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +// @ts-nocheck +import prompt from '@system.prompt'; +import wifi from '@ohos.wifi' + +import { PageTitle } from '../../Component/pageTitle'; +import Router from '@system.router'; +import mediaquery from '@ohos.mediaquery'; +// @ts-ignore +import parameter from '@ohos.systemparameter'; +import { TabletTitle , BrowserTabs , WebTab } from '../../Component/webTitleBar'; +import { PhoneLayout } from '../../Component/phoneLayout'; +import { Browser , LoadingStatus } from '../../entryability/model/bowser'; +import Logger from '../../entryability/model/Logger'; +import ConfigData from '../../utils/ConfigData'; +import { ConfigData } from '../../utils/ConfigData'; +import fs from '@ohos.file.fs'; +import UIAbility from '@ohos.app.ability.UIAbility'; +import window from '@ohos.window'; +import http from '@ohos.net.http'; +import performanceMonitor from '@ohos.arkui.performanceMonitor'; +import App from '@system.app'; + +const TAG = '[webLatencyTest]'; + +/** + * wifi Found Test Page Of Wifi test + */ +@Entry +@Component +struct webLatencyTest { + private testItem: TestData = Router.getParams().testId; + @State isPhone: boolean = true; + @State testNumbers: Number = 30 //测试次数 + @State openWebNumber: Number = 0 // 打开Web的次数 + @State closeWebNumber: Number = 0 // 关闭Web的次数 + @State openSuccessNumbers: Number = 0; + @State openFailNumbers: Number = 0; + @State progressStatus: Number = 0; + @State browser: Browser = new Browser(); + @StorageLink( "pageCostTime" ) pageCostTime: number = 0 + @StorageLink( "pathDir" ) pathDir: string = "" + @State addr: string = "www.baidu.com" + @State filePath: string = "" + private isInit: Boolean = false; + @State pairedSsid: string = ""; + @State wifiConnectionMessage: String = "" + @State webLoopState: Boolean = true + @State webMessage: String = "" + @State webMessageLog: String = "" + @State requestStartTime: Number = 0 + @State requestEndTime: Number = 0 + @State requestCostTime: Number = 0 + @State file: fs.File = null + @State fileData: string = ""; + listener = mediaquery.matchMediaSync( '(orientation:landscape)' ); + + aboutToAppear() { + try { + let deviceType = parameter.getSync( "const.build.characteristics" ); + console.log( TAG , "deviceType：" + deviceType ) + if ( deviceType === 'default' ) { + this.isPhone = true; + } + } catch( e ) { + console.log( TAG , `getSync unexpected error: ${ e }` ); + } + console.log( TAG , "aboutToAppear" ) + let wifiState = wifi.isConnected() + console.log( TAG , "aboutToAppear,isConnected:" + wifiState ) + if ( wifiState ) { + this.wifiConnectionMessage = "connected"; + wifi.getLinkedInfo( ( err , data ) => { + if ( err ) { + console.log( TAG , "get linked info error" ); + } + let linkedInfoMessage = JSON.stringify( data ) + console.log( TAG , "aboutToAppear, linkedInfo:" + linkedInfoMessage ) + this.pairedSsid = data.ssid + AppStorage.SetOrCreate( "pairedSsid" , this.pairedSsid ) + } ) + } else { + this.wifiConnectionMessage = "disconnected"; + prompt.showToast( { message : 'wifi还未连接，请先连接WiFi' } ) + } + + this.filePath = this.pathDir + "/dataLog.txt"; + console.log( TAG , "沙箱路径为: " + this.filePath ) + this.file = fs.openSync( this.filePath , fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE ); + AppStorage.setOrCreate( "fsFile" , this.file ) + AppStorage.SetOrCreate( "openWebNumber" , this.openWebNumber ) + console.log( TAG , "数据文件的沙箱路径为: " + this.filePath ) + console.log( TAG , "file fd: " + this.file.fd ); + } + + aboutToDisappear() { + fs.closeSync( this.file ); + } + + build() { + Column() { + Stack( { alignContent : Alignment.TopStart } ) { + // TestImageDisplay( { testItem : this.testItem } ) + PageTitle( { testItem : this.testItem } ) + } + + Stack().height( "0.5vp" ).backgroundColor( "#000000" ); + + Column() { + Text( "WiFi连接情况：" + this.wifiConnectionMessage ) + .fontSize( "17vp" ) + .margin( { top : "8vp" , bottom : "4vp" , left : "15vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_100_100 ) + Text( "已连接的WiFi：" + this.pairedSsid ) + .fontSize( "17vp" ) + .margin( { top : "4vp" , bottom : "8vp" , left : "15vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_100_100 ) + Row() { + Text( "测试次数:" ) + .fontSize( "17vp" ) + .width( "25%" ) + .margin( { top : "8vp" , bottom : "8vp" , left : "5vp" } ) + TextInput( { placeholder : "请输入循环次数，默认为：30" } ) + .placeholderColor( Color.Grey ) + .placeholderFont( { size : $r( 'app.float.font_16' ) } ) + .caretColor( Color.Blue ) + .width( "70%" ) + .fontSize( $r( 'app.float.font_16' ) ) + .fontColor( $r( 'app.color.title_black_color' ) ) + .onChange( ( value: string ) => { + this.testNumbers = Number( value ); + } ) + } + + TabletTitle( { browser : $browser } ) + + Column() { + Row() { + Button( "开始web测试" ) + .operateButtonStyle( $r( 'app.color.main_blue' ) ) + .align( Alignment.Center ) + .onClick( async( event: ClickEvent ) => { + console.log( TAG , "start web test-------------" ) + let self = this + self.webLoopState = true + + async function forLoop() { + self.stateMessageLog = "" + let funcMessage = "" // 函数信息 + for ( self.openWebNumber ; self.openWebNumber < self.testNumbers ; self.openWebNumber ++ ) { + if ( !self.webLoopState ) { + console.log( TAG , "web测试结束------------" ) + break; + } else { + console.log( TAG , "测试开始--------" ) + console.log( TAG , "self.addr:" , self.addr ) + self.fileData = "第" + ( self.openWebNumber + 1 ) + "次网页测试开始! addr为: " + self.addr + "------------" + "\n" + fs.writeSync( self.file.fd , self.fileData ); + + let httpRequest = http.createHttp(); + self.requestStartTime = new Date().getTime() + console.time( "request" ) + httpRequest.request( "www.baidu.com" , ( err: Error , data: http.HttpResponse ) => { + if ( !err ) { + console.log( TAG , 'Result:' + data.result ); + console.log( TAG , 'code:' + data.responseCode ); + console.log( TAG , 'header:' + JSON.stringify( data.header ) ); + console.log( TAG , 'cookies:' + data.cookies ); + console.timeEnd( "request" ) + self.requestEndTime = new Date().getTime() + self.requestCostTime = self.requestEndTime - self.requestStartTime + self.fileData = "第" + ( self.openWebNumber + 1 ) + "次http request的耗时： " + self.requestCostTime + "ms" + "\n" + fs.writeSync( self.file.fd , self.fileData ); + // console.info( TAG , "write data to file succeed and size is:" + writeLen ); + } else { + console.log( TAG , 'error:' + JSON.stringify( err ) ); + } + } ); + self.browser.loadUrl( self.addr ) + await sleep( 10 ) + self.openSuccessNumbers ++ + self.browser.loadUrl( { + url : $rawfile( 'phone.html' ) // pad.html + } ) + console.log( TAG , "第" + ( self.openWebNumber + 1 ) + "次测试结束--------" ) + self.fileData = "第" + ( self.openWebNumber + 1 ) + "次网页测试结束! ------------" + "\n" + fs.writeSync( self.file.fd , self.fileData ); + AppStorage.SetOrCreate( "openWebNumber" , self.openWebNumber ) + await sleep( 5 ) + } + + } + fs.closeSync( self.file ); + } + + forLoop() + + } ) + + Blank().width( "10%" ) + + Button( "关闭Web测试" ) + .operateButtonStyle( $r( 'app.color.main_blue' ) ) + .align( Alignment.Center ) + .onClick( async( event: ClickEvent ) => { + let self = this + self.webLoopState = false + console.log( TAG , "准备测试停止 -------------" ) + self.webMessageLog = "" + fs.closeSync( self.file ); + } ) + } + }.width( "100%" ).backgroundColor( '#F5F5F5' ).padding( { top : " 5vp" } ) + + + Column() { + Column() { + Text( "测试结果：" ) + .fontSize( "18vp" ) + .width( ConfigData.WH_95_100 ) + .align( Alignment.TopStart ) + .padding( { top : " 5vp" } ) + Scroll() { + Column() { + Text( "测试次数：" + this.testNumbers ) + .fontSize( "18vp" ) + .margin( { top : "3vp" , left : "5vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_95_100 ) + Text( "打开web的成功次数：" + this.openSuccessNumbers ) + .fontSize( "18vp" ) + .margin( { top : "3vp" , left : "5vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_95_100 ) + Text( "打开web的失败次数：" + this.openFailNumbers ) + .fontSize( "18vp" ) + .margin( { top : "3vp" , left : "5vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_95_100 ) + Text( "测试进度状态：" + this.browser.progress + " %" ) + .fontSize( "18vp" ) + .margin( { top : "3vp" , left : "5vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_95_100 ) + Text( "httpRequest耗时：" + this.requestCostTime + " ms" ) + .fontSize( "18vp" ) + .margin( { top : "3vp" , left : "5vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_95_100 ) + Text( "数据文件沙箱路径：" + this.filePath ) + .fontSize( "18vp" ) + .margin( { top : "3vp" , left : "5vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_95_100 ) + } + .width( ConfigData.WH_95_100 ) + .backgroundColor( $r( "sys.color.ohos_id_color_foreground_contrary" ) ) + } + .scrollBarWidth( 10 ) + .scrollBar( BarState.Auto ) + } + .width( ConfigData.WH_100_100 ) + + Column() { + Text( "log显示：" ) + .fontSize( "18vp" ) + .width( ConfigData.WH_95_100 ) + .align( Alignment.TopStart ) + .padding( { top : "5vp" } ) + List() { + ListItem() { + Text( "hilog" ) + .fontSize( "18vp" ) + .margin( { top : "5vp" , left : "20vp" , right : "5vp" } ) + .textAlign( TextAlign.Start ) + .width( ConfigData.WH_90_100 ) + } + } + .width( ConfigData.WH_95_100 ) + .height( ConfigData.WH_88_100 ) + .backgroundColor( $r( "sys.color.ohos_id_color_foreground_contrary" ) ) + } + .height( ConfigData.WH_50_100 ) + .width( ConfigData.WH_100_100 ) + } + .height( ConfigData.WH_50_100 ) + .width( ConfigData.WH_100_100 ) + } + .width( ConfigData.WH_100_100 ) + .height( ConfigData.WH_65_100 ) + + Column() { + if ( this.isPhone ) { + Progress( { value : this.browser.progress , total : 100 } ) + .color( '#0000ff' ) + .visibility( this.browser.hideProgress ? Visibility.None : Visibility.Visible ) + BrowserTabs( { browser : $browser } ) + Divider().color( '#c6c6c6' ).width( '100%' ).flexShrink( 0 ) + WebTab( { browser : $browser , isPhone : $isPhone } ) + } else { + PhoneLayout( { browser : $browser } ) + } + } + .width( ConfigData.WH_100_100 ) + .height( ConfigData.WH_20_100 ) + + } + .width( ConfigData.WH_100_100 ) + .height( ConfigData.WH_100_100 ) + .backgroundColor( '#F5F5F5' ) + } + + orientationCallback( result ) { + if ( !this.isInit ) { + if ( result.matches ) { + this.isPhone = false; + } else { + this.isPhone = true; + } + this.isInit = true; + } + console.log( TAG , `orientationCallback end,isPhone=${ this.isPhone }` ); + } + + onBackPress(): boolean { + console.log( TAG , `enter onBackPress` ); + if ( this.browser.webControllerArray[ this.browser.tabArrayIndex ].controller.accessBackward() || + this.browser.loadingStatus === LoadingStatus.LOADING ) { + this.browser.webControllerArray[ this.browser.tabArrayIndex ].controller.backward(); + return true; + } + + return false; + } + + onDeviceChange() { + this.browser = new Browser(); + } +} + +@Extend( Button ) +function operateButtonStyle( color: Resource ) { + .width( $r( 'app.float.button_width' ) ) + .height( $r( 'app.float.button_height' ) ) + .fontSize( $r( 'app.float.font_16' ) ) + .fontWeight( 500 ) + .fontColor( color ) + .backgroundColor( $r( 'app.color.button_background' ) ) +} + +function sleep( time ) { + return new Promise(( resolve , reject ) => { + setTimeout( () => { + resolve() + } , time * 1000 ) + }) +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiConnectStabilityTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiConnectStabilityTest.ets index 435ebab74..32ebdb391 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiConnectStabilityTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiConnectStabilityTest.ets @@ -20,8 +20,8 @@ import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; import ConfigData from '../../Utils/ConfigData'; -import { initWifiApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import { initWifiApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; import wifiManager from '@ohos.wifiManager'; import prompt from '@system.prompt'; @@ -47,7 +47,6 @@ struct WiFiConnectStabilityTest { @State connectFailNumber: Number = 0 // 打开WiFi的失败次数 @State disconnectSuccessNumber: Number = 0 // 关闭WiFi的成功次数 @State disconnectFailNumber: Number = 0 // 关闭WiFi的失败次数 - @State message: string = "测试结果" @State testNumbers: Number = 30 //测试次数 @State successTimes: Number = 0 @@ -215,7 +214,7 @@ struct WiFiConnectStabilityTest { console.log( TAG , "第" + ( self.connectNumber + 1 ) + "次WIFI连接开始时间: " + self.connect_StartTime + "ms" ) self.connectionMessageLog += "第" + ( self.connectNumber + 1 ) + "次WIFI连接结果：" + funcMessage + "\n" console.log( TAG , "第" + ( self.connectNumber + 1 ) + "次WIFI连接结果：" + funcMessage ) - await sleep( 10 ) + await sleep( 15 ) self.connectionMessage = AppStorage.Get( "connectionMessage" ) // prompt.showToast( { message : funcMessage } ) if ( self.connectionMessage == "connected" ) { @@ -233,7 +232,7 @@ struct WiFiConnectStabilityTest { self.connectionMessageLog += "第" + self.disconnectNumber + "次WIFI断连结果：" + funcMessage + "\n" console.log( TAG , "第" + self.disconnectNumber + "次WIFI断连结果：" + funcMessage ) console.log( TAG , "disconnectNumber: " + self.disconnectNumber ) - await sleep( 10 ) + await sleep( 15 ) // prompt.showToast( { message : funcMessage } ) self.connectionMessage = AppStorage.Get( "connectionMessage" ) if ( self.connectionMessage == "disconnected" ) { @@ -243,12 +242,16 @@ struct WiFiConnectStabilityTest { self.disconnectSuccessNumber = self.disconnectSuccessNumber + 1 self.connectionMessageLog += "断连成功的次数：" + self.disconnectSuccessNumber + "\n" console.log( TAG , "断连成功的次数：" + self.disconnectSuccessNumber ) - await sleep( 7 ) + await sleep( 15 ) } else { self.disconnectFailNumber = self.disconnectFailNumber + 1 + console.log( TAG , "断连失败的次数：" + self.disconnectFailNumber ) + console.log( TAG , "第" + self.disconnectNumber + "次WIFI断连失败" ) } } else if ( self.connectionMessage == "disconnected" ) { self.connectFailNumber = self.connectFailNumber + 1 + console.log( TAG , "连接失败的次数：" + self.connectFailNumber ) + console.log( TAG , "第" + ( self.connectNumber + 1 ) + "次WIFI连接失败" ) break; } else { console.log( "第" + ( self.connectNumber + 1 ) + "次连接后状态不清楚" ); @@ -262,6 +265,8 @@ struct WiFiConnectStabilityTest { } ) + Blank().width( "10%" ) + Button( "关闭连接测试" ) .operateButtonStyle( $r( 'app.color.main_blue' ) ) .padding( { right : "10vp" } ) @@ -317,14 +322,17 @@ struct WiFiConnectStabilityTest { console.log( TAG , " on.wifiConnectionChange callback end--------" ) return this.connectionMessage } ) - return this.connectionMessage + } + + aboutToDisappear() { + wifiManager.off( "wifiConnectionChange" ) } } @Component struct setWifiDevice { - @StorageLink( 'w_networkIdM' ) w_networkIdM: number = 0; // id,netId,networkId是一个值嘛？ - @StorageLink( 'w_featureIdM' ) w_featureIdM: number = 1; + @StorageLink( 'w_networkIdM' ) w_networkIdM: Number = 0; // id,netId,networkId是一个值嘛？ + @StorageLink( 'w_featureIdM' ) w_featureIdM: Number = 1; @StorageLink( 'wifiConfig' ) wifiConfig: Object = { ssid : String = "TP-LINK_6365" , bssid : String = "6C:B1:58:75:63:65" , @@ -443,7 +451,7 @@ struct setWifiDevice { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( TAG , "Select:" + index ) this.wifiConfig.securityType = index; } ) @@ -548,7 +556,7 @@ struct setWifiDevice { Row() { Text( "ipTypeM:" ).fontSize( 15 ).width( 60 ); - TextInput( { text : this.wifiConfig.IpType , placeholder : "1" } ) //DHCP + TextInput( { text : this.wifiConfig.IpType , placeholder : "1" } )//DHCP .fontSize( "15vp" ) .onChange( ( strInput ) => { //判断合法性 @@ -649,7 +657,8 @@ struct setWifiDevice { /** * Custom button style. */ -@Extend( Button ) function operateButtonStyle( color: Resource ) { +@Extend( Button ) +function operateButtonStyle( color: Resource ) { .width( $r( 'app.float.button_width' ) ) .height( $r( 'app.float.button_height' ) ) .fontSize( $r( 'app.float.font_16' ) ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiScanStabilityTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiScanStabilityTest.ets index 376a9b7ef..41e6db40e 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiScanStabilityTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiScanStabilityTest.ets @@ -20,8 +20,8 @@ import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; import ConfigData from '../../Utils/ConfigData'; -import { initWifiApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import { initWifiApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; import wifiManager from '@ohos.wifiManager'; import prompt from '@system.prompt'; @@ -204,9 +204,13 @@ struct WiFiScanStabilityTest { await sleep( 7 ) } else { self.closeScanFailNumber = self.closeScanFailNumber + 1 + console.log( TAG , "去使能失败的次数：" + self.closeScanFailNumber ) + console.log( TAG , "第" + self.closeScanNumber + "次去使能失败" ) } } else if ( self.scanStateMessage == "scan fail" ) { self.openScanFailNumber = self.openScanFailNumber + 1 + console.log( TAG , "扫描失败的次数：" + self.openScanFailNumber ) + console.log( TAG , "第" + ( self.openScanNumber + 1 ) + "次WIFI扫描失败" ) break; } else { console.log( "第" + ( self.openScanNumber + 1 ) + "次扫描后状态不清楚" ); @@ -220,6 +224,8 @@ struct WiFiScanStabilityTest { } ) + Blank().width( "10%" ) + Button( "关闭扫描测试" ) .operateButtonStyle( $r( 'app.color.main_blue' ) ) .padding( { right : "10vp" } ) @@ -269,14 +275,18 @@ struct WiFiScanStabilityTest { console.log( TAG , " on.wifiStateChange callback end--------" ) return this.scanStateMessage } ) - return this.scanStateMessage + } + + aboutToDisappear() { + wifiManager.off( "wifiScanStateChange" ) } } /** * Custom button style. */ -@Extend( Button ) function operateButtonStyle( color: Resource ) { +@Extend( Button ) +function operateButtonStyle( color: Resource ) { .width( $r( 'app.float.button_width' ) ) .height( $r( 'app.float.button_height' ) ) .fontSize( $r( 'app.float.font_16' ) ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiSwitchStabilityTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiSwitchStabilityTest.ets index aaf61f2f1..e9b589e89 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiSwitchStabilityTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStabilityTest/wifiSwitchStabilityTest.ets @@ -20,8 +20,8 @@ import { TestImageDisplay } from '../../Component/testImageDisplay'; import { ContentTable } from '../../Component/contentTable'; import Router from '@system.router'; import ConfigData from '../../Utils/ConfigData'; -import { initWifiApiData } from '../../MainAbility/model/testDataModels' -import { TestData } from '../../MainAbility/model/testData' +import { initWifiApiData } from '../../entryability/model/testDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; import wifiManager from '@ohos.wifiManager'; import prompt from '@system.prompt'; @@ -47,7 +47,6 @@ struct WiFiSwitchStabilityTest { @State openFailNumber: Number = 0 // 打开WiFi的失败次数 @State closeSuccessNumber: Number = 0 // 关闭WiFi的成功次数 @State closeFailNumber: Number = 0 // 关闭WiFi的失败次数 - @State message: string = "测试结果:" @State testNumbers: Number = 30 //测试次数 @State successTimes: Number = 0 @@ -181,7 +180,7 @@ struct WiFiSwitchStabilityTest { console.log( TAG , "第" + ( self.openWifiNumber + 1 ) + "次WIFI使能开始时间: " + self.open_StartTime + "ms" ) self.stateMessageLog += "第" + ( self.openWifiNumber + 1 ) + "次WIFI使能结果：" + funcMessage + "\n" console.log( TAG , "第" + ( self.openWifiNumber + 1 ) + "次WIFI使能结果：" + funcMessage ) - await sleep( 10 ) + await sleep( 15 ) self.stateMessage = AppStorage.Get( "stateMessage" ) // prompt.showToast( { message : funcMessage } ) if ( self.stateMessage == "active" ) { @@ -199,7 +198,7 @@ struct WiFiSwitchStabilityTest { self.stateMessageLog += "第" + self.closeWifiNumber + "次WIFI去使能结果：" + funcMessage + "\n" console.log( TAG , "第" + self.closeWifiNumber + "次WIFI去使能结果：" + funcMessage ) console.log( TAG , "closeWifiNumber: " + self.closeWifiNumber ) - await sleep( 10 ) + await sleep( 15 ) // prompt.showToast( { message : funcMessage } ) self.stateMessage = AppStorage.Get( "stateMessage" ) if ( self.stateMessage == "inactive" ) { @@ -212,9 +211,13 @@ struct WiFiSwitchStabilityTest { await sleep( 7 ) } else { self.closeFailNumber = self.closeFailNumber + 1 + console.log( TAG , "去使能失败的次数：" + self.closeFailNumber ) + console.log( TAG , "第" + self.closeWifiNumber + "次WIFI去使能失败" ) } } else if ( self.stateMessage == "inactive" ) { self.openFailNumber = self.openFailNumber + 1 + console.log( TAG , "使能失败的次数：" + self.openFailNumber ) + console.log( TAG , "第" + ( self.openWifiNumber + 1 ) + "次WIFI使能失败" ) break; } else { console.log( "第" + ( self.openWifiNumber + 1 ) + "次开wifi后状态不清楚" ); @@ -228,6 +231,8 @@ struct WiFiSwitchStabilityTest { } ) + Blank().width( "10%" ) + Button( "关闭WiFi测试" ) .operateButtonStyle( $r( 'app.color.main_blue' ) ) .padding( { right : "10vp" } ) @@ -282,14 +287,18 @@ struct WiFiSwitchStabilityTest { console.log( TAG , " on.wifiStateChange callback end--------" ) return this.stateMessage } ) - return this.stateMessage + } + + aboutToDisappear() { + wifiManager.off( "wifiStateChange" ) } } /** * Custom button style. */ -@Extend( Button ) function operateButtonStyle( color: Resource ) { +@Extend( Button ) +function operateButtonStyle( color: Resource ) { .width( $r( 'app.float.button_width' ) ) .height( $r( 'app.float.button_height' ) ) .fontSize( $r( 'app.float.font_16' ) ) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotManagerStressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotManagerStressTest.ets index c45642287..f9c008459 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotManagerStressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotManagerStressTest.ets @@ -20,13 +20,13 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { StressContentTable } from '../../Component/stressContentTable'; import router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initHotspotManagerStressData } from '../../MainAbility/model/stressTestDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initHotspotManagerStressData } from '../../entryability/model/stressTestDataModels' +import { TestData } from '../../entryability/model/testData' import { FilterTableManager } from '../../Component/filterTableManager'; import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -64,14 +64,14 @@ struct hotspotManagerStressTest { @State showListItem: boolean = false; private testItem: TestData = router.getParams().testId; @State message: string = ""; - @StorageLink( 'stressNumber' ) stressNumber: number = 0 ; - @StorageLink( 'stressTime' ) stressTime: number = 0; + @StorageLink( 'stressNumber' ) stressNumber: Number = 0 ; + @StorageLink( 'stressTime' ) stressTime: Number = 0; @State h_ssid1: string = "testApp1"; - @State h_securityType1: number = 3; - @State h_band1: number = 2; + @State h_securityType1: Number = 3; + @State h_band1: Number = 2; @State h_preSharedKey1: string = "12345678"; - @State h_maxConn1: number = 3 ; - @State h_channel1: number = 36 ; + @State h_maxConn1: Number = 3 ; + @State h_channel1: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid1" , this.h_ssid1 ) @@ -404,8 +404,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotStressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotStressTest.ets index d5bd9a16d..ae42d853b 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotStressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/hotspotStressTest.ets @@ -20,13 +20,13 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { StressContentTable } from '../../Component/stressContentTable'; import router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initHotspotStressData } from '../../MainAbility/model/stressTestDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initHotspotStressData } from '../../entryability/model/stressTestDataModels' +import { TestData } from '../../entryability/model/testData' import { FilterTable } from '../../Component/filterTable'; import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -64,14 +64,14 @@ struct hotspotStressTest { @State showListItem: boolean = false; private testItem: TestData = router.getParams().testId; @State message: string = ""; - @StorageLink( 'stressNumber' ) stressNumber: number = 0 ; - @StorageLink( 'stressTime' ) stressTime: number = 0; + @StorageLink( 'stressNumber' ) stressNumber: Number = 0 ; + @StorageLink( 'stressTime' ) stressTime: Number = 0; @State h_ssid: string = "testApp1"; - @State h_securityType: number = 3; - @State h_band: number = 2; + @State h_securityType: Number = 3; + @State h_band: Number = 2; @State h_preSharedKey: string = "12345678"; - @State h_maxConn: number = 3 ; - @State h_channel: number = 36 ; + @State h_maxConn: Number = 3 ; + @State h_channel: Number = 36 ; aboutToAppear() { AppStorage.SetOrCreate( "h_ssid" , this.h_ssid ) @@ -401,8 +401,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pManagerStressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pManagerStressTest.ets index fef9963ce..41db479e3 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pManagerStressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pManagerStressTest.ets @@ -20,12 +20,12 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { StressContentTable } from '../../Component/stressContentTable'; import router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initP2pManagerStressData } from '../../MainAbility/model/stressTestDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initP2pManagerStressData } from '../../entryability/model/stressTestDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' @@ -64,15 +64,15 @@ struct P2pManagerStressTest { private testItem: TestData = router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "MyTestDevice" - @StorageLink( 'stressNumber' ) stressNumber: number = 0 ; - @StorageLink( 'stressTime' ) stressTime: number = 0; + @StorageLink( 'stressNumber' ) stressNumber: Number = 0 ; + @StorageLink( 'stressTime' ) stressTime: Number = 0; aboutToAppear() { AppStorage.SetOrCreate( "deviceAddressManager" , this.deviceAddressManager ) @@ -223,10 +223,10 @@ struct P2pManagerStressTest { @Component struct p2pManagerSetting { @State deviceAddressManager: string = '6c:96:d7:3d:87:6f'; - @State netIdManager: number = - 2 ; + @State netIdManager: Number = - 2 ; @State passphraseManager: string = "12345678" ; @State groupNameManager: string = "testGroup" - @State goBandManager: number = 0 ; + @State goBandManager: Number = 0 ; @State devNameManager: string = "MyTestDevice" aboutToAppear() { @@ -540,8 +540,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pStressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pStressTest.ets index 481012ecf..263fb8795 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pStressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/p2pStressTest.ets @@ -20,11 +20,11 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { StressContentTable } from '../../Component/stressContentTable'; import router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import { initP2pStressData } from '../../MainAbility/model/stressTestDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import { initP2pStressData } from '../../entryability/model/stressTestDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' import request from '@ohos.request' @@ -61,15 +61,15 @@ struct P2pStressTest { private testItem: TestData = router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; + @State netId: Number = - 2 ; @State passphrase: string = "12345678" ; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0 ; @State deviceName: string = "MyTestDevice" - @StorageLink( 'stressNumber' ) stressNumber: number = 0 ; - @StorageLink( 'stressTime' ) stressTime: number = 0; + @StorageLink( 'stressNumber' ) stressNumber: Number = 0 ; + @StorageLink( 'stressTime' ) stressTime: Number = 0; aboutToAppear() { AppStorage.SetOrCreate( "deviceAddress" , this.deviceAddress ) @@ -221,10 +221,10 @@ struct P2pStressTest { @Component struct p2pSetting { @State deviceAddress: string = '6c:96:d7:3d:87:6f'; - @State netId: number = - 2 ; + @State netId: Number = - 2 ; @State passphrase: string = "12345678" ; @State groupName: string = "testGroup" - @State goBand: number = 0 ; + @State goBand: Number = 0 ; @State deviceName: string = "MyTestDevice" aboutToAppear() { @@ -539,8 +539,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiManagerStressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiManagerStressTest.ets index a066b19a9..f0c3a3266 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiManagerStressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiManagerStressTest.ets @@ -20,12 +20,12 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { StressContentTable } from '../../Component/stressContentTable'; import router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initWifiManagerStressData } from '../../MainAbility/model/stressTestDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initWifiManagerStressData } from '../../entryability/model/stressTestDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' import request from '@ohos.request' @@ -62,27 +62,27 @@ struct wifiManagerStressTest { private testItem: TestData = router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @StorageLink( 'pairedMac' ) pairedMac: string = ""; @State w_ssid1: string = "TP-LINK_6365"; @State w_bssid1: string = "6C:B1:58:75:63:65"; @State w_preSharedKey1: string = "12345678"; @State w_isHiddenSsid1: boolean = false; - @State w_securityType1: number = 3 - @State w_creatorUid1: number = 1; - @State w_disableReason1: number = 0; - @State w_netId1: number = 0 ; - @State w_randomMacType1: number = 0 ; + @State w_securityType1: Number = 3 + @State w_creatorUid1: Number = 1; + @State w_disableReason1: Number = 0; + @State w_netId1: Number = 0 ; + @State w_randomMacType1: Number = 0 ; @State w_randomMacAddr1: string = "08:fb:ea:1b:38:aa" - @State w_ipType1: number = 1 ; - @State w_staticIp_ipAddress1: number = 3232235880 ; - @State w_staticIp_gateway1: number = 3232235777 ; - @State w_staticIp_dnsServers1: number = 3716386629 ; + @State w_ipType1: Number = 1 ; + @State w_staticIp_ipAddress1: Number = 3232235880 ; + @State w_staticIp_gateway1: Number = 3232235777 ; + @State w_staticIp_dnsServers1: Number = 3716386629 ; @State w_staticIp_domains1: Array = [ "0", "1", "2" ] ; - @State w_networkIdM: number = 0 ; - @State w_featureIdM: number = 1 ; - @StorageLink( 'stressNumber' ) stressNumber: number = 0 ; - @StorageLink( 'stressTime' ) stressTime: number = 0; + @State w_networkIdM: Number = 0 ; + @State w_featureIdM: Number = 1 ; + @StorageLink( 'stressNumber' ) stressNumber: Number = 0 ; + @StorageLink( 'stressTime' ) stressTime: Number = 0; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid1' , this.w_ssid1 ); @@ -249,19 +249,19 @@ struct WifiManagerDeviceSetting { private w_bssid1 = "6C:B1:58:75:63:65"; private w_preSharedKey1 = "12345678"; private w_isHiddenSsid1 = "false"; - @State w_securityType1: number = 3 - @State w_creatorUid1: number = 1; - @State w_disableReason1: number = 0; - @State w_netId1: number = 0 ; - @State w_randomMacType1: number = 0 ; + @State w_securityType1: Number = 3 + @State w_creatorUid1: Number = 1; + @State w_disableReason1: Number = 0; + @State w_netId1: Number = 0 ; + @State w_randomMacType1: Number = 0 ; @State w_randomMacAddr1: string = "08:fb:ea:1b:38:aa" - @State w_ipType1: number = 1 ; - @State w_staticIp_ipAddress1: number = 3232235880 ; - @State w_staticIp_gateway1: number = 3232235777 ; - @State w_staticIp_dnsServers1: number = 3716386629 ; + @State w_ipType1: Number = 1 ; + @State w_staticIp_ipAddress1: Number = 3232235880 ; + @State w_staticIp_gateway1: Number = 3232235777 ; + @State w_staticIp_dnsServers1: Number = 3716386629 ; @State w_staticIp_domains1: Array = [ "0", "1", "2" ] ; - @State w_networkIdM: number = 0 ; - @State w_featureIdM: number = 1 ; + @State w_networkIdM: Number = 0 ; + @State w_featureIdM: Number = 1 ; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid1' , this.w_ssid1 ); @@ -372,7 +372,7 @@ struct WifiManagerDeviceSetting { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( "Select:" + index ) this.w_securityType1 = index; AppStorage.SetOrCreate( 'w_securityType1' , index ); @@ -761,8 +761,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiStressTest.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiStressTest.ets index bda6ef892..42bfe5504 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiStressTest.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subStressTest/wifiStressTest.ets @@ -20,12 +20,12 @@ import { PageTitle } from '../../Component/pageTitle'; import { TestImageDisplay } from '../../Component/testImageDisplay'; import { StressContentTable } from '../../Component/stressContentTable'; import router from '@system.router'; -import ConfigData from '../../Utils/ConfigData'; -import LogUtil from '../../Utils/LogUtil'; -import { initWifiStressData } from '../../MainAbility/model/stressTestDataModels' -import { TestData } from '../../MainAbility/model/testData' +import ConfigData from '../../utils/ConfigData'; +import LogUtil from '../../utils/LogUtil'; +import { initWifiStressData } from '../../entryability/model/stressTestDataModels' +import { TestData } from '../../entryability/model/testData' import wifi from '@ohos.wifi'; -import { resolveIP } from '../../Utils/Util' +import { resolveIP } from '../../utils/Util' import socket from '@ohos.net.socket'; import http from '@ohos.net.http' import request from '@ohos.request' @@ -61,27 +61,27 @@ struct WifiStressTest { private testItem: TestData = router.getParams().testId; @State message: string = ""; @State deviceId: string = ''; - @State currentClick: number = - 1; + @State currentClick: Number = - 1; @StorageLink( 'pairedMac' ) pairedMac: string = ""; @State w_ssid: string = "TP-LINK_6365"; @State w_bssid: string = "6C:B1:58:75:63:65"; @State w_preSharedKey: string = "12345678"; @State w_isHiddenSsid: boolean = false; - @State w_securityType: number = 3 - @State w_creatorUid: number = 1; - @State w_disableReason: number = 0; - @State w_netId: number = 100 ; - @State w_randomMacType: number = 0 ; + @State w_securityType: Number = 3 + @State w_creatorUid: Number = 1; + @State w_disableReason: Number = 0; + @State w_netId: Number = 100 ; + @State w_randomMacType: Number = 0 ; @State w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @State w_ipType: number = 1 ; - @State w_staticIp_ipAddress: number = 3232235880 ; - @State w_staticIp_gateway: number = 3232235777 ; - @State w_staticIp_dnsServers: number = 3716386629 ; + @State w_ipType: Number = 1 ; + @State w_staticIp_ipAddress: Number = 3232235880 ; + @State w_staticIp_gateway: Number = 3232235777 ; + @State w_staticIp_dnsServers: Number = 3716386629 ; @State w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @State w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @State w_featureId: number = 1 ; - @StorageLink( 'stressNumber' ) stressNumber: number = 0 ; - @StorageLink( 'stressTime' ) stressTime: number = 0; + @State w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @State w_featureId: Number = 1 ; + @StorageLink( 'stressNumber' ) stressNumber: Number = 0 ; + @StorageLink( 'stressTime' ) stressTime: Number = 0; // @StorageLink('getDeviceConfigsMessage') getDeviceConfigsMessage: string = ''; // @StorageLink('getScanInfoMessage') getScanInfoMessage: string = ''; @@ -249,19 +249,19 @@ struct WifiDeviceSetting { @State w_bssid: string = "6C:B1:58:75:63:65"; //6C:B1:58:75:63:65 @State w_preSharedKey: string = "12345678"; //kaihong123 @State w_isHiddenSsid: boolean = false; - @State w_securityType: number = 3 - @State w_creatorUid: number = 1; - @State w_disableReason: number = 0; - @State w_netId: number = 100 ; - @State w_randomMacType: number = 0 ; + @State w_securityType: Number = 3 + @State w_creatorUid: Number = 1; + @State w_disableReason: Number = 0; + @State w_netId: Number = 100 ; + @State w_randomMacType: Number = 0 ; @State w_randomMacAddr: string = "08:fb:ea:1b:38:aa" - @State w_ipType: number = 1 ; - @State w_staticIp_ipAddress: number = 3232235880 ; - @State w_staticIp_gateway: number = 3232235777 ; - @State w_staticIp_dnsServers: number = 3716386629 ; + @State w_ipType: Number = 1 ; + @State w_staticIp_ipAddress: Number = 3232235880 ; + @State w_staticIp_gateway: Number = 3232235777 ; + @State w_staticIp_dnsServers: Number = 3716386629 ; @State w_staticIp_domains: Array = [ "0", "1", "2" ] ; - @State w_networkId: number = 0 ; // id,netId,networkId是一个值嘛？ - @State w_featureId: number = 1 ; + @State w_networkId: Number = 0 ; // id,netId,networkId是一个值嘛？ + @State w_featureId: Number = 1 ; aboutToAppear() { AppStorage.SetOrCreate( 'w_ssid' , this.w_ssid ); @@ -372,7 +372,7 @@ struct WifiDeviceSetting { .selectedOptionFont( { size : 17 } ) .optionFont( { size : 15 } ) .width( ConfigData.WH_80_100 ) - .onSelect( ( index: number ) => { + .onSelect( ( index: Number ) => { console.log( "Select:" + index ) this.w_securityType = index; AppStorage.SetOrCreate( 'w_securityType' , this.w_securityType ); @@ -761,8 +761,8 @@ struct socketTest { @Component struct upDownLoad { - @State receivedSize: number = 0 - @State totalSize: number = 0 + @State receivedSize: Number = 0 + @State totalSize: Number = 0 @State message: string = '' @State files: Array = [] @State uploads: Array = [] diff --git a/wifi/test/wifi_testapp/entry/src/main/module.json5 b/wifi/test/wifi_testapp/entry/src/main/module.json5 index b244c3fea..7b31018a4 100644 --- a/wifi/test/wifi_testapp/entry/src/main/module.json5 +++ b/wifi/test/wifi_testapp/entry/src/main/module.json5 @@ -13,88 +13,86 @@ * limitations under the License. */ { - "module": { - "name": "entry", - "type": "entry", - "srcEntrance": "./ets/Application/MyAbilityStage.ts", - "description": "$string:entry_desc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:white", - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } + "module": { + "name": "entry", + "type": "entry", + "description": "$string:module_desc", + "mainElement": "EntryAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "EntryAbility", + "srcEntrance": "./ets/entryability/EntryAbility.ets", + "description": "$string:EntryAbility_desc", + "icon": "$media:app_icon", + "label": "$string:EntryAbility_label", + "startWindowIcon": "$media:app_icon", + "startWindowBackground": "$color:start_window_background", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.SET_WIFI_INFO" + }, + { + "name": "ohos.permission.GET_WIFI_INFO" + }, + { + "name": "ohos.permission.LOCATION" + }, + { + "name": "ohos.permission.GET_WIFI_PEERS_MAC" + }, + { + "name": "ohos.permission.MANAGE_WIFI_CONNECTION" + }, + { + "name": "ohos.permission.SET_WIFI_CONFIG" + }, + { + "name": "ohos.permission.GET_WIFI_CONFIG" + }, + { + "name": "ohos.permission.GET_WIFI_LOCAL_MAC" + }, + { + "name": "ohos.permission.MANAGE_WIFI_HOTSPOT" + }, + { + "name": "ohos.permission.GET_WIFI_INFO_INTERNAL" + }, + { + "name": "ohos.permission.INTERNET" + } ] - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.CAPTURE_SCREEN" - }, - { - "name": "ohos.permission.WRITE_MEDIA" - }, - { - "name": "ohos.permission.READ_MEDIA" - }, - { - "name": "ohos.permission.MEDIA_LOCATION" - }, - { - "name": "ohos.permission.SET_WIFI_INFO" - }, - { - "name": "ohos.permission.GET_WIFI_INFO" - }, - { - "name": "ohos.permission.LOCATION" - }, - { - "name": "ohos.permission.GET_WIFI_PEERS_MAC" - }, - { - "name": "ohos.permission.MANAGE_WIFI_CONNECTION" - }, - { - "name": "ohos.permission.SET_WIFI_CONFIG" - }, - { - "name": "ohos.permission.GET_WIFI_CONFIG" - }, - { - "name": "ohos.permission.GET_WIFI_LOCAL_MAC" - }, - { - "name": "ohos.permission.MANAGE_WIFI_HOTSPOT" - }, - { - "name": "ohos.permission.GET_WIFI_INFO_INTERNAL" - }, - { - "name": "ohos.permission.INTERNET" - } - ] - } + } } \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/element/string.json b/wifi/test/wifi_testapp/entry/src/main/resources/base/element/string.json index a2c96077f..d08e32884 100644 --- a/wifi/test/wifi_testapp/entry/src/main/resources/base/element/string.json +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/element/string.json @@ -1733,7 +1733,7 @@ }, { "name": "EntryAbility_label", - "value": "目标管理" + "value": "wifi专项测试" }, { "name": "title", @@ -1814,6 +1814,10 @@ { "name": "input_candidate_wifi_securityType", "value": "选择securityType" + }, + { + "name": "Input_url", + "value": "输入网址..." } ] } \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/app_icon.png b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/app_icon.png new file mode 100644 index 000000000..ce307a882 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/app_icon.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_add.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_add.svg new file mode 100644 index 000000000..614328d35 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_add.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_add + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_advance.png b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_advance.png new file mode 100644 index 000000000..7ac8aad48 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_advance.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_back.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_back.svg new file mode 100644 index 000000000..50e4ecd57 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_back.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_back + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_cancel_filled.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_cancel_filled.svg new file mode 100644 index 000000000..8256169b9 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_cancel_filled.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_cancel_filled + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_home.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_home.svg new file mode 100644 index 000000000..82838d76a --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_home.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_home + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_more_filled.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_more_filled.svg new file mode 100644 index 000000000..6edafee67 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_more_filled.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_more_filled + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_navigation.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_navigation.svg new file mode 100644 index 000000000..133224207 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_navigation.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_navigation + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_refresh.svg b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_refresh.svg new file mode 100644 index 000000000..98c942acd --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/ic_public_refresh.svg @@ -0,0 +1,13 @@ + + + Public/ic_public_refresh + + + + + + + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/media/submit.png b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/submit.png new file mode 100644 index 000000000..d3998a465 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/base/media/submit.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/base/profile/main_pages.json b/wifi/test/wifi_testapp/entry/src/main/resources/base/profile/main_pages.json index 3b11e7db1..b1144b38d 100644 --- a/wifi/test/wifi_testapp/entry/src/main/resources/base/profile/main_pages.json +++ b/wifi/test/wifi_testapp/entry/src/main/resources/base/profile/main_pages.json @@ -43,6 +43,8 @@ "pages/subAppTest/p2pDiscoveryTest", "pages/subStabilityTest/wifiSwitchStabilityTest", "pages/subStabilityTest/wifiScanStabilityTest", - "pages/subStabilityTest/wifiConnectStabilityTest" + "pages/subStabilityTest/wifiConnectStabilityTest", + "pages/subStabilityTest/hotspotStabilityTest", + "pages/subStabilityTest/webLatencyTest" ] } diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/en_US/element/string.json b/wifi/test/wifi_testapp/entry/src/main/resources/en_US/element/string.json new file mode 100644 index 000000000..279e00849 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/en_US/element/string.json @@ -0,0 +1,1825 @@ +{ + "string": [ + { + "name": "module_desc", + "value": "module description" + }, + { + "name": "EntryAbility_desc", + "value": "description" + }, + { + "name": "EntryAbility_label", + "value": "wifiTest" + }, + { + "name": "entry_desc", + "value": "description" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "form_FormAbility_desc", + "value": "form_description" + }, + { + "name": "form_FormAbility_label", + "value": "form_label" + }, + { + "name": "MainAbility2_desc", + "value": "description" + }, + { + "name": "btn_fullscreen", + "value": "全屏截屏" + }, + { + "name": "btn_fixedsize", + "value": "部分截屏" + }, + { + "name": "MainAbility2_label", + "value": "label" + }, + { + "name": "MainAbility3_desc", + "value": "description" + }, + { + "name": "MainAbility3_label", + "value": "label" + }, + { + "name": "PageAbility_desc", + "value": "description" + }, + { + "name": "PageAbility_label", + "value": "label" + }, + { + "name": "DataAbility_desc", + "value": "hap sample empty provider" + }, + { + "name": "MainAbility_label", + "value": "wifi专项测试" + }, + { + "name": "api", + "value": "接口测试" + }, + { + "name": "scenario", + "value": "场景测试" + }, + { + "name": "stability", + "value": "稳定性测试" + }, + { + "name": "autotest", + "value": "自动测试" + }, + { + "name": "profile", + "value": "Profile测试" + }, + { + "name": "testcase", + "value": "接口" + }, + { + "name": "result", + "value": "结果" + }, + { + "name": "benchmark", + "value": "性能测试" + }, + { + "name": "stress", + "value": "压力测试" + }, + { + "name": "App", + "value": "应用测试" + }, + { + "name": "test_title", + "value": "WIFI测试" + }, + { + "name": "api_test_title", + "value": "手动API测试" + }, + { + "name": "manual_test_title", + "value": "手动场景化测试" + }, + { + "name": "auto_test_title", + "value": "自动化测试" + }, + { + "name": "conf_title", + "value": "配置信息" + }, + { + "name": "cancel", + "value": "取消" + }, + { + "name": "confirm", + "value": "确认" + }, + { + "name": "version", + "value": "1.1.1" + }, + { + "name": "more", + "value": "more" + }, + { + "name": "put_away", + "value": "put away" + }, + { + "name": "cancelPairing", + "value": "取消配对" + }, + { + "name": "scanning", + "value": "正在搜索…" + }, + { + "name": "entry_wifi_MainAbility", + "value": "wifi扫描结果" + }, + { + "name": "entry_p2p_MainAbility", + "value": "p2p扫描结果" + }, + { + "name": "description_mainability", + "value": "eTSWLAN Ability" + }, + { + "name": "sure", + "value": "确定" + }, + { + "name": "router_uri", + "value": "跳转" + }, + { + "name": "wlan", + "value": "WLAN" + }, + { + "name": "available_wlan", + "value": "Available WLAN" + }, + { + "name": "connected", + "value": "Connected" + }, + { + "name": "create_room", + "value": "create room" + }, + { + "name": "send_message", + "value": "发送" + }, + { + "name": "about", + "value": "关于" + }, + { + "name": "ip_address", + "value": "IP地址:" + }, + { + "name": "gate_way", + "value": "网关:" + }, + { + "name": "net_mask", + "value": "掩码:" + }, + { + "name": "primary_dns", + "value": "主DNS服务器:" + }, + { + "name": "second_dns", + "value": "备DNS服务器:" + }, + { + "name": "server_ip", + "value": "DHCP服务端ip:" + }, + { + "name": "lease_duration", + "value": "IP地址租用时长:" + }, + { + "name": "country_code", + "value": "国家码:" + }, + { + "name": "infrastructure_feature", + "value": "基础结构模式特性:" + }, + { + "name": "ghz_feature", + "value": "5 GHz 宽带特性:" + }, + { + "name": "gas_anqp_feature", + "value": "GAS/ANQP特性:" + }, + { + "name": "wifi_direct", + "value": "WiFi-Direct特性:" + }, + { + "name": "soft_ap", + "value": "Soft AP特性:" + }, + { + "name": "wifi_aware", + "value": "WiFi Aware组网特性:" + }, + { + "name": "encryption", + "value": "加密" + }, + { + "name": "useful", + "value": "可用" + }, + { + "name": "p2pConnected", + "value": "已连接" + }, + { + "name": "open", + "value": "开放" + }, + { + "name": "wifi_enable", + "value": "wifi已经使能" + }, + { + "name": "testEnableWifi_Start", + "value": "testEnableWifi Start----------" + }, + { + "name": "testEnableWifi_End", + "value": "testEnableWifi End----------" + }, + { + "name": "enableWifi_result", + "value": "使能结果: " + }, + { + "name": "wifi_disEnable", + "value": "WIFI还未使能" + }, + { + "name": "testDisableWifi_Start", + "value": "testDisableWifi Start----------" + }, + { + "name": "testDisableWifi_End", + "value": "testDisableWifi End----------" + }, + { + "name": "disableWifi_result", + "value": "去使能结果: " + }, + { + "name": "wifi_enable_result", + "value": "Wifi使能执行结果：" + }, + { + "name": "wifi_disEnable_result", + "value": "Wifi去使能执行结果：" + }, + { + "name": "wifi_enable_confirm", + "value": "Wifi已打开或打开失败,请确认" + }, + { + "name": "wifi_disEnable_confirm", + "value": "Wifi已关闭或关闭失败,请确认" + }, + { + "name": "wifi_IsActive", + "value": "wifi使能结果为：" + }, + { + "name": "testIsWifiActive_Start", + "value": "testIsWifiActive Start----------" + }, + { + "name": "testIsWifiActive_End", + "value": "testDisableWifi End----------" + }, + { + "name": "testEnableWifi", + "value": "enableWifi test" + }, + { + "name": "testDisableWifi", + "value": "disableWifi test" + }, + { + "name": "testIsWifiActive", + "value": "isWifiActive test" + }, + { + "name": "testScan", + "value": "scan test" + }, + { + "name": "testScan_Start", + "value": "testScan Start----------" + }, + { + "name": "testScan_End", + "value": "testScan End----------" + }, + { + "name": "scan", + "value": "scan: " + }, + { + "name": "testForcibleScan_Start", + "value": "testForcibleScan Start----------" + }, + { + "name": "testForcibleScan_End", + "value": "testForcibleScan End----------" + }, + { + "name": "testGetScanInfosPromise", + "value": "getScanInfosPromise test" + }, + { + "name": "testGetScanInfosPromise_Start", + "value": "testGetScanInfosPromise Start----------" + }, + { + "name": "testGetScanInfosPromise_End", + "value": "testGetScanInfosPromise End----------" + }, + { + "name": "testGetScanInfosPromise_successful", + "value": "getScanInfos promise successful" + }, + { + "name": "getScanInfosPromise", + "value": "WifiScanInfo: " + }, + { + "name": "testGetScanInfosCallback", + "value": "getScanInfosCallback test" + }, + { + "name": "testGetScanInfosCallback_Start", + "value": "testGetScanInfosCallback Start----------" + }, + { + "name": "testGetScanInfosCallback_End", + "value": "testGetScanInfosCallback End----------" + }, + { + "name": "testGetScanInfosCallback_successful", + "value": "getScanInfos callback successful" + }, + { + "name": "getScanInfosCallback", + "value": "WifiScanInfo: " + }, + { + "name": "testAddDeviceConfigPromise", + "value": "addDeviceConfigPromise test" + }, + { + "name": "testAddDeviceConfigPromise_Start", + "value": "testAddDeviceConfigPromise Start----------" + }, + { + "name": "testAddDeviceConfigPromise_End", + "value": "testAddDeviceConfigPromise End----------" + }, + { + "name": "testAddDeviceConfigPromise_successful", + "value": "addDeviceConfig promise successful" + }, + { + "name": "addDeviceConfigPromise", + "value": "addDeviceConfig: " + }, + { + "name": "testAddDeviceConfigCallback", + "value": "addDeviceConfigCallback test" + }, + { + "name": "testAddDeviceConfigCallback_Start", + "value": "testAddDeviceConfigCallback Start----------" + }, + { + "name": "testAddDeviceConfigCallback_End", + "value": "testAddDeviceConfigCallback End----------" + }, + { + "name": "testAddDeviceConfigCallback_successful", + "value": "addDeviceConfig Callback successful" + }, + { + "name": "addDeviceConfigCallback", + "value": "addDeviceConfig: " + }, + { + "name": "testAddUntrustedConfigPromise", + "value": "addUntrustedConfigPromise test" + }, + { + "name": "testAddUntrustedConfigPromise_Start", + "value": "testAddUntrustedConfigPromise Start----------" + }, + { + "name": "testAddUntrustedConfigPromise_End", + "value": "testAddUntrustedConfigPromise End----------" + }, + { + "name": "testAddUntrustedConfigPromise_successful", + "value": "addUntrustedConfig promise successful" + }, + { + "name": "addUntrustedConfigPromise", + "value": "addUntrustedConfig: " + }, + { + "name": "testAddUntrustedConfigCallback", + "value": "addUntrustedConfigCallback test" + }, + { + "name": "testAddUntrustedConfigCallback_Start", + "value": "testAddUntrustedConfigCallback Start----------" + }, + { + "name": "testAddUntrustedConfigCallback_End", + "value": "testAddUntrustedConfigCallback End----------" + }, + { + "name": "testAddUntrustedConfigCallback_successful", + "value": "addUntrustedConfig Callback successful" + }, + { + "name": "addUntrustedConfigCallback", + "value": "addUntrustedConfig: " + }, + { + "name": "testRemoveUntrustedConfigPromise", + "value": "removeUntrustedConfigPromise test" + }, + { + "name": "testRemoveUntrustedConfigPromise_Start", + "value": "testRemoveUntrustedConfigPromise Start----------" + }, + { + "name": "testRemoveUntrustedConfigPromise_End", + "value": "testRemoveUntrustedConfigPromise End----------" + }, + { + "name": "testRemoveUntrustedConfigPromise_successful", + "value": "removeUntrustedConfig promise successful" + }, + { + "name": "removeUntrustedConfigPromise", + "value": "removeUntrustedConfig: " + }, + { + "name": "testRemoveUntrustedConfigCallback", + "value": "removeUntrustedConfigCallback test" + }, + { + "name": "testRemoveUntrustedConfigCallback_Start", + "value": "testRemoveUntrustedConfigCallback Start----------" + }, + { + "name": "testRemoveUntrustedConfigCallback_End", + "value": "testRemoveUntrustedConfigCallback End----------" + }, + { + "name": "testRemoveUntrustedConfigCallback_successful", + "value": "removeUntrustedConfig Callback successful" + }, + { + "name": "removeUntrustedConfigCallback", + "value": "removeUntrustedConfig: " + }, + { + "name": "testConnectToNetwork", + "value": "connectToNetwork test" + }, + { + "name": "testConnectToNetwork_Start", + "value": "testConnectToNetwork Start----------" + }, + { + "name": "testConnectToNetwork_End", + "value": "testConnectToNetwork End----------" + }, + { + "name": "connectToNetwork", + "value": "ConnectToNetwork: " + }, + { + "name": "testConnectToDevice", + "value": "connectToDevice test" + }, + { + "name": "testConnectToDevice_Start", + "value": "testConnectToDevice Start----------" + }, + { + "name": "testConnectToDevice_End", + "value": "testConnectToDevice End----------" + }, + { + "name": "connectToDevice", + "value": "ConnectToDevice: " + }, + { + "name": "testDisconnect", + "value": "disconnect test" + }, + { + "name": "testDisconnect_Start", + "value": "testDisconnect Start----------" + }, + { + "name": "choice_download_file", + "value": "请选择需要下载的文件" + }, + { + "name": "upload_page", + "value": "上传" + }, + { + "name": "click_download", + "value": "点击下载" + }, + { + "name": "download_progress", + "value": "下载进度：" + }, + { + "name": "testDisconnect_End", + "value": "testDisconnect End----------" + }, + { + "name": "disconnect", + "value": "disconnect: " + }, + { + "name": "testGetSignalLevel", + "value": "getSignalLevel test" + }, + { + "name": "testGetSignalLevel_Start", + "value": "testGetSignalLevel Start----------" + }, + { + "name": "testGetSignalLevel_End", + "value": "testGetSignalLevel End----------" + }, + { + "name": "getSignalLevel", + "value": "getSignalLevel is: " + }, + { + "name": "testGetLinkedInfoPromise", + "value": "getLinkedInfoPromise test" + }, + { + "name": "testGetLinkedInfoPromise_Start", + "value": "testGetLinkedInfoPromise Start----------" + }, + { + "name": "testGetLinkedInfoPromise_End", + "value": "testGetLinkedInfoPromise End----------" + }, + { + "name": "testGetLinkedInfoPromise_successful", + "value": "getLinkedInfoPromise test successful" + }, + { + "name": "getLinkedInfoPromise", + "value": "get wifi linked info: " + }, + { + "name": "testGetLinkedInfoCallback", + "value": "getLinkedInfoCallback test" + }, + { + "name": "testGetLinkedInfoCallback_Start", + "value": "testGetLinkedInfoCallback Start----------" + }, + { + "name": "testGetLinkedInfoCallback_End", + "value": "testGetLinkedInfoCallback End----------" + }, + { + "name": "testGetLinkedInfoCallback_successful", + "value": "getLinkedInfoCallback test successful" + }, + { + "name": "getLinkedInfoCallback", + "value": "get wifi linked info: " + }, + { + "name": "testIsConnected", + "value": "isConnected test" + }, + { + "name": "testIsConnected_Start", + "value": "testIsConnected Start----------" + }, + { + "name": "testIsConnected_End", + "value": "testIsConnected End----------" + }, + { + "name": "isConnected", + "value": "isConnected: " + }, + { + "name": "testGetSupportedFeatures", + "value": "getSupportedFeatures test" + }, + { + "name": "testGetSupportedFeatures_Start", + "value": "testGetSupportedFeatures Start----------" + }, + { + "name": "testGetSupportedFeatures_End", + "value": "testGetSupportedFeatures End----------" + }, + { + "name": "getSupportedFeatures", + "value": "GetSupportedFeatures: " + }, + { + "name": "testIsFeatureSupported", + "value": "isFeatureSupported test" + }, + { + "name": "testIsFeatureSupported_Start", + "value": "testIsFeatureSupported Start----------" + }, + { + "name": "testIsFeatureSupported_End", + "value": "testIsFeatureSupported End----------" + }, + { + "name": "isFeatureSupported", + "value": "isFeatureSupported: " + }, + { + "name": "testGetDeviceMacAddress", + "value": "getDeviceMacAddress test" + }, + { + "name": "testGetDeviceMacAddress_Start", + "value": "testGetDeviceMacAddress Start----------" + }, + { + "name": "testGetDeviceMacAddress_End", + "value": "testGetDeviceMacAddress End----------" + }, + { + "name": "getDeviceMacAddress", + "value": "macAddress: " + }, + { + "name": "testGetIpInfo", + "value": "getIpInfo test" + }, + { + "name": "testGetIpInfo_Start", + "value": "testGetIpInfo Start----------" + }, + { + "name": "testGetIpInfo_End", + "value": "testGetIpInfo End----------" + }, + { + "name": "getIpInfo", + "value": "IpInfo: " + }, + { + "name": "testGetCountryCode", + "value": "getCountryCode test" + }, + { + "name": "testGetCountryCode_Start", + "value": "testGetCountryCode Start----------" + }, + { + "name": "testGetCountryCode_End", + "value": "testGetCountryCode End----------" + }, + { + "name": "getCountryCode", + "value": "CountryCode is: " + }, + { + "name": "testReassociate", + "value": "reAssociate test" + }, + { + "name": "testReassociate_Start", + "value": "testReassociate Start----------" + }, + { + "name": "testReassociate_End", + "value": "testReassociate End----------" + }, + { + "name": "reassociate", + "value": "reassociate is: " + }, + { + "name": "testReConnect", + "value": "reConnect test" + }, + { + "name": "testReConnect_Start", + "value": "testReConnect Start----------" + }, + { + "name": "testReConnect_End", + "value": "testReConnect End----------" + }, + { + "name": "reconnect", + "value": "reConnect is: " + }, + { + "name": "testGetDeviceConfigs", + "value": "getDeviceConfigs test" + }, + { + "name": "testGetDeviceConfigs_Start", + "value": "testGetDeviceConfigs Start----------" + }, + { + "name": "testGetDeviceConfigs_End", + "value": "testGetDeviceConfigs End----------" + }, + { + "name": "getDeviceConfigs", + "value": "DeviceConfigs is: " + }, + { + "name": "testUpdateNetwork", + "value": "updateNetwork test" + }, + { + "name": "testUpdateNetwork_Start", + "value": "testUpdateNetwork Start----------" + }, + { + "name": "testUpdateNetwork_End", + "value": "testUpdateNetwork End----------" + }, + { + "name": "updateNetwork", + "value": "updateNetwork: " + }, + { + "name": "testDisableNetwork", + "value": "disableNetWork test" + }, + { + "name": "testDisableNetwork_Start", + "value": "testDisableNetwork Start----------" + }, + { + "name": "testDisableNetwork_End", + "value": "testDisableNetwork End----------" + }, + { + "name": "disableNetwork", + "value": "disableNetwork: " + }, + { + "name": "testRemoveAllNetwork", + "value": "removeAllNetwork test" + }, + { + "name": "testRemoveAllNetwork_Start", + "value": "testRemoveAllNetwork Start----------" + }, + { + "name": "testRemoveAllNetwork_End", + "value": "testRemoveAllNetwork End----------" + }, + { + "name": "removeAllNetwork", + "value": "removeAllNetwork: " + }, + { + "name": "testRemoveDevice", + "value": "removeDevice test" + }, + { + "name": "testRemoveDevice_Start", + "value": "testRemoveDevice Start----------" + }, + { + "name": "testRemoveDevice_End", + "value": "testRemoveDevice End----------" + }, + { + "name": "removeDevice", + "value": "removeDevice: " + }, + { + "name": "testOnWifiStateChange", + "value": "onWifiStateChange test" + }, + { + "name": "testOnWifiStateChange_Start", + "value": "testOnWifiStateChange Start----------" + }, + { + "name": "testOnWifiStateChange_End", + "value": "testOnWifiStateChange End----------" + }, + { + "name": "offWifiStateChange", + "value": "on.WifiStateChange监听已关闭" + }, + { + "name": "offWifiStateChangeTest", + "value": "关闭注册WLAN状态改变事件" + }, + { + "name": "onWifiStateChange", + "value": "on.WifiStateChange监听已打开" + }, + { + "name": "onWifiStateChangeTest", + "value": "打开注册WLAN状态变化" + }, + { + "name": "wifiStateChange", + "value": "wifi状态: " + }, + { + "name": "testOnWifiConnectionChange", + "value": "onWifiConnectionChange test" + }, + { + "name": "testOnWifiConnectionChange_Start", + "value": "testOnWifiConnectionChange Start----------" + }, + { + "name": "testOnWifiConnectionChange_End", + "value": "testOnWifiConnectionChange End----------" + }, + { + "name": "offWifiConnectionChange", + "value": "on.wifiConnectionChange监听已关闭" + }, + { + "name": "offWifiConnectionChangeTest", + "value": "关闭WLAN连接状态改变事件" + }, + { + "name": "onWifiConnectionChange", + "value": "on.wifiConnectionChange监听已打开" + }, + { + "name": "onWifiConnectionChangeTest", + "value": "打开注册WLAN连接状态变化" + }, + { + "name": "wifiConnectionChange", + "value": "连接状态: " + }, + { + "name": "testOnWifiScanStateChange", + "value": "onWifiScanStateChange test" + }, + { + "name": "testOnWifiScanStateChange_Start", + "value": "testOnWifiConnectionChange Start----------" + }, + { + "name": "testOnWifiScanStateChange_End", + "value": "testOnWifiConnectionChange End----------" + }, + { + "name": "offWifiScanStateChange", + "value": "on.wifiScanStateChange监听已关闭" + }, + { + "name": "offWifiScanStateChangeTest", + "value": "关闭扫描状态改变事件" + }, + { + "name": "onWifiScanStateChange", + "value": "on.wifiScanStateChange监听已打开" + }, + { + "name": "onWifiScanStateChangeTest", + "value": "打开注册扫描状态变化" + }, + { + "name": "wifiScanStateChange", + "value": "scan状态: " + }, + { + "name": "testOnWifiRssiChange", + "value": "onWifiRssiChange test" + }, + { + "name": "testOnWifiRssiChange_Start", + "value": "testOnWifiRssiChange Start----------" + }, + { + "name": "testOnWifiRssiChange_End", + "value": "testOnWifiRssiChange End----------" + }, + { + "name": "offWifiRssiChange", + "value": "on.wifiRssiChange监听已关闭" + }, + { + "name": "offWifiRssiChangeTest", + "value": "关闭RSSI状态变化事件" + }, + { + "name": "onWifiRssiChange", + "value": "on.wifiRssiChange监听已打开" + }, + { + "name": "onWifiRssiChangeTest", + "value": "打开注册RSSI状态变化" + }, + { + "name": "wifiRssiChange", + "value": "rssi: " + }, + { + "name": "testOnStreamChange", + "value": "onStreamChange test" + }, + { + "name": "testOnStreamChange_Start", + "value": "testOnStreamChange Start----------" + }, + { + "name": "testOnStreamChange_End", + "value": "testOnStreamChange End----------" + }, + { + "name": "offStreamChange", + "value": "on.streamChange监听已关闭" + }, + { + "name": "offStreamChangeTest", + "value": "关闭注册流改变事件" + }, + { + "name": "onStreamChange", + "value": "on.streamChange监听已打开" + }, + { + "name": "onStreamChangeTest", + "value": "打开注册流变化" + }, + { + "name": "streamChange", + "value": "stream状态: " + }, + { + "name": "testEnableHotspot", + "value": "enableHotspot test" + }, + { + "name": "testEnableHotspot_Start", + "value": "testEnableHotspot start--------------" + }, + { + "name": "testEnableHotspot_End", + "value": "testEnableHotspot End--------------" + }, + { + "name": "hotspot_enable", + "value": "热点已经使能" + }, + { + "name": "hotspot_disEnable", + "value": "热点还未使能" + }, + { + "name": "hotspot_enable_result", + "value": "热点使能执行结果：" + }, + { + "name": "hotspot_disEnable_result", + "value": "热点去使能执行结果：" + }, + { + "name": "hotspot_enable_confirm", + "value": "热点已打开或打开失败,请确认" + }, + { + "name": "hotspot_disEnable_confirm", + "value": "热点已关闭或关闭失败,请确认" + }, + { + "name": "hotspot_IsActive", + "value": "热点使能结果为：" + }, + { + "name": "testDisableHotspot", + "value": "disableHotspot test" + }, + { + "name": "testDisableHotspot_Start", + "value": "testDisableHotspot start--------------" + }, + { + "name": "testDisableHotspot_End", + "value": "testDisableHotspot End--------------" + }, + { + "name": "testIsHotspotActive", + "value": "isHotspotActive test" + }, + { + "name": "testIsHostActive_Start", + "value": "testIsHostActive start--------------" + }, + { + "name": "testIsHostActive_End", + "value": "testIsHostActive End--------------" + }, + { + "name": "testIsHotspotDualBandSupported", + "value": "isHotspotDualBandSupported test" + }, + { + "name": "testIsHotspotDualBandSupported_Start", + "value": "testIsHotspotDualBandSupported start--------------" + }, + { + "name": "testIsHotspotDualBandSupported_End", + "value": "testIsHotspotDualBandSupported End--------------" + }, + { + "name": "isHotspotDualBandSupported", + "value": "热点支持双频结果：" + }, + { + "name": "testSetHotspotConfig", + "value": "SetHotspotConfig test" + }, + { + "name": "testSetHotspotConfig_Start", + "value": "testSetHotspotConfig start--------------" + }, + { + "name": "testSetHotspotConfig_End", + "value": "testSetHotspotConfig End--------------" + }, + { + "name": "setHotspotConfig", + "value": "SetHotspotConfig: " + }, + { + "name": "testGetHotspotConfig", + "value": "getHotspotConfig test" + }, + { + "name": "testGetHotspotConfig_Start", + "value": "testGetHotspotConfig start--------------" + }, + { + "name": "testGetHotspotConfig_End", + "value": "testGetHotspotConfig End--------------" + }, + { + "name": "getHotspotConfig", + "value": "HotspotConfig: " + }, + { + "name": "testGetStations", + "value": "GetStations test" + }, + { + "name": "testGetStations_Start", + "value": "testGetStations start--------------" + }, + { + "name": "testGetStations_End", + "value": "testGetStations End--------------" + }, + { + "name": "getStations", + "value": "GetStations: " + }, + { + "name": "testOnHotspotStateChange", + "value": "onHotspotStateChange test" + }, + { + "name": "testOnHotspotStateChange_Start", + "value": "testOnHotspotStateChange start--------------" + }, + { + "name": "testOnHotspotStateChange_End", + "value": "testOnHotspotStateChange End--------------" + }, + { + "name": "offHotspotStateChange", + "value": "on.hotspotStateChange监听已关闭" + }, + { + "name": "offHotspotStateChangeTest", + "value": "关闭注册热点状态改变事件" + }, + { + "name": "onHotspotStateChange", + "value": "on.hotspotStateChange监听已打开" + }, + { + "name": "onHotspotStateChangeTest", + "value": "打开注册热点状态变化" + }, + { + "name": "hotspotStateChange", + "value": "状态为: " + }, + { + "name": "testOnHotspotStaJoin", + "value": "onHotspotStaJoin test" + }, + { + "name": "testOnHotspotStaJoin_Start", + "value": "testOnHotspotStaJoin start--------------" + }, + { + "name": "testOnHotspotStaJoin_End", + "value": "testOnHotspotStaJoin End--------------" + }, + { + "name": "offHotspotStaJoin", + "value": "on.hotspotStaJoin监听已关闭" + }, + { + "name": "offHotspotStaJoinTest", + "value": "关闭注册Wi-Fi 热点 sta加入变化事件" + }, + { + "name": "onHotspotStaJoin", + "value": "on.hotspotStateChange监听已打开" + }, + { + "name": "onHotspotStaJoinTest", + "value": "打开注册Wi-Fi 热点 sta加入变化" + }, + { + "name": "hotspotStaJoin", + "value": "状态为: " + }, + { + "name": "testOnHotspotStaLeave", + "value": "onHotspotStaLeave test" + }, + { + "name": "testOnHotspotStaLeave_Start", + "value": "testOnHotspotStaLeave start--------------" + }, + { + "name": "testOnHotspotStaLeave_End", + "value": "testOnHotspotStaLeave End--------------" + }, + { + "name": "offHotspotStaLeave", + "value": "on.hotspotStaLeave监听已关闭" + }, + { + "name": "offHotspotStaLeaveTest", + "value": "关闭注册Wi-Fi 热点 sta离开变化事件" + }, + { + "name": "onHotspotStaLeave", + "value": "on.hotspotStateChange监听已打开" + }, + { + "name": "onHotspotStaLeaveTest", + "value": "打开注册Wi-Fi 热点 sta离开变化" + }, + { + "name": "hotspotStaLeave", + "value": "状态为: " + }, + { + "name": "testGetP2pLinkedInfoPromise", + "value": "getP2pLinkedInfoPromise test" + }, + { + "name": "testGetP2pLinkedInfoPromise_Start", + "value": "testGetP2pLinkedInfoPromise Start----------" + }, + { + "name": "testGetP2pLinkedInfoPromise_End", + "value": "testGetP2pLinkedInfoPromise End----------" + }, + { + "name": "getP2pLinkedInfoPromise_successful", + "value": "getP2pLinkedInfoPromise successful" + }, + { + "name": "getP2pLinkedInfoPromise", + "value": "getP2pLinkedInfoPromise: " + }, + { + "name": "testGetP2pLinkedInfoCallback", + "value": "getP2pLinkedInfoCallback test" + }, + { + "name": "testGetP2pLinkedInfoCallback_Start", + "value": "testGetP2pLinkedInfoCallback Start----------" + }, + { + "name": "testGetP2pLinkedInfoCallback_End", + "value": "testGetP2pLinkedInfoCallback End----------" + }, + { + "name": "getP2pLinkedInfoCallback_error", + "value": "getP2pLinkedInfoCallback error" + }, + { + "name": "getP2pLinkedInfoCallback_successful", + "value": "getP2pLinkedInfoCallback successful " + }, + { + "name": "getP2pLinkedInfoCallback", + "value": "getP2pLinkedInfoCallback: " + }, + { + "name": "testGetCurrentGroupPromise", + "value": "getCurrentGroupPromise test" + }, + { + "name": "testGetCurrentGroupPromise_Start", + "value": "testGetCurrentGroupPromise Start----------" + }, + { + "name": "testGetCurrentGroupPromise_End", + "value": "testGetCurrentGroupPromise End----------" + }, + { + "name": "testGetCurrentGroupPromise_successful", + "value": "getCurrentGroupPromise successful" + }, + { + "name": "getCurrentGroupPromise", + "value": "getCurrentGroupPromise: " + }, + { + "name": "testGetCurrentGroupCallback", + "value": "getCurrentGroupCallback test" + }, + { + "name": "testGetCurrentGroupCallback_Start", + "value": "testGetCurrentGroupCallback Start----------" + }, + { + "name": "testGetCurrentGroupCallback_End", + "value": "testGetCurrentGroupCallback End----------" + }, + { + "name": "testCurrentGroupCallback_error", + "value": "testCurrentGroupCallback error" + }, + { + "name": "getCurrentGroupCallback_successful", + "value": "getCurrentGroupCallback successful" + }, + { + "name": "getCurrentGroupCallback", + "value": "getCurrentGroupCallback: " + }, + { + "name": "testGetP2pPeerDevicesPromise", + "value": "getP2pPeerDevicesPromise test: " + }, + { + "name": "testGetP2pPeerDevicesPromise_Start", + "value": "testGetP2pPeerDevicesPromise Start----------" + }, + { + "name": "testGetP2pPeerDevicesPromise_End", + "value": "testGetP2pPeerDevicesPromise End----------" + }, + { + "name": "getP2pPeerDevicesPromise_successful", + "value": "getP2pPeerDevicesPromise successful" + }, + { + "name": "getP2pPeerDevicesPromise", + "value": "getP2pPeerDevicesPromise: " + }, + { + "name": "testGetP2pPeerDevicesCallback", + "value": "getP2pPeerDevicesCallback test: " + }, + { + "name": "testGetP2pPeerDevicesCallback_Start", + "value": "testGetP2pPeerDevicesCallback Start----------" + }, + { + "name": "testGetP2pPeerDevicesCallback_End", + "value": "testGetP2pPeerDevicesCallback End----------" + }, + { + "name": "getP2pPeerDevicesCallback_error", + "value": "getP2pPeerDevicesCallback error" + }, + { + "name": "getP2pPeerDevicesCallback_successful", + "value": "getP2pPeerDevicesCallback successful" + }, + { + "name": "getP2pPeerDevicesCallback", + "value": "getP2pPeerDevicesCallback: " + }, + { + "name": "testCreateGroup", + "value": "createGroup test" + }, + { + "name": "testCreateGroup_Start", + "value": "testCreateGroup Start----------" + }, + { + "name": "testCreateGroup_End", + "value": "testCreateGroup End----------" + }, + { + "name": "createGroup", + "value": "createGroup: " + }, + { + "name": "testRemoveGroup", + "value": "removeGroup test" + }, + { + "name": "testRemoveGroup_Start", + "value": "testRemoveGroup Start----------" + }, + { + "name": "testRemoveGroup_End", + "value": "testRemoveGroup End----------" + }, + { + "name": "removeGroup", + "value": "removeGroup: " + }, + { + "name": "testP2pConnect", + "value": "P2pConnect test" + }, + { + "name": "testP2pConnect_Start", + "value": "testP2pConnect Start----------" + }, + { + "name": "testP2pConnect_End", + "value": "testP2pConnect End----------" + }, + { + "name": "p2pConnect", + "value": "p2pConnect: " + }, + { + "name": "testP2pCancelConnect", + "value": "p2pCancelConnect test" + }, + { + "name": "testP2pCancelConnect_Start", + "value": "testP2pCancelConnect Start----------" + }, + { + "name": "testP2pCancelConnect_End", + "value": "testP2pCancelConnect End----------" + }, + { + "name": "p2pCancelConnect", + "value": "p2pCancelConnect: " + }, + { + "name": "testStartDiscoverDevices", + "value": "startDiscoverDevices test" + }, + { + "name": "testStartDiscoverDevices_Start", + "value": "testStartDiscoverDevices Start----------" + }, + { + "name": "testStartDiscoverDevices_End", + "value": "testStartDiscoverDevices End----------" + }, + { + "name": "startDiscoverDevices", + "value": "startDiscoverDevices: " + }, + { + "name": "testStopDiscoverDevices", + "value": "stopDiscoverDevices test" + }, + { + "name": "testStopDiscoverDevices_Start", + "value": "testStopDiscoverDevices Start----------" + }, + { + "name": "testStopDiscoverDevices_End", + "value": "testStopDiscoverDevices End----------" + }, + { + "name": "stopDiscoverDevices", + "value": "stopDiscoverDevices: " + }, + { + "name": "testDeletePersistentGroup", + "value": "deletePersistentGroup test" + }, + { + "name": "testDeletePersistentGroup_Start", + "value": "testDeletePersistentGroup Start----------" + }, + { + "name": "testDeletePersistentGroup_End", + "value": "testDeletePersistentGroup End----------" + }, + { + "name": "deletePersistentGroup", + "value": "deletePersistentGroup: " + }, + { + "name": "testSetDeviceName", + "value": "setDeviceName test" + }, + { + "name": "testSetDeviceName_Start", + "value": "testSetDeviceName Start----------" + }, + { + "name": "testSetDeviceName_End", + "value": "testSetDeviceName End----------" + }, + { + "name": "setDeviceName", + "value": "setDeviceName: " + }, + { + "name": "testOnP2pStateChange", + "value": "OnP2pStateChange test" + }, + { + "name": "testOnP2pStateChange_test", + "value": "testOnP2pStateChange test" + }, + { + "name": "testOnP2pStateChange_Start", + "value": "testOnP2pStateChange Start----------" + }, + { + "name": "testOnP2pStateChange_End", + "value": "testOnP2pStateChange End----------" + }, + { + "name": "offP2pStateChange", + "value": "on.p2pStateChange监听已关闭" + }, + { + "name": "offP2pStateChangeTest", + "value": "关闭注册P2P开关状态改变事件" + }, + { + "name": "onP2pStateChange", + "value": "on.p2pStateChange监听已打开" + }, + { + "name": "onP2pStateChangeTest", + "value": "打开注册P2P开关状态变化" + }, + { + "name": "p2pStateChange", + "value": "状态为: " + }, + { + "name": "testOnP2pConnectionChange", + "value": "OnP2pConnectionChange test" + }, + { + "name": "testOnP2pConnectionChange_test", + "value": "testOnP2pConnectionChange test" + }, + { + "name": "testOnP2pConnectionChange_Start", + "value": "testOnP2pConnectionChange Start----------" + }, + { + "name": "testOnP2pConnectionChange_End", + "value": "testOnP2pConnectionChange End----------" + }, + { + "name": "offP2pConnectionChange", + "value": "on.P2pConnectionChange监听已关闭" + }, + { + "name": "offP2pConnectionChangeTest", + "value": "关闭P2P连接状态改变事件" + }, + { + "name": "onP2pConnectionChange", + "value": "on.p2pConnectionChange监听已打开" + }, + { + "name": "onP2pConnectionChangeTest", + "value": "打开注册p2p连接状态变化" + }, + { + "name": "P2pConnectionChange", + "value": "状态为: " + }, + { + "name": "testOnP2pDeviceChange", + "value": "OnP2pDeviceChange test" + }, + { + "name": "testOnP2pDeviceChange_Start", + "value": "testOnP2pDeviceChange Start----------" + }, + { + "name": "testOnP2pDeviceChange_End", + "value": "testOnP2pDeviceChange End----------" + }, + { + "name": "testOnP2pDeviceChange_test", + "value": "testOnP2pDeviceChange test" + }, + { + "name": "offP2pDeviceChange", + "value": "on.P2pDeviceChange监听已关闭" + }, + { + "name": "offP2pDeviceChangeTest", + "value": "关闭P2P设备状态改变事件" + }, + { + "name": "onP2pDeviceChange", + "value": "on.p2pConnectionChange监听已打开" + }, + { + "name": "onP2pDeviceChangeTest", + "value": "打开注册p2p设备连接状态变化" + }, + { + "name": "P2pDeviceChange", + "value": "状态为: " + }, + { + "name": "testOnP2pPeerDeviceChange", + "value": "OnP2pPeerDeviceChange test" + }, + { + "name": "testOnP2pPeerDeviceChange_Start", + "value": "testOnP2pPeerDeviceChange Start----------" + }, + { + "name": "testOnP2pPeerDeviceChange_End", + "value": "testOnP2pPeerDeviceChange End----------" + }, + { + "name": "testOnP2pPeerDeviceChange_test", + "value": "testOnP2pPeerDeviceChange test" + }, + { + "name": "offP2pPeerDeviceChange", + "value": "on.p2pPeerDeviceChange监听已关闭" + }, + { + "name": "offP2pPeerDeviceChangeTest", + "value": "关闭P2P对端设备状态改变事件" + }, + { + "name": "onP2pPeerDeviceChange", + "value": "on.p2pPeerDeviceChange监听已打开" + }, + { + "name": "onP2pPeerDeviceChangeTest", + "value": "打开P2P对端设备状态变化" + }, + { + "name": "P2pPeerDeviceChange", + "value": "状态为: " + }, + { + "name": "testOnP2pPersistentGroupChange", + "value": "OnP2pPersistentGroupChange test" + }, + { + "name": "testOnP2pPersistentGroupChange_Start", + "value": "testOnP2pPersistentGroupChange Start----------" + }, + { + "name": "testOnP2pPersistentGroupChange_End", + "value": "testOnP2pPersistentGroupChange End----------" + }, + { + "name": "testOnP2pPersistentGroupChange_test", + "value": "testOnP2pPersistentGroupChange test" + }, + { + "name": "offP2pPersistentGroupChange", + "value": "on.p2pPersistentGroupChange监听已关闭" + }, + { + "name": "offP2pPersistentGroupChangeTest", + "value": "关闭P2P设备状态改变事件" + }, + { + "name": "onP2pPersistentGroupChange", + "value": "on.p2pPersistentGroupChange监听已打开" + }, + { + "name": "onP2pPersistentGroupChangeTest", + "value": "打开P2P永久组状态变化" + }, + { + "name": "p2pPersistentGroupChange", + "value": "状态为: " + }, + { + "name": "testOnP2pDiscoveryChange", + "value": "OnP2pDiscoveryChange test" + }, + { + "name": "testOnP2pDiscoveryChange_Start", + "value": "testOnP2pDiscoveryChange Start----------" + }, + { + "name": "testOnP2pDiscoveryChange_End", + "value": "testOnP2pDiscoveryChange End----------" + }, + { + "name": "testOnP2pDiscoveryChange_test", + "value": "testOnP2pDiscoveryChange test" + }, + { + "name": "offP2pDiscoveryChange", + "value": "on.P2pDiscoveryChange监听已关闭" + }, + { + "name": "offP2pDiscoveryChangeTest", + "value": "关闭发现设备状态改变事件" + }, + { + "name": "onP2pDiscoveryChange", + "value": "on.p2pDiscoveryChange监听已打开" + }, + { + "name": "onP2pDiscoveryChangeTest", + "value": "打开发现设备状态变化" + }, + { + "name": "p2pDiscoveryChange", + "value": "状态为: " + }, + { + "name": "wlanIsConnected", + "value": "已连接" + }, + { + "name": "wlan_available", + "value": "可用WLAN" + }, + { + "name": "p2p_available", + "value": "对等设备" + }, + { + "name": "candidateWifiGroup", + "value": "可选的候选网络" + }, + { + "name": "candidateWifi", + "value": "candidateWifi" + }, + + { + "name": "title", + "value": "工作目标" + }, + { + "name": "add_task", + "value": "添加候选wifi" + }, + { + "name": "target_name", + "value": "目标" + }, + { + "name": "target_info", + "value": "点击按钮添加候选网络" + }, + { + "name": "overall_progress", + "value": "整体进度" + }, + { + "name": "add_task_dialog", + "value": "添加候选WiFi" + }, + { + "name": "latest_updateTime", + "value": "更新时间: " + }, + { + "name": "sub_goals", + "value": "候选WiFi列表" + }, + { + "name": "cancel_button", + "value": "取消" + }, + { + "name": "confirm_button", + "value": "确定" + }, + { + "name": "delete_button", + "value": "删除" + }, + { + "name": "edit_button", + "value": "编辑" + }, + { + "name": "select_all_button", + "value": "全选" + }, + { + "name": "cannot_input_empty", + "value": "WiFi名称不能为空！" + }, + { + "name": "input_candidate_wifi", + "value": "输入候选WiFi的配置" + }, + { + "name": "input_candidate_wifi_ssid", + "value": "输入候选WiFi的SSID" + }, + { + "name": "input_candidate_wifi_bssid", + "value": "输入候选WiFi的bssid(MAC) (可不填)" + }, + { + "name": "input_candidate_wifi_preSharedKey", + "value": "输入候选WiFi密码" + }, + { + "name": "input_candidate_wifi_isHiddenSsid", + "value": "输入1或0 (可不填;1:ture,0:false)" + }, + { + "name": "input_candidate_wifi_securityType", + "value": "选择securityType" + }, + { + "name": "Input_url", + "value": "InputUrl" + } + ] +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/bilibili.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/bilibili.png new file mode 100644 index 000000000..87cdb9b58 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/bilibili.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/bing.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/bing.png new file mode 100644 index 000000000..09239f634 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/bing.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/dianping.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/dianping.png new file mode 100644 index 000000000..714217ebc Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/dianping.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/dongchedi.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/dongchedi.png new file mode 100644 index 000000000..61a6a85eb Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/dongchedi.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/favicon.ico b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/favicon.ico new file mode 100644 index 000000000..fdc021cfe Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/favicon.ico differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/index.html b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/index.html new file mode 100644 index 000000000..6ba175d83 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/index.html @@ -0,0 +1,12 @@ + + + + Hello world! + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/jingdong.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/jingdong.png new file mode 100644 index 000000000..d29003fa0 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/jingdong.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/meituan.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/meituan.png new file mode 100644 index 000000000..0bf39a136 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/meituan.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/pad.html b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/pad.html new file mode 100644 index 000000000..38af1b0c4 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/pad.html @@ -0,0 +1,150 @@ + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/phone.html b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/phone.html new file mode 100644 index 000000000..54f9ab2cd --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/phone.html @@ -0,0 +1,156 @@ + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/pinduoduo.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/pinduoduo.png new file mode 100644 index 000000000..0f357c38a Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/pinduoduo.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/search.svg b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/search.svg new file mode 100644 index 000000000..d484a2d7b --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/search.svg @@ -0,0 +1,9 @@ + + + + Public/ic_public_input_search + Created with Sketch. + + + + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/sohu.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/sohu.png new file mode 100644 index 000000000..53376c6bc Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/sohu.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/test.html b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/test.html new file mode 100644 index 000000000..caea28188 --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/test.html @@ -0,0 +1,87 @@ + + + + + +
+
+
+ + \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/weibo.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/weibo.png new file mode 100644 index 000000000..e3404e621 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/weibo.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/weipinhui.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/weipinhui.png new file mode 100644 index 000000000..a15faa0cc Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/weipinhui.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/yuedu.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/yuedu.png new file mode 100644 index 000000000..e8094ede5 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/yuedu.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/zhihu.png b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/zhihu.png new file mode 100644 index 000000000..633ab88d2 Binary files /dev/null and b/wifi/test/wifi_testapp/entry/src/main/resources/rawfile/zhihu.png differ diff --git a/wifi/test/wifi_testapp/entry/src/main/resources/zh_CN/element/string.json b/wifi/test/wifi_testapp/entry/src/main/resources/zh_CN/element/string.json new file mode 100644 index 000000000..42a76a37a --- /dev/null +++ b/wifi/test/wifi_testapp/entry/src/main/resources/zh_CN/element/string.json @@ -0,0 +1,1824 @@ +{ + "string": [ + { + "name": "module_desc", + "value": "模块描述" + }, + { + "name": "EntryAbility_desc", + "value": "描述" + }, + { + "name": "EntryAbility_label", + "value": "wifi专项测试" + }, + { + "name": "entry_desc", + "value": "描述" + }, + { + "name": "MainAbility_desc", + "value": "描述" + }, + { + "name": "form_FormAbility_desc", + "value": "表单描述" + }, + { + "name": "form_FormAbility_label", + "value": "表单标签" + }, + { + "name": "MainAbility2_desc", + "value": "描述" + }, + { + "name": "btn_fullscreen", + "value": "全屏截屏" + }, + { + "name": "btn_fixedsize", + "value": "部分截屏" + }, + { + "name": "MainAbility2_label", + "value": "标签" + }, + { + "name": "MainAbility3_desc", + "value": "描述" + }, + { + "name": "MainAbility3_label", + "value": "标签" + }, + { + "name": "PageAbility_desc", + "value": "描述" + }, + { + "name": "PageAbility_label", + "value": "标签" + }, + { + "name": "DataAbility_desc", + "value": "hap示例空提供程序" + }, + { + "name": "MainAbility_label", + "value": "wifi专项测试" + }, + { + "name": "api", + "value": "接口测试" + }, + { + "name": "scenario", + "value": "场景测试" + }, + { + "name": "stability", + "value": "稳定性测试" + }, + { + "name": "autotest", + "value": "自动测试" + }, + { + "name": "profile", + "value": "Profile测试" + }, + { + "name": "testcase", + "value": "接口" + }, + { + "name": "result", + "value": "结果" + }, + { + "name": "benchmark", + "value": "性能测试" + }, + { + "name": "stress", + "value": "压力测试" + }, + { + "name": "App", + "value": "应用测试" + }, + { + "name": "test_title", + "value": "WIFI测试" + }, + { + "name": "api_test_title", + "value": "手动API测试" + }, + { + "name": "manual_test_title", + "value": "手动场景化测试" + }, + { + "name": "auto_test_title", + "value": "自动化测试" + }, + { + "name": "conf_title", + "value": "配置信息" + }, + { + "name": "cancel", + "value": "取消" + }, + { + "name": "confirm", + "value": "确认" + }, + { + "name": "version", + "value": "1.1.1" + }, + { + "name": "more", + "value": "更多" + }, + { + "name": "put_away", + "value": "收起" + }, + { + "name": "cancelPairing", + "value": "取消配对" + }, + { + "name": "scanning", + "value": "正在搜索…" + }, + { + "name": "entry_wifi_MainAbility", + "value": "wifi扫描结果" + }, + { + "name": "entry_p2p_MainAbility", + "value": "p2p扫描结果" + }, + { + "name": "description_mainability", + "value": "eTS WLAN功能" + }, + { + "name": "sure", + "value": "确定" + }, + { + "name": "router_uri", + "value": "跳转" + }, + { + "name": "wlan", + "value": "WLAN" + }, + { + "name": "available_wlan", + "value": "可用的WLAN" + }, + { + "name": "connected", + "value": "已连接" + }, + { + "name": "create_room", + "value": "创建room" + }, + { + "name": "send_message", + "value": "发送" + }, + { + "name": "about", + "value": "关于" + }, + { + "name": "ip_address", + "value": "IP地址:" + }, + { + "name": "gate_way", + "value": "网关:" + }, + { + "name": "net_mask", + "value": "掩码:" + }, + { + "name": "primary_dns", + "value": "主DNS服务器:" + }, + { + "name": "second_dns", + "value": "备DNS服务器:" + }, + { + "name": "server_ip", + "value": "DHCP服务端ip:" + }, + { + "name": "lease_duration", + "value": "IP地址租用时长:" + }, + { + "name": "country_code", + "value": "国家码:" + }, + { + "name": "infrastructure_feature", + "value": "基础结构模式特性:" + }, + { + "name": "ghz_feature", + "value": "5 GHz 宽带特性:" + }, + { + "name": "gas_anqp_feature", + "value": "GAS/ANQP特性:" + }, + { + "name": "wifi_direct", + "value": "WiFi-Direct特性:" + }, + { + "name": "soft_ap", + "value": "Soft AP特性:" + }, + { + "name": "wifi_aware", + "value": "WiFi Aware组网特性:" + }, + { + "name": "encryption", + "value": "加密" + }, + { + "name": "useful", + "value": "可用" + }, + { + "name": "p2pConnected", + "value": "已连接" + }, + { + "name": "open", + "value": "开放" + }, + { + "name": "wifi_enable", + "value": "wifi已经使能" + }, + { + "name": "testEnableWifi_Start", + "value": "testEnableWifi 开始----------" + }, + { + "name": "testEnableWifi_End", + "value": "testEnableWifi 结束----------" + }, + { + "name": "enableWifi_result", + "value": "使能结果: " + }, + { + "name": "wifi_disEnable", + "value": "WIFI还未使能" + }, + { + "name": "testDisableWifi_Start", + "value": "testDisableWifi 开始----------" + }, + { + "name": "testDisableWifi_End", + "value": "testDisableWifi 结束----------" + }, + { + "name": "disableWifi_result", + "value": "去使能结果: " + }, + { + "name": "wifi_enable_result", + "value": "Wifi使能执行结果：" + }, + { + "name": "wifi_disEnable_result", + "value": "Wifi去使能执行结果：" + }, + { + "name": "wifi_enable_confirm", + "value": "Wifi已打开或打开失败,请确认" + }, + { + "name": "wifi_disEnable_confirm", + "value": "Wifi已关闭或关闭失败,请确认" + }, + { + "name": "wifi_IsActive", + "value": "wifi使能结果为：" + }, + { + "name": "testIsWifiActive_Start", + "value": "testIsWifiActive 开始----------" + }, + { + "name": "testIsWifiActive_End", + "value": "testDisableWifi 结束----------" + }, + { + "name": "testEnableWifi", + "value": "enableWifi 测试" + }, + { + "name": "testDisableWifi", + "value": "disableWifi 测试" + }, + { + "name": "testIsWifiActive", + "value": "isWifiActive 测试" + }, + { + "name": "testScan", + "value": "scan 测试" + }, + { + "name": "testScan_Start", + "value": "testScan 开始----------" + }, + { + "name": "testScan_End", + "value": "testScan 结束----------" + }, + { + "name": "scan", + "value": "scan: " + }, + { + "name": "testForcibleScan_Start", + "value": "testForcibleScan 开始----------" + }, + { + "name": "testForcibleScan_End", + "value": "testForcibleScan 结束----------" + }, + { + "name": "testGetScanInfosPromise", + "value": "getScanInfosPromise 测试" + }, + { + "name": "testGetScanInfosPromise_Start", + "value": "testGetScanInfosPromise 开始----------" + }, + { + "name": "testGetScanInfosPromise_End", + "value": "testGetScanInfosPromise 结束----------" + }, + { + "name": "testGetScanInfosPromise_successful", + "value": "getScanInfos promise 成功" + }, + { + "name": "getScanInfosPromise", + "value": "WifiScanInfo: " + }, + { + "name": "testGetScanInfosCallback", + "value": "getScanInfosCallback 测试" + }, + { + "name": "testGetScanInfosCallback_Start", + "value": "testGetScanInfosCallback 开始----------" + }, + { + "name": "testGetScanInfosCallback_End", + "value": "testGetScanInfosCallback 结束----------" + }, + { + "name": "testGetScanInfosCallback_successful", + "value": "getScanInfos callback 成功" + }, + { + "name": "getScanInfosCallback", + "value": "WifiScanInfo: " + }, + { + "name": "testAddDeviceConfigPromise", + "value": "addDeviceConfigPromise 测试" + }, + { + "name": "testAddDeviceConfigPromise_Start", + "value": "testAddDeviceConfigPromise 开始----------" + }, + { + "name": "testAddDeviceConfigPromise_End", + "value": "testAddDeviceConfigPromise 结束----------" + }, + { + "name": "testAddDeviceConfigPromise_successful", + "value": "addDeviceConfig promise 成功" + }, + { + "name": "addDeviceConfigPromise", + "value": "addDeviceConfig: " + }, + { + "name": "testAddDeviceConfigCallback", + "value": "addDeviceConfigCallback 测试" + }, + { + "name": "testAddDeviceConfigCallback_Start", + "value": "testAddDeviceConfigCallback 开始----------" + }, + { + "name": "testAddDeviceConfigCallback_End", + "value": "testAddDeviceConfigCallback 结束----------" + }, + { + "name": "testAddDeviceConfigCallback_successful", + "value": "addDeviceConfig Callback 成功" + }, + { + "name": "addDeviceConfigCallback", + "value": "addDeviceConfig: " + }, + { + "name": "testAddUntrustedConfigPromise", + "value": "addUntrustedConfigPromise 测试" + }, + { + "name": "testAddUntrustedConfigPromise_Start", + "value": "testAddUntrustedConfigPromise 开始----------" + }, + { + "name": "testAddUntrustedConfigPromise_End", + "value": "testAddUntrustedConfigPromise 结束----------" + }, + { + "name": "testAddUntrustedConfigPromise_successful", + "value": "addUntrustedConfig promise 成功" + }, + { + "name": "addUntrustedConfigPromise", + "value": "addUntrustedConfig: " + }, + { + "name": "testAddUntrustedConfigCallback", + "value": "addUntrustedConfigCallback 测试" + }, + { + "name": "testAddUntrustedConfigCallback_Start", + "value": "testAddUntrustedConfigCallback 开始----------" + }, + { + "name": "testAddUntrustedConfigCallback_End", + "value": "testAddUntrustedConfigCallback 结束----------" + }, + { + "name": "testAddUntrustedConfigCallback_successful", + "value": "addUntrustedConfig Callback 成功" + }, + { + "name": "addUntrustedConfigCallback", + "value": "addUntrustedConfig: " + }, + { + "name": "testRemoveUntrustedConfigPromise", + "value": "removeUntrustedConfigPromise 测试" + }, + { + "name": "testRemoveUntrustedConfigPromise_Start", + "value": "testRemoveUntrustedConfigPromise 开始----------" + }, + { + "name": "testRemoveUntrustedConfigPromise_End", + "value": "testRemoveUntrustedConfigPromise 结束----------" + }, + { + "name": "testRemoveUntrustedConfigPromise_successful", + "value": "removeUntrustedConfig promise 成功" + }, + { + "name": "removeUntrustedConfigPromise", + "value": "removeUntrustedConfig: " + }, + { + "name": "testRemoveUntrustedConfigCallback", + "value": "removeUntrustedConfigCallback 测试" + }, + { + "name": "testRemoveUntrustedConfigCallback_Start", + "value": "testRemoveUntrustedConfigCallback 开始----------" + }, + { + "name": "testRemoveUntrustedConfigCallback_End", + "value": "testRemoveUntrustedConfigCallback 结束----------" + }, + { + "name": "testRemoveUntrustedConfigCallback_successful", + "value": "removeUntrustedConfig Callback 成功" + }, + { + "name": "removeUntrustedConfigCallback", + "value": "removeUntrustedConfig: " + }, + { + "name": "testConnectToNetwork", + "value": "connectToNetwork 测试" + }, + { + "name": "testConnectToNetwork_Start", + "value": "testConnectToNetwork 开始----------" + }, + { + "name": "testConnectToNetwork_End", + "value": "testConnectToNetwork 结束----------" + }, + { + "name": "connectToNetwork", + "value": "ConnectToNetwork: " + }, + { + "name": "testConnectToDevice", + "value": "connectToDevice 测试" + }, + { + "name": "testConnectToDevice_Start", + "value": "testConnectToDevice 开始----------" + }, + { + "name": "testConnectToDevice_End", + "value": "testConnectToDevice 结束----------" + }, + { + "name": "connectToDevice", + "value": "ConnectToDevice: " + }, + { + "name": "testDisconnect", + "value": "disconnect 测试" + }, + { + "name": "testDisconnect_Start", + "value": "testDisconnect 开始----------" + }, + { + "name": "choice_download_file", + "value": "请选择需要下载的文件" + }, + { + "name": "upload_page", + "value": "上传" + }, + { + "name": "click_download", + "value": "点击下载" + }, + { + "name": "download_progress", + "value": "下载进度：" + }, + { + "name": "testDisconnect_End", + "value": "testDisconnect 结束----------" + }, + { + "name": "disconnect", + "value": "disconnect: " + }, + { + "name": "testGetSignalLevel", + "value": "getSignalLevel 测试" + }, + { + "name": "testGetSignalLevel_Start", + "value": "testGetSignalLevel 开始----------" + }, + { + "name": "testGetSignalLevel_End", + "value": "testGetSignalLevel 结束----------" + }, + { + "name": "getSignalLevel", + "value": "getSignalLevel is: " + }, + { + "name": "testGetLinkedInfoPromise", + "value": "getLinkedInfoPromise 测试" + }, + { + "name": "testGetLinkedInfoPromise_Start", + "value": "testGetLinkedInfoPromise 开始----------" + }, + { + "name": "testGetLinkedInfoPromise_End", + "value": "testGetLinkedInfoPromise 结束----------" + }, + { + "name": "testGetLinkedInfoPromise_successful", + "value": "getLinkedInfoPromise test 成功" + }, + { + "name": "getLinkedInfoPromise", + "value": "get wifi linked info: " + }, + { + "name": "testGetLinkedInfoCallback", + "value": "getLinkedInfoCallback 测试" + }, + { + "name": "testGetLinkedInfoCallback_Start", + "value": "testGetLinkedInfoCallback 开始----------" + }, + { + "name": "testGetLinkedInfoCallback_End", + "value": "testGetLinkedInfoCallback 结束----------" + }, + { + "name": "testGetLinkedInfoCallback_successful", + "value": "getLinkedInfoCallback test 成功" + }, + { + "name": "getLinkedInfoCallback", + "value": "get wifi linked info: " + }, + { + "name": "testIsConnected", + "value": "isConnected 测试" + }, + { + "name": "testIsConnected_Start", + "value": "testIsConnected 开始----------" + }, + { + "name": "testIsConnected_End", + "value": "testIsConnected 结束----------" + }, + { + "name": "isConnected", + "value": "isConnected: " + }, + { + "name": "testGetSupportedFeatures", + "value": "getSupportedFeatures 测试" + }, + { + "name": "testGetSupportedFeatures_Start", + "value": "testGetSupportedFeatures 开始----------" + }, + { + "name": "testGetSupportedFeatures_End", + "value": "testGetSupportedFeatures 结束----------" + }, + { + "name": "getSupportedFeatures", + "value": "GetSupportedFeatures: " + }, + { + "name": "testIsFeatureSupported", + "value": "isFeatureSupported 测试" + }, + { + "name": "testIsFeatureSupported_Start", + "value": "testIsFeatureSupported 开始----------" + }, + { + "name": "testIsFeatureSupported_End", + "value": "testIsFeatureSupported 结束----------" + }, + { + "name": "isFeatureSupported", + "value": "isFeatureSupported: " + }, + { + "name": "testGetDeviceMacAddress", + "value": "getDeviceMacAddress 测试" + }, + { + "name": "testGetDeviceMacAddress_Start", + "value": "testGetDeviceMacAddress 开始----------" + }, + { + "name": "testGetDeviceMacAddress_End", + "value": "testGetDeviceMacAddress 结束----------" + }, + { + "name": "getDeviceMacAddress", + "value": "macAddress: " + }, + { + "name": "testGetIpInfo", + "value": "getIpInfo 测试" + }, + { + "name": "testGetIpInfo_Start", + "value": "testGetIpInfo 开始----------" + }, + { + "name": "testGetIpInfo_End", + "value": "testGetIpInfo 结束----------" + }, + { + "name": "getIpInfo", + "value": "IpInfo: " + }, + { + "name": "testGetCountryCode", + "value": "getCountryCode 测试" + }, + { + "name": "testGetCountryCode_Start", + "value": "testGetCountryCode 开始----------" + }, + { + "name": "testGetCountryCode_End", + "value": "testGetCountryCode 结束----------" + }, + { + "name": "getCountryCode", + "value": "CountryCode is: " + }, + { + "name": "testReassociate", + "value": "reAssociate 测试" + }, + { + "name": "testReassociate_Start", + "value": "testReassociate 开始----------" + }, + { + "name": "testReassociate_End", + "value": "testReassociate 结束----------" + }, + { + "name": "reassociate", + "value": "reassociate is: " + }, + { + "name": "testReConnect", + "value": "reConnect 测试" + }, + { + "name": "testReConnect_Start", + "value": "testReConnect 开始----------" + }, + { + "name": "testReConnect_End", + "value": "testReConnect 结束----------" + }, + { + "name": "reconnect", + "value": "reConnect is: " + }, + { + "name": "testGetDeviceConfigs", + "value": "getDeviceConfigs 测试" + }, + { + "name": "testGetDeviceConfigs_Start", + "value": "testGetDeviceConfigs 开始----------" + }, + { + "name": "testGetDeviceConfigs_End", + "value": "testGetDeviceConfigs 结束----------" + }, + { + "name": "getDeviceConfigs", + "value": "DeviceConfigs is: " + }, + { + "name": "testUpdateNetwork", + "value": "updateNetwork 测试" + }, + { + "name": "testUpdateNetwork_Start", + "value": "testUpdateNetwork 开始----------" + }, + { + "name": "testUpdateNetwork_End", + "value": "testUpdateNetwork 结束----------" + }, + { + "name": "updateNetwork", + "value": "updateNetwork: " + }, + { + "name": "testDisableNetwork", + "value": "disableNetWork 测试" + }, + { + "name": "testDisableNetwork_Start", + "value": "testDisableNetwork 开始----------" + }, + { + "name": "testDisableNetwork_End", + "value": "testDisableNetwork 结束----------" + }, + { + "name": "disableNetwork", + "value": "disableNetwork: " + }, + { + "name": "testRemoveAllNetwork", + "value": "removeAllNetwork 测试" + }, + { + "name": "testRemoveAllNetwork_Start", + "value": "testRemoveAllNetwork 开始----------" + }, + { + "name": "testRemoveAllNetwork_End", + "value": "testRemoveAllNetwork 结束----------" + }, + { + "name": "removeAllNetwork", + "value": "removeAllNetwork: " + }, + { + "name": "testRemoveDevice", + "value": "removeDevice 测试" + }, + { + "name": "testRemoveDevice_Start", + "value": "testRemoveDevice 开始----------" + }, + { + "name": "testRemoveDevice_End", + "value": "testRemoveDevice 结束----------" + }, + { + "name": "removeDevice", + "value": "removeDevice: " + }, + { + "name": "testOnWifiStateChange", + "value": "onWifiStateChange 测试" + }, + { + "name": "testOnWifiStateChange_Start", + "value": "testOnWifiStateChange 开始----------" + }, + { + "name": "testOnWifiStateChange_End", + "value": "testOnWifiStateChange 结束----------" + }, + { + "name": "offWifiStateChange", + "value": "on.WifiStateChange监听已关闭" + }, + { + "name": "offWifiStateChangeTest", + "value": "关闭注册WLAN状态改变事件" + }, + { + "name": "onWifiStateChange", + "value": "on.WifiStateChange监听已打开" + }, + { + "name": "onWifiStateChangeTest", + "value": "打开注册WLAN状态变化" + }, + { + "name": "wifiStateChange", + "value": "wifi状态: " + }, + { + "name": "testOnWifiConnectionChange", + "value": "onWifiConnectionChange 测试" + }, + { + "name": "testOnWifiConnectionChange_Start", + "value": "testOnWifiConnectionChange 开始----------" + }, + { + "name": "testOnWifiConnectionChange_End", + "value": "testOnWifiConnectionChange 结束----------" + }, + { + "name": "offWifiConnectionChange", + "value": "on.wifiConnectionChange监听已关闭" + }, + { + "name": "offWifiConnectionChangeTest", + "value": "关闭WLAN连接状态改变事件" + }, + { + "name": "onWifiConnectionChange", + "value": "on.wifiConnectionChange监听已打开" + }, + { + "name": "onWifiConnectionChangeTest", + "value": "打开注册WLAN连接状态变化" + }, + { + "name": "wifiConnectionChange", + "value": "连接状态: " + }, + { + "name": "testOnWifiScanStateChange", + "value": "onWifiScanStateChange 测试" + }, + { + "name": "testOnWifiScanStateChange_Start", + "value": "testOnWifiConnectionChange 开始----------" + }, + { + "name": "testOnWifiScanStateChange_End", + "value": "testOnWifiConnectionChange 结束----------" + }, + { + "name": "offWifiScanStateChange", + "value": "on.wifiScanStateChange监听已关闭" + }, + { + "name": "offWifiScanStateChangeTest", + "value": "关闭扫描状态改变事件" + }, + { + "name": "onWifiScanStateChange", + "value": "on.wifiScanStateChange监听已打开" + }, + { + "name": "onWifiScanStateChangeTest", + "value": "打开注册扫描状态变化" + }, + { + "name": "wifiScanStateChange", + "value": "scan状态: " + }, + { + "name": "testOnWifiRssiChange", + "value": "onWifiRssiChange 测试" + }, + { + "name": "testOnWifiRssiChange_Start", + "value": "testOnWifiRssiChange 开始----------" + }, + { + "name": "testOnWifiRssiChange_End", + "value": "testOnWifiRssiChange 结束----------" + }, + { + "name": "offWifiRssiChange", + "value": "on.wifiRssiChange监听已关闭" + }, + { + "name": "offWifiRssiChangeTest", + "value": "关闭RSSI状态变化事件" + }, + { + "name": "onWifiRssiChange", + "value": "on.wifiRssiChange监听已打开" + }, + { + "name": "onWifiRssiChangeTest", + "value": "打开注册RSSI状态变化" + }, + { + "name": "wifiRssiChange", + "value": "rssi: " + }, + { + "name": "testOnStreamChange", + "value": "onStreamChange 测试" + }, + { + "name": "testOnStreamChange_Start", + "value": "testOnStreamChange 开始----------" + }, + { + "name": "testOnStreamChange_End", + "value": "testOnStreamChange 结束----------" + }, + { + "name": "offStreamChange", + "value": "on.streamChange监听已关闭" + }, + { + "name": "offStreamChangeTest", + "value": "关闭注册流改变事件" + }, + { + "name": "onStreamChange", + "value": "on.streamChange监听已打开" + }, + { + "name": "onStreamChangeTest", + "value": "打开注册流变化" + }, + { + "name": "streamChange", + "value": "stream状态: " + }, + { + "name": "testEnableHotspot", + "value": "enableHotspot 测试" + }, + { + "name": "testEnableHotspot_Start", + "value": "testEnableHotspot 开始--------------" + }, + { + "name": "testEnableHotspot_End", + "value": "testEnableHotspot 结束--------------" + }, + { + "name": "hotspot_enable", + "value": "热点已经使能" + }, + { + "name": "hotspot_disEnable", + "value": "热点还未使能" + }, + { + "name": "hotspot_enable_result", + "value": "热点使能执行结果：" + }, + { + "name": "hotspot_disEnable_result", + "value": "热点去使能执行结果：" + }, + { + "name": "hotspot_enable_confirm", + "value": "热点已打开或打开失败,请确认" + }, + { + "name": "hotspot_disEnable_confirm", + "value": "热点已关闭或关闭失败,请确认" + }, + { + "name": "hotspot_IsActive", + "value": "热点使能结果为：" + }, + { + "name": "testDisableHotspot", + "value": "disableHotspot 测试" + }, + { + "name": "testDisableHotspot_Start", + "value": "testDisableHotspot 开始--------------" + }, + { + "name": "testDisableHotspot_End", + "value": "testDisableHotspot 结束--------------" + }, + { + "name": "testIsHotspotActive", + "value": "isHotspotActive 测试" + }, + { + "name": "testIsHostActive_Start", + "value": "testIsHostActive 开始--------------" + }, + { + "name": "testIsHostActive_End", + "value": "testIsHostActive 结束--------------" + }, + { + "name": "testIsHotspotDualBandSupported", + "value": "isHotspotDualBandSupported 测试" + }, + { + "name": "testIsHotspotDualBandSupported_Start", + "value": "testIsHotspotDualBandSupported 开始--------------" + }, + { + "name": "testIsHotspotDualBandSupported_End", + "value": "testIsHotspotDualBandSupported 结束--------------" + }, + { + "name": "isHotspotDualBandSupported", + "value": "热点支持双频结果：" + }, + { + "name": "testSetHotspotConfig", + "value": "SetHotspotConfig 测试" + }, + { + "name": "testSetHotspotConfig_Start", + "value": "testSetHotspotConfig 开始--------------" + }, + { + "name": "testSetHotspotConfig_End", + "value": "testSetHotspotConfig 结束--------------" + }, + { + "name": "setHotspotConfig", + "value": "SetHotspotConfig: " + }, + { + "name": "testGetHotspotConfig", + "value": "getHotspotConfig 测试" + }, + { + "name": "testGetHotspotConfig_Start", + "value": "testGetHotspotConfig 开始--------------" + }, + { + "name": "testGetHotspotConfig_End", + "value": "testGetHotspotConfig 结束--------------" + }, + { + "name": "getHotspotConfig", + "value": "HotspotConfig: " + }, + { + "name": "testGetStations", + "value": "GetStations 测试" + }, + { + "name": "testGetStations_Start", + "value": "testGetStations 开始--------------" + }, + { + "name": "testGetStations_End", + "value": "testGetStations 结束--------------" + }, + { + "name": "getStations", + "value": "GetStations: " + }, + { + "name": "testOnHotspotStateChange", + "value": "onHotspotStateChange 测试" + }, + { + "name": "testOnHotspotStateChange_Start", + "value": "testOnHotspotStateChange 开始--------------" + }, + { + "name": "testOnHotspotStateChange_End", + "value": "testOnHotspotStateChange 结束--------------" + }, + { + "name": "offHotspotStateChange", + "value": "on.hotspotStateChange监听已关闭" + }, + { + "name": "offHotspotStateChangeTest", + "value": "关闭注册热点状态改变事件" + }, + { + "name": "onHotspotStateChange", + "value": "on.hotspotStateChange监听已打开" + }, + { + "name": "onHotspotStateChangeTest", + "value": "打开注册热点状态变化" + }, + { + "name": "hotspotStateChange", + "value": "状态为: " + }, + { + "name": "testOnHotspotStaJoin", + "value": "onHotspotStaJoin 测试" + }, + { + "name": "testOnHotspotStaJoin_Start", + "value": "testOnHotspotStaJoin 开始--------------" + }, + { + "name": "testOnHotspotStaJoin_End", + "value": "testOnHotspotStaJoin 结束--------------" + }, + { + "name": "offHotspotStaJoin", + "value": "on.hotspotStaJoin监听已关闭" + }, + { + "name": "offHotspotStaJoinTest", + "value": "关闭注册Wi-Fi 热点 sta加入变化事件" + }, + { + "name": "onHotspotStaJoin", + "value": "on.hotspotStateChange监听已打开" + }, + { + "name": "onHotspotStaJoinTest", + "value": "打开注册Wi-Fi 热点 sta加入变化" + }, + { + "name": "hotspotStaJoin", + "value": "状态为: " + }, + { + "name": "testOnHotspotStaLeave", + "value": "onHotspotStaLeave 测试" + }, + { + "name": "testOnHotspotStaLeave_Start", + "value": "testOnHotspotStaLeave 开始--------------" + }, + { + "name": "testOnHotspotStaLeave_End", + "value": "testOnHotspotStaLeave 结束--------------" + }, + { + "name": "offHotspotStaLeave", + "value": "on.hotspotStaLeave监听已关闭" + }, + { + "name": "offHotspotStaLeaveTest", + "value": "关闭注册Wi-Fi 热点 sta离开变化事件" + }, + { + "name": "onHotspotStaLeave", + "value": "on.hotspotStateChange监听已打开" + }, + { + "name": "onHotspotStaLeaveTest", + "value": "打开注册Wi-Fi 热点 sta离开变化" + }, + { + "name": "hotspotStaLeave", + "value": "状态为: " + }, + { + "name": "testGetP2pLinkedInfoPromise", + "value": "getP2pLinkedInfoPromise 测试" + }, + { + "name": "testGetP2pLinkedInfoPromise_Start", + "value": "testGetP2pLinkedInfoPromise 开始----------" + }, + { + "name": "testGetP2pLinkedInfoPromise_End", + "value": "testGetP2pLinkedInfoPromise 结束----------" + }, + { + "name": "getP2pLinkedInfoPromise_successful", + "value": "getP2pLinkedInfoPromise 成功" + }, + { + "name": "getP2pLinkedInfoPromise", + "value": "getP2pLinkedInfoPromise: " + }, + { + "name": "testGetP2pLinkedInfoCallback", + "value": "getP2pLinkedInfoCallback 测试" + }, + { + "name": "testGetP2pLinkedInfoCallback_Start", + "value": "testGetP2pLinkedInfoCallback 开始----------" + }, + { + "name": "testGetP2pLinkedInfoCallback_End", + "value": "testGetP2pLinkedInfoCallback 结束----------" + }, + { + "name": "getP2pLinkedInfoCallback_error", + "value": "getP2pLinkedInfoCallback 异常" + }, + { + "name": "getP2pLinkedInfoCallback_successful", + "value": "getP2pLinkedInfoCallback 成功 " + }, + { + "name": "getP2pLinkedInfoCallback", + "value": "getP2pLinkedInfoCallback: " + }, + { + "name": "testGetCurrentGroupPromise", + "value": "getCurrentGroupPromise 测试" + }, + { + "name": "testGetCurrentGroupPromise_Start", + "value": "testGetCurrentGroupPromise 开始----------" + }, + { + "name": "testGetCurrentGroupPromise_End", + "value": "testGetCurrentGroupPromise 结束----------" + }, + { + "name": "testGetCurrentGroupPromise_successful", + "value": "getCurrentGroupPromise 成功" + }, + { + "name": "getCurrentGroupPromise", + "value": "getCurrentGroupPromise: " + }, + { + "name": "testGetCurrentGroupCallback", + "value": "getCurrentGroupCallback 测试" + }, + { + "name": "testGetCurrentGroupCallback_Start", + "value": "testGetCurrentGroupCallback 开始----------" + }, + { + "name": "testGetCurrentGroupCallback_End", + "value": "testGetCurrentGroupCallback 结束----------" + }, + { + "name": "testCurrentGroupCallback_error", + "value": "testCurrentGroupCallback 异常" + }, + { + "name": "getCurrentGroupCallback_successful", + "value": "getCurrentGroupCallback 成功" + }, + { + "name": "getCurrentGroupCallback", + "value": "getCurrentGroupCallback: " + }, + { + "name": "testGetP2pPeerDevicesPromise", + "value": "getP2pPeerDevicesPromise test: " + }, + { + "name": "testGetP2pPeerDevicesPromise_Start", + "value": "testGetP2pPeerDevicesPromise 开始----------" + }, + { + "name": "testGetP2pPeerDevicesPromise_End", + "value": "testGetP2pPeerDevicesPromise 结束----------" + }, + { + "name": "getP2pPeerDevicesPromise_successful", + "value": "getP2pPeerDevicesPromise 成功" + }, + { + "name": "getP2pPeerDevicesPromise", + "value": "getP2pPeerDevicesPromise: " + }, + { + "name": "testGetP2pPeerDevicesCallback", + "value": "getP2pPeerDevicesCallback test: " + }, + { + "name": "testGetP2pPeerDevicesCallback_Start", + "value": "testGetP2pPeerDevicesCallback 开始----------" + }, + { + "name": "testGetP2pPeerDevicesCallback_End", + "value": "testGetP2pPeerDevicesCallback 结束----------" + }, + { + "name": "getP2pPeerDevicesCallback_error", + "value": "getP2pPeerDevicesCallback 异常" + }, + { + "name": "getP2pPeerDevicesCallback_successful", + "value": "getP2pPeerDevicesCallback 成功" + }, + { + "name": "getP2pPeerDevicesCallback", + "value": "getP2pPeerDevicesCallback: " + }, + { + "name": "testCreateGroup", + "value": "createGroup 测试" + }, + { + "name": "testCreateGroup_Start", + "value": "testCreateGroup 开始----------" + }, + { + "name": "testCreateGroup_End", + "value": "testCreateGroup 结束----------" + }, + { + "name": "createGroup", + "value": "createGroup: " + }, + { + "name": "testRemoveGroup", + "value": "removeGroup 测试" + }, + { + "name": "testRemoveGroup_Start", + "value": "testRemoveGroup 开始----------" + }, + { + "name": "testRemoveGroup_End", + "value": "testRemoveGroup 结束----------" + }, + { + "name": "removeGroup", + "value": "removeGroup: " + }, + { + "name": "testP2pConnect", + "value": "P2pConnect 测试" + }, + { + "name": "testP2pConnect_Start", + "value": "testP2pConnect 开始----------" + }, + { + "name": "testP2pConnect_End", + "value": "testP2pConnect 结束----------" + }, + { + "name": "p2pConnect", + "value": "p2pConnect: " + }, + { + "name": "testP2pCancelConnect", + "value": "p2pCancelConnect 测试" + }, + { + "name": "testP2pCancelConnect_Start", + "value": "testP2pCancelConnect 开始----------" + }, + { + "name": "testP2pCancelConnect_End", + "value": "testP2pCancelConnect 结束----------" + }, + { + "name": "p2pCancelConnect", + "value": "p2pCancelConnect: " + }, + { + "name": "testStartDiscoverDevices", + "value": "startDiscoverDevices 测试" + }, + { + "name": "testStartDiscoverDevices_Start", + "value": "testStartDiscoverDevices 开始----------" + }, + { + "name": "testStartDiscoverDevices_End", + "value": "testStartDiscoverDevices 结束----------" + }, + { + "name": "startDiscoverDevices", + "value": "startDiscoverDevices: " + }, + { + "name": "testStopDiscoverDevices", + "value": "stopDiscoverDevices 测试" + }, + { + "name": "testStopDiscoverDevices_Start", + "value": "testStopDiscoverDevices 开始----------" + }, + { + "name": "testStopDiscoverDevices_End", + "value": "testStopDiscoverDevices 结束----------" + }, + { + "name": "stopDiscoverDevices", + "value": "stopDiscoverDevices: " + }, + { + "name": "testDeletePersistentGroup", + "value": "deletePersistentGroup 测试" + }, + { + "name": "testDeletePersistentGroup_Start", + "value": "testDeletePersistentGroup 开始----------" + }, + { + "name": "testDeletePersistentGroup_End", + "value": "testDeletePersistentGroup 结束----------" + }, + { + "name": "deletePersistentGroup", + "value": "deletePersistentGroup: " + }, + { + "name": "testSetDeviceName", + "value": "setDeviceName 测试" + }, + { + "name": "testSetDeviceName_Start", + "value": "testSetDeviceName 开始----------" + }, + { + "name": "testSetDeviceName_End", + "value": "testSetDeviceName 结束----------" + }, + { + "name": "setDeviceName", + "value": "setDeviceName: " + }, + { + "name": "testOnP2pStateChange", + "value": "OnP2pStateChange 测试" + }, + { + "name": "testOnP2pStateChange_test", + "value": "testOnP2pStateChange 测试" + }, + { + "name": "testOnP2pStateChange_Start", + "value": "testOnP2pStateChange 开始----------" + }, + { + "name": "testOnP2pStateChange_End", + "value": "testOnP2pStateChange 结束----------" + }, + { + "name": "offP2pStateChange", + "value": "on.p2pStateChange监听已关闭" + }, + { + "name": "offP2pStateChangeTest", + "value": "关闭注册P2P开关状态改变事件" + }, + { + "name": "onP2pStateChange", + "value": "on.p2pStateChange监听已打开" + }, + { + "name": "onP2pStateChangeTest", + "value": "打开注册P2P开关状态变化" + }, + { + "name": "p2pStateChange", + "value": "状态为: " + }, + { + "name": "testOnP2pConnectionChange", + "value": "OnP2pConnectionChange 测试" + }, + { + "name": "testOnP2pConnectionChange_test", + "value": "testOnP2pConnectionChange 测试" + }, + { + "name": "testOnP2pConnectionChange_Start", + "value": "testOnP2pConnectionChange 开始----------" + }, + { + "name": "testOnP2pConnectionChange_End", + "value": "testOnP2pConnectionChange 结束----------" + }, + { + "name": "offP2pConnectionChange", + "value": "on.P2pConnectionChange监听已关闭" + }, + { + "name": "offP2pConnectionChangeTest", + "value": "关闭P2P连接状态改变事件" + }, + { + "name": "onP2pConnectionChange", + "value": "on.p2pConnectionChange监听已打开" + }, + { + "name": "onP2pConnectionChangeTest", + "value": "打开注册p2p连接状态变化" + }, + { + "name": "P2pConnectionChange", + "value": "状态为: " + }, + { + "name": "testOnP2pDeviceChange", + "value": "OnP2pDeviceChange 测试" + }, + { + "name": "testOnP2pDeviceChange_Start", + "value": "testOnP2pDeviceChange 开始----------" + }, + { + "name": "testOnP2pDeviceChange_End", + "value": "testOnP2pDeviceChange 结束----------" + }, + { + "name": "testOnP2pDeviceChange_test", + "value": "testOnP2pDeviceChange 测试" + }, + { + "name": "offP2pDeviceChange", + "value": "on.P2pDeviceChange监听已关闭" + }, + { + "name": "offP2pDeviceChangeTest", + "value": "关闭P2P设备状态改变事件" + }, + { + "name": "onP2pDeviceChange", + "value": "on.p2pConnectionChange监听已打开" + }, + { + "name": "onP2pDeviceChangeTest", + "value": "打开注册p2p设备连接状态变化" + }, + { + "name": "P2pDeviceChange", + "value": "状态为: " + }, + { + "name": "testOnP2pPeerDeviceChange", + "value": "OnP2pPeerDeviceChange 测试" + }, + { + "name": "testOnP2pPeerDeviceChange_Start", + "value": "testOnP2pPeerDeviceChange 开始----------" + }, + { + "name": "testOnP2pPeerDeviceChange_End", + "value": "testOnP2pPeerDeviceChange 结束----------" + }, + { + "name": "testOnP2pPeerDeviceChange_test", + "value": "testOnP2pPeerDeviceChange 测试" + }, + { + "name": "offP2pPeerDeviceChange", + "value": "on.p2pPeerDeviceChange监听已关闭" + }, + { + "name": "offP2pPeerDeviceChangeTest", + "value": "关闭P2P对端设备状态改变事件" + }, + { + "name": "onP2pPeerDeviceChange", + "value": "on.p2pPeerDeviceChange监听已打开" + }, + { + "name": "onP2pPeerDeviceChangeTest", + "value": "打开P2P对端设备状态变化" + }, + { + "name": "P2pPeerDeviceChange", + "value": "状态为: " + }, + { + "name": "testOnP2pPersistentGroupChange", + "value": "OnP2pPersistentGroupChange 测试" + }, + { + "name": "testOnP2pPersistentGroupChange_Start", + "value": "testOnP2pPersistentGroupChange 开始----------" + }, + { + "name": "testOnP2pPersistentGroupChange_End", + "value": "testOnP2pPersistentGroupChange 结束----------" + }, + { + "name": "testOnP2pPersistentGroupChange_test", + "value": "testOnP2pPersistentGroupChange 测试" + }, + { + "name": "offP2pPersistentGroupChange", + "value": "on.p2pPersistentGroupChange监听已关闭" + }, + { + "name": "offP2pPersistentGroupChangeTest", + "value": "关闭P2P设备状态改变事件" + }, + { + "name": "onP2pPersistentGroupChange", + "value": "on.p2pPersistentGroupChange监听已打开" + }, + { + "name": "onP2pPersistentGroupChangeTest", + "value": "打开P2P永久组状态变化" + }, + { + "name": "p2pPersistentGroupChange", + "value": "状态为: " + }, + { + "name": "testOnP2pDiscoveryChange", + "value": "OnP2pDiscoveryChange 测试" + }, + { + "name": "testOnP2pDiscoveryChange_Start", + "value": "testOnP2pDiscoveryChange 开始----------" + }, + { + "name": "testOnP2pDiscoveryChange_End", + "value": "testOnP2pDiscoveryChange 结束----------" + }, + { + "name": "testOnP2pDiscoveryChange_test", + "value": "testOnP2pDiscoveryChange 测试" + }, + { + "name": "offP2pDiscoveryChange", + "value": "on.P2pDiscoveryChange监听已关闭" + }, + { + "name": "offP2pDiscoveryChangeTest", + "value": "关闭发现设备状态改变事件" + }, + { + "name": "onP2pDiscoveryChange", + "value": "on.p2pDiscoveryChange监听已打开" + }, + { + "name": "onP2pDiscoveryChangeTest", + "value": "打开发现设备状态变化" + }, + { + "name": "p2pDiscoveryChange", + "value": "状态为: " + }, + { + "name": "wlanIsConnected", + "value": "已连接" + }, + { + "name": "wlan_available", + "value": "可用WLAN" + }, + { + "name": "p2p_available", + "value": "对等设备" + }, + { + "name": "candidateWifiGroup", + "value": "可选的候选网络" + }, + { + "name": "candidateWifi", + "value": "候选WiFi" + }, + { + "name": "title", + "value": "工作目标" + }, + { + "name": "add_task", + "value": "添加候选wifi" + }, + { + "name": "target_name", + "value": "目标" + }, + { + "name": "target_info", + "value": "点击按钮添加候选网络" + }, + { + "name": "overall_progress", + "value": "整体进度" + }, + { + "name": "add_task_dialog", + "value": "添加候选WiFi" + }, + { + "name": "latest_updateTime", + "value": "更新时间: " + }, + { + "name": "sub_goals", + "value": "候选WiFi列表" + }, + { + "name": "cancel_button", + "value": "取消" + }, + { + "name": "confirm_button", + "value": "确定" + }, + { + "name": "delete_button", + "value": "删除" + }, + { + "name": "edit_button", + "value": "编辑" + }, + { + "name": "select_all_button", + "value": "全选" + }, + { + "name": "cannot_input_empty", + "value": "WiFi名称不能为空！" + }, + { + "name": "input_candidate_wifi", + "value": "输入候选WiFi的配置" + }, + { + "name": "input_candidate_wifi_ssid", + "value": "输入候选WiFi的SSID" + }, + { + "name": "input_candidate_wifi_bssid", + "value": "输入候选WiFi的bssid(MAC) (可不填)" + }, + { + "name": "input_candidate_wifi_preSharedKey", + "value": "输入候选WiFi密码" + }, + { + "name": "input_candidate_wifi_isHiddenSsid", + "value": "输入1或0 (可不填;1:ture,0:false)" + }, + { + "name": "input_candidate_wifi_securityType", + "value": "选择securityType" + }, + { + "name": "Input_url", + "value": "输入网址..." + } + ] +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/TestAbility.ets b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/TestAbility.ets index b5a5a9fec..65633fedd 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/TestAbility.ets +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/TestAbility.ets @@ -14,15 +14,12 @@ */ import hilog from '@ohos.hilog'; -import Ability from '@ohos.application.Ability' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from '@ohos/hypium' -import testsuite from '../test/List.test' -import Window from '@ohos.window' +import { Hypium } from '@ohos/hypium'; +import testsuite from '../test/List.test'; +import window from '@ohos.window'; -export default class TestAbility extends Ability { +export default class TestAbility extends UIAbility { onCreate(want, launchParam) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate'); hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:'+ JSON.stringify(launchParam) ?? ''); @@ -30,45 +27,35 @@ export default class TestAbility extends Ability { abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() var abilityDelegatorArguments: any abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!'); Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } onDestroy() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy'); } - onWindowStageCreate(windowStage: Window.WindowStage) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); + onWindowStageCreate(windowStage: window.WindowStage) { hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate'); - windowStage.loadContent('TestAbility/pages/index', (err, data) => { + windowStage.loadContent('testability/pages/Index', (err, data) => { if (err.code) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR); hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); return; } - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); }); - - globalThis.abilityContext = this.context; } onWindowStageDestroy() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy'); } onForeground() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground'); } onBackground() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground'); } } \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/pages/index.ets b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/pages/index.ets index 01d5a147d..f89ae9f7a 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/pages/index.ets +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestAbility/pages/index.ets @@ -18,7 +18,6 @@ import hilog from '@ohos.hilog'; @Component struct Index { aboutToAppear() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear'); } @State message: string = 'Hello World' diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestRunner/OpenHarmonyTestRunner.ts b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestRunner/OpenHarmonyTestRunner.ts index 6c0cd301b..3c785782e 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -13,34 +13,17 @@ * limitations under the License. */ import hilog from '@ohos.hilog'; -import TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import TestRunner from '@ohos.application.testRunner'; +import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; var abilityDelegator = undefined var abilityDelegatorArguments = undefined -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - async function onAbilityCreateCallback() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback'); } async function addAbilityMonitorCallback(err: any) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? ''); } @@ -49,12 +32,10 @@ export default class OpenHarmonyTestRunner implements TestRunner { } onPrepare() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare '); } async onRun() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() @@ -65,17 +46,14 @@ export default class OpenHarmonyTestRunner implements TestRunner { }; abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) var debug = abilityDelegatorArguments.parameters['-D'] if (debug == 'true') { cmd += ' -D' } - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd); abilityDelegator.executeShellCommand(cmd, (err: any, d: any) => { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? ''); hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? ''); hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? ''); diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/test/Ability.test.ets b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/test/Ability.test.ets index b4edc121d..34c3619ca 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/ets/test/Ability.test.ets @@ -37,15 +37,5 @@ export default function abilityTest() { // Presets a clear action, which is performed after all test cases of the test suite end. // This API supports only one parameter: clear action function. }) - it('assertContain',0, function () { - // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); - hilog.info(0x0000, 'testTag', '%{public}s', 'it begin'); - let a = 'abc' - let b = 'b' - // Defines a variety of assertion methods, which are used to declare expected boolean conditions. - expect(a).assertContain(b) - expect(a).assertEqual(a) - }) }) } \ No newline at end of file diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/module.json5 b/wifi/test/wifi_testapp/entry/src/ohosTest/module.json5 index ab0d2a410..167aec103 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/module.json5 +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/module.json5 @@ -13,40 +13,39 @@ * limitations under the License. */ { - "module": { - "name": "entry_test", - "type": "feature", - "srcEntrance": "./ets/Application/TestAbilityStage.ts", - "description": "$string:entry_test_desc", - "mainElement": "TestAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:test_pages", - "abilities": [ - { - "name": "TestAbility", - "srcEntrance": "./ets/TestAbility/TestAbility.ets", - "description": "$string:TestAbility_desc", - "icon": "$media:icon", - "label": "$string:TestAbility_label", - "visible": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:white", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } + "module": { + "name": "entry_test", + "type": "feature", + "description": "$string:module_test_desc", + "mainElement": "TestAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:test_pages", + "abilities": [ + { + "name": "TestAbility", + "srcEntrance": "./ets/testability/TestAbility.ets", + "description": "$string:TestAbility_desc", + "icon": "$media:icon", + "label": "$string:TestAbility_label", + "visible": true, + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:start_window_background", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } ] - } - ] - } + } } diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/color.json b/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/color.json index 1bbc9aa96..3c712962d 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/color.json +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/color.json @@ -1,7 +1,7 @@ { "color": [ { - "name": "white", + "name": "start_window_background", "value": "#FFFFFF" } ] diff --git a/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/string.json b/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/string.json index 36d4230c5..65d8fa5a7 100644 --- a/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/string.json +++ b/wifi/test/wifi_testapp/entry/src/ohosTest/resources/base/element/string.json @@ -1,7 +1,7 @@ { "string": [ { - "name": "entry_test_desc", + "name": "module_test_desc", "value": "test ability description" }, { diff --git a/wifi/test/wifi_testapp/entry/hvigorfile.js b/wifi/test/wifi_testapp/hvigorfile.ts similarity index 63% rename from wifi/test/wifi_testapp/entry/hvigorfile.js rename to wifi/test/wifi_testapp/hvigorfile.ts index d7720ee6a..647818690 100644 --- a/wifi/test/wifi_testapp/entry/hvigorfile.js +++ b/wifi/test/wifi_testapp/hvigorfile.ts @@ -1,2 +1,2 @@ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks +export { appTasks } from '@ohos/hvigor-ohos-plugin'; \ No newline at end of file diff --git a/wifi/test/wifi_testapp/oh-package-lock.json5 b/wifi/test/wifi_testapp/oh-package-lock.json5 new file mode 100644 index 000000000..2ed80d8fd --- /dev/null +++ b/wifi/test/wifi_testapp/oh-package-lock.json5 @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +{ + "lockfileVersion": 1, + "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", + "specifiers": { + "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" + }, + "packages": { + "@ohos/hypium@1.0.6": { + "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", + "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" + } + } +} \ No newline at end of file diff --git a/wifi/test/wifi_testapp/oh-package.json5 b/wifi/test/wifi_testapp/oh-package.json5 new file mode 100644 index 000000000..5552c4ed3 --- /dev/null +++ b/wifi/test/wifi_testapp/oh-package.json5 @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +{ + "license": "ISC", + "devDependencies": { + "@ohos/hypium": "1.0.6" + }, + "name": "location", + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/wifi/test/wifi_testapp/package-lock.json b/wifi/test/wifi_testapp/package-lock.json deleted file mode 100644 index 519eb3905..000000000 --- a/wifi/test/wifi_testapp/package-lock.json +++ /dev/null @@ -1,1226 +0,0 @@ -{ - "name": "myapplication", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/hos-sdkmanager-common": { - "version": "1.0.4", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hos-sdkmanager-common/-/@ohos/hos-sdkmanager-common-1.0.4.tgz", - "integrity": "sha512-LWrfF8Js+u54BcEAdyjzsA81iGBA4LPvQdQ1ig/pX6mvTieUPSvtjtAzdI8nnGVmJRLrHwAMHEO/syd9d8UAFw==", - "requires": { - "@ohos/sdkmanager-common": "^1.1.8" - } - }, - "@ohos/hvigor": { - "version": "1.2.2", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.2.2.tgz", - "integrity": "sha512-GfXCf7pDnyEcxWkG7Edd23XPxgym1vY37zdNt/Gj0pZmw0f+FrP+blfCzVWfYQYlI76krzd96+kvD4lgWkIPBQ==", - "requires": { - "@ohos/hvigor-base": "1.2.2", - "fs-extra": "10.0.1", - "interpret": "1.4.0", - "liftoff": "4.0.0", - "mute-stdout": "1.0.0", - "pretty-hrtime": "1.0.0", - "v8flags": "3.2.0", - "yargs": "7.1.2" - } - }, - "@ohos/hvigor-base": { - "version": "1.2.2", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.2.2.tgz", - "integrity": "sha512-omwL/qjTE7DTCQdHZnMKuAxKlH1JOgOxaVAae1ca8j/oPuNgY6Spn+mpYRDHIktvav6axMmHT9zV1hJykY4GEg==", - "requires": { - "fs-extra": "10.0.1", - "json5": "2.2.0", - "log4js": "6.4.1", - "once": "1.4.0", - "pretty-hrtime": "1.0.0" - } - }, - "@ohos/hvigor-ohos-plugin": { - "version": "1.2.2", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.2.2.tgz", - "integrity": "sha512-gir91UxlhMbf2E/NjTYWJGrsNGBKD/1YYbaEdmswD/qW18UDY7jyuqSVyV/gj0h9+iji+gd53rXWzpLLztG5lg==", - "requires": { - "@ohos/hos-sdkmanager-common": "1.0.4", - "@ohos/hvigor-base": "1.2.2", - "@ohos/sdkmanager-common": "1.1.8", - "adm-zip": "0.5.9", - "ajv": "8.10.0", - "execa": "5.1.1", - "fast-xml-parser": "4.0.3", - "fs-extra": "10.0.1", - "glob": "7.2.0", - "iconv-lite": "0.6.3", - "json5": "2.2.0", - "lodash": "4.17.21", - "pretty-hrtime": "1.0.3", - "resolve-package-path": "4.0.3" - }, - "dependencies": { - "pretty-hrtime": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" - } - } - }, - "@ohos/hypium": { - "version": "1.0.2", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hypium/-/@ohos/hypium-1.0.2.tgz", - "integrity": "sha512-HWW62q6hbd0PhvPTH96lo4j//owFwyCLj6Q2jmVLDW6mOt1dwJJwUQ7qUH+Cni/6MmcnyXKvt9I0moGAPK1aCw==" - }, - "@ohos/sdkmanager-common": { - "version": "1.1.8", - "resolved": "https://repo.harmonyos.com/npm/@ohos/sdkmanager-common/-/@ohos/sdkmanager-common-1.1.8.tgz", - "integrity": "sha512-mxq69+6Zg/ybeQGnOtkBzOTbNBkEdiYehRKWsAD/je53v1W+ahauLqe90pNZEiBuVYugzb6z2EaJtAXYZtE8gQ==" - }, - "adm-zip": { - "version": "0.5.9", - "resolved": "https://repo.huaweicloud.com/repository/npm/adm-zip/-/adm-zip-0.5.9.tgz", - "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==" - }, - "ajv": { - "version": "8.10.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/ajv/-/ajv-8.10.0.tgz", - "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==" - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://repo.huaweicloud.com/repository/npm/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "dependencies": { - "which": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "date-format": { - "version": "4.0.14", - "resolved": "https://repo.huaweicloud.com/repository/npm/date-format/-/date-format-4.0.14.tgz", - "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" - }, - "define-properties": { - "version": "1.1.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==" - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "execa": { - "version": "5.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-xml-parser": { - "version": "4.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/fast-xml-parser/-/fast-xml-parser-4.0.3.tgz", - "integrity": "sha512-xhQbg3a/EYNHwK0cxIG1nZmVkHX/0tWihamn5pU4Mhd9KEVE2ga8ZJiqEUgB2sApElvAATOdMTLjgqIpvYDUkQ==", - "requires": { - "strnum": "^1.0.5" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "findup-sync": { - "version": "5.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.3", - "micromatch": "^4.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fined/-/fined-2.0.0.tgz", - "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0", - "object.pick": "^1.3.0", - "parse-filepath": "^1.0.2" - } - }, - "flagged-respawn": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/flagged-respawn/-/flagged-respawn-2.0.0.tgz", - "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==" - }, - "flatted": { - "version": "3.2.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "requires": { - "for-in": "^1.0.1" - } - }, - "fs-extra": { - "version": "10.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.0.1.tgz", - "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" - }, - "glob": { - "version": "7.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" - }, - "has": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hosted-git-info": { - "version": "2.8.9", - "resolved": "https://repo.huaweicloud.com/repository/npm/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://repo.huaweicloud.com/repository/npm/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.8", - "resolved": "https://repo.huaweicloud.com/repository/npm/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, - "interpret": { - "version": "1.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==" - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "json5": { - "version": "2.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "requires": { - "minimist": "^1.2.5" - } - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", - "requires": { - "invert-kv": "^1.0.0" - } - }, - "liftoff": { - "version": "4.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/liftoff/-/liftoff-4.0.0.tgz", - "integrity": "sha512-rMGwYF8q7g2XhG2ulBmmJgWv25qBsqRbDn5gH0+wnuyeFt7QBJlHJmtg5qEdn4pN6WVAUMgXnIxytMFRX9c1aA==", - "requires": { - "extend": "^3.0.2", - "findup-sync": "^5.0.0", - "fined": "^2.0.0", - "flagged-respawn": "^2.0.0", - "is-plain-object": "^5.0.0", - "object.map": "^1.0.1", - "rechoir": "^0.8.0", - "resolve": "^1.20.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "log4js": { - "version": "6.4.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/log4js/-/log4js-6.4.1.tgz", - "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", - "requires": { - "date-format": "^4.0.3", - "debug": "^4.3.3", - "flatted": "^3.2.4", - "rfdc": "^1.3.0", - "streamroller": "^3.0.2" - } - }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "requires": { - "kind-of": "^6.0.2" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "mute-stdout": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/mute-stdout/-/mute-stdout-1.0.0.tgz", - "integrity": "sha512-MaSQenn0f9oxIjtCufclpV00MuYTiHaXPbdcfPIM+quMqoa8cXywjHHx4LhhIAZlXqPWMdcUpYviajfmHtHRJw==" - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "requires": { - "path-key": "^3.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - }, - "object.assign": { - "version": "4.1.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - } - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.map": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", - "requires": { - "lcid": "^1.0.0" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", - "requires": { - "error-ex": "^1.2.0" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==" - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==" - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" - }, - "pify": { - "version": "2.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "requires": { - "pinkie": "^2.0.0" - } - }, - "pretty-hrtime": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz", - "integrity": "sha512-CU2l5CYUAptUYq/671ajexQfXuxJFwwg0n243Kdkx8bTjeenedsWgu8TGHPm03vLfNtk3aTXgySKPp3Usykudw==" - }, - "punycode": { - "version": "2.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "rechoir": { - "version": "0.8.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "requires": { - "resolve": "^1.20.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-package-path": { - "version": "4.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-package-path/-/resolve-package-path-4.0.3.tgz", - "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==", - "requires": { - "path-root": "^0.1.1" - } - }, - "rfdc": { - "version": "1.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "semver": { - "version": "5.7.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.12", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", - "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==" - }, - "streamroller": { - "version": "3.1.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/streamroller/-/streamroller-3.1.4.tgz", - "integrity": "sha512-Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw==", - "requires": { - "date-format": "^4.0.14", - "debug": "^4.3.4", - "fs-extra": "^8.1.0" - }, - "dependencies": { - "fs-extra": { - "version": "8.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" - } - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" - }, - "strnum": { - "version": "1.0.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==" - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "requires": { - "punycode": "^2.1.0" - } - }, - "v8flags": { - "version": "3.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "y18n": { - "version": "3.2.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/y18n/-/y18n-3.2.2.tgz", - "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" - }, - "yargs": { - "version": "7.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/yargs/-/yargs-7.1.2.tgz", - "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==", - "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.1" - } - }, - "yargs-parser": { - "version": "5.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/yargs-parser/-/yargs-parser-5.0.1.tgz", - "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", - "requires": { - "camelcase": "^3.0.0", - "object.assign": "^4.1.0" - } - } - } -} diff --git a/wifi/test/wifi_testapp/package.json b/wifi/test/wifi_testapp/package.json deleted file mode 100644 index 7929e7305..000000000 --- a/wifi/test/wifi_testapp/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "license": "ISC", - "devDependencies": {}, - "name": "myapplication", - "ohos": { - "org": "huawei", - "directoryLevel": "project", - "buildTool": "hvigor" - }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/hypium": "1.0.2", - "@ohos/hvigor-ohos-plugin": "1.2.2", - "@ohos/hvigor": "1.2.2" - } -}