@lambo-design-mobile/lambo-js-bridge 1.0.0-beta.29 → 1.0.0-beta.30

package/src/sdk/LamboJsBridge.js

@@ -1,102 +1,102 @@
-/* eslint-disable prefer-destructuring */
-import WechatAdapter from './WechatAdapter';
-import DingTalkAdapter from './DingTalkAdapter';
-import CordovaAdapter from './CordovaAdapter';
-import YunTuAdapter from './YunTuAdapter';
-import WeComAdapter from './WeComAdapter';
-import BrowserAdapter from './BrowserAdapter';
-import MobileIMAdaoter from './MobileIMAdaoter';
-
-class LamboJsBridge {
-    constructor(param) {
-        this._detectPlatform(param);
-    }
-
-    _detectPlatform(param) {
-        let userAgent;
-        if (param.userAgent) {
-            userAgent = param.userAgent;
-        } else {
-            userAgent = navigator.userAgent.toLowerCase();
-        }
-        if (/wxwork/.test(userAgent)) {
-            this.platform = new WeComAdapter(param);
-        } else if (/micromessenger/.test(userAgent)) {
-            this.platform = new WechatAdapter(param);
-        } else if (/dingtalk/.test(userAgent)) {
-            this.platform = new DingTalkAdapter(param);
-        } else if (/cordova/.test(userAgent)) {
-            this.platform = new CordovaAdapter(param);
-        } else if (/yuntu/.test(userAgent)) {
-            this.platform = new YunTuAdapter(param);
-        } else if (/mobileim/.test(userAgent)) {
-            this.platform = new MobileIMAdaoter(param);
-        } else {
-            this.platform = new BrowserAdapter();
-        }
-    }
-
-    async initializePlugin(pluginConfig = []) {
-        if (this.platform instanceof YunTuAdapter) {
-            return this.platform.initializePlugin(pluginConfig);
-        }
-            return Promise.resolve();
-
-    }
-
-    async getPlatform(options = {}) {
-        return this.platform.getPlatform(options);
-    }
-
-    async getLocation(options = {}) {
-        return this.platform.getLocation(options);
-    }
-
-    async scanCode(options = {}) {
-        return this.platform.scanCode(options);
-    }
-
-    async localAuthPlugin(options = {}) {
-        return this.platform.localAuthPlugin(options);
-    }
-
-    async getAvailableBiometrics(options = {}) {
-        return this.platform.getAvailableBiometrics(options);
-    }
-
-    async takePhoto(options = {}) {
-        return this.platform.takePhoto(options);
-    }
-
-    async openLocation(options = {}) {
-        return this.platform.openLocation(options);
-    }
-
-    async filePreview(options = {}) {
-        return this.platform.filePreview(options);
-    }
-
-    async initKey(options = {}) {
-        return this.platform.initKey(options);
-    }
-
-    async startRecording(options = {}) {
-        return this.platform.startRecording(options);
-    }
-
-    async stopRecording(options = {}) {
-        return this.platform.stopRecording(options);
-    }
-
-    async downloadFile(options={}){
-        return this.platform.downloadFile(options);
-    }
-
-    // 创建一个 Vue 插件
-    static install(Vue) {
-        // 将 LamboJsBridge 实例挂载到 Vue 原型上，全局可用
-        Vue.prototype.$lamboJsBridge = new LamboJsBridge({});
-    }
-}
-
-export default LamboJsBridge;
+/* eslint-disable prefer-destructuring */
+import WechatAdapter from './WechatAdapter';
+import DingTalkAdapter from './DingTalkAdapter';
+import CordovaAdapter from './CordovaAdapter';
+import YunTuAdapter from './YunTuAdapter';
+import WeComAdapter from './WeComAdapter';
+import BrowserAdapter from './BrowserAdapter';
+import MobileIMAdaoter from './MobileIMAdaoter';
+
+class LamboJsBridge {
+    constructor(param) {
+        this._detectPlatform(param);
+    }
+
+    _detectPlatform(param) {
+        let userAgent;
+        if (param.userAgent) {
+            userAgent = param.userAgent;
+        } else {
+            userAgent = navigator.userAgent.toLowerCase();
+        }
+        if (/wxwork/.test(userAgent)) {
+            this.platform = new WeComAdapter(param);
+        } else if (/micromessenger/.test(userAgent)) {
+            this.platform = new WechatAdapter(param);
+        } else if (/dingtalk/.test(userAgent)) {
+            this.platform = new DingTalkAdapter(param);
+        } else if (/cordova/.test(userAgent)) {
+            this.platform = new CordovaAdapter(param);
+        } else if (/yuntu/.test(userAgent)) {
+            this.platform = new YunTuAdapter(param);
+        } else if (/mobileim/.test(userAgent)) {
+            this.platform = new MobileIMAdaoter(param);
+        } else {
+            this.platform = new BrowserAdapter();
+        }
+    }
+
+    async initializePlugin(pluginConfig = []) {
+        if (this.platform instanceof YunTuAdapter) {
+            return this.platform.initializePlugin(pluginConfig);
+        }
+            return Promise.resolve();
+
+    }
+
+    async getPlatform(options = {}) {
+        return this.platform.getPlatform(options);
+    }
+
+    async getLocation(options = {}) {
+        return this.platform.getLocation(options);
+    }
+
+    async scanCode(options = {}) {
+        return this.platform.scanCode(options);
+    }
+
+    async localAuthPlugin(options = {}) {
+        return this.platform.localAuthPlugin(options);
+    }
+
+    async getAvailableBiometrics(options = {}) {
+        return this.platform.getAvailableBiometrics(options);
+    }
+
+    async takePhoto(options = {}) {
+        return this.platform.takePhoto(options);
+    }
+
+    async openLocation(options = {}) {
+        return this.platform.openLocation(options);
+    }
+
+    async filePreview(options = {}) {
+        return this.platform.filePreview(options);
+    }
+
+    async initKey(options = {}) {
+        return this.platform.initKey(options);
+    }
+
+    async startRecording(options = {}) {
+        return this.platform.startRecording(options);
+    }
+
+    async stopRecording(options = {}) {
+        return this.platform.stopRecording(options);
+    }
+
+    async downloadFile(options={}){
+        return this.platform.downloadFile(options);
+    }
+
+    // 创建一个 Vue 插件
+    static install(Vue) {
+        // 将 LamboJsBridge 实例挂载到 Vue 原型上，全局可用
+        Vue.prototype.$lamboJsBridge = new LamboJsBridge({});
+    }
+}
+
+export default LamboJsBridge;

package/src/sdk/MobileIMAdaoter.js

@@ -1,40 +1,59 @@
-import config from "@lambo-design-mobile/shared/config/config";
+import { getAddress } from './BdMapUtils';
 
 class MobileIMAdaoter {
   constructor(_options) {
-    function loadScript(src) {
-      return new Promise((resolve, reject) => {
-        const script = document.createElement('script');
-        script.src = src;
-        script.onload = () => resolve(script);
-        script.onerror = () => reject(new Error('Failed to load script'));
-        document.head.appendChild(script);
-      });
-    }
-    loadScript('/ind-uc-ext/native.js')
-      .then((script) => console.log('Script loaded'))
-      .catch((err) => console.error(err));
   }
 
+  // 新门户系统： 我们移动端只能提供坐标数据，没法提供街道地市这些信息。。
   async getLocation(options) {
     return new Promise((resolve, reject) => {
       try {
         let args = {
           // 是否获取地址信息
           // isNeedAddress: true,
-          ...config.imGeoOptions
         };
-        window.native.getLocation(args, (res) => {
-          console.error('getLocation success:', res);
-          resolve({
-            latitude: res.point.latitude,
-            longitude: res.point.longitude,
-            accuracy: res.point.horizontalAccuracy,
-            address: res.address,
-            province: res.addressComponents.province,
-            city: res.addressComponents.city,
+
+        const fetchLocation = () => {
+          return new Promise((resolve2) => {
+            window.native.getLocation(args, (res) => {
+              resolve2({
+                latitude: res.point.latitude,
+                longitude: res.point.longitude,
+                accuracy: res.point.horizontalAccuracy,
+              });
+            });
           });
-        });
+        };
+
+        // 先判断是否需要地理位置 如不需要 直接返回坐标
+        if (options.needAddress) {
+          fetchLocation()
+            .then(async (bd09Location) => {
+              console.log(
+                'with options.needAddress bd09Location',
+                bd09Location
+              );
+              // const result = getAddress(bd09Location.longitude, bd09Location.latitude)
+              //平台返回的经纬度是反的 解决了再换回来
+              const result = await getAddress(
+                bd09Location.latitude,
+                bd09Location.longitude
+              );
+              console.log('with options.needAddress getAddress result', result);
+              if (!result) {
+                return reject(new Error('Invalid location data'));
+              }
+              resolve({
+                ...bd09Location,
+                ...result,
+              });
+            })
+            .catch((err) => {
+              reject(err);
+            });
+        } else {
+          resolve(fetchLocation());
+        }
       } catch (err) {
         console.error('getLocation failed:', err);
         reject(err);
@@ -56,7 +75,7 @@ class MobileIMAdaoter {
     });
   }
 
-  async getInitInfo(options = {}) {
+  async getPlatform(options = {}) {
     // 获取初始化信息
     return {
       platform: 'MobileIM',