@smart100/spu-web-plugin 1.0.10 → 1.0.12

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.10";
+var version = "1.0.12";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -16142,34 +16142,37 @@ var TenantSetting = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function get(key) {
+      // const 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'
+      // // tenantsetting.lbssetting.setting.type = 'tencent'
+      // // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+      // // tenantsetting.lbssetting.setting.type = 'baidu'
+      // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+      // lsProxy.setItem('tenantsetting', JSON.stringify(tenantsetting))
       var tenantsettingStr = lsProxy.getItem('tenantsetting');
       if (tenantsettingStr) {
         var tenantsetting = JSON.parse(tenantsettingStr);
-        // 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'
-        // tenantsetting.lbssetting.setting.type = 'tencent'
-        // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
-        // tenantsetting.lbssetting.setting.type = 'baidu'
-        // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
         if (key) {
           return tenantsetting[key];
         }
@@ -17071,6 +17074,7 @@ var MapService = /*#__PURE__*/function () {
   function MapService() {
     _classCallCheck$1(this, MapService);
     _defineProperty$1(this, "isInit", false);
+    _defineProperty$1(this, "initPromise", null);
     _defineProperty$1(this, "AMap", null);
     _defineProperty$1(this, "TMap", null);
     _defineProperty$1(this, "BMap", null);
@@ -17145,8 +17149,7 @@ var MapService = /*#__PURE__*/function () {
     //   return window.BMap
     // }
     function () {
-      var _init = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
-        var type;
+      var _init2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
         return _regeneratorRuntime$1().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -17156,70 +17159,97 @@ var MapService = /*#__PURE__*/function () {
               }
               return _context.abrupt("return");
             case 2:
-              this.isInit = true;
-              type = this.type; // if (process.env.NODE_ENV === 'development') {
-              //     type = 'baidu'
-              // }
-              if (!(type === 'tencent')) {
-                _context.next = 9;
+              if (!this.initPromise) {
+                _context.next = 4;
                 break;
               }
+              return _context.abrupt("return", this.initPromise);
+            case 4:
+              this.initPromise = this._init();
               _context.next = 7;
-              return this.initTecent();
+              return this.initPromise;
             case 7:
-              _context.next = 17;
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function init() {
+        return _init2.apply(this, arguments);
+      }
+      return init;
+    }()
+  }, {
+    key: "_init",
+    value: function () {
+      var _init3 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2() {
+        var type;
+        return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              type = this.type;
+              if (!(type === 'tencent')) {
+                _context2.next = 6;
+                break;
+              }
+              _context2.next = 4;
+              return this.initTecent();
+            case 4:
+              _context2.next = 14;
               break;
-            case 9:
+            case 6:
               if (!(type === 'amap')) {
-                _context.next = 14;
+                _context2.next = 11;
                 break;
               }
-              _context.next = 12;
+              _context2.next = 9;
               return this.initAmap();
-            case 12:
-              _context.next = 17;
+            case 9:
+              _context2.next = 14;
               break;
-            case 14:
+            case 11:
               if (!(type === 'baidu')) {
-                _context.next = 17;
+                _context2.next = 14;
                 break;
               }
-              _context.next = 17;
+              _context2.next = 14;
               return this.initBaidu();
-            case 17:
+            case 14:
+              this.isInit = true;
+            case 15:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function init() {
-        return _init.apply(this, arguments);
+      function _init() {
+        return _init3.apply(this, arguments);
       }
-      return init;
+      return _init;
     }() // reset() {
     //   this.isInit = false
     // }
   }, {
     key: "initTecent",
     value: function () {
-      var _initTecent = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2() {
-        return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _initTecent = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
+        return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return importJS("https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=".concat(this.key),
               // `https://map.qq.com/api/gljs?v=1.exp&key=${this.key}`,
               'TMap');
             case 2:
               this.TMap = window.TMap;
               this.MapCore = window.TMap;
-              _context2.next = 6;
+              _context3.next = 6;
               return delay(300);
             case 6:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function initTecent() {
         return _initTecent.apply(this, arguments);
@@ -17229,18 +17259,18 @@ var MapService = /*#__PURE__*/function () {
   }, {
     key: "initAmap",
     value: function () {
-      var _initAmap = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
+      var _initAmap = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4() {
         var plugin, AMap;
-        return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              // if (this.secretkey) {
-              //   window._AMapSecurityConfig = {
-              //     securityJsCode: this.secretkey
-              //   }
-              // }
-              plugin = ['AMap.Geolocation']; // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
-              _context3.next = 3;
+              if (this.secretkey) {
+                window._AMapSecurityConfig = {
+                  securityJsCode: this.secretkey
+                };
+              }
+              plugin = ['AMap.Geolocation', 'AMap.Geocoder'];
+              _context4.next = 4;
               return AMapLoader$1.load({
                 key: this.key,
                 version: '2.0',
@@ -17250,8 +17280,8 @@ var MapService = /*#__PURE__*/function () {
                   plugins: []
                 }
               });
-            case 3:
-              AMap = _context3.sent;
+            case 4:
+              AMap = _context4.sent;
               window.AMap = AMap;
               this.AMap = AMap;
               this.MapCore = window.AMap;
@@ -17260,11 +17290,11 @@ var MapService = /*#__PURE__*/function () {
               // console.log(window.AMapUI)
               // console.log(window.AMapLoader)
               // console.log(window.AMap === aaaa)
-            case 7:
+            case 8:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function initAmap() {
         return _initAmap.apply(this, arguments);
@@ -17274,12 +17304,12 @@ var MapService = /*#__PURE__*/function () {
   }, {
     key: "initBaidu",
     value: function () {
-      var _initBaidu = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4() {
+      var _initBaidu = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5() {
         var _this = this;
-        return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              return _context4.abrupt("return", new Promise(function (resolve, reject) {
+              return _context5.abrupt("return", new Promise(function (resolve, reject) {
                 window.BMAP_INITIAL_CALLBACK = function () {
                   _this.BMap = window.BMap;
                   _this.MapCore = window.BMap;
@@ -17300,9 +17330,9 @@ var MapService = /*#__PURE__*/function () {
               }));
             case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
       function initBaidu() {
         return _initBaidu.apply(this, arguments);
@@ -17690,34 +17720,32 @@ var getCityLocationByAmap = /*#__PURE__*/function () {
 // 高德逆地址解析
 var getAddressByAmap = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee8(position) {
-    var address;
     return _regeneratorRuntime$1().wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
           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服务查询
-          _context8.next = 4;
-          return getAddressByIpaas(position);
-        case 4:
-          address = _context8.sent;
-          return _context8.abrupt("return", address);
-        case 6:
+          return _context8.abrupt("return", new Promise(function (resolve, reject) {
+            if (position) {
+              new window.AMap.Geocoder({
+                city: '',
+                radius: 500
+              }).getAddress([position.longitude, position.latitude], function (status, result) {
+                var _result$regeocode;
+                // console.log(status)
+                // console.log(result)
+                // debugger
+                if (status === 'complete' && result.info === 'OK' && result !== null && result !== void 0 && (_result$regeocode = result.regeocode) !== null && _result$regeocode !== void 0 && _result$regeocode.formattedAddress) {
+                  var address = result.regeocode.formattedAddress || '';
+                  console.log("getAddressByAmap success: ".concat(address));
+                  resolve(address);
+                } else {
+                  console.error("getAddressByAmap fail: status = ".concat(status, ", result = ").concat(result));
+                  resolve('');
+                }
+              });
+            }
+          }));
+        case 2:
         case "end":
           return _context8.stop();
       }
@@ -18010,94 +18038,96 @@ var getAddressByBmap = /*#__PURE__*/function () {
     return _ref15.apply(this, arguments);
   };
 }();
-// 定位流程: 缓存 > 判断环境（APP，小程序，企微）基于环境获取定位 > 地图商高精度定位 > 地图商城市ip定位
 var getLocationPromise = /*#__PURE__*/function () {
   var _ref17 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee17() {
     var _window;
-    var location;
+    var isuseiplocarion,
+      location,
+      _args17 = arguments;
     return _regeneratorRuntime$1().wrap(function _callee17$(_context17) {
       while (1) switch (_context17.prev = _context17.next) {
         case 0:
+          isuseiplocarion = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : false;
           location = null; // 在 SPU 容器里使用 Native-API 的定位
           if (!((_window = window) !== null && _window !== void 0 && (_window = _window.Native) !== null && _window !== void 0 && _window.getLocation)) {
-            _context17.next = 5;
+            _context17.next = 6;
             break;
           }
-          _context17.next = 4;
+          _context17.next = 5;
           return getLocationByNative();
-        case 4:
-          location = _context17.sent;
         case 5:
+          location = _context17.sent;
+        case 6:
           if (location) {
-            _context17.next = 9;
+            _context17.next = 10;
             break;
           }
-          _context17.next = 8;
+          _context17.next = 9;
           return getLocationByNavigator();
-        case 8:
-          location = _context17.sent;
         case 9:
+          location = _context17.sent;
+        case 10:
           if (location) {
-            _context17.next = 34;
+            _context17.next = 39;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context17.next = 20;
+            _context17.next = 25;
             break;
           }
-          _context17.next = 13;
+          _context17.next = 14;
           return getLocationByAmap();
-        case 13:
+        case 14:
           location = _context17.sent;
-          if (location) {
-            _context17.next = 18;
+          if (!(!location && isuseiplocarion)) {
+            _context17.next = 19;
             break;
           }
-          _context17.next = 17;
+          _context17.next = 18;
           return getCityLocationByAmap();
-        case 17:
-          location = _context17.sent;
         case 18:
-          _context17.next = 34;
+          location = _context17.sent;
+        case 19:
+          if (!(!location && isuseiplocarion)) {
+            _context17.next = 23;
+            break;
+          }
+          _context17.next = 22;
+          return getIPLocationByIpaas();
+        case 22:
+          location = _context17.sent;
+        case 23:
+          _context17.next = 39;
           break;
-        case 20:
-          if (!(mapService.type === 'tencent')) {
-            _context17.next = 26;
+        case 25:
+          if (!(mapService.type === 'tencent' && isuseiplocarion)) {
+            _context17.next = 31;
             break;
           }
-          _context17.next = 23;
+          _context17.next = 28;
           return getIPLocationByTMap();
-        case 23:
+        case 28:
           location = _context17.sent;
-          _context17.next = 34;
+          _context17.next = 39;
           break;
-        case 26:
+        case 31:
           if (!(mapService.type === 'baidu')) {
-            _context17.next = 34;
+            _context17.next = 39;
             break;
           }
-          _context17.next = 29;
+          _context17.next = 34;
           return getLocationByBMap();
-        case 29:
+        case 34:
           location = _context17.sent;
-          if (location) {
-            _context17.next = 34;
+          if (!(!location && isuseiplocarion)) {
+            _context17.next = 39;
             break;
           }
-          _context17.next = 33;
+          _context17.next = 38;
           return getCityLocationByBMap();
-        case 33:
-          location = _context17.sent;
-        case 34:
-          if (location) {
-            _context17.next = 38;
-            break;
-          }
-          _context17.next = 37;
-          return getIPLocationByIpaas();
-        case 37:
-          location = _context17.sent;
         case 38:
+          location = _context17.sent;
+        case 39:
           // 开发模式下为了方便测试提供虚拟定位
           if (!location && urlquery.isvirtuallocation) {
             location = {
@@ -18106,23 +18136,23 @@ var getLocationPromise = /*#__PURE__*/function () {
             };
           }
           if (!(location && !location.address)) {
-            _context17.next = 46;
+            _context17.next = 47;
             break;
           }
-          _context17.next = 42;
+          _context17.next = 43;
           return getAddress(location);
-        case 42:
+        case 43:
           _context17.t0 = _context17.sent;
           if (_context17.t0) {
-            _context17.next = 45;
+            _context17.next = 46;
             break;
           }
           _context17.t0 = '经纬度获取成功，但地址获取失败。';
-        case 45:
-          location.address = _context17.t0;
         case 46:
-          return _context17.abrupt("return", location);
+          location.address = _context17.t0;
         case 47:
+          return _context17.abrupt("return", location);
+        case 48:
         case "end":
           return _context17.stop();
       }
@@ -18134,36 +18164,40 @@ var getLocationPromise = /*#__PURE__*/function () {
 }();
 // WGS84 GCJ-02 BD-09 坐标系
 // https://www.jianshu.com/p/559029832a67
+// 不能精确定位的情况下是否启用ip城市定位，ip定位用于不需要精确定位的场景
 function getLocation() {
   return _getLocation.apply(this, arguments);
 } // 逆地址解析
 function _getLocation() {
   _getLocation = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee20() {
-    var locationRes;
+    var isuseiplocarion,
+      locationRes,
+      _args20 = arguments;
     return _regeneratorRuntime$1().wrap(function _callee20$(_context20) {
       while (1) switch (_context20.prev = _context20.next) {
         case 0:
-          _context20.next = 2;
+          isuseiplocarion = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : false;
+          _context20.next = 3;
           return mapService.init();
-        case 2:
+        case 3:
           if (!(datetime && Date.now() - datetime <= cachetime && lastLocation && !runing)) {
-            _context20.next = 4;
+            _context20.next = 5;
             break;
           }
           return _context20.abrupt("return", cloneDeep$1(lastLocation));
-        case 4:
+        case 5:
           if (!(runing && locationPromise)) {
-            _context20.next = 6;
+            _context20.next = 7;
             break;
           }
           return _context20.abrupt("return", locationPromise);
-        case 6:
+        case 7:
           // console.log('runing')
           runing = true;
-          locationPromise = getLocationPromise();
-          _context20.next = 10;
+          locationPromise = getLocationPromise(isuseiplocarion);
+          _context20.next = 11;
           return locationPromise;
-        case 10:
+        case 11:
           locationRes = _context20.sent;
           runing = false;
           if (locationRes) {
@@ -18171,7 +18205,7 @@ function _getLocation() {
             lastLocation = locationRes;
           }
           return _context20.abrupt("return", locationRes);
-        case 14:
+        case 15:
         case "end":
           return _context20.stop();
       }
@@ -18188,49 +18222,53 @@ var getAddress = /*#__PURE__*/function () {
           _context18.next = 2;
           return mapService.init();
         case 2:
-          address = ''; // 先统一用ipaas解析 因为需要储存一致的地址格式（各地图商逆地址查询的地址格式不统一）
-          // 如果不行再按照各地图商解析
-          _context18.next = 5;
-          return getAddressByIpaas(position);
-        case 5:
-          address = _context18.sent;
+          address = '';
           if (address) {
-            _context18.next = 23;
+            _context18.next = 24;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context18.next = 13;
+            _context18.next = 14;
             break;
           }
-          _context18.next = 10;
+          _context18.next = 7;
           return getAddressByAmap(position);
-        case 10:
+        case 7:
           address = _context18.sent;
-          _context18.next = 23;
+          if (address) {
+            _context18.next = 12;
+            break;
+          }
+          _context18.next = 11;
+          return getAddressByIpaas(position);
+        case 11:
+          address = _context18.sent;
+        case 12:
+          _context18.next = 24;
           break;
-        case 13:
+        case 14:
           if (!(mapService.type === 'tencent')) {
-            _context18.next = 19;
+            _context18.next = 20;
             break;
           }
-          _context18.next = 16;
+          _context18.next = 17;
           return getAddressByTMap(position);
-        case 16:
+        case 17:
           address = _context18.sent;
-          _context18.next = 23;
+          _context18.next = 24;
           break;
-        case 19:
+        case 20:
           if (!(mapService.type === 'baidu')) {
-            _context18.next = 23;
+            _context18.next = 24;
             break;
           }
-          _context18.next = 22;
+          _context18.next = 23;
           return getAddressByBmap(position);
-        case 22:
-          address = _context18.sent;
         case 23:
-          return _context18.abrupt("return", address);
+          address = _context18.sent;
         case 24:
+          return _context18.abrupt("return", address);
+        case 25:
         case "end":
           return _context18.stop();
       }
@@ -52861,9 +52899,7 @@ var load = function load(options) {
       };
     }
   }
-  // 不开放地址查询 改用ipaas
-  var plugin = ['AMap.Geolocation'];
-  // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
+  var plugin = ['AMap.Geolocation', 'AMap.Geocoder'];
   return AMapLoader$1.load({
     key: AMapKey.key,
     version: '2.0',

package/package.json

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

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

@@ -20,6 +20,7 @@ interface ILbsSettingData {
 
 class MapService {
   private isInit = false
+  private initPromise: any = null
 
   get isLbssettingEnable() {
     return tenantSetting.get('lbssetting')?.enable === '1'
@@ -89,13 +90,17 @@ class MapService {
   async init() {
     if (this.isInit) return
 
-    this.isInit = true
+    // 兼容同时间发起多个
+    if (this.initPromise) {
+      return this.initPromise
+    }
 
-    const type = this.type
+    this.initPromise = this._init()
+    await this.initPromise
+  }
 
-    // if (process.env.NODE_ENV === 'development') {
-    //     type = 'baidu'
-    // }
+  private async _init() {
+    const type = this.type
     if (type === 'tencent') {
       await this.initTecent()
     } else if (type === 'amap') {
@@ -103,6 +108,7 @@ class MapService {
     } else if (type === 'baidu') {
       await this.initBaidu()
     }
+    this.isInit = true
   }
 
   // reset() {
@@ -121,14 +127,13 @@ class MapService {
   }
 
   private async initAmap() {
-    // if (this.secretkey) {
-    //   window._AMapSecurityConfig = {
-    //     securityJsCode: this.secretkey
-    //   }
-    // }
+    if (this.secretkey) {
+      window._AMapSecurityConfig = {
+        securityJsCode: this.secretkey
+      }
+    }
 
-    const plugin = ['AMap.Geolocation']
-    // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
+    const plugin = ['AMap.Geolocation', 'AMap.Geocoder']
 
     const AMap = await AMapLoader.load({
       key: this.key,

package/src/map/index.ts

@@ -232,25 +232,26 @@ 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
+  return new Promise((resolve, reject) => {
+    if (position) {
+      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地址获取其当前所在地理位置，精确到市级，常用于显示当地城市天气预报、初始化用户城市等非精确定位场景。
@@ -437,8 +438,7 @@ const getAddressByBmap = async (position: Location): Promise<string> => {
   })
 }
 
-// 定位流程: 缓存 > 判断环境（APP，小程序，企微）基于环境获取定位 > 地图商高精度定位 > 地图商城市ip定位
-const getLocationPromise = async (): Promise<Location> => {
+const getLocationPromise = async (isuseiplocarion = false): Promise<Location> => {
   let location: Location = null
 
   // 在 SPU 容器里使用 Native-API 的定位
@@ -449,29 +449,27 @@ const getLocationPromise = async (): Promise<Location> => {
   if (!location) {
     location = await getLocationByNavigator()
   }
+  // location = null
 
   if (!location) {
     if (mapService.type === 'amap') {
       location = await getLocationByAmap()
-      // ip城市定位结果不精确 但总比定不到位好
-      if (!location) {
+      if (!location && isuseiplocarion) {
         location = await getCityLocationByAmap()
       }
-    } else if (mapService.type === 'tencent') {
+      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 = {
@@ -489,7 +487,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 +501,7 @@ async function getLocation() {
   }
   // console.log('runing')
   runing = true
-  locationPromise = getLocationPromise()
+  locationPromise = getLocationPromise(isuseiplocarion)
   const locationRes = await locationPromise
   runing = false
   if (locationRes) {
@@ -518,13 +517,14 @@ const getAddress = async (position: Location): Promise<string> => {
 
   let address = ''
 
-  // 先统一用ipaas解析 因为需要储存一致的地址格式（各地图商逆地址查询的地址格式不统一）
-  // 如果不行再按照各地图商解析
-  address = await getAddressByIpaas(position)
-
   if (!address) {
     if (mapService.type === 'amap') {
       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,43 @@ 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: ''
+    //       }
+    //     }
+    //   }
+    // }
+
+    // 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'
+    // // tenantsetting.lbssetting.setting.type = 'tencent'
+    // // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
 
-      // tenantsetting.lbssetting.setting.type = 'tencent'
-      // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+    // // tenantsetting.lbssetting.setting.type = 'baidu'
+    // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
 
-      // 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]
       }