@smart100/spu-web-plugin 1.0.0 → 1.0.4

package/src/location.ts

@@ -1,12 +1,12 @@
-import AMapLoader from './AMapLoader'
 import { cloneDeep } from 'lodash-es'
-import urlquery from './urlquery'
+import AMapLoader from './AMapLoader'
+import { urlquery } from './urlquery'
 
 type Location = {
-  longitude: string;
-  latitude: string;
-  address: string;
-  [propName: string]: any;
+  longitude: string
+  latitude: string
+  address: string
+  [propName: string]: any
 } | null
 
 let AMap: any = null
@@ -17,7 +17,7 @@ let lastLocation: Location = null
 let runing = false
 let locationPromise: Promise<Location>
 
-const init = async () => {
+async function init() {
   if (!AMap) {
     AMap = await AMapLoader.load({
       plugins: ['AMap.Geolocation', 'AMap.Geocoder']
@@ -33,10 +33,12 @@ const init = async () => {
   }
 }
 
-const getAmapLocation = async (): Promise<Location> => {
+async function getAmapLocation(): Promise<Location> {
   await init()
   return new Promise((resolve, reject) => {
+    // https://blog.csdn.net/Liu331013/article/details/115423749
     geolocation.getCurrentPosition((status: string, result: any) => {
+      console.log(status, result)
       if (status === 'complete') {
         const { lng, lat } = result.position
         // console.log('getAmapLocation success')
@@ -54,15 +56,15 @@ const getAmapLocation = async (): Promise<Location> => {
   })
 }
 
-const getSpuLocation = async (): Promise<Location> => {
+async function getSpuLocation(): Promise<Location> {
   return new Promise((resolve, reject) => {
     let isload = false
     setTimeout(() => {
       if (!isload) {
-        console.error('getSpuLocation timeout 10000')
+        console.error('getSpuLocation timeout 30000')
         resolve(null)
       }
-    }, 10000)
+    }, 30000)
     window.Native.getLocation((result: any, error: any, status: any) => {
       isload = true
       // console.log('getLocation result', result)
@@ -82,7 +84,7 @@ const getSpuLocation = async (): Promise<Location> => {
   })
 }
 
-const getAmapCityLocation = async (): Promise<Location> => {
+async function getAmapCityLocation(): Promise<Location> {
   await init()
   return new Promise((resolve, reject) => {
     geolocation.getCityInfo((status: string, result: any) => {
@@ -105,7 +107,7 @@ const getAmapCityLocation = async (): Promise<Location> => {
   })
 }
 
-const getAddress = async (position: Location): Promise<string> => {
+async function getAddress(position: Location): Promise<string> {
   await init()
   return new Promise((resolve, reject) => {
     if (position) {
@@ -123,7 +125,7 @@ const getAddress = async (position: Location): Promise<string> => {
 }
 
 // 定位流程: 缓存 > 判断环境（APP，小程序，企微）基于环境获取定位 > 高德地图高精度定位 > 百度地图定位 > 高德城市定位
-const getLocationPromise = async (): Promise<Location> => {
+async function getLocationPromise(): Promise<Location> {
   let location: Location = null
 
   // 在 SPU 容器里使用 Native-API 的定位
@@ -152,14 +154,13 @@ const getLocationPromise = async (): Promise<Location> => {
   }
 
   if (location && !location.address) {
-    location.address = await getAddress(location) || '经纬度获取成功，但地址获取失败。'
+    location.address = (await getAddress(location)) || '经纬度获取成功，但地址获取失败。'
   }
 
   return location
 }
 
-
-const getLocation = async () => {
+async function getLocation() {
   // debugger
   // 缓存30秒
   if (datetime && Date.now() - datetime <= 30000 && lastLocation && !runing) {
@@ -181,12 +182,11 @@ const getLocation = async () => {
   return locationRes
 }
 
-const getDistance = async (p1: [number, number], p2: [number, number]) => {
+async function getDistance(p1: [number, number], p2: [number, number]) {
   await init()
   return AMap.GeometryUtil.distance(p1, p2)
 }
 
-
 // // 两个经纬度距离计算
 // function getDistance (latlng1, latlng2) {
 //   console.log(latlng1)
@@ -205,7 +205,4 @@ const getDistance = async (p1: [number, number], p2: [number, number]) => {
 //   return s * 1000
 // }
 
-export {
-  getLocation,
-  getDistance
-}
+export { getLocation, getDistance }