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

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) {
@@ -87,16 +88,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 +107,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,163 +1,224 @@
-import ajax from "@lambo-design-mobile/shared/utils/ajax";
-import config from "@lambo-design-mobile/shared/config/config";
-import coordtransform from "coordtransform";
-
-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));
-    }
-
-    async initializePlugin() {
-        window.yuntu.config('["myPlugin","amapPlugin","tabBarPlugin","scanCodePlugin","filePreviewPlugin","imagePickerPlugin","appUpdatePlugin"]');
-        this.isInitialized = true;
-        console.log("this.isInitialized:",this.isInitialized);
-    }
-
-
-    async getPlatform() {
-        return {
-            platform: 'Yuntu'
-        };
-    }
-
-    async getLocation(options) {
-        if (!this.isInitialized) {
-            await this.initializePlugin(); // 确保插件初始化
-        }
-
-        return new Promise((resolve, reject) => {
-
-            if (window.geolocation && typeof window.geolocation.getCurrentPosition === 'function') {
-                window.geolocation.getCurrentPosition(
-                    (res) => {
-                        console.log('YunTu: Location obtained', JSON.stringify(res));
-                        resolve(res); // 成功获取位置
-                    },
-                    (err) => {
-                        console.error('YunTu: Failed to obtain location', err);
-                        reject(err); // 获取位置失败
-                    },
-                    options
-                );
-            } else {
-                const errorMessage = 'Geolocation is not initialized or not available';
-                console.error('YunTu:', errorMessage);
-                reject(new Error(errorMessage)); // Geolocation 未初始化或不可用
-            }
-        });
-    }
-
-    async openLocation(options) {
-        if (!this.isInitialized) {
-            await this.initializePlugin(); // 确保插件初始化
-        }
-
-        return new Promise((resolve, reject) => {
-            if (window.geolocation && typeof window.geolocation.openLocation === 'function') {
-                console.log("1")
-                window.geolocation.openLocation(
-                    (res) => {
-                        console.log('YunTu: Open location success', res);
-                        resolve(res); // 成功打开地图
-                    },
-                    (err) => {
-                        console.error('YunTu: Failed to open location', err);
-                        reject(err); // 打开地图失败
-                    },
-                    {
-                        latitude: options.latitude,
-                        longitude: options.longitude,
-                        type: options.type || 'amap' // 默认为高德地图
-                    }
-                );
-            } else {
-                const errorMessage = 'Geolocation is not initialized or not available';
-                console.error('YunTu:', errorMessage);
-                reject(new Error(errorMessage)); // Geolocation 未初始化或不可用
-            }
-        });
-    }
-
-    async scanCode(options) {
-        if (!this.isInitialized) {
-            await this.initializePlugin(); // 确保插件初始化
-        }
-
-        return new Promise((resolve, reject) => {
-            if (window.scanCode && typeof window.scanCode.startScan === 'function') {
-                window.scanCode.startScan(
-                    (res) => {
-                        console.log('YunTu: Scan code success', res);
-                        resolve(res); // 成功获取扫码结果
-                    },
-                    (err) => {
-                        console.error('YunTu: Failed to scan code', err);
-                        reject(err); // 扫码失败
-                    },
-                    options // 传递给扫码方法的选项
-                );
-            } else {
-                const errorMessage = 'ScanCode is not initialized or not available';
-                console.error('YunTu:', errorMessage);
-                reject(new Error(errorMessage)); // ScanCode 未初始化或不可用
-            }
-        });
-    }
-
-
-    async takePhoto(options) {
-        console.log('YunTu: Taking photo with options', options);
-
-        if (!this.isInitialized) {
-            await this.initializePlugin(); // 确保插件初始化
-        }
-
-        return new Promise((resolve, reject) => {
-            if (window.imagePicker) {
-                const sourceType = options && options.sourceType === 'gallery' ? 'gallery' : 'camera';
-                const pickerFunction = window.imagePicker[sourceType];
-
-                if (typeof pickerFunction === 'function') {
-                    pickerFunction(
-                        (res) => {
-                            console.log('YunTu: Photo selection success', res);
-                            resolve(JSON.parse(res)); // 成功获取照片
-                        },
-                        (err) => {
-                            console.error('YunTu: Failed to select photo', err);
-                            reject(JSON.parse(err)); // 选择照片失败
-                        },
-                        options // 传递给选取照片方法的选项（如果有需要的话）
-                    );
-                } else {
-                    const errorMessage = `${sourceType} function is not available in ImagePicker`;
-                    console.error('YunTu:', errorMessage);
-                    reject(new Error(errorMessage)); // 相应的接口未初始化或不可用
-                }
-            } else {
-                const errorMessage = 'ImagePicker is not initialized or not available';
-                console.error('YunTu:', errorMessage);
-                reject(new Error(errorMessage)); // ImagePicker 未初始化或不可用
-            }
-        });
-    }
-
-
-}
-
-export default YunTuAdapter;
+import './yuntu';
+
+class YunTuAdapter {
+    constructor(options) {
+        // 标志插件是否已初始化
+        this.isInitialized = false;
+        this.initializePlugin(options.pluginConfig);
+    }
+
+    async initializePlugin(pluginConfig) {
+        try {
+            const configToUse = Array.isArray(pluginConfig) && pluginConfig.length > 0
+                ? JSON.stringify(pluginConfig)
+                : '["localAuthPlugin","amapPlugin","tabBarPlugin","scanCodePlugin","filePreviewPlugin","imagePickerPlugin"]';
+            // eslint-disable-next-line no-undef
+            await yuntuConfig(configToUse); // 确保等待 yuntuConfig 执行完成
+            this.isInitialized = true;
+            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'
+        };
+    }
+
+    async getLocation(options) {
+        return new Promise((resolve, reject) => {
+
+            if (window.top.geolocation && typeof window.top.geolocation.getCurrentPosition === 'function') {
+                window.top.geolocation.getCurrentPosition(
+                    (res) => {
+                        console.log('YunTu: Location obtained', JSON.stringify(res));
+                        resolve(res); // 成功获取位置
+                    },
+                    (err) => {
+                        console.error('YunTu: Failed to obtain location', err);
+                        reject(err); // 获取位置失败
+                    },
+                    options
+                );
+            } else {
+                const errorMessage = 'Geolocation is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // Geolocation 未初始化或不可用
+            }
+        });
+    }
+
+    async openLocation(options) {
+        return new Promise((resolve, reject) => {
+            if (window.top.geolocation && typeof window.top.geolocation.openLocation === 'function') {
+                console.log("1")
+                window.top.geolocation.openLocation(
+                    (err) => {
+                        console.error('YunTu: Failed to open location', err);
+                        err.message=err.msg
+                         reject(err); // 打开地图失败
+                    },
+                   JSON.stringify( {
+                        latitude: options.latitude,
+                        longitude: options.longitude,
+                        type: options.type || 'amap' // 默认为高德地图
+                    })
+                );
+            } else {
+                const errorMessage = 'Geolocation is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // Geolocation 未初始化或不可用
+            }
+        });
+    }
+
+    async initKey(options) {
+        return new Promise((resolve, reject) => {
+            if (window.top.geolocation && typeof window.top.geolocation.initKey === 'function') {
+                window.top.geolocation.initKey(function (msg) {
+                    console.log('YunTu: initKey success', msg);
+                    resolve(msg); //  
+                   },  JSON.stringify(options) );
+            } else {
+                const errorMessage = 'Geolocation is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // Geolocation 未初始化或不可用
+            }
+        });
+    }
+
+    async scanCode(options) {
+        return new Promise((resolve, reject) => {
+            if (window.top.scanCode && typeof window.top.scanCode.startScan === 'function') {
+                window.top.scanCode.startScan(
+                    (res) => {
+                        console.log('YunTu: Scan code success', res);
+                        resolve(res); // 成功获取扫码结果
+                    },
+                    (err) => {
+                        console.error('YunTu: Failed to scan code', err);
+                        reject(err); // 扫码失败
+                    },
+                    options // 传递给扫码方法的选项
+                );
+            } else {
+                const errorMessage = 'ScanCode is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // ScanCode 未初始化或不可用
+            }
+        });
+    }
+
+    async localAuthPlugin(options) {
+        return new Promise((resolve, reject) => {
+            if (window.top.localAuthPlugin && typeof window.top.localAuthPlugin.auth === 'function') {
+                window.top.localAuthPlugin.auth(
+                    (res) => {
+                        console.log('YunTu: local auth success', res);
+                        resolve(res); // 成功获取认证结果
+                    },
+                    (err) => {
+                        console.error('YunTu: Failed to local auth', err);
+                        reject(err); // 认证失败
+                    },
+                    options // 传递给认证方法的选项
+                );
+            } else {
+                const errorMessage = 'local auth is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // ScanCode 未初始化或不可用
+            }
+        });
+    }
+
+    async getAvailableBiometrics(options) {
+        return new Promise((resolve, reject) => {
+            if (window.top.localAuthPlugin && typeof window.top.localAuthPlugin.getAvailableBiometrics === 'function') {
+                window.top.localAuthPlugin.getAvailableBiometrics(
+                    (res) => {
+                        console.log('YunTu: Get Available Biometrics', res);
+                        resolve(res); // 成功获取生物认证列表
+                    },
+                    (err) => {
+                        console.error('YunTu: Failed Get Available Biometrics', err);
+                        reject(err); // 获取生物认证列表失败
+                    },
+                    options // 传递给认证方法的选项
+                );
+            } else {
+                const errorMessage = 'local auth is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage));
+            }
+        });
+    }
+
+
+    async takePhoto(options) {
+        console.log('YunTu: Taking photo with options', options);
+
+        return new Promise((resolve, reject) => {
+            if (window.top.imagePicker) {
+                const sourceType = options && options.sourceType === 'gallery' ? 'gallery' : 'camera';
+                const pickerFunction = window.top.imagePicker[sourceType]; 
+                options.type= options.outputType.includes("data")?1:0; 
+                if (typeof pickerFunction === 'function') {
+                    pickerFunction(
+                        (res) => {
+                            console.log('YunTu: Photo selection success', res);
+                            resolve(res); // 成功获取照片
+                        },
+                        (err) => {
+                            console.error('YunTu: Failed to select photo', err);
+                            reject(err); // 选择照片失败
+                        },
+                        options // 传递给选取照片方法的选项（如果有需要的话）
+                    );
+                } else {
+                    const errorMessage = `${sourceType} function is not available in ImagePicker`;
+                    console.error('YunTu:', errorMessage);
+                    reject(new Error(errorMessage)); // 相应的接口未初始化或不可用
+                }
+            } else {
+                const errorMessage = 'ImagePicker is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // ImagePicker 未初始化或不可用
+            }
+        });
+    };
+
+    async filePreview(options) {
+        console.log('YunTu: File preview with options', options);
+
+        return new Promise((resolve, reject) => {
+            if (window.top.filePreview && typeof window.top.filePreview.openFile === 'function') {
+                window.top.filePreview.openFile(
+                    (res) => {
+                        console.log('YunTu: File preview success', res);
+                        resolve(res); // Successfully previewed the file
+                    },
+                    (err) => {
+                        console.error('YunTu: File preview failed', err);
+                        reject(err); // Failed to preview the file
+                    },
+                    JSON.stringify(options) // Pass the options as a string
+                );
+            } else {
+                const errorMessage = 'FilePreview is not initialized or not available';
+                console.error('YunTu:', errorMessage);
+                reject(new Error(errorMessage)); // FilePreview interface is not available
+            }
+        });
+    }
+
+
+}
+
+export default YunTuAdapter;

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);
-    });
-}