@tarojs/taro-h5 3.4.6 → 3.4.9

package/dist/api/device/accelerometer.js

@@ -1,3 +1,4 @@
+import { throttle } from '../utils';
 import { CallbackManager, MethodHandler } from '../utils/handler';
 const callbackManager = new CallbackManager();
 let devicemotionListener;
@@ -30,22 +31,6 @@ const INTERVAL_MAP = {
         frequency: 5
     }
 };
-const getDevicemotionListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager.trigger({
-            x: evt.acceleration.x || 0,
-            y: evt.acceleration.y || 0,
-            z: evt.acceleration.z || 0
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
 /**
  * 开始监听加速度数据。
  */
@@ -57,7 +42,14 @@ export const startAccelerometer = ({ interval = 'normal', success, fail, complet
             if (devicemotionListener) {
                 stopAccelerometer();
             }
-            devicemotionListener = getDevicemotionListener(intervalObj.interval);
+            devicemotionListener = throttle((evt) => {
+                var _a, _b, _c;
+                callbackManager.trigger({
+                    x: ((_a = evt.acceleration) === null || _a === void 0 ? void 0 : _a.x) || 0,
+                    y: ((_b = evt.acceleration) === null || _b === void 0 ? void 0 : _b.y) || 0,
+                    z: ((_c = evt.acceleration) === null || _c === void 0 ? void 0 : _c.z) || 0
+                });
+            }, intervalObj.interval);
             window.addEventListener('devicemotion', devicemotionListener, true);
         }
         else {

package/dist/api/device/compass.js

@@ -1,45 +1,59 @@
+import { getDeviceInfo } from '../base/system';
+import { throttle } from '../utils';
 import { CallbackManager, MethodHandler } from '../utils/handler';
 const callbackManager = new CallbackManager();
 let compassListener;
+/**
+ * Note: 按系统类型获取对应绝对 orientation 事件名，因为安卓系统中直接监听 deviceorientation 事件得到的不是绝对 orientation
+ */
+const deviceorientationEventName = ['absolutedeviceorientation', 'deviceorientationabsolute', 'deviceorientation'].find(item => {
+    if ('on' + item in window) {
+        return item;
+    }
+}) || '';
 /**
  * 停止监听罗盘数据
  */
 export const stopCompass = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'stopCompass', success, fail, complete });
     try {
-        window.removeEventListener('deviceorientation', compassListener, true);
+        window.removeEventListener(deviceorientationEventName, compassListener, true);
         return handle.success();
     }
     catch (e) {
         return handle.fail({ errMsg: e.message });
     }
 };
-const getDeviceOrientationListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager.trigger({
-            direction: 360 - evt.alpha
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
+let CompassChangeTrigger = false;
 /**
  * 开始监听罗盘数据
  */
 export const startCompass = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'startCompass', success, fail, complete });
     try {
-        if (window.DeviceOrientationEvent) {
+        if (deviceorientationEventName !== '') {
             if (compassListener) {
                 stopCompass();
             }
-            compassListener = getDeviceOrientationListener(200);
-            window.addEventListener('deviceorientation', compassListener, true);
+            compassListener = throttle((evt) => {
+                const isAndroid = getDeviceInfo().system === 'AndroidOS';
+                if (isAndroid && !evt.absolute && !CompassChangeTrigger) {
+                    CompassChangeTrigger = true;
+                    console.warn('Warning: In \'onCompassChange\', your browser is not supported to get the orientation relative to the earth, the orientation data will be related to the initial orientation of the device .');
+                }
+                const alpha = evt.alpha || 0;
+                /**
+                 * 由于平台差异，accuracy 在 iOS/Android 的值不同。
+                 * - iOS：accuracy 是一个 number 类型的值，表示相对于磁北极的偏差。0 表示设备指向磁北，90 表示指向东，180 表示指向南，依此类推。
+                 * - Android：accuracy 是一个 string 类型的枚举值。
+                 */
+                const accuracy = isAndroid ? evt.absolute ? 'high' : 'medium' : alpha;
+                callbackManager.trigger({
+                    direction: 360 - alpha,
+                    accuracy: accuracy
+                });
+            }, 5000);
+            window.addEventListener(deviceorientationEventName, compassListener, true);
         }
         else {
             throw new Error('compass is not supported');

package/dist/api/device/motion.js

@@ -1,3 +1,4 @@
+import { throttle } from '../utils';
 import { CallbackManager, MethodHandler } from '../utils/handler';
 const callbackManager = new CallbackManager();
 let deviceMotionListener;
@@ -28,22 +29,6 @@ export const stopDeviceMotionListening = ({ success, fail, complete } = {}) => {
         return handle.fail({ errMsg: e.message });
     }
 };
-const getDeviceOrientationListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager.trigger({
-            alpha: evt.alpha,
-            beta: evt.beta,
-            gamma: evt.gamma
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
 /**
  * 开始监听设备方向的变化。
  */
@@ -55,7 +40,13 @@ export const startDeviceMotionListening = ({ interval = 'normal', success, fail,
             if (deviceMotionListener) {
                 stopDeviceMotionListening();
             }
-            deviceMotionListener = getDeviceOrientationListener(intervalObj.interval);
+            deviceMotionListener = throttle((evt) => {
+                callbackManager.trigger({
+                    alpha: evt.alpha,
+                    beta: evt.beta,
+                    gamma: evt.gamma
+                });
+            }, intervalObj.interval);
             window.addEventListener('deviceorientation', deviceMotionListener, true);
         }
         else {

package/dist/api/device/scan.js

@@ -1,6 +1,10 @@
 import { processOpenApi } from '../utils';
 // 扫码
-export const scanCode = processOpenApi('scanQRCode', { needResult: 1 }, res => ({
-    errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
-    result: res.resultStr
-}));
+export const scanCode = processOpenApi({
+    name: 'scanQRCode',
+    defaultOptions: { needResult: 1 },
+    formatResult: res => ({
+        errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
+        result: res.resultStr
+    })
+});

package/dist/api/location/getLocation.js

@@ -0,0 +1,64 @@
+import { processOpenApi, shouldBeObject } from '../utils';
+import { MethodHandler } from '../utils/handler';
+const getLocationByW3CApi = (options) => {
+    var _a;
+    // 断言 options 必须是 Object
+    const isObject = shouldBeObject(options);
+    if (!isObject.flag) {
+        const res = { errMsg: `getLocation:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    // 解构回调函数
+    const { success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'getLocation', success, fail, complete });
+    // const defaultMaximumAge = 5 * 1000
+    const positionOptions = {
+        enableHighAccuracy: options.isHighAccuracy || (options.altitude != null),
+        // maximumAge: defaultMaximumAge, // 允许取多久以内的缓存位置
+        timeout: options.highAccuracyExpireTime // 高精度定位超时时间
+    };
+    // Web端API实现暂时仅支持GPS坐标系
+    if (((_a = options.type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'WGS84') {
+        return handle.fail({
+            errMsg: 'This coordinate system type is not temporarily supported'
+        });
+    }
+    // 判断当前浏览器是否支持位置API
+    const geolocationSupported = navigator.geolocation;
+    if (!geolocationSupported) {
+        return handle.fail({
+            errMsg: 'The current browser does not support this feature'
+        });
+    }
+    // 开始获取位置
+    return new Promise((resolve, reject) => {
+        navigator.geolocation.getCurrentPosition((position) => {
+            const result = {
+                /** 位置的精确度 */
+                accuracy: position.coords.accuracy,
+                /** 高度，单位 m */
+                altitude: position.coords.altitude,
+                /** 水平精度，单位 m */
+                horizontalAccuracy: position.coords.accuracy,
+                /** 纬度，范围为 -90~90，负数表示南纬 */
+                latitude: position.coords.latitude,
+                /** 经度，范围为 -180~180，负数表示西经 */
+                longitude: position.coords.longitude,
+                /** 速度，单位 m/s */
+                speed: position.coords.speed,
+                /** 垂直精度，单位 m（Android 无法获取，返回 0） */
+                verticalAccuracy: position.coords.altitudeAccuracy || 0,
+                /** 调用结果,自动补充 */
+                errMsg: ''
+            };
+            handle.success(result, resolve);
+        }, (error) => {
+            handle.fail({ errMsg: error.message }, reject);
+        }, positionOptions);
+    });
+};
+export const getLocation = processOpenApi({
+    name: 'getLocation',
+    standardMethod: getLocationByW3CApi
+});

package/dist/api/location/index.js

@@ -3,11 +3,14 @@ import { processOpenApi, temporarilyNotSupport } from '../utils/index';
 export const stopLocationUpdate = temporarilyNotSupport('stopLocationUpdate');
 export const startLocationUpdateBackground = temporarilyNotSupport('startLocationUpdateBackground');
 export const startLocationUpdate = temporarilyNotSupport('startLocationUpdate');
-export const openLocation = processOpenApi('openLocation', { scale: 18 });
+export const openLocation = processOpenApi({
+    name: 'openLocation',
+    defaultOptions: { scale: 18 }
+});
 export const onLocationChangeError = temporarilyNotSupport('onLocationChangeError');
 export const onLocationChange = temporarilyNotSupport('onLocationChange');
 export const offLocationChangeError = temporarilyNotSupport('offLocationChangeError');
 export const offLocationChange = temporarilyNotSupport('offLocationChange');
-export const getLocation = processOpenApi('getLocation');
+export { getLocation } from './getLocation';
 export const choosePoi = temporarilyNotSupport('choosePoi');
-export * from './chooseLocation';
+export { chooseLocation } from './chooseLocation';

package/dist/api/utils/animation.js

@@ -0,0 +1,14 @@
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+export const easeInOut = (t) => (t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1);
+export const getTimingFunc = (easeFunc, frameCnt) => {
+    return x => {
+        if (frameCnt <= 1) {
+            return easeFunc(1);
+        }
+        const t = x / (frameCnt - 1);
+        return easeFunc(t);
+    };
+};

package/dist/api/utils/index.js

@@ -90,7 +90,7 @@ export function temporarilyNotSupport(apiName) {
 }
 export function weixinCorpSupport(apiName) {
     return () => {
-        const errMsg = `h5端仅在微信公众号中支持 API ${apiName}`;
+        const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`;
         if (process.env.NODE_ENV !== 'production') {
             console.error(errMsg);
             return Promise.reject({
@@ -122,51 +122,38 @@ export function permanentlyNotSupport(apiName) {
         }
     };
 }
-export function isFunction(obj) {
-    return typeof obj === 'function';
-}
-const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
-export const isValidColor = (color) => {
-    return VALID_COLOR_REG.test(color);
-};
-export function processOpenApi(apiName, defaultOptions, formatResult = res => res, formatParams = options => options) {
-    // @ts-ignore
-    if (!window.wx) {
-        return weixinCorpSupport(apiName);
-    }
-    return options => {
-        options = options || {};
-        const obj = Object.assign({}, defaultOptions, options);
-        const p = new Promise((resolve, reject) => {
-            ['fail', 'success', 'complete'].forEach(k => {
-                obj[k] = oriRes => {
-                    const res = formatResult(oriRes);
-                    options[k] && options[k](res);
-                    if (k === 'success') {
-                        resolve(res);
-                    }
-                    else if (k === 'fail') {
-                        reject(res);
-                    }
-                };
+export function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
+    const notSupported = weixinCorpSupport(name);
+    return (options = {}) => {
+        var _a;
+        // @ts-ignore
+        const targetApi = (_a = window === null || window === void 0 ? void 0 : window.wx) === null || _a === void 0 ? void 0 : _a[name];
+        const opts = formatOptions(Object.assign({}, defaultOptions, options));
+        if (typeof targetApi === 'function') {
+            return new Promise((resolve, reject) => {
+                ['fail', 'success', 'complete'].forEach(k => {
+                    opts[k] = preRef => {
+                        const res = formatResult(preRef);
+                        options[k] && options[k](res);
+                        if (k === 'success') {
+                            resolve(res);
+                        }
+                        else if (k === 'fail') {
+                            reject(res);
+                        }
+                    };
+                    return targetApi(opts);
+                });
             });
-            // @ts-ignore
-            wx[apiName](formatParams(obj));
-        });
-        return p;
-    };
-}
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-export const easeInOut = (t) => t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1;
-export const getTimingFunc = (easeFunc, frameCnt) => {
-    return x => {
-        if (frameCnt <= 1) {
-            return easeFunc(1);
         }
-        const t = x / (frameCnt - 1);
-        return easeFunc(t);
+        else if (typeof standardMethod === 'function') {
+            return standardMethod(opts);
+        }
+        else {
+            return notSupported();
+        }
     };
-};
+}
+export * from './animation';
+export * from './lodash';
+export * from './valid';

package/dist/api/utils/lodash.js

@@ -0,0 +1,29 @@
+export function throttle(fn, threshold = 250, scope) {
+    let lastTime = 0;
+    let deferTimer;
+    return function (...args) {
+        const context = scope || this;
+        const now = Date.now();
+        if (now - lastTime > threshold) {
+            fn.apply(this, args);
+            lastTime = now;
+        }
+        else {
+            clearTimeout(deferTimer);
+            deferTimer = setTimeout(() => {
+                lastTime = now;
+                fn.apply(context, args);
+            }, threshold);
+        }
+    };
+}
+export function debounce(fn, ms = 250, scope) {
+    let timer;
+    return function (...args) {
+        const context = scope || this;
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+            fn.apply(context, args);
+        }, ms);
+    };
+}

package/dist/api/utils/valid.js

@@ -0,0 +1,7 @@
+export function isFunction(obj) {
+    return typeof obj === 'function';
+}
+const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
+export const isValidColor = (color) => {
+    return VALID_COLOR_REG.test(color);
+};

package/dist/dist/api/device/scan.d.ts

@@ -1 +1,3 @@
-export declare const scanCode: (options: any) => Promise<unknown>;
+export declare const scanCode: (options?: Partial<{
+    needResult: number;
+}>) => Promise<any>;

package/dist/dist/api/location/getLocation.d.ts

@@ -0,0 +1,2 @@
+import Taro from '@tarojs/api';
+export declare const getLocation: (options?: Partial<Taro.getLocation.Option>) => Promise<Taro.getLocation.SuccessCallbackResult>;

package/dist/dist/api/location/index.d.ts

@@ -7,7 +7,9 @@ export declare const startLocationUpdateBackground: () => Promise<{
 export declare const startLocationUpdate: () => Promise<{
     errMsg: string;
 }>;
-export declare const openLocation: (options: any) => Promise<unknown>;
+export declare const openLocation: (options?: Partial<{
+    scale: number;
+}>) => Promise<any>;
 export declare const onLocationChangeError: () => Promise<{
     errMsg: string;
 }>;
@@ -20,8 +22,8 @@ export declare const offLocationChangeError: () => Promise<{
 export declare const offLocationChange: () => Promise<{
     errMsg: string;
 }>;
-export declare const getLocation: (options: any) => Promise<unknown>;
+export { getLocation } from './getLocation';
 export declare const choosePoi: () => Promise<{
     errMsg: string;
 }>;
-export * from './chooseLocation';
+export { chooseLocation } from './chooseLocation';

package/dist/dist/api/utils/animation.d.ts

@@ -0,0 +1,6 @@
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+export declare const easeInOut: (t: number) => number;
+export declare const getTimingFunc: (easeFunc: any, frameCnt: any) => (x: any) => any;

package/dist/dist/api/utils/index.d.ts

@@ -26,13 +26,14 @@ export declare function weixinCorpSupport(apiName: any): () => Promise<{
 export declare function permanentlyNotSupport(apiName: any): () => Promise<{
     errMsg: string;
 }>;
-export declare function isFunction(obj: any): boolean;
-export declare const isValidColor: (color: any) => boolean;
-export declare function processOpenApi(apiName: string, defaultOptions?: Record<string, unknown>, formatResult?: (res: any) => any, formatParams?: (options: any) => any): (options: any) => Promise<unknown>;
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-export declare const easeInOut: (t: number) => number;
-export declare const getTimingFunc: (easeFunc: any, frameCnt: any) => (x: any) => any;
-export {};
+interface IProcessOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any> {
+    name: string;
+    defaultOptions?: TOptions;
+    standardMethod?: (opts: TOptions) => Promise<TResult>;
+    formatOptions?: (opts: TOptions) => TOptions;
+    formatResult?: (res: TResult) => TResult;
+}
+export declare function processOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any>({ name, defaultOptions, standardMethod, formatOptions, formatResult }: IProcessOpenApi<TOptions, TResult>): (options?: Partial<TOptions>) => Promise<TResult>;
+export * from './animation';
+export * from './lodash';
+export * from './valid';

package/dist/dist/api/utils/lodash.d.ts

@@ -0,0 +1,2 @@
+export declare function throttle(fn: any, threshold?: number, scope?: any): (...args: any[]) => void;
+export declare function debounce(fn: any, ms?: number, scope?: any): (...args: any[]) => void;

package/dist/dist/api/utils/valid.d.ts

@@ -0,0 +1,2 @@
+export declare function isFunction(obj: any): boolean;
+export declare const isValidColor: (color: any) => boolean;