提交 c5ff2c96 编写于 作者: lizhongyi_'s avatar lizhongyi_

fix : uni-wifi iOS相关接口错误信息统一调整

上级 5539c89d
......@@ -14,7 +14,7 @@ type WifiOption = {
};
/**
* Wifi 链接参数封装
* Wifi 链接参数封装
*/
type WifiConnectOption = {
SSID: string;
......@@ -149,19 +149,30 @@ function fetchConnectedWifiWithLocationPromise(option: GetConnectedWifiOptions)
if (wifiInfo.BSSID.length > 0 && wifiInfo.SSID.length > 0) {
let res = {
errSubject: "uni-getConnectedWifi",
errCode: 0,
errMsg: "getConnectedWifi:success",
errMsg: "getConnectedWifi:ok",
wifi: wifiInfo,
}
option.success?.(res)
option.complete?.(res)
}else {
option.fail?.({errCode: 12000, errMsg: "current wifi is null"})
option.complete?.({errCode: 12000, errMsg: "current wifi is null"})
const res = {
errSubject: "uni-getConnectedWifi",
errCode: 12010,
errMsg: "getConnectedWifi:system internal error"
}
option.fail?.(res)
option.complete?.(res)
}
}else {
option.fail?.({errCode: 12000, errMsg: "current wifi is null"})
option.complete?.({errCode: 12000, errMsg: "current wifi is null"})
const res = {
errSubject: "uni-getConnectedWifi",
errCode: 12010,
errMsg: "getConnectedWifi:system internal error"
}
option.fail?.(res)
option.complete?.(res)
}
}
......@@ -184,8 +195,9 @@ class UniWiFiModuleGloabInfo {
export function startWifi(option: WifiOption) {
UniWiFiModuleGloabInfo.alreadyStartWifi = true
let res = {
errSubject: "uni-startWifi",
errCode: 0,
errMsg: "startWifi: ok"
errMsg: "startWifi:ok"
}
option.success?.(res)
option.complete?.(res)
......@@ -194,9 +206,16 @@ export function startWifi(option: WifiOption) {
/*
* 停止wifi模块
*/
export function stopWifi() {
export function stopWifi(option: WifiOption) {
UniWiFiModuleGloabInfo.alreadyStartWifi = false
LocationPromiseService.promiseCompletionHandler = []
let res = {
errSubject: "uni-stopWifi",
errCode: 0,
errMsg: "stopWifi:ok"
}
option.success?.(res)
option.complete?.(res)
}
/*
......@@ -204,8 +223,9 @@ export function stopWifi() {
*/
export function getWifiList(option: WifiOption) {
let res = {
errSubject: "uni-getWifiList",
errCode: 12001,
errMsg: "system not support"
errMsg: "getWifiList:system not support"
}
option.fail?.(res)
option.complete?.(res)
......@@ -230,18 +250,11 @@ export function offGetWifiList(callback: UTSCallback) {
* 获取当前连接的wifi信息
*/
export function getConnectedWifi(option: GetConnectedWifiOptions) {
let wifiInfo = new UniWifiInfo()
wifiInfo.SSID = ""
wifiInfo.BSSID = ""
wifiInfo.secure = false
wifiInfo.signalStrength = 0
wifiInfo.frequency = 0
if (UniWiFiModuleGloabInfo.alreadyStartWifi == false) {
let res = {
errSubject: "uni-getConnectedWifi",
errCode: 12000,
errMsg: "getConnectedWifi: not init",
wifi: wifiInfo
errMsg: "getConnectedWifi:not init",
}
option.fail?.(res)
option.complete?.(res)
......@@ -252,9 +265,9 @@ export function getConnectedWifi(option: GetConnectedWifiOptions) {
fetchConnectedWifiWithLocationPromise(option)
}else {
let res = {
errCode: 12010,
errMsg: "have no location promise",
wifi: wifiInfo
errSubject: "uni-getConnectedWifi",
errCode: 12007,
errMsg: "getConnectedWifi:user denied",
}
option.fail?.(res)
option.complete?.(res)
......@@ -271,8 +284,9 @@ export function getConnectedWifi(option: GetConnectedWifiOptions) {
*/
export function connectWifi(option: WifiConnectOption) {
let res = {
errSubject: "uni-connectWifi",
errCode: 12001,
errMsg: "system not support"
errMsg: "connectWifi:system not support"
}
option.fail?.(res)
option.complete?.(res)
......@@ -312,8 +326,9 @@ export function onOffWifiConnectedWithPartialInfo(callback: UTSCallback | null)
*/
export function setWifiList(option: WifiOption) {
let res = {
errSubject: "uni-setWifiList",
errCode: 12001,
errMsg: "system not support"
errMsg: "setWifiList:system not support"
}
option.fail?.(res)
option.complete?.(res)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册