From 3f4a09477b5e13efc061f0a5c6753305d7debf02 Mon Sep 17 00:00:00 2001 From: wangzd1026 Date: Mon, 19 Jul 2021 19:02:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4wifi=E7=9A=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/default/model/wifiImpl/WifiModel.js | 101 +++++++++++------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/entry/src/main/js/default/model/wifiImpl/WifiModel.js b/entry/src/main/js/default/model/wifiImpl/WifiModel.js index 1d98d4bb..8ed4b6e2 100755 --- a/entry/src/main/js/default/model/wifiImpl/WifiModel.js +++ b/entry/src/main/js/default/model/wifiImpl/WifiModel.js @@ -19,6 +19,7 @@ import Subscriber from '@ohos.commonevent'; let logUtil = new LogUtil(); let mWifiList = []; +let remdupWifiList = []; var wifiCode = null; let mCommonEventSubscriber = null; let mCommonEventSubscribeInfo = { @@ -45,10 +46,12 @@ export default class WifiModel extends BaseModel { logUtil.info('get to wifi information start---->'); logUtil.info('[wifi_js_test] Wifi get scan infos callback'); mWifiList = []; + remdupWifiList = []; wifi_native_js.getScanInfos(result => { + logUtil.info("[wifi_js_test] wifi received scan info call back results: " + JSON.stringify(result)); let clen = Object.keys(result).length; let image; - logUtil.info("[wifi_js_test] wifi received scan info call back: " + clen); + logUtil.info("[wifi_js_test] wifi received scan info call back length: " + clen); for (let j = 0; j < clen; j++) { logUtil.info("result[0].ssid :" + result[j].ssid); logUtil.info("securityType: " + result[j].securityType); @@ -58,79 +61,95 @@ export default class WifiModel extends BaseModel { logUtil.info("frequency: " + result[j].frequency); logUtil.info("timestamp: " + result[j].timestamp); logUtil.info(("wifi_native_js.getSignalLevel: " + wifi_native_js.getSignalLevel(result[j].rssi, result[j].band))); + if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_signal_4_dark.png'; logUtil.info("securityType 1 and signal level 4:"); - } - ; + }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_signal_3_dark.png'; logUtil.info("securityType 1 and signal level 3 :"); - } - ; + }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_signal_2_dark.png'; logUtil.info("securityType 1 and signal level 2 :"); - } - ; + }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_signal_1_dark.png'; logUtil.info("securityType 1 and signal level 1 :"); - } - ; + }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_signal_1_dark.png'; logUtil.info("securityType 1 and signal level 1 :"); - } - ; + }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_lock_signal_4_dark.png'; logUtil.info("securityType lock and level 4 :"); - } - ; + }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_lock_signal_3_dark.png'; logUtil.info("securityType lock and level 3 :"); - } - ; + }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_lock_signal_2_dark.png'; logUtil.info("securityType lock and level 2 :"); - } - ; + }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; logUtil.info("securityType lock and level 1 :"); - } - ; + }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; logUtil.info("securityType lock and level 1 :"); + }; + + if(result[j].ssid == ''||result[j] == null){ + logUtil.info("result ssid empty :"); + }else{ + mWifiList.push({ + settingIcon: '', + settingSummary: '', + settingTitle: result[j].ssid, + settingValue: '', + settingArrow: image, + settingDefaultValue: '', + dividerIsShow: true, + settingType: 1, + bssid: result[j].bssid, + securityType: result[j].securityType, + signalLevel: wifi_native_js.getSignalLevel(result[j].rssi, result[j].band), + }); } - ; - mWifiList.push({ - settingIcon: '', - settingSummary: '', - settingTitle: result[j].ssid, - settingValue: '', - settingArrow: image, - settingDefaultValue: '', - dividerIsShow: true, - settingType: 1, - bssid: result[j].bssid, - securityType: result[j].securityType, - }); - logUtil.info("result[j] come in :"); - } - ; - for (let j = 0; j < mWifiList.length; j++) { - logUtil.info("result[0].settingTitle :" + result[j].ssid); - } - ; - logUtil.info("[wifiList.length: " + mWifiList.length); + }; + logUtil.info("original mWifiList :" + JSON.stringify(mWifiList)); + for (let i = 0; i < mWifiList.length; i++) { + let position = this.getItemPosition(remdupWifiList, mWifiList[i].settingTitle); + if (position != -1) { + // the same SSID，Take the strong signal + if (remdupWifiList[position].signalLevel < mWifiList[i].signalLevel) { + remdupWifiList.splice(position, 1); + remdupWifiList.splice(position, 0, mWifiList[i]); + } + } else { + remdupWifiList.push(mWifiList[i]) + } + }; + logUtil.info("remove duplicate ssid remdupWifiList: " + JSON.stringify(remdupWifiList)); }); logUtil.info('get to wifi information end---->'); - return mWifiList; + return remdupWifiList; + }; + + /** + * Get the next value corresponding to SSID + */ + getItemPosition(list, ssid) { + for (let i = 0; i < list.length; i++) { + if (ssid == list[i].settingTitle) { + return i; + } + } + return -1; }; connectToDevice(obj) { logUtil.info("[wifi_js_test] connect to wifi "); -- Gitee From 5c7e9cd191ef163d66fc88ce75785a7ba43eb3d7 Mon Sep 17 00:00:00 2001 From: wangzd1026 Date: Tue, 20 Jul 2021 10:04:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?wifi=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/default/model/wifiImpl/WifiModel.js | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/entry/src/main/js/default/model/wifiImpl/WifiModel.js b/entry/src/main/js/default/model/wifiImpl/WifiModel.js index 8ed4b6e2..c087d932 100755 --- a/entry/src/main/js/default/model/wifiImpl/WifiModel.js +++ b/entry/src/main/js/default/model/wifiImpl/WifiModel.js @@ -27,24 +27,25 @@ let mCommonEventSubscribeInfo = { }; export default class WifiModel extends BaseModel { getWifiStatus() { - logUtil.info("wifi_native_js isWifiActive"); + logUtil.info('wifi_native_js isWifiActive'); return wifi_native_js.isWifiActive(); }; + getEnableWifi() { - logUtil.info("wifi_native_js enableWifi"); + logUtil.info('wifi_native_js enableWifi'); return wifi_native_js.enableWifi(); }; disableWifi() { - logUtil.info("wifi_native_js enableWifi"); + logUtil.info('wifi_native_js enableWifi'); return wifi_native_js.disableWifi(); }; getScanWifi() { - logUtil.info("wifi_native_js scan"); + logUtil.info('wifi_native_js scan'); return wifi_native_js.scan(); }; getScanInfoCallBack() { logUtil.info('get to wifi information start---->'); - logUtil.info('[wifi_js_test] Wifi get scan infos callback'); + logUtil.info('Wifi get scan information callback'); mWifiList = []; remdupWifiList = []; wifi_native_js.getScanInfos(result => { @@ -53,7 +54,7 @@ export default class WifiModel extends BaseModel { let image; logUtil.info("[wifi_js_test] wifi received scan info call back length: " + clen); for (let j = 0; j < clen; j++) { - logUtil.info("result[0].ssid :" + result[j].ssid); + logUtil.info("result[0].ssid: " + result[j].ssid); logUtil.info("securityType: " + result[j].securityType); logUtil.info("rssi: " + result[j].rssi); logUtil.info("bssid: " + result[j].bssid); @@ -64,48 +65,48 @@ export default class WifiModel extends BaseModel { if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_signal_4_dark.png'; - logUtil.info("securityType 1 and signal level 4:"); + logUtil.info('securityType 1 and signal level 4'); }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_signal_3_dark.png'; - logUtil.info("securityType 1 and signal level 3 :"); + logUtil.info('securityType 1 and signal level 3'); }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_signal_2_dark.png'; - logUtil.info("securityType 1 and signal level 2 :"); + logUtil.info('securityType 1 and signal level 2'); }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_signal_1_dark.png'; - logUtil.info("securityType 1 and signal level 1 :"); + logUtil.info('securityType 1 and signal level 1'); }; if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_signal_1_dark.png'; - logUtil.info("securityType 1 and signal level 1 :"); + logUtil.info('securityType 1 and signal level 1'); }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_lock_signal_4_dark.png'; - logUtil.info("securityType lock and level 4 :"); + logUtil.info('securityType lock and level 4'); }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_lock_signal_3_dark.png'; - logUtil.info("securityType lock and level 3 :"); + logUtil.info('securityType lock and level 3'); }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_lock_signal_2_dark.png'; - logUtil.info("securityType lock and level 2 :"); + logUtil.info('securityType lock and level 2'); }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; - logUtil.info("securityType lock and level 1 :"); + logUtil.info('securityType lock and level 1'); }; if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; - logUtil.info("securityType lock and level 1 :"); + logUtil.info('securityType lock and level 1'); }; - if(result[j].ssid == ''||result[j] == null){ - logUtil.info("result ssid empty :"); - }else{ + if (result[j].ssid == '' || result[j] == null) { + logUtil.info('result ssid empty'); + } else { mWifiList.push({ settingIcon: '', settingSummary: '', @@ -151,25 +152,28 @@ export default class WifiModel extends BaseModel { } return -1; }; + connectToDevice(obj) { - logUtil.info("[wifi_js_test] connect to wifi "); + logUtil.info('[wifi_js_test] connect to wifi'); return wifi_native_js.connectToDevice(obj); }; /** * wifi monitoring events */ wifiStatusListener() { - logUtil.info("wifi status listener") + logUtil.info('wifi status listener') Subscriber.createSubscriber(mCommonEventSubscribeInfo, - this.CreateSubscriberCallBack.bind(this)); + this.CreateSubscriberCallBack.bind(this)); }; + CreateSubscriberCallBack(err, data) { - logUtil.info("subscriber subscribe"); + logUtil.info('subscriber subscribe'); mCommonEventSubscriber = data; Subscriber.subscribe(mCommonEventSubscriber, this.SubscriberCallBack.bind(this)); }; + SubscriberCallBack(err, data) { - logUtil.info(" subscriber call back") + logUtil.info('subscriber call back') logUtil.info("==========================>SubscriberCallBack event = " + data.event); logUtil.info("==========================>SubscriberCallBack data = " + JSON.stringify(data)); logUtil.info("==========================>SubscriberCallBack data code = " + data.code); @@ -183,13 +187,15 @@ export default class WifiModel extends BaseModel { logUtil.info("wifi code value" + wifiCode); return wifiCode; }; + unSubscriberListener() { Subscriber.unsubscribe(mCommonEventSubscriber, () => { - logUtil.info("wifi unsubscribe"); + logUtil.info('wifi unsubscribe'); }); }; + disConnect() { - logUtil.info("netWork disconnect"); + logUtil.info('netWork disconnect'); return wifi_native_js.disConnect(); }; } \ No newline at end of file -- Gitee From 7d080813ce1877b06eafb01152556035291b3445 Mon Sep 17 00:00:00 2001 From: wangzd1026 Date: Tue, 20 Jul 2021 10:56:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?wifi=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/default/model/wifiImpl/WifiModel.js | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/entry/src/main/js/default/model/wifiImpl/WifiModel.js b/entry/src/main/js/default/model/wifiImpl/WifiModel.js index c087d932..1a9447d5 100755 --- a/entry/src/main/js/default/model/wifiImpl/WifiModel.js +++ b/entry/src/main/js/default/model/wifiImpl/WifiModel.js @@ -45,23 +45,22 @@ export default class WifiModel extends BaseModel { }; getScanInfoCallBack() { logUtil.info('get to wifi information start---->'); - logUtil.info('Wifi get scan information callback'); mWifiList = []; remdupWifiList = []; wifi_native_js.getScanInfos(result => { - logUtil.info("[wifi_js_test] wifi received scan info call back results: " + JSON.stringify(result)); + logUtil.info('[wifi_js_test] wifi received scan info call back results:' + JSON.stringify(result)); let clen = Object.keys(result).length; let image; - logUtil.info("[wifi_js_test] wifi received scan info call back length: " + clen); + logUtil.info('[wifi_js_test] wifi received scan info call back length:' + clen); for (let j = 0; j < clen; j++) { - logUtil.info("result[0].ssid: " + result[j].ssid); - logUtil.info("securityType: " + result[j].securityType); - logUtil.info("rssi: " + result[j].rssi); - logUtil.info("bssid: " + result[j].bssid); - logUtil.info("band: " + result[j].band); - logUtil.info("frequency: " + result[j].frequency); - logUtil.info("timestamp: " + result[j].timestamp); - logUtil.info(("wifi_native_js.getSignalLevel: " + wifi_native_js.getSignalLevel(result[j].rssi, result[j].band))); + logUtil.info('result[0].ssid: ' + result[j].ssid); + logUtil.info('securityType: ' + result[j].securityType); + logUtil.info('rssi: ' + result[j].rssi); + logUtil.info('bssid: ' + result[j].bssid); + logUtil.info('band: ' + result[j].band); + logUtil.info('frequency: ' + result[j].frequency); + logUtil.info('timestamp: ' + result[j].timestamp); + logUtil.info('wifi_native_js.getSignalLevel: ' + wifi_native_js.getSignalLevel(result[j].rssi, result[j].band)); if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_signal_4_dark.png'; @@ -135,7 +134,7 @@ export default class WifiModel extends BaseModel { remdupWifiList.push(mWifiList[i]) } }; - logUtil.info("remove duplicate ssid remdupWifiList: " + JSON.stringify(remdupWifiList)); + logUtil.info('remove duplicate ssid remdupWifiList: ' + JSON.stringify(remdupWifiList)); }); logUtil.info('get to wifi information end---->'); return remdupWifiList; @@ -174,17 +173,17 @@ export default class WifiModel extends BaseModel { SubscriberCallBack(err, data) { logUtil.info('subscriber call back') - logUtil.info("==========================>SubscriberCallBack event = " + data.event); - logUtil.info("==========================>SubscriberCallBack data = " + JSON.stringify(data)); - logUtil.info("==========================>SubscriberCallBack data code = " + data.code); + logUtil.info('==========================>SubscriberCallBack event = ' + data.event); + logUtil.info('==========================>SubscriberCallBack data = ' + JSON.stringify(data)); + logUtil.info('==========================>SubscriberCallBack data code = ' + data.code); wifiCode = data.code; - logUtil.info("wifi data code value" + wifiCode); + logUtil.info('wifi data code value' + wifiCode); }; /** * get wifi code value */ getWifiCode() { - logUtil.info("wifi code value" + wifiCode); + logUtil.info('wifi code value' + wifiCode); return wifiCode; }; -- Gitee From 5fa988c2ae658eeb7b7d228bd939df9a068e705a Mon Sep 17 00:00:00 2001 From: wangzd1026 Date: Tue, 20 Jul 2021 11:18:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?wifi=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/js/default/model/wifiImpl/WifiModel.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entry/src/main/js/default/model/wifiImpl/WifiModel.js b/entry/src/main/js/default/model/wifiImpl/WifiModel.js index 1a9447d5..5c954069 100755 --- a/entry/src/main/js/default/model/wifiImpl/WifiModel.js +++ b/entry/src/main/js/default/model/wifiImpl/WifiModel.js @@ -44,7 +44,7 @@ export default class WifiModel extends BaseModel { return wifi_native_js.scan(); }; getScanInfoCallBack() { - logUtil.info('get to wifi information start---->'); + logUtil.info('get to wifi information start'); mWifiList = []; remdupWifiList = []; wifi_native_js.getScanInfos(result => { @@ -60,7 +60,7 @@ export default class WifiModel extends BaseModel { logUtil.info('band: ' + result[j].band); logUtil.info('frequency: ' + result[j].frequency); logUtil.info('timestamp: ' + result[j].timestamp); - logUtil.info('wifi_native_js.getSignalLevel: ' + wifi_native_js.getSignalLevel(result[j].rssi, result[j].band)); + logUtil.info('SignalLevel: ' + wifi_native_js.getSignalLevel(result[j].rssi, result[j].band)); if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_signal_4_dark.png'; @@ -121,7 +121,7 @@ export default class WifiModel extends BaseModel { }); } }; - logUtil.info("original mWifiList :" + JSON.stringify(mWifiList)); + logUtil.info('original mWifiList :' + JSON.stringify(mWifiList)); for (let i = 0; i < mWifiList.length; i++) { let position = this.getItemPosition(remdupWifiList, mWifiList[i].settingTitle); if (position != -1) { -- Gitee From acffc5aa23d8eb21946ca5c723c2a790aa81aa04 Mon Sep 17 00:00:00 2001 From: wangzd1026 Date: Tue, 20 Jul 2021 14:25:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?wifi=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/default/model/wifiImpl/WifiModel.js | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/entry/src/main/js/default/model/wifiImpl/WifiModel.js b/entry/src/main/js/default/model/wifiImpl/WifiModel.js index 5c954069..f20119cd 100755 --- a/entry/src/main/js/default/model/wifiImpl/WifiModel.js +++ b/entry/src/main/js/default/model/wifiImpl/WifiModel.js @@ -14,7 +14,7 @@ */ import BaseModel from '../BaseModel.js'; import LogUtil from '../../common/baseUtil/LogUtil.js'; -import wifi_native_js from '@ohos.wifi_native_js'; +import WifiNativeJs from '@ohos.wifi_native_js'; import Subscriber from '@ohos.commonevent'; let logUtil = new LogUtil(); @@ -27,27 +27,27 @@ let mCommonEventSubscribeInfo = { }; export default class WifiModel extends BaseModel { getWifiStatus() { - logUtil.info('wifi_native_js isWifiActive'); - return wifi_native_js.isWifiActive(); + logUtil.info('WifiNativeJs isWifiActive'); + return WifiNativeJs.isWifiActive(); }; getEnableWifi() { - logUtil.info('wifi_native_js enableWifi'); - return wifi_native_js.enableWifi(); + logUtil.info('WifiNativeJs enableWifi'); + return WifiNativeJs.enableWifi(); }; disableWifi() { - logUtil.info('wifi_native_js enableWifi'); - return wifi_native_js.disableWifi(); + logUtil.info('WifiNativeJs enableWifi'); + return WifiNativeJs.disableWifi(); }; getScanWifi() { - logUtil.info('wifi_native_js scan'); - return wifi_native_js.scan(); + logUtil.info('WifiNativeJs scan'); + return WifiNativeJs.scan(); }; getScanInfoCallBack() { - logUtil.info('get to wifi information start'); + logUtil.info('get to wifi info start'); mWifiList = []; remdupWifiList = []; - wifi_native_js.getScanInfos(result => { + WifiNativeJs.getScanInfos(result => { logUtil.info('[wifi_js_test] wifi received scan info call back results:' + JSON.stringify(result)); let clen = Object.keys(result).length; let image; @@ -60,47 +60,47 @@ export default class WifiModel extends BaseModel { logUtil.info('band: ' + result[j].band); logUtil.info('frequency: ' + result[j].frequency); logUtil.info('timestamp: ' + result[j].timestamp); - logUtil.info('SignalLevel: ' + wifi_native_js.getSignalLevel(result[j].rssi, result[j].band)); + logUtil.info('SignalLevel: ' + WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band)); - if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { + if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_signal_4_dark.png'; - logUtil.info('securityType 1 and signal level 4'); + logUtil.info('securityType 1 and signal level 4'); }; - if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 3) { + if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_signal_3_dark.png'; - logUtil.info('securityType 1 and signal level 3'); + logUtil.info('securityType 1 and signal level 3'); }; - if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 2) { + if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_signal_2_dark.png'; - logUtil.info('securityType 1 and signal level 2'); + logUtil.info('securityType 1 and signal level 2'); }; - if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 1) { + if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_signal_1_dark.png'; - logUtil.info('securityType 1 and signal level 1'); + logUtil.info('securityType 1 and signal level 1'); }; - if (result[j].securityType == 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 0) { + if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_signal_1_dark.png'; - logUtil.info('securityType 1 and signal level 1'); + logUtil.info('securityType 1 and signal level 1'); }; - if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 4) { + if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_lock_signal_4_dark.png'; - logUtil.info('securityType lock and level 4'); + logUtil.info('securityType lock and level 4'); }; - if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 3) { + if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_lock_signal_3_dark.png'; - logUtil.info('securityType lock and level 3'); + logUtil.info('securityType lock and level 3'); }; - if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 2) { + if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_lock_signal_2_dark.png'; - logUtil.info('securityType lock and level 2'); + logUtil.info('securityType lock and level 2'); }; - if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 1) { + if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; - logUtil.info('securityType lock and level 1'); + logUtil.info('securityType lock and level 1'); }; - if (result[j].securityType != 1 && wifi_native_js.getSignalLevel(result[j].rssi, result[j].band) == 0) { + if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; - logUtil.info('securityType lock and level 1'); + logUtil.info('securityType lock and level 1'); }; if (result[j].ssid == '' || result[j] == null) { @@ -117,7 +117,7 @@ export default class WifiModel extends BaseModel { settingType: 1, bssid: result[j].bssid, securityType: result[j].securityType, - signalLevel: wifi_native_js.getSignalLevel(result[j].rssi, result[j].band), + signalLevel: WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band), }); } }; @@ -154,7 +154,7 @@ export default class WifiModel extends BaseModel { connectToDevice(obj) { logUtil.info('[wifi_js_test] connect to wifi'); - return wifi_native_js.connectToDevice(obj); + return WifiNativeJs.connectToDevice(obj); }; /** * wifi monitoring events @@ -195,6 +195,6 @@ export default class WifiModel extends BaseModel { disConnect() { logUtil.info('netWork disconnect'); - return wifi_native_js.disConnect(); + return WifiNativeJs.disConnect(); }; } \ No newline at end of file -- Gitee From 31b834f4fe427178efcfe71acca7232e47dd3a70 Mon Sep 17 00:00:00 2001 From: wangzd1026 Date: Tue, 20 Jul 2021 14:52:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?wifi=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/default/model/wifiImpl/WifiModel.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/entry/src/main/js/default/model/wifiImpl/WifiModel.js b/entry/src/main/js/default/model/wifiImpl/WifiModel.js index f20119cd..53162c65 100755 --- a/entry/src/main/js/default/model/wifiImpl/WifiModel.js +++ b/entry/src/main/js/default/model/wifiImpl/WifiModel.js @@ -64,43 +64,43 @@ export default class WifiModel extends BaseModel { if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_signal_4_dark.png'; - logUtil.info('securityType 1 and signal level 4'); + logUtil.info('securityType 1 and signal level 4'); }; if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_signal_3_dark.png'; - logUtil.info('securityType 1 and signal level 3'); + logUtil.info('securityType 1 and signal level 3'); }; if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_signal_2_dark.png'; - logUtil.info('securityType 1 and signal level 2'); + logUtil.info('securityType 1 and signal level 2'); }; if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_signal_1_dark.png'; - logUtil.info('securityType 1 and signal level 1'); + logUtil.info('securityType 1 and signal level 1'); }; if (result[j].securityType == 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_signal_1_dark.png'; - logUtil.info('securityType 1 and signal level 1'); + logUtil.info('securityType 1 and signal level 1'); }; if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 4) { image = '/res/image/ic_wifi_lock_signal_4_dark.png'; - logUtil.info('securityType lock and level 4'); + logUtil.info('securityType lock and level 4'); }; if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 3) { image = '/res/image/ic_wifi_lock_signal_3_dark.png'; - logUtil.info('securityType lock and level 3'); + logUtil.info('securityType lock and level 3'); }; if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 2) { image = '/res/image/ic_wifi_lock_signal_2_dark.png'; - logUtil.info('securityType lock and level 2'); + logUtil.info('securityType lock and level 2'); }; if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 1) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; - logUtil.info('securityType lock and level 1'); + logUtil.info('securityType lock and level 1'); }; if (result[j].securityType != 1 && WifiNativeJs.getSignalLevel(result[j].rssi, result[j].band) == 0) { image = '/res/image/ic_wifi_lock_signal_1_dark.png'; - logUtil.info('securityType lock and level 1'); + logUtil.info('securityType lock and level 1'); }; if (result[j].ssid == '' || result[j] == null) { -- Gitee