wifi issues

Signed-off-by: Nq00313334 <quanli1@huawei.com>

communication/BUILD.gn

-# 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

communication/bluetooth_ble/src/main/js/default/pages/index/index.css

+/*
+ * 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;

communication/bluetooth_ble/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/bluetooth_ble/src/main/js/default/pages/index/index.js

 /*
- * 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'
 

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();
     })
 
 

communication/bluetooth_on/src/main/js/default/pages/index/index.css

+/*
+ * 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;

communication/bluetooth_on/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/bluetooth_on/src/main/js/default/pages/index/index.js

 /*
- * 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 {

communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js

 /*
- * 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

communication/bluetooth_standard/src/main/js/default/pages/index/index.css

+/*
+ * 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;

communication/bluetooth_standard/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/bluetooth_standard/src/main/js/default/pages/index/index.js

 /*
- * 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'
 

communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js

 /*
- * 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

communication/wifi_hotspot/BUILD.gn

-# 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

communication/wifi_hotspot/src/main/js/default/app.js

 /*
- * 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

communication/wifi_hotspot/src/main/js/default/pages/index/index.css

+/*
+ * 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;

communication/wifi_hotspot/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/wifi_hotspot/src/main/js/default/pages/index/index.js

 /*
- * 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')

communication/wifi_hotspot/src/main/js/default/test/List.test.js

 /*
- * 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

communication/wifi_hotspot/src/main/js/default/test/WifiSoftAP.test.js

 /*
- * 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

communication/wifi_p2p/BUILD.gn

-# 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

communication/wifi_p2p/src/main/js/default/app.js

 /*
- * 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

communication/wifi_p2p/src/main/js/default/pages/index/index.css

+/*
+ * 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;

communication/wifi_p2p/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/wifi_p2p/src/main/js/default/pages/index/index.js

 /*
- * 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')

communication/wifi_p2p/src/main/js/default/test/List.test.js

 /*
- * 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

communication/wifi_p2p/src/main/js/default/test/WifiP2P.test.js

 /*
- * 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

communication/wifi_standard/BUILD.gn

-# 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

communication/wifi_standard/src/main/js/default/app.js

 /*
- * 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

communication/wifi_standard/src/main/js/default/pages/index/index.css

+/*
+ * 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;

communication/wifi_standard/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/wifi_standard/src/main/js/default/pages/index/index.js

 /*
- * 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')

communication/wifi_standard/src/main/js/default/test/List.test.js

 /*
- * 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

communication/wifi_standard/src/main/js/default/test/WifiSta.test.js

 /*
- * 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