@smart100/spu-web-plugin 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/index.ts

@@ -2,7 +2,7 @@ import { version } from '../package.json'
 import { merge } from 'lodash-es'
 import { v4 as getUuid } from 'uuid'
 import { installStorageProxy, lsProxy, ssProxy } from './storageProxy'
-import { getLocation, getDistance } from './map/index'
+import { getLocation, getDistance, getAddress } from './map/index'
 import { installAxios, spuAxios, axios } from './axios'
 import { installSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
@@ -101,6 +101,7 @@ export {
   ssProxy,
   getLocation,
   getDistance,
+  getAddress,
   spuAxios,
   axios,
   axios as apaasAxios,

package/src/map/AMapLoader.ts

@@ -22,9 +22,7 @@ const load = (options?: {
     }
   }
 
-  // 不开放地址查询 改用ipaas
-  const plugin = ['AMap.Geolocation']
-  // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
+  const plugin = ['AMap.Geolocation', 'AMap.Geocoder']
 
   return AMapLoader.load({
     key: AMapKey.key,

package/src/map/MapService.ts

@@ -127,46 +127,51 @@ class MapService {
   }
 
   private async initAmap() {
-    // if (this.secretkey) {
-    //   window._AMapSecurityConfig = {
-    //     securityJsCode: this.secretkey
-    //   }
-    // }
-
-    const plugin = ['AMap.Geolocation']
-    // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
-
-    const AMap = await AMapLoader.load({
-      key: this.key,
-      version: '2.0',
-      plugins: plugin,
-      AMapUI: {
-        version: '1.1',
-        plugins: []
+    return new Promise(async (resolve, reject) => {
+      // 高德地图api初始化失败 没有返回reject 因此用超时机制检测
+      const time = setTimeout(() => {
+        console.error('initAmap fail: 请检查 AMap key 是否正确配置')
+        resolve(null)
+      }, 3000)
+
+      if (this.secretkey) {
+        window._AMapSecurityConfig = {
+          securityJsCode: this.secretkey
+        }
       }
+
+      const plugin = ['AMap.Geolocation', 'AMap.Geocoder']
+      // debugger
+
+      const AMap = await AMapLoader.load({
+        key: this.key,
+        version: '2.0',
+        plugins: plugin,
+        AMapUI: {
+          version: '1.1',
+          plugins: []
+        }
+      })
+      // debugger
+      clearTimeout(time)
+
+      window.AMap = AMap
+      this.AMap = window.AMap
+      this.MapCore = window.AMap
+      // console.log(window)
+      // console.log(window.AMap)
+      // console.log(window.AMapUI)
+      // console.log(window.AMapLoader)
+      // console.log(window.AMap === aaaa)
+      resolve(window.AMap)
     })
-    window.AMap = AMap
-    this.AMap = AMap
-    this.MapCore = window.AMap
-    // console.log(window)
-    // console.log(window.AMap)
-    // console.log(window.AMapUI)
-    // console.log(window.AMapLoader)
-    // console.log(window.AMap === aaaa)
   }
 
   private async initBaidu() {
-    // await importJS(
-    //     `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}`,
-    //     'BMap'
-    // )
-    // await delay(300)
-    // function initialize() {
-    //     const mp = new BMap.Map('map')
-    //     mp.centerAndZoom(new BMap.Point(121.491, 31.233), 11)
-    // }
     return new Promise((resolve, reject) => {
-      window.BMAP_INITIAL_CALLBACK = () => {
+      window.BMAP_INITIAL_CALLBACK = (e: any) => {
+        // console.log(e)
+        // debugger
         this.BMap = window.BMap
         this.MapCore = window.BMap
         // debugger

package/src/map/index.ts

@@ -3,6 +3,7 @@ import { cloneDeep } from 'lodash-es'
 import { mapService } from './MapService'
 import { getAMapKey } from './AMapKey'
 import { axios } from '../axios'
+import { delay } from '../utils'
 import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points } from './utils'
 
 type Location = {
@@ -30,9 +31,9 @@ const getLocationByNative = async (): Promise<Location> => {
       }
     }, 30000)
     window.Native.getLocation((res: any, error: any, status: any) => {
-      // console.log('getLocation res', res)
-      // console.log('getLocation error', error)
-      // console.log('getLocation status', status)
+      // console.log('window.Native.getLocation res', res)
+      // console.log('window.Native.getLocation error', error)
+      // console.log('window.Native.getLocation status', status)
       isload = true
       if (res && res?.longitude && res?.latitude) {
         const result = {
@@ -174,15 +175,18 @@ const getAddressByIpaas = async (position: Location): Promise<string> => {
 }
 
 // 高德定位
-const getLocationByAmap = async (): Promise<Location> => {
-  console.log('getLocationByAmap start...')
+const getLocationByAMap = async (): Promise<Location> => {
+  console.log('getLocationByAMap start...')
   return new Promise((resolve, reject) => {
-    const geolocation = new window.AMap.Geolocation({
+    if (!window?.AMap) {
+      console.error('getLocationByAMap fail: AMap is undefinded')
+      resolve(null)
+      return
+    }
+    new window.AMap.Geolocation({
       enableHighAccuracy: true,
       timeout: 15000
-    })
-
-    geolocation.getCurrentPosition((status: string, res: any) => {
+    }).getCurrentPosition((status: string, res: any) => {
       // console.log(status, result)
       // debugger
       if (status === 'complete') {
@@ -191,10 +195,10 @@ const getLocationByAmap = async (): Promise<Location> => {
           longitude: lng.toString(),
           latitude: lat.toString()
         }
-        console.log(`getLocationByAmap success: ${JSON.stringify(result)}`)
+        console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
         resolve(result)
       } else {
-        console.error('getLocationByAmap fail')
+        console.error('getLocationByAMap fail')
         resolve(null)
       }
     })
@@ -202,14 +206,18 @@ const getLocationByAmap = async (): Promise<Location> => {
 }
 
 // 高德城市定位
-const getCityLocationByAmap = async (): Promise<Location> => {
-  console.log('getCityLocationByAmap start...')
+const getCityLocationByAMap = async (): Promise<Location> => {
+  console.log('getCityLocationByAMap start...')
   return new Promise((resolve, reject) => {
-    const geolocation = new window.AMap.Geolocation({
+    if (!window?.AMap) {
+      console.error('getCityLocationByAMap fail: AMap is undefinded')
+      resolve(null)
+      return
+    }
+    new window.AMap.Geolocation({
       enableHighAccuracy: true,
       timeout: 15000
-    })
-    geolocation.getCityInfo((status: string, res: any) => {
+    }).getCityInfo((status: string, res: any) => {
       // console.log(res)
       // debugger
       if (status === 'complete') {
@@ -219,10 +227,10 @@ const getCityLocationByAmap = async (): Promise<Location> => {
           longitude: lng.toString(),
           latitude: lat.toString()
         }
-        console.log(`getCityLocationByAmap success: ${JSON.stringify(result)}`)
+        console.log(`getCityLocationByAMap success: ${JSON.stringify(result)}`)
         resolve(result)
       } else {
-        console.error('getCityLocationByAmap fail')
+        console.error('getCityLocationByAMap fail')
         resolve(null)
       }
     })
@@ -230,37 +238,42 @@ const getCityLocationByAmap = async (): Promise<Location> => {
 }
 
 // 高德逆地址解析
-const getAddressByAmap = async (position: Location): Promise<string> => {
-  console.log('getAddressByAmap start...')
-  console.log('getAddressByAmap changeto getAddressByIpaas')
-  // return new Promise((resolve, reject) => {
-  //   if (position) {
-  //     new window.AMap.Geocoder({
-  //       city: '',
-  //       radius: 500
-  //     }).getAddress([position.longitude, position.latitude], (status: string, result: any) => {
-  //       if (status === 'complete' && result.info === 'OK' && result.regeocode) {
-  //         resolve(result?.regeocode?.formattedAddress || '')
-  //       } else {
-  //         console.error('getAddressByAmap fail')
-  //         resolve('')
-  //       }
-  //     })
-  //   }
-  // })
-  // 如果不设置安全秘钥的话 js-api的逆地址查询不成功 返回 INVALID_USER_SCODE 改成用ipaas服务查询
-  const address = await getAddressByIpaas(position)
-  return address
+const getAddressByAMap = async (position: Location): Promise<string> => {
+  console.log('getAddressByAMap start...')
+  return new Promise((resolve, reject) => {
+    if (position) {
+      if (!window?.AMap) {
+        console.error('getAddressByAMap fail: AMap is undefinded')
+        resolve('')
+        return
+      }
+      new window.AMap.Geocoder({
+        city: '',
+        radius: 500
+      }).getAddress([position.longitude, position.latitude], (status: string, result: any) => {
+        // console.log(status)
+        // console.log(result)
+        // debugger
+        if (status === 'complete' && result.info === 'OK' && result?.regeocode?.formattedAddress) {
+          const address = result.regeocode.formattedAddress || ''
+          console.log(`getAddressByAMap success: ${address}`)
+          resolve(address)
+        } else {
+          console.error(`getAddressByAMap fail: status = ${status}, result = ${result}`)
+          resolve('')
+        }
+      })
+    }
+  })
 }
 
 // 腾讯ip定位：通过终端设备IP地址获取其当前所在地理位置，精确到市级，常用于显示当地城市天气预报、初始化用户城市等非精确定位场景。
 const getIPLocationByTMap = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByTMap start...')
   return new Promise((resolve, reject) => {
-    const ipLocation = new window.TMap.service.IPLocation()
     const params = ip ? { ip } : {}
-    ipLocation
-      .locate(params)
+    new window.TMap.service.IPLocation()
+      .locate({ ...params, servicesk: mapService.secretkey })
       .then((res: any) => {
         const result = {
           longitude: res.result.location.lng.toString(),
@@ -282,14 +295,12 @@ const getAddressByTMap = async (position: Location): Promise<string> => {
   console.log('getAddressByTMap start...')
   return new Promise((resolve, reject) => {
     if (position) {
-      const location = new window.TMap.LatLng(position.latitude, position.longitude)
-      // console.log(position)
-      // console.log(location)
       // debugger
       new window.TMap.service.Geocoder()
         .getAddress({
-          location,
-          getPoi: false
+          location: new window.TMap.LatLng(position.latitude, position.longitude),
+          getPoi: false,
+          servicesk: mapService.secretkey
         })
         .then((res: any) => {
           // console.log(res)
@@ -431,14 +442,14 @@ const getAddressByBmap = async (position: Location): Promise<string> => {
         resolve(address)
       } else {
         console.error('getAddressByBmap fail')
+        // console.error(result)
         resolve('')
       }
     })
   })
 }
 
-// 定位流程: 缓存 > 判断环境（APP，小程序，企微）基于环境获取定位 > 地图商高精度定位 > 地图商城市ip定位
-const getLocationPromise = async (): Promise<Location> => {
+const getLocationPromise = async (isuseiplocarion = false): Promise<Location> => {
   let location: Location = null
 
   // 在 SPU 容器里使用 Native-API 的定位
@@ -449,29 +460,28 @@ const getLocationPromise = async (): Promise<Location> => {
   if (!location) {
     location = await getLocationByNavigator()
   }
+  // location = null
 
   if (!location) {
     if (mapService.type === 'amap') {
-      location = await getLocationByAmap()
-      // ip城市定位结果不精确 但总比定不到位好
-      if (!location) {
-        location = await getCityLocationByAmap()
+      location = await getLocationByAMap()
+      if (!location && isuseiplocarion) {
+        location = await getCityLocationByAMap()
       }
-    } else if (mapService.type === 'tencent') {
+      // 改成不使用ipaas了
+      // if (!location && isuseiplocarion) {
+      //   location = await getIPLocationByIpaas()
+      // }
+    } else if (mapService.type === 'tencent' && isuseiplocarion) {
       location = await getIPLocationByTMap()
     } else if (mapService.type === 'baidu') {
       location = await getLocationByBMap()
-      // ip城市定位结果不精确 但总比定不到位好
-      if (!location) {
+      if (!location && isuseiplocarion) {
         location = await getCityLocationByBMap()
       }
     }
   }
 
-  if (!location) {
-    location = await getIPLocationByIpaas()
-  }
-
   // 开发模式下为了方便测试提供虚拟定位
   if (!location && urlquery.isvirtuallocation) {
     location = {
@@ -480,6 +490,20 @@ const getLocationPromise = async (): Promise<Location> => {
     }
   }
 
+  // if (location) {
+  //   for (let i = 0, len = 5000; i < len; i++) {
+  //     // location.latitude = (Number(location.latitude) + 0.02).toString()
+  //     location.longitude = (Number(location.longitude) + 0.002).toString()
+  //     await getAddress(location)
+  //     .then((res: any) => {
+  //       console.log(res)
+  //     }).catch((err: any) => {
+  //       console.error(err)
+  //     })
+  //     await delay(300)
+  //   }
+  // }
+
   if (location && !location.address) {
     location.address = (await getAddress(location)) || '经纬度获取成功，但地址获取失败。'
   }
@@ -489,7 +513,8 @@ const getLocationPromise = async (): Promise<Location> => {
 
 // WGS84 GCJ-02 BD-09 坐标系
 // https://www.jianshu.com/p/559029832a67
-async function getLocation() {
+// 不能精确定位的情况下是否启用ip城市定位，ip定位用于不需要精确定位的场景
+async function getLocation(isuseiplocarion = false) {
   await mapService.init()
   // debugger
   // 缓存30秒
@@ -502,7 +527,7 @@ async function getLocation() {
   }
   // console.log('runing')
   runing = true
-  locationPromise = getLocationPromise()
+  locationPromise = getLocationPromise(isuseiplocarion)
   const locationRes = await locationPromise
   runing = false
   if (locationRes) {
@@ -518,13 +543,13 @@ const getAddress = async (position: Location): Promise<string> => {
 
   let address = ''
 
-  // 先统一用ipaas解析 因为需要储存一致的地址格式（各地图商逆地址查询的地址格式不统一）
-  // 如果不行再按照各地图商解析
-  address = await getAddressByIpaas(position)
-
   if (!address) {
     if (mapService.type === 'amap') {
-      address = await getAddressByAmap(position)
+      address = await getAddressByAMap(position)
+      // if (!address) {
+      //   // 如果不设置安全秘钥的话 js-api的逆地址查询不成功 返回 INVALID_USER_SCODE 改成用ipaas服务查询
+      //   address = await getAddressByIpaas(position)
+      // }
     } else if (mapService.type === 'tencent') {
       address = await getAddressByTMap(position)
     } else if (mapService.type === 'baidu') {

package/src/tenantSetting.ts

@@ -39,38 +39,61 @@ class TenantSetting {
   }
 
   get(key: string) {
-    const tenantsettingStr = lsProxy.getItem('tenantsetting')
-    if (tenantsettingStr) {
-      const tenantsetting = JSON.parse(tenantsettingStr)
+    // const tenantsetting = {
+    //   lbssetting: {
+    //     enable: '1',
+    //     setting: {
+    //       type: '',
+    //       key: {
+    //         web: '',
+    //         android: '',
+    //         ios: '',
+    //         harmony: ''
+    //       },
+    //       secretkey: {
+    //         web: '',
+    //         android: '',
+    //         ios: '',
+    //         harmony: ''
+    //       }
+    //     }
+    //   }
+    // }
+
+    // // 高德地图key配置错误
+    // // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
+    // // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
+
+    // // // 高德地图公司key
+    // // tenantsetting.lbssetting.setting.type = 'amap'
+    // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+    // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
 
-      // tenantsetting.lbssetting = {
-      //   enable: '1',
-      //   setting: {
-      //     type: '',
-      //     key: {
-      //       web: '',
-      //       android: '',
-      //       ios: '',
-      //       harmony: ''
-      //     },
-      //     secretkey: {
-      //       web: '',
-      //       android: '',
-      //       ios: '',
-      //       harmony: ''
-      //     }
-      //   }
-      // }
-      // tenantsetting.lbssetting.setting.type = 'amap'
-      // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-      // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+    // // // 高德地图个人key
+    // // tenantsetting.lbssetting.setting.type = 'amap'
+    // // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
+    // // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
 
-      // tenantsetting.lbssetting.setting.type = 'tencent'
-      // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+    // // tencent地图key配置错误
+    // // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
+    // // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
+    // // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
+    // // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
+    // tenantsetting.lbssetting.setting.type = 'tencent'
+    // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+    // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
 
-      // tenantsetting.lbssetting.setting.type = 'baidu'
-      // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+    // // 百度地图key配置错误alert以下信息
+    // // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
+    // // tenantsetting.lbssetting.setting.type = 'baidu'
+    // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
 
+    // lsProxy.setItem('tenantsetting', JSON.stringify(tenantsetting))
+
+
+    let tenantsettingStr = lsProxy.getItem('tenantsetting')
+    if (tenantsettingStr) {
+      const tenantsetting = JSON.parse(tenantsettingStr)
       if (key) {
         return tenantsetting[key]
       }

package/src/types/index.d.ts

@@ -99,6 +99,11 @@ export const getLocation: () => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any