diff --git a/pages/index/index.vue b/pages/index/index.vue
index ea087bcfb08853f2e097621eec7c04116ac985e0..03c8c8ac8295e53b5c0d1332ee8b5e4baa1d3347 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,6 +13,7 @@
+
@@ -33,6 +34,9 @@
onMemoryWarning:function(res){
console.log(res);
},
+ testConnnectWifi(){
+ uni.connectWifi({});
+ },
testGetConnnectWifi(){
uni.getConnectedWifi({
partialInfo:false,
diff --git a/uni_modules/uni-wifi/package.json b/uni_modules/uni-wifi/package.json
index b46d512b0570b70f0624d9c7095162a2209a7da0..d6b43d8c1807354ee8bf0b7ad04df2d77486ec01 100644
--- a/uni_modules/uni-wifi/package.json
+++ b/uni_modules/uni-wifi/package.json
@@ -38,7 +38,8 @@
"stopWifi": "stopWifi",
"getWifiList":"getWifiList",
"onGetWifiList":"onGetWifiList",
- "onWifiConnected":"onWifiConnected"
+ "onWifiConnected":"onWifiConnected",
+ "connectWifi":"connectWifi"
}
},
"dependencies": [],
diff --git a/uni_modules/uni-wifi/utssdk/app-android/index.uts b/uni_modules/uni-wifi/utssdk/app-android/index.uts
index e7114f9fabf9f8b3106a41cc0caacfcb23121890..9f96000f10b5588694e5ad38e9334d6932364ca0 100644
--- a/uni_modules/uni-wifi/utssdk/app-android/index.uts
+++ b/uni_modules/uni-wifi/utssdk/app-android/index.uts
@@ -214,7 +214,8 @@ export function getWifiList(option: WifiOption) {
// 还没调用startWifi 提示报错
var result = {
errCode: 12000,
- errMsg: "getWifiList:fail:not invoke startWifi"
+ errMsg: "getWifiList:fail:not invoke startWifi",
+ errSubject:"uni-wifi"
}
option.fail?.(result)
option.complete?.(result)
@@ -236,6 +237,7 @@ export function getWifiList(option: WifiOption) {
}
+
/**
* wifi 链接成功的回调注册
*/
@@ -270,9 +272,15 @@ export function offGetWifiList(callback: UTSCallback) {
}
}
-export function connectWifi(_option: WifiOption) {
+export function connectWifi(_option: WifiConnectOption) {
// todo
console.log(_option)
+ if(_option.maunal == true){
+ // 指定了手动模式
+ let manunalIntent = new Intent(android.provider.Settings.ACTION_WIFI_SETTINGS);
+ getUniActivity()!!.startActivity(manunalIntent);
+ }
+
}
/**
@@ -375,9 +383,6 @@ export function getConnectedWifi(option: GetConnectedWifiOptions) {
return
}
-
-
-
if (ActivityCompat.checkSelfPermission(getUniActivity()!, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// 尚不具备权限,返回错误
res.errCode = 12001