@lambo-design-mobile/lambo-js-bridge 1.0.0-beta.2 → 1.0.0-beta.5

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 # Changelog
+## [1.0.0-beta.5](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/js-bridge@1.0.0-beta.4...@lambo-design-mobile/js-bridge@1.0.0-beta.5) (2024-08-29)
+
+
+### ✨ Features | 新功能
+
+* **@lambo-dsign-mobile/js-bridge:** 新增filepreview ([80de1a1](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/80de1a1b7c7c690ea55895f2c6c9acfbf1859fda))
+
+## [1.0.0-beta.4](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/js-bridge@1.0.0-beta.3...@lambo-design-mobile/js-bridge@1.0.0-beta.4) (2024-08-23)
+
+
+### ✨ Features | 新功能
+
+* **@lambo-design-mobile/lambo-js-picker:** 修改云途 ([0d8dd53](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/0d8dd5347c349787a1705e0d83531677e34159b2))
+
+## [1.0.0-beta.3](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/js-bridge@1.0.0-beta.2...@lambo-design-mobile/js-bridge@1.0.0-beta.3) (2024-08-22)
+
 ## [1.0.0-beta.2](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/js-bridge@1.0.0-beta.1...@lambo-design-mobile/js-bridge@1.0.0-beta.2) (2024-08-22)
 
 

package/demo/index.vue

@@ -24,6 +24,9 @@
       <van-button @click="openLocation">打开位置</van-button>
       <pre v-if="openLocationResult"><code>{{ openLocationResult }}</code></pre>
     </demo-block>
+    <demo-block title="文件预览">
+      <a href="javascript:void(0);" @click="previewFile">点击这里预览文件</a>
+    </demo-block>
   </demo-section>
 </template>
 
@@ -43,8 +46,8 @@ export default {
       scanResult: '',
       photoResult: '',
       openLocationResult: '', // 添加用于存储打开位置的返回值
-      latitude: null, // 存储纬度
-      longitude: null, // 存储经度
+      latitude: 117.129, // 存储纬度
+      longitude: 36.662, // 存储经度
       ossServerContext: 'ibp-upms-server',
       ossImgPutUrl: '/oss/file/put',
       ossImgGetUrl: '/oss/file/get/',
@@ -100,11 +103,13 @@ export default {
           // 初始化参数，根据需要填写
         };
         const location = await this.lamboBridge.getLocation(options);
-        console.log("location",location)
+        // console.log("location",location)
         this.location += `${JSON.stringify(location)}\n`; // 追加新数据
         this.latitude = location.latitude; // 存储纬度
         this.longitude = location.longitude; // 存储经度
-        console.log('Location:', location);
+        console.log("this.latitude:",this.latitude);
+        console.log("this.longitude:",this.longitude);
+        // console.log('Location:', location);
       } catch (error) {
         console.error('Error getting location:', error);
       }
@@ -126,7 +131,8 @@ export default {
         const options = {
           ossServerContext: this.ossServerContext,
           ossImgPutUrl: this.ossImgPutUrl,
-          ossImgGetUrl: this.ossImgGetUrl
+          ossImgGetUrl: this.ossImgGetUrl,
+          // sourceType: 'gallery'
         };
         const photos = await this.lamboBridge.takePhoto(options);
         this.photoResult += `${JSON.stringify(photos)}\n`;
@@ -167,6 +173,18 @@ export default {
         this.openLocationResult = `打开位置时出错: ${error.message}`; // 存储错误信息
         console.error('Error opening location:', error);
       }
+    },
+    async previewFile() {
+      try {
+        const options = {
+          title: '预览文件', // 文件的标题
+          path: 'http://160.mall.eap.lambo.top/ecm-runtime-server/api/file/get/123456' // 文件的URL路径
+        };
+        const result = await this.lamboBridge.filePreview(options);
+        console.log('File preview result:', result);
+      } catch (error) {
+        console.error('Error previewing file:', error);
+      }
     }
   },
   beforeRouteEnter (to, from, next) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/lambo-js-bridge",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.5",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -9,7 +9,9 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "dependencies": {},
+  "dependencies": {
+    "coordtransform": "^2.1.2"
+  },
   "scripts": {
     "release-js-bridge": "pnpm release-beta && git push --follow-tags && pnpm re-publish",
     "release-major": "standard-version --release-as major",

package/src/sdk/BdMapUtils.js

@@ -0,0 +1,74 @@
+import config from "@lambo-design-mobile/shared/config/config";
+import coordtransform from "coordtransform";
+
+const addScript = function (src, cb) {
+  const script = document.createElement('script')
+  script.src = src
+  document.getElementsByTagName('head')[0].appendChild(script)
+  script.onload = function () {
+      if (!!cb) {
+          cb()
+      }
+  }
+}
+
+export function initBdMap() {
+  let tempAk = 'AWZBggDSk8Zsv2STX7S2SBYO6wsH7BVT'
+  if (config.akList) {
+    tempAk = config.akList[Math.random() * config.akList.length]
+  }
+  addScript('https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=' + tempAk)
+  addScript('https://api.map.baidu.com/getscript?type=webgl&v=1.0&ak=' + tempAk)
+}
+
+export function getAddress(longitude, latitude) {
+  const myGeo = new BMap.Geocoder({extensions_town: false});      
+  let city = ''
+  let province = ''
+  let address = ''
+
+  // 根据坐标得到地址描述    
+  myGeo.getLocation(new BMap.Point(longitude, latitude), function(result){      
+    if (result){      
+      city = result.addressComponents.city
+      province = result.addressComponents.province
+      address = result.address
+    }      
+  });
+  return {
+    city,
+    province,
+    address
+  }
+}
+
+export function getAxisByType(unifiedLocation, locationType) {
+  // 目前只有wgs84 bd09 gcj02 默认传进unifiedLocation 坐标系为gcj02 不转换
+  if(locationType === 'bd09') {
+    // 将 gcj02 坐标转换为 bd09
+    const [bd09Lng, bd09Lat] = coordtransform.gcj02tobd09(unifiedLocation.longitude, unifiedLocation.latitude);
+    unifiedLocation.longitude = bd09Lng;
+    unifiedLocation.latitude = bd09Lat;
+  }
+  else if(locationType === 'wgs84'){
+    // 将 gcj02 坐标转换为 bd09
+    const [wgs84Lng, wgs84Lat] = coordtransform.gcj02towgs84(unifiedLocation.longitude, unifiedLocation.latitude);
+    unifiedLocation.longitude = wgs84Lng;
+    unifiedLocation.latitude = wgs84Lat;
+  }
+  if (!unifiedLocation.latitude || !unifiedLocation.longitude) {
+    return false;
+  }
+  return unifiedLocation
+}
+
+export function getAddressByType(unifiedLocation, locationType) {
+  
+  const [bd09Lng, bd09Lat] = coordtransform.gcj02tobd09(unifiedLocation.longitude, unifiedLocation.latitude);
+  // 根据坐标得到地址描述    
+  const res = getAddress(bd09Lng, bd09Lat)
+  unifiedLocation.city = res.addressComponents.city
+  unifiedLocation.province = res.addressComponents.province
+  unifiedLocation.address = res.address
+  getAxisByType(unifiedLocation, locationType)
+}

package/src/sdk/LamboJsBridge.js

@@ -4,28 +4,16 @@ import CordovaAdapter from './CordovaAdapter';
 import YunTuAdapter from './YunTuAdapter';
 import WeComAdapter from './WeComAdapter';
 import BrowserAdapter from './BrowserAdapter';
+import { initBdMap } from './BdMapUtils';
 
 class LamboJsBridge {
-    constructor(param) {
-      // param.isBdNiJieXi 需要百度地图逆地址解析
-      if(param.isBdNiJieXi) {
-        const addScript = function (src, cb) {
-          const script = document.createElement('script')
-          script.src = src
-          document.getElementsByTagName('head')[0].appendChild(script)
-          script.onload = function () {
-              if (!!cb) {
-                  cb()
-              }
-          }
-        }
-        addScript('https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=AWZBggDSk8Zsv2STX7S2SBYO6wsH7BVT')
-        addScript(
-            'https://api.map.baidu.com/getscript?type=webgl&v=1.0&ak=AWZBggDSk8Zsv2STX7S2SBYO6wsH7BVT',
-        )
-      }
-        this._detectPlatform(param);
+  constructor(param) {
+    // param.isBdNiJieXi 需要百度地图逆地址解析
+    if (param.isBdNiJieXi) {
+      initBdMap();
     }
+    this._detectPlatform(param);
+  }
 
     _detectPlatform(param) {
         const userAgent = navigator.userAgent.toLowerCase();
@@ -45,6 +33,16 @@ class LamboJsBridge {
 
     }
 
+  // yuntu接口：初始化插件（只有yuntu平台需要）
+  async initializePlugin(pluginConfig = []) {
+    if (this.platform instanceof YunTuAdapter) {
+      return this.platform.initializePlugin(pluginConfig);
+    } else {
+      // 非 yuntu 平台，直接返回一个已解决的 Promise
+      return Promise.resolve();
+    }
+  }
+
     // 通用接口：获取初始化信息
     async getPlatform(options = {}) {
         return this.platform.getPlatform(options);
@@ -69,5 +67,9 @@ class LamboJsBridge {
     async openLocation(options = {}){
         return this.platform.openLocation(options);
     }
+
+    async filePreview(options={}){
+        return this.platform.filePreview(options);
+    }
 }
 export default LamboJsBridge;

package/src/sdk/WechatAdapter.js

@@ -3,7 +3,8 @@
 
 import ajax from "@lambo-design-mobile/shared/utils/ajax";
 import config from "@lambo-design-mobile/shared/config/config";
-import coordtransform from "coordtransform";
+// import coordtransform from "coordtransform";
+import { getAddress, initBdMap, getAddressByType, getAxisByType } from './BdMapUtils';
 
 class WechatAdapter {
     constructor(_options) {
@@ -23,11 +24,9 @@ class WechatAdapter {
             });
         }
         loadScript('//res.wx.qq.com/open/js/jweixin-1.6.0.js')
-            .then(script => {
-                console.log('Script loaded');
-                this.init(_options);
-            })
+            .then(script => console.log('Script loaded'))
             .catch(err => console.error(err));
+        this.init(_options);
     }
 
     async init(options) {
@@ -87,16 +86,14 @@ class WechatAdapter {
                                 if (!unifiedLocation.latitude || !unifiedLocation.longitude) {
                                     return reject(new Error('Invalid location data'));
                                 }
-                                
-                                const myGeo = new BMap.Geocoder({extensions_town: false});      
-                                // 根据坐标得到地址描述    
-                                myGeo.getLocation(new BMap.Point(unifiedLocation.longitude, unifiedLocation.latitude), function(result){      
-                                  if (result){      
-                                    unifiedLocation.city = result.addressComponents.city
-                                    unifiedLocation.province = result.addressComponents.province
-                                    unifiedLocation.address = result.address
-                                  }      
-                                });
+                                // options.needAddress 是否需要地址信息
+                                // if(options.needAddress && !unifiedLocation.address) {
+                                //   // 根据坐标得到地址描述
+                                //   const res = getAddress(unifiedLocation.longitude, unifiedLocation.latitude)
+                                //   unifiedLocation.city = res.addressComponents.city
+                                //   unifiedLocation.province = res.addressComponents.province
+                                //   unifiedLocation.address = res.address
+                                // }
 
                                 resolve(unifiedLocation);
                             },
@@ -108,31 +105,67 @@ class WechatAdapter {
                     });
                 };
 
-                if (locationType === 'bd09') {
-                    // 先获取 gcj02 坐标
-                    fetchLocation('gcj02').then(unifiedLocation => {
-                        // 将 gcj02 坐标转换为 bd09
-                        const [bd09Lng, bd09Lat] = coordtransform.gcj02tobd09(unifiedLocation.longitude, unifiedLocation.latitude);
-                        unifiedLocation.longitude = bd09Lng;
-                        unifiedLocation.latitude = bd09Lat;
+                // 先判断是否需要地理位置 如不需要 直接返回坐标
+                if(options.needAddress) {
+                  fetchLocation('gcj02'.then(unifiedLocation => {
+                    const result = getAddressByType(unifiedLocation, locationType)
+                    if(!result) {
+                      return reject(new Error('Invalid location data'));
+                    }
+                    resolve(unifiedLocation);
+                  }))
+                  .catch(err => { reject(err) })
+                }
+                else {
+                  resolve(fetchLocation(locationType))
+                }
 
-                        const myGeo = new BMap.Geocoder({extensions_town: false});      
-                        // 根据坐标得到地址描述    
-                        myGeo.getLocation(new BMap.Point(unifiedLocation.longitude, unifiedLocation.latitude), function(result){      
-                          if (result){      
-                            unifiedLocation.city = result.addressComponents.city
-                            unifiedLocation.province = result.addressComponents.province
-                            unifiedLocation.address = result.address
-                          }      
-                        });
+                // // 先取gcj02 再根据type转成不同坐标系
+                // fetchLocation('gcj02').then(unifiedLocation => {
+                //   // options.needAddress 是否需要地址信息
+                //   if(options.needAddress && !unifiedLocation.address) {
+                //     const result = getAddressByType(unifiedLocation, locationType)
+                //     if(!result) {
+                //       return reject(new Error('Invalid location data'));
+                //     }
+                //     resolve(unifiedLocation);
+                //   }
+                //   else {
+                //     const result = getAxisByType(unifiedLocation, locationType)
+                //     if(!result) {
+                //       return reject(new Error('Invalid location data'));
+                //     }
+                //     resolve(unifiedLocation);
+                //   }
+                // }).catch(err => {
+                //   reject(err);
+                // });
 
-                        resolve(unifiedLocation);
-                    }).catch(err => {
-                        reject(err);
-                    });
-                } else {
-                    fetchLocation(locationType).then(resolve).catch(reject);
-                }
+
+                // if (locationType === 'bd09') {
+                //     // 先获取 gcj02 坐标
+                //     fetchLocation('gcj02').then(unifiedLocation => {
+                //       // 将 gcj02 坐标转换为 bd09
+                //       const [bd09Lng, bd09Lat] = coordtransform.gcj02tobd09(unifiedLocation.longitude, unifiedLocation.latitude);
+                //       unifiedLocation.longitude = bd09Lng;
+                //       unifiedLocation.latitude = bd09Lat;
+                //       if (!unifiedLocation.latitude || !unifiedLocation.longitude) {
+                //           return reject(new Error('Invalid location data'));
+                //       }
+                //       // options.needAddress 是否需要地址信息
+                //       if(options.needAddress && !unifiedLocation.address) {
+                //         // 根据坐标得到地址描述
+                //         const res = getAddress(unifiedLocation.longitude, unifiedLocation.latitude)
+                //         unifiedLocation.city = res.addressComponents.city
+                //         unifiedLocation.province = res.addressComponents.province
+                //         unifiedLocation.address = res.address
+                //       }
+
+                //       resolve(unifiedLocation);
+                //   }).catch(err => {
+                //       reject(err);
+                //   });
+                // }
             });
         });
     }

package/src/sdk/YunTuAdapter.js

@@ -1,34 +1,33 @@
-import ajax from "@lambo-design-mobile/shared/utils/ajax";
-import config from "@lambo-design-mobile/shared/config/config";
-import coordtransform from "coordtransform";
+import './yuntu';
 
 class YunTuAdapter {
     constructor() {
-        this.isInitialized = false; // 标志插件是否已初始化
-        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('/packages/js-bridge/yuntu.js')
-            .then(script => {
-                console.log('Script loaded');
-                this.initializePlugin(); // 确保初始化完成
-            })
-            .catch(err => console.error(err));
+        // 标志插件是否已初始化
+        this.isInitialized = false;
     }
 
-    async initializePlugin() {
-        window.yuntu.config('["myPlugin","amapPlugin","tabBarPlugin","scanCodePlugin","filePreviewPlugin","imagePickerPlugin","appUpdatePlugin"]');
-        this.isInitialized = true;
-        console.log("this.isInitialized:",this.isInitialized);
+    async initializePlugin(pluginConfig) {
+        try {
+            // 如果传入的是非空数组，则直接使用；否则使用默认的全部插件配置
+            const configToUse = Array.isArray(pluginConfig) && pluginConfig.length > 0
+                ? JSON.stringify(pluginConfig)
+                : '["myPlugin","amapPlugin","tabBarPlugin","scanCodePlugin","filePreviewPlugin","imagePickerPlugin"]';
+            // 调用插件初始化
+            await yuntuConfig(configToUse); // 确保等待 yuntuConfig 执行完成
+
+            this.isInitialized = true;
+            // 将插件信息解析并存储到 this.plugin
+            this.plugins = JSON.parse(configToUse);
+            console.log("Initialized plugins:", this.plugins);
+            return this.plugins;
+        } catch (error) {
+            console.error("Plugin initialization failed:", error);
+            this.isInitialized = false;
+            return "Plugin initialization failed:" + error;
+        }
     }
 
-
+    // 其余代码保持不变
     async getPlatform() {
         return {
             platform: 'Yuntu'

package/src/sdk/yuntu.js

@@ -0,0 +1,55 @@
+(function(global) {
+    global.yuntu = {
+        config: function (options) {
+            global.flutter_inappwebview.callHandler(
+                "yuntu",
+                "init",
+                options
+            );
+        },
+        exec: function(plugin, action, successCallback, errorCallback, options) {
+            global.flutter_inappwebview.callHandler(
+                plugin,
+                action,
+                options
+            ).then((result) => {
+                successCallback(result);
+            }).catch((error) => {
+                errorCallback(error);
+            });
+        }
+    };
+
+    // 等待一个全局函数或变量加载完成
+    function waitForGlobalVariableOrFunction(globalName, callHandler) {
+        return new Promise((resolve, reject) => {
+            var interval = 1000; // 每1000毫秒检查一次
+            var timeout = 10000; // 设定最大等待时间 10 秒
+            var elapsedTime = 0;
+
+            var timer = setInterval(function () {
+                elapsedTime += interval;
+                if (global[globalName] && global[globalName][callHandler] !== undefined) {
+                    clearInterval(timer); // 停止定时器
+                    resolve(); // 执行回调函数，表示成功
+                    console.log("yuntu 插件加载成功");
+                } else if (elapsedTime >= timeout) {
+                    clearInterval(timer); // 停止定时器
+                    console.log("yuntu 插件加载失败");
+                    reject(new Error(`Timeout: ${globalName}.${callHandler} not found within ${timeout}ms`));
+                }
+            }, interval);
+        });
+    }
+
+    global.yuntuConfig = async function(options) {
+        try {
+            await waitForGlobalVariableOrFunction('flutter_inappwebview', 'callHandler');
+            global.yuntu.config(options);
+        } catch (error) {
+            console.error("yuntuConfig 初始化失败:", error);
+            throw error; // 如果失败则抛出错误
+        }
+    };
+
+})(window);

package/yuntu.js

@@ -1,42 +0,0 @@
-window.yuntu = {
-    config: function (options) {
-        window.flutter_inappwebview.callHandler(
-            "yuntu",
-            "init",
-            options
-        )
-    },
-    exec: function(plugin, action, successCallback, errorCallback, options) {
-        window.flutter_inappwebview.callHandler(
-            plugin,
-            action,
-            options
-        ).then((result) => {
-            successCallback(result);
-        }).catch((error) => {
-            errorCallback(error);
-        });
-    }
-}
-// 等待一个全局函数或变量加载完成
-function waitForGlobalVariableOrFunction(globalName, callHandler, callback) {
-    // 设置轮询的时间间隔（毫秒）
-    var interval = 100; // 例如，每100毫秒检查一次
-    var t = 0
-    // 定义一个定时器函数
-    var timer = setInterval(function () {
-        console.log(t++)
-        if (window[globalName][callHandler] !== undefined) {
-            // 全局变量或函数已加载
-            clearInterval(timer); // 停止定时器
-            callback(); // 执行回调函数
-        }
-    }, interval);
-}
-
-function yuntuConfig(options){
-    waitForGlobalVariableOrFunction('flutter_inappwebview', 'callHandler', function () {
-        // 在这里执行你的代码，myFunction 已加载
-        window.yuntu.config(options);
-    });
-}