From 9d0d8e78b2cb245f9ec48809c8d20003090807ca Mon Sep 17 00:00:00 2001
From: m0_75226990 <lizhongyi@dcloud.io>
Date: Fri, 25 Nov 2022 17:01:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20uni-wifiinformation=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WifiInfomation/wifiInfomation.vue         | 40 +++++++++----------
 .../utssdk/app-ios/Info.plist                 |  8 ++++
 .../utssdk/app-ios/config.json                |  9 +++++
 .../utssdk/app-ios/index.uts                  | 25 ++++++++++--
 4 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 uni_modules/uni-wifiinformation/utssdk/app-ios/Info.plist
 create mode 100644 uni_modules/uni-wifiinformation/utssdk/app-ios/config.json

diff --git a/pages/SystemAPI/WifiInfomation/wifiInfomation.vue b/pages/SystemAPI/WifiInfomation/wifiInfomation.vue
index e10c6a9..9d1a857 100644
--- a/pages/SystemAPI/WifiInfomation/wifiInfomation.vue
+++ b/pages/SystemAPI/WifiInfomation/wifiInfomation.vue
@@ -8,35 +8,35 @@
 
 <script>
 
-	// import { getCurrentWifiInfo, requestLocationPromise } from '@/uni_modules/uni-wifiinformation/utssdk/app-ios/index.uts';
+	import { getCurrentWifiInfo, requestLocationPromise } from '@/uni_modules/uni-wifiinformation';
 
 	export default {
 		 
 		methods:{
 			getLocationPromise() {
-				// requestLocationPromise((res):void => {
-				// 	console.log(res)
-				// 	uni.showToast({
-				// 		title: res["message"],
-				// 		icon: 'none'
-				// 	})
-				// })
+				requestLocationPromise(function(res){
+						console.log(res)
+						uni.showToast({
+							title: res["message"],
+							icon: 'none'
+						})
+				})
 			},
 			
 			getWifiInfo() {
 				/* iOS12之后获取wifi信息需要获取系统定位权限，否则获取到的wifi信息为空 */
-				// requestLocationPromise((res):void => {
-					// if (res["success"] == true) {
-					// 	let wifiInfo = getCurrentWifiInfo()
-					// 	if (wifiInfo != null) {
-					// 		console.log(wifiInfo)
-					// 		uni.showToast({
-					// 			title: "当前wifi信息获取成功",
-					// 			icon: 'none'
-					// 		})
-					// 	}
-					// }
-				// })
+				requestLocationPromise(function(res) {
+					if (res["success"] == true) {
+						let wifiInfo = getCurrentWifiInfo()
+						if (wifiInfo != null) {
+							console.log(wifiInfo)
+							uni.showToast({
+								title: "当前wifi信息获取成功",
+								icon: 'none'
+							})
+						}
+					}
+				})
 			},
 			
 		}
diff --git a/uni_modules/uni-wifiinformation/utssdk/app-ios/Info.plist b/uni_modules/uni-wifiinformation/utssdk/app-ios/Info.plist
new file mode 100644
index 0000000..001d3ce
--- /dev/null
+++ b/uni_modules/uni-wifiinformation/utssdk/app-ios/Info.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>使用期间获取位置权限</string>
+  </dict>
+</plist>
\ No newline at end of file
diff --git a/uni_modules/uni-wifiinformation/utssdk/app-ios/config.json b/uni_modules/uni-wifiinformation/utssdk/app-ios/config.json
new file mode 100644
index 0000000..bc3370d
--- /dev/null
+++ b/uni_modules/uni-wifiinformation/utssdk/app-ios/config.json
@@ -0,0 +1,9 @@
+{
+	"frameworks": [
+		"CoreLocation",
+		"SystemConfiguration"
+	],
+	"deploymentTarget": "9.0",
+	"validArchitectures": [   
+		"arm64", "armv7" ]   
+}
\ No newline at end of file
diff --git a/uni_modules/uni-wifiinformation/utssdk/app-ios/index.uts b/uni_modules/uni-wifiinformation/utssdk/app-ios/index.uts
index a0fdbd7..6f9bf6c 100644
--- a/uni_modules/uni-wifiinformation/utssdk/app-ios/index.uts
+++ b/uni_modules/uni-wifiinformation/utssdk/app-ios/index.uts
@@ -1,4 +1,4 @@
-import { CLLocationManager, CLAuthorizationStatus, CLLocationManagerDelegate } from 'CoreLocation';
+import { CLLocationManager, CLAuthorizationStatus, CLLocationManagerDelegate } from 'CoreLocation'
 import { CaptiveNetwork, kCNNetworkInfoKeySSID, kCNNetworkInfoKeyBSSID } from 'SystemConfiguration.CaptiveNetwork';
 import { NSArray, NSDictionary } from 'Foundation';
 import { CFString } from 'CoreFoundation';
@@ -19,9 +19,9 @@ class CurrentWifiInfo {
 class LocationPromiseService implements CLLocationManagerDelegate  {
 	static promiseCompletionHandler: UTSCallback[] = []
 	
-	manager?: CLLocationManager = null
+	manager?: CLLocationManager
 	
-	constructor(manager: CLLocationManager | null = null) {
+	constructor(manager?: CLLocationManager) {
 		this.manager = manager
 	}
 	
@@ -47,6 +47,22 @@ class LocationPromiseService implements CLLocationManagerDelegate  {
 		}
 	}   
 	
+	locationManagerDidChangeAuthorization(manager: CLLocationManager) {
+		
+	}
+	
+	locationManagerDidPauseLocationUpdates(manager: CLLocationManager) {
+		
+	}
+	
+	locationManagerDidResumeLocationUpdates(manager: CLLocationManager) {
+		
+	}
+	
+	locationManagerShouldDisplayHeadingCalibration(manager: CLLocationManager): boolean {
+		return true
+	}
+	
 	requestPromise(completion: UTSCallback) {
 		let status: CLAuthorizationStatus = CLLocationManager.authorizationStatus()
 		if (status == CLAuthorizationStatus.notDetermined) {
@@ -65,7 +81,7 @@ class LocationPromiseService implements CLLocationManagerDelegate  {
 	}
 }
 
-const locationPromiseService: LocationPromiseService = new LocationPromiseService()
+const locationPromiseService: LocationPromiseService = new LocationPromiseService(null)
 
 
 
@@ -107,3 +123,4 @@ export function getCurrentWifiInfo (): CurrentWifiInfo | null {
 	}
 	return null
 }
+
-- 
GitLab