diff --git a/communication/BUILD.gn b/communication/BUILD.gn index 37ad5254de8aada9dbf60e110f3eefb2b71a594e..4407c122e972bd69146c0ab56eb36d5d08c9e84a 100644 --- a/communication/BUILD.gn +++ b/communication/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/communication/bluetooth_ble/src/main/js/default/pages/index/index.css b/communication/bluetooth_ble/src/main/js/default/pages/index/index.css index 6fda792753f2e15f22b529c7b90a82185b2770bf..72baaffcaa675bfe9f3d3d1974690ae7d05c1a4b 100644 --- a/communication/bluetooth_ble/src/main/js/default/pages/index/index.css +++ b/communication/bluetooth_ble/src/main/js/default/pages/index/index.css @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + .container { flex-direction: column; justify-content: center; diff --git a/communication/bluetooth_ble/src/main/js/default/pages/index/index.hml b/communication/bluetooth_ble/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..546cd8296b727c1639d551d2301a0bca055c1457 100644 --- a/communication/bluetooth_ble/src/main/js/default/pages/index/index.hml +++ b/communication/bluetooth_ble/src/main/js/default/pages/index/index.hml @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +
{{ $t('strings.hello') }} {{ title }} diff --git a/communication/bluetooth_ble/src/main/js/default/pages/index/index.js b/communication/bluetooth_ble/src/main/js/default/pages/index/index.js index 0b183159696d3347a6a31ff04a879a9e6b7e994b..6bdd4bdf51eb53aa247c142dca9b6cfaee61163d 100644 --- a/communication/bluetooth_ble/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_ble/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,7 +13,6 @@ * limitations under the License. */ -import app from '@system.app' import {Core, ExpectExtend} from 'deccjsunit/index' diff --git a/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js b/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js index 6a0e5757ec2f90d11afbcdcfb7f5bbb85d7f919c..94e8f4767b6aec3e3b7662ec20a72f8722378103 100644 --- a/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js +++ b/communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js @@ -157,7 +157,7 @@ describe('bluetoothhostTest', function() { * @tc.level Level 2 */ it('bluetooth_ble_start_advertising', 0, async function (done) { - console.info('BLE advertising start'); + console.info('[bluetooth_js] BLE advertising start'); var manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -269,16 +269,22 @@ describe('bluetoothhostTest', function() { */ it('bluetooth_ble_read_rssi', 0, async function (done) { console.info('[bluetooth_js] BLE get rssi1 start'); - var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00"); - gattClient.getRssiValue((err, data)=> { - console.info('[bluetooth_js] rssi err:' + JSON.stringify(err)); - console.info('[bluetooth_js] rssi value:' + JSON.stringify(data)); - expect(data).assertNull(); - console.info('[bluetooth_js] BLE read rssi1 end'); - done(); - }); + let promise = new Promise((resolve) => { + var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00"); + gattClient.getRssiValue((err, data)=> { + console.info('[bluetooth_js] rssi err:' + JSON.stringify(err)); + console.info('[bluetooth_js] rssi value:' + JSON.stringify(data)); + expect(data).assertNull(); + console.info('[bluetooth_js] BLE read rssi1 end'); + done(); + }); + resolve() + }) + await promise.then(done) + done(); }) + /** * @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_RSSI_VALUE_PROMISE_0001 * @tc.name testGetRssiValue @@ -290,24 +296,29 @@ describe('bluetoothhostTest', function() { */ it('bluetooth_ble_read_rssi_promise', 0, async function (done) { console.info('[bluetooth_js] BLE get rssi start'); - var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00"); - await gattClient.getRssiValue().then((data) => { - if (data != null) { - console.info('[bluetooth_js] rssi' + JSON.stringify(data)); - done(); + let promise = new Promise((resolve) => { + var gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00"); + gattClient.getRssiValue().then((data) => { + if (data != null) { + console.info('[bluetooth_js] rssi' + JSON.stringify(data)); + done(); + expect(true).assertEqual(true); + } else { + console.info('[bluetooth_js] BLE read rssi ' + JSON.stringify(data)); + var rssiLength = Object.keys(data).length; + console.info("[bluetooth_js] ble rssi_length -> " + rssiLength); + expect(rssiLength).assertEqual(0); + done(); + } + }).catch(err => { + console.error(`bluetooth getRssiValue has error: ${err}`); expect(true).assertEqual(true); - } else { - console.info('[bluetooth_js] BLE read rssi ' + JSON.stringify(data)); - var rssiLength = Object.keys(data).length; - console.info("[bluetooth_js] ble rssi_length -> " + rssiLength); - expect(rssiLength).assertEqual(0); done(); - } - }).catch(err => { - console.error(`bluetooth getRssiValue has error: ${err}`); - expect(true).assertEqual(true); - done(); - }); + }); + resolve() + }) + await promise.then(done) + done(); }) diff --git a/communication/bluetooth_on/src/main/js/default/pages/index/index.css b/communication/bluetooth_on/src/main/js/default/pages/index/index.css index 6fda792753f2e15f22b529c7b90a82185b2770bf..72baaffcaa675bfe9f3d3d1974690ae7d05c1a4b 100644 --- a/communication/bluetooth_on/src/main/js/default/pages/index/index.css +++ b/communication/bluetooth_on/src/main/js/default/pages/index/index.css @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + .container { flex-direction: column; justify-content: center; diff --git a/communication/bluetooth_on/src/main/js/default/pages/index/index.hml b/communication/bluetooth_on/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..546cd8296b727c1639d551d2301a0bca055c1457 100644 --- a/communication/bluetooth_on/src/main/js/default/pages/index/index.hml +++ b/communication/bluetooth_on/src/main/js/default/pages/index/index.hml @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +
{{ $t('strings.hello') }} {{ title }} diff --git a/communication/bluetooth_on/src/main/js/default/pages/index/index.js b/communication/bluetooth_on/src/main/js/default/pages/index/index.js index 0b183159696d3347a6a31ff04a879a9e6b7e994b..dfdb3cc85f1e3dd0517855630c4ca270a9ae02ae 100644 --- a/communication/bluetooth_on/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_on/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,8 +13,6 @@ * limitations under the License. */ -import app from '@system.app' - import {Core, ExpectExtend} from 'deccjsunit/index' export default { diff --git a/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js b/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js index 59065bb4b1667f733feb87536098f1112331a16a..519953d4842d5d908108347f807b8123f99c4279 100644 --- a/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js +++ b/communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.css b/communication/bluetooth_standard/src/main/js/default/pages/index/index.css index 6fda792753f2e15f22b529c7b90a82185b2770bf..72baaffcaa675bfe9f3d3d1974690ae7d05c1a4b 100644 --- a/communication/bluetooth_standard/src/main/js/default/pages/index/index.css +++ b/communication/bluetooth_standard/src/main/js/default/pages/index/index.css @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + .container { flex-direction: column; justify-content: center; diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.hml b/communication/bluetooth_standard/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..546cd8296b727c1639d551d2301a0bca055c1457 100644 --- a/communication/bluetooth_standard/src/main/js/default/pages/index/index.hml +++ b/communication/bluetooth_standard/src/main/js/default/pages/index/index.hml @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +
{{ $t('strings.hello') }} {{ title }} diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.js b/communication/bluetooth_standard/src/main/js/default/pages/index/index.js index 0b183159696d3347a6a31ff04a879a9e6b7e994b..6bdd4bdf51eb53aa247c142dca9b6cfaee61163d 100644 --- a/communication/bluetooth_standard/src/main/js/default/pages/index/index.js +++ b/communication/bluetooth_standard/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,7 +13,6 @@ * limitations under the License. */ -import app from '@system.app' import {Core, ExpectExtend} from 'deccjsunit/index' diff --git a/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js b/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js index a28b82b18a4e368c3fce1a101e5636778576acdd..4be76344f413b13380273e1ffa55c700c2143b03 100644 --- a/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js +++ b/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_hotspot/BUILD.gn b/communication/wifi_hotspot/BUILD.gn index de100eb0ce93d3a8e6aa4a63e2ef26c0c37431db..1780dd41559468fcad561a86118db6142142ddd1 100755 --- a/communication/wifi_hotspot/BUILD.gn +++ b/communication/wifi_hotspot/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/communication/wifi_hotspot/src/main/js/default/app.js b/communication/wifi_hotspot/src/main/js/default/app.js index 363f2555b1badec9fec342a93141db084083fcb8..8fe0b77dcef1db4bb1706399fd481541de8166cd 100644 --- a/communication/wifi_hotspot/src/main/js/default/app.js +++ b/communication/wifi_hotspot/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_hotspot/src/main/js/default/pages/index/index.css b/communication/wifi_hotspot/src/main/js/default/pages/index/index.css index 6fda792753f2e15f22b529c7b90a82185b2770bf..3a8326a076cdb9ecabf543df9dba84240f5b52a4 100644 --- a/communication/wifi_hotspot/src/main/js/default/pages/index/index.css +++ b/communication/wifi_hotspot/src/main/js/default/pages/index/index.css @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + .container { flex-direction: column; justify-content: center; diff --git a/communication/wifi_hotspot/src/main/js/default/pages/index/index.hml b/communication/wifi_hotspot/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0053057b5ff7362e00db48887ee1663cffa35988 100644 --- a/communication/wifi_hotspot/src/main/js/default/pages/index/index.hml +++ b/communication/wifi_hotspot/src/main/js/default/pages/index/index.hml @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +
{{ $t('strings.hello') }} {{ title }} diff --git a/communication/wifi_hotspot/src/main/js/default/pages/index/index.js b/communication/wifi_hotspot/src/main/js/default/pages/index/index.js index 2a73c3753b482e8f5c680a7ba20f3a355525f446..696aad4cf934ca8ca2e2b636169bb736427a4ea0 100755 --- a/communication/wifi_hotspot/src/main/js/default/pages/index/index.js +++ b/communication/wifi_hotspot/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,13 +13,14 @@ * limitations under the License. */ -import app from '@system.app' + import {Core, ExpectExtend} from 'deccjsunit/index' export default { data: { - title: "" + title: '', + myTimeout: 15000 }, onInit() { this.title = this.$t('strings.world'); @@ -37,7 +38,7 @@ export default { core.init() const configService = core.getDefaultService('config') - this.timeout = 15000 + this.timeout = this.myTimeout configService.setConfig(this) require('../../test/List.test') diff --git a/communication/wifi_hotspot/src/main/js/default/test/List.test.js b/communication/wifi_hotspot/src/main/js/default/test/List.test.js index f6ed2e334f9d78602492a9dbb9f2a21cd32479ca..c82020cebf53f6db3e4f23a35e7577c0576ed456 100755 --- a/communication/wifi_hotspot/src/main/js/default/test/List.test.js +++ b/communication/wifi_hotspot/src/main/js/default/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_hotspot/src/main/js/default/test/WifiSoftAP.test.js b/communication/wifi_hotspot/src/main/js/default/test/WifiSoftAP.test.js index eaf7c2b4ffb4443b1c378dee825f917b8d0fdfa8..c937f7b5ff97fa692d6546e08cc870e22c15a70b 100755 --- a/communication/wifi_hotspot/src/main/js/default/test/WifiSoftAP.test.js +++ b/communication/wifi_hotspot/src/main/js/default/test/WifiSoftAP.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_p2p/BUILD.gn b/communication/wifi_p2p/BUILD.gn index 5da69958636cb21b1137a852f845396828e9afce..76ec0a7400196640447387c30d9568807fbd0ddb 100755 --- a/communication/wifi_p2p/BUILD.gn +++ b/communication/wifi_p2p/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/communication/wifi_p2p/src/main/js/default/app.js b/communication/wifi_p2p/src/main/js/default/app.js index 363f2555b1badec9fec342a93141db084083fcb8..8fe0b77dcef1db4bb1706399fd481541de8166cd 100644 --- a/communication/wifi_p2p/src/main/js/default/app.js +++ b/communication/wifi_p2p/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_p2p/src/main/js/default/pages/index/index.css b/communication/wifi_p2p/src/main/js/default/pages/index/index.css index 6fda792753f2e15f22b529c7b90a82185b2770bf..3a8326a076cdb9ecabf543df9dba84240f5b52a4 100644 --- a/communication/wifi_p2p/src/main/js/default/pages/index/index.css +++ b/communication/wifi_p2p/src/main/js/default/pages/index/index.css @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + .container { flex-direction: column; justify-content: center; diff --git a/communication/wifi_p2p/src/main/js/default/pages/index/index.hml b/communication/wifi_p2p/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0053057b5ff7362e00db48887ee1663cffa35988 100644 --- a/communication/wifi_p2p/src/main/js/default/pages/index/index.hml +++ b/communication/wifi_p2p/src/main/js/default/pages/index/index.hml @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +
{{ $t('strings.hello') }} {{ title }} diff --git a/communication/wifi_p2p/src/main/js/default/pages/index/index.js b/communication/wifi_p2p/src/main/js/default/pages/index/index.js index 2a73c3753b482e8f5c680a7ba20f3a355525f446..a756c422e6c842edbb3d5a877a8ad90cd3fd29b1 100755 --- a/communication/wifi_p2p/src/main/js/default/pages/index/index.js +++ b/communication/wifi_p2p/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,13 +13,14 @@ * limitations under the License. */ -import app from '@system.app' + import {Core, ExpectExtend} from 'deccjsunit/index' export default { data: { - title: "" + title: '', + myTimeout: 15000 }, onInit() { this.title = this.$t('strings.world'); @@ -37,7 +38,8 @@ export default { core.init() const configService = core.getDefaultService('config') - this.timeout = 15000 + + this.timeout = this.myTimeout configService.setConfig(this) require('../../test/List.test') diff --git a/communication/wifi_p2p/src/main/js/default/test/List.test.js b/communication/wifi_p2p/src/main/js/default/test/List.test.js index f93cd18a2ad450d7ef8820367f15e768aa6bf30c..4be23311c4230cf78a7b7149d5fd597780d4c23a 100755 --- a/communication/wifi_p2p/src/main/js/default/test/List.test.js +++ b/communication/wifi_p2p/src/main/js/default/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js b/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js index ccee2858975aca9807128d6c196781d580e0ef41..b0e5c7e95acff38dcf6669bea74bffc180d16b18 100644 --- a/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js +++ b/communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_standard/BUILD.gn b/communication/wifi_standard/BUILD.gn index 71407c7da1f073ae9778a98e8aa61ecb3b2dce41..6cde1a2f39cd108c70ab908e0a374eb3af1b781b 100755 --- a/communication/wifi_standard/BUILD.gn +++ b/communication/wifi_standard/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/communication/wifi_standard/src/main/js/default/app.js b/communication/wifi_standard/src/main/js/default/app.js index 363f2555b1badec9fec342a93141db084083fcb8..8fe0b77dcef1db4bb1706399fd481541de8166cd 100644 --- a/communication/wifi_standard/src/main/js/default/app.js +++ b/communication/wifi_standard/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_standard/src/main/js/default/pages/index/index.css b/communication/wifi_standard/src/main/js/default/pages/index/index.css index 6fda792753f2e15f22b529c7b90a82185b2770bf..72baaffcaa675bfe9f3d3d1974690ae7d05c1a4b 100644 --- a/communication/wifi_standard/src/main/js/default/pages/index/index.css +++ b/communication/wifi_standard/src/main/js/default/pages/index/index.css @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + .container { flex-direction: column; justify-content: center; diff --git a/communication/wifi_standard/src/main/js/default/pages/index/index.hml b/communication/wifi_standard/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0053057b5ff7362e00db48887ee1663cffa35988 100644 --- a/communication/wifi_standard/src/main/js/default/pages/index/index.hml +++ b/communication/wifi_standard/src/main/js/default/pages/index/index.hml @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +
{{ $t('strings.hello') }} {{ title }} diff --git a/communication/wifi_standard/src/main/js/default/pages/index/index.js b/communication/wifi_standard/src/main/js/default/pages/index/index.js index 2a73c3753b482e8f5c680a7ba20f3a355525f446..6e05db1fe0023ba6cd04a32307429c903b5b4d11 100755 --- a/communication/wifi_standard/src/main/js/default/pages/index/index.js +++ b/communication/wifi_standard/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,13 +13,12 @@ * limitations under the License. */ -import app from '@system.app' - import {Core, ExpectExtend} from 'deccjsunit/index' export default { data: { - title: "" + title: '', + myTimeout: 15000 }, onInit() { this.title = this.$t('strings.world'); @@ -37,7 +36,7 @@ export default { core.init() const configService = core.getDefaultService('config') - this.timeout = 15000 + this.timeout = this.myTimeout configService.setConfig(this) require('../../test/List.test') diff --git a/communication/wifi_standard/src/main/js/default/test/List.test.js b/communication/wifi_standard/src/main/js/default/test/List.test.js index 0a3bd0eddbde1fb110c5e654b577e025faf6d220..00a5ef997024685e21e4399f5a6014eeb237be02 100755 --- a/communication/wifi_standard/src/main/js/default/test/List.test.js +++ b/communication/wifi_standard/src/main/js/default/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js b/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js index 66c9696316c9c3105abd378026f3ad95c61dd91c..0e2262ec2309c989c48d0fd2c5dc4993086bef77 100755 --- a/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js +++ b/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at