|
|
@ -462,8 +462,7 @@ private class GetCurrentLocationHandler: FunctionHandler { |
|
|
guard let latStr = locationInfo["user_lat"] as? String, |
|
|
guard let latStr = locationInfo["user_lat"] as? String, |
|
|
let lngStr = locationInfo["user_lng"] as? String, |
|
|
let lngStr = locationInfo["user_lng"] as? String, |
|
|
let latitude = Double(latStr), |
|
|
let latitude = Double(latStr), |
|
|
let longitude = Double(lngStr), |
|
|
let longitude = Double(lngStr) else { |
|
|
let address = locationInfo["user_location"] as? String else { |
|
|
|
|
|
print("[GetCurrentLocationHandler] 位置数据格式错误") |
|
|
print("[GetCurrentLocationHandler] 位置数据格式错误") |
|
|
continuation.resume(returning: self.createErrorResponse(message: "位置数据格式错误,请重试")) |
|
|
continuation.resume(returning: self.createErrorResponse(message: "位置数据格式错误,请重试")) |
|
|
return |
|
|
return |
|
|
@ -471,8 +470,8 @@ private class GetCurrentLocationHandler: FunctionHandler { |
|
|
|
|
|
|
|
|
print("[GetCurrentLocationHandler] 位置获取成功: lat=\(latitude), lng=\(longitude)") |
|
|
print("[GetCurrentLocationHandler] 位置获取成功: lat=\(latitude), lng=\(longitude)") |
|
|
|
|
|
|
|
|
let message = "当前位置:\(address)(纬度 \(latitude),经度 \(longitude))" |
|
|
// let message = "当前位置:\(address)(纬度 \(latitude),经度 \(longitude))" |
|
|
let successResponse = self.createSuccessResponse(message: message, latitude: latitude, longitude: longitude, address: address) |
|
|
let successResponse = self.createSuccessResponse(latitude: latitude, longitude: longitude) |
|
|
|
|
|
|
|
|
print("[GetCurrentLocationHandler] 返回位置结果") |
|
|
print("[GetCurrentLocationHandler] 返回位置结果") |
|
|
continuation.resume(returning: successResponse) |
|
|
continuation.resume(returning: successResponse) |
|
|
@ -486,14 +485,12 @@ private class GetCurrentLocationHandler: FunctionHandler { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private func createSuccessResponse(message: String, latitude: Double, longitude: Double, address: String) -> String { |
|
|
private func createSuccessResponse(latitude: Double, longitude: Double) -> String { |
|
|
let result: [String: Any] = [ |
|
|
let result: [String: Any] = [ |
|
|
"success": true, |
|
|
"success": true, |
|
|
"message": message, |
|
|
|
|
|
"data": [ |
|
|
"data": [ |
|
|
"latitude": latitude, |
|
|
"latitude": latitude, |
|
|
"longitude": longitude, |
|
|
"longitude": longitude, |
|
|
"address": address, |
|
|
|
|
|
"timestamp": Date().timeIntervalSince1970 * 1000 |
|
|
"timestamp": Date().timeIntervalSince1970 * 1000 |
|
|
] |
|
|
] |
|
|
] |
|
|
] |
|
|
|