From d01b4259bed44918929d1c96d11a908ebc00ef2c Mon Sep 17 00:00:00 2001 From: wkj <278599135@qq.com> Date: Tue, 13 Sep 2022 16:12:50 +0800 Subject: [PATCH] =?UTF-8?q?web=20=E4=BD=BF=E7=94=A8navigator=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/features/location.d.ts | 5 ++- lib/features/location.js | 66 +++++++++++++++++++++++++++++++--- src/features/location.ts | 72 +++++++++++++++++++++++++++++++++----- 3 files changed, 128 insertions(+), 15 deletions(-) diff --git a/lib/features/location.d.ts b/lib/features/location.d.ts index 7ed466a6..9997a17f 100644 --- a/lib/features/location.d.ts +++ b/lib/features/location.d.ts @@ -9,5 +9,8 @@ export declare class Location, AD latitude: number; longitude: number; }>; - refresh(): void; + refresh(): Promise<{ + latitude: number; + longitude: number; + }>; } diff --git a/lib/features/location.js b/lib/features/location.js index 3e4e57cd..7119baa0 100644 --- a/lib/features/location.js +++ b/lib/features/location.js @@ -11,11 +11,12 @@ var Location = /** @class */ (function (_super) { Location.prototype.get = function (acceptableLatency) { if (acceptableLatency === void 0) { acceptableLatency = 10000; } return tslib_1.__awaiter(this, void 0, void 0, function () { - var result; + var result, getGeolocation, result; return tslib_1.__generator(this, function (_a) { switch (_a.label) { case 0: - if (this.lastTimestamp && Date.now() - this.lastTimestamp < acceptableLatency) { + if (this.lastTimestamp && + Date.now() - this.lastTimestamp < acceptableLatency) { return [2 /*return*/, { latitude: this.latitude, longitude: this.longitude, @@ -23,7 +24,7 @@ var Location = /** @class */ (function (_super) { } if (!(process.env.OAK_PLATFORM === 'wechatMp')) return [3 /*break*/, 2]; return [4 /*yield*/, wx.getLocation({ - type: 'gcj02' + type: 'gcj02', })]; case 1: result = _a.sent(); @@ -34,13 +35,68 @@ var Location = /** @class */ (function (_super) { latitude: this.latitude, longitude: this.longitude, }]; - case 2: throw new Error('Method not implemented.'); + case 2: + getGeolocation = function () { + return new Promise(function (resolve, reject) { + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition(function (position) { + // 1. coords.latitude：估计纬度 + // 2. coords.longitude：估计经度 + // 3. coords.altitude：估计高度 + // 4. coords.accuracy：所提供的以米为单位的经度和纬度估计的精确度 + // 5. coords.altitudeAccuracy：所提供的以米为单位的高度估计的精确度 + // 6. coords.heading： 宿主设备当前移动的角度方向，相对于正北方向顺时针计算 + // 7. coords.speed：以米每秒为单位的设备的当前对地速度 + var coords = position.coords; + var location = { + accuracy: coords.accuracy, + altitude: coords.altitude, + altitudeAccuracy: coords.altitudeAccuracy, + heading: coords.heading, + latitude: coords.latitude, + longitude: coords.longitude, + speed: coords.speed, + }; + resolve(location); + }, function (error) { + reject(error); + }, { + // 指示浏览器获取高精度的位置，默认为false + enableHighAccuracy: true, + // 指定获取地理位置的超时时间，默认不限时，单位为毫秒 + timeout: 10000, + // 最长有效期，在重复获取地理位置时，此参数指定多久再次获取位置。 + maximumAge: 3000, + }); + } + else { + reject('Your browser does not support Geolocation!'); + } + }); + }; + return [4 /*yield*/, getGeolocation()]; + case 3: + result = (_a.sent()); + this.lastTimestamp = Date.now(); + this.latitude = result.latitude; + this.longitude = result.longitude; + return [2 /*return*/, { + latitude: this.latitude, + longitude: this.longitude, + }]; } }); }); }; Location.prototype.refresh = function () { - throw new Error('Method not implemented.'); + return tslib_1.__awaiter(this, void 0, void 0, function () { + return tslib_1.__generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, this.get()]; + case 1: return [2 /*return*/, _a.sent()]; + } + }); + }); }; tslib_1.__decorate([ Feature_1.Action diff --git a/src/features/location.ts b/src/features/location.ts index b456e62f..e60552fa 100644 --- a/src/features/location.ts +++ b/src/features/location.ts @@ -2,12 +2,19 @@ import { EntityDict, Aspect, Context } from 'oak-domain/lib/types'; import { Action, Feature } from '../types/Feature'; import { CommonAspectDict } from 'oak-common-aspect'; -export class Location, AD extends CommonAspectDict> extends Feature { +export class Location< + ED extends EntityDict, + Cxt extends Context, + AD extends CommonAspectDict +> extends Feature { private latitude?: number; private longitude?: number; private lastTimestamp?: number; async get(acceptableLatency: number = 10000) { - if (this.lastTimestamp && Date.now() - this.lastTimestamp < acceptableLatency) { + if ( + this.lastTimestamp && + Date.now() - this.lastTimestamp < acceptableLatency + ) { return { latitude: this.latitude!, longitude: this.longitude!, @@ -16,7 +23,7 @@ export class Location, AD extends if (process.env.OAK_PLATFORM === 'wechatMp') { // 小程序平台 const result = await wx.getLocation({ - type: 'gcj02' + type: 'gcj02', }); this.latitude = result.latitude; this.longitude = result.longitude; @@ -26,14 +33,61 @@ export class Location, AD extends latitude: this.latitude!, longitude: this.longitude!, }; - } - else { - throw new Error('Method not implemented.'); + } else { + const getGeolocation = () => + new Promise((resolve, reject) => { + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition( + (position) => { + // 1. coords.latitude：估计纬度 + // 2. coords.longitude：估计经度 + // 3. coords.altitude：估计高度 + // 4. coords.accuracy：所提供的以米为单位的经度和纬度估计的精确度 + // 5. coords.altitudeAccuracy：所提供的以米为单位的高度估计的精确度 + // 6. coords.heading： 宿主设备当前移动的角度方向，相对于正北方向顺时针计算 + // 7. coords.speed：以米每秒为单位的设备的当前对地速度 + const coords = position.coords; + const location = { + accuracy: coords.accuracy, + altitude: coords.altitude, + altitudeAccuracy: coords.altitudeAccuracy, + heading: coords.heading, + latitude: coords.latitude, + longitude: coords.longitude, + speed: coords.speed, + }; + resolve(location); + }, + (error) => { + reject(error); + }, + { + // 指示浏览器获取高精度的位置，默认为false + enableHighAccuracy: true, + // 指定获取地理位置的超时时间，默认不限时，单位为毫秒 + timeout: 10000, + // 最长有效期，在重复获取地理位置时，此参数指定多久再次获取位置。 + maximumAge: 3000, + } + ); + } else { + reject('Your browser does not support Geolocation!'); + } + }); + + const result = (await getGeolocation()) as GeolocationCoordinates; + this.lastTimestamp = Date.now(); + this.latitude = result.latitude!; + this.longitude = result.longitude!; + return { + latitude: this.latitude!, + longitude: this.longitude!, + }; } } @Action - refresh() { - throw new Error('Method not implemented.'); - } + async refresh() { + return await this.get(); + } }