feat：集成location实现web定位功能

example/lib/main.dart

@@ -17,9 +17,9 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  Map<String, Object>? _locationResult;
+  Map<String, Object?>? _locationResult;
 
-  StreamSubscription<Map<String, Object>>? _locationListener;
+  StreamSubscription<Map<String, Object?>>? _locationListener;
 
   AMapFlutterLocation _locationPlugin = new AMapFlutterLocation();
 
@@ -49,7 +49,7 @@ class _MyAppState extends State<MyApp> {
     AMapFlutterLocation.updatePrivacyAgree(true);
 
     /// 动态申请定位权限
-    requestPermission();
+    // requestPermission();
 
     ///设置Android和iOS的apiKey<br>
     ///key的申请请参考高德开放平台官网说明<br>
@@ -71,7 +71,7 @@ class _MyAppState extends State<MyApp> {
     ///注册定位结果监听
     _locationListener = _locationPlugin
         .onLocationChanged()
-        .listen((Map<String, Object> result) {
+        .listen((Map<String, Object?> result) {
       setState(() {
         _locationResult = result;
       });

lib/amap_flutter_location.dart

@@ -59,7 +59,7 @@ class AMapFlutterLocation {
   }
 
   /// 定位结果回调
-  Stream<Map<String, Object>> onLocationChanged() {
+  Stream<Map<String, Object?>> onLocationChanged() {
     final result = AmapLocationPluginPlatform.instance.onLocationChanged();
     return result;
   }

lib/amap_location_plugin_method_channel.dart

@@ -27,6 +27,7 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   String? _pluginKey;
 
   /// 初始化key
+  @override
   void initKey() {
     _pluginKey = DateTime.now().millisecondsSinceEpoch.toString();
   }
@@ -48,17 +49,20 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   }
 
   /// 开始定位
+  @override
   void startLocation() {
     _methodChannel.invokeMethod('startLocation', {'pluginKey': _pluginKey});
   }
 
   /// 停止定位
+  @override
   void stopLocation() {
     _methodChannel.invokeMethod('stopLocation', {'pluginKey': _pluginKey});
     return;
   }
 
   ///计算2点之间的距离
+  @override
   Future<double> calculateDistance(
       double lat1, double lon1, double lat2, double lon2) async {
     var result = await _methodChannel.invokeMethod<double>('calculateDistance',
@@ -72,12 +76,14 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   ///iOS端: https://lbs.amap.com/api/ios-location-sdk/guide/create-project/get-key<br>
   ///[androidKey] Android平台的key<br>
   ///[iosKey] ios平台的key<br>
+  @override
   void setApiKey(String androidKey, String iosKey, String webKey) {
     _methodChannel
         .invokeMethod('setApiKey', {'android': androidKey, 'ios': iosKey});
   }
 
   /// 设置定位参数
+  @override
   void setLocationOption(AMapLocationOption locationOption) {
     Map option = locationOption.getOptionsMap();
     option['pluginKey'] = _pluginKey;
@@ -85,6 +91,7 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   }
 
   /// 销毁定位
+  @override
   void destroy() {
     _methodChannel.invokeListMethod('destroy', {'pluginKey': _pluginKey});
     if (_subscription != null) {
@@ -140,6 +147,7 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   /// `errorCode`: 错误码，当定位失败时才会返回对应的错误码， 具体错误请参考：https://lbs.amap.com/api/android-location-sdk/guide/utilities/errorcode
   ///
   /// `errorInfo`: 错误信息， 当定位失败时才会返回
+  @override
   Stream<Map<String, Object>> onLocationChanged() {
     if (_receiveStream == null) {
       _receiveStream = StreamController();
@@ -166,6 +174,7 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy
   /// [hasContains] 隐私声明中是否包含高德隐私政策说明<br>
   /// [hasShow] 隐私权政策是否弹窗展示告知用户<br>
+  @override
   void updatePrivacyShow(bool hasContains, bool hasShow) {
     _methodChannel.invokeMethod('updatePrivacyStatement',
         {'hasContains': hasContains, 'hasShow': hasShow});
@@ -175,6 +184,7 @@ class AmapLocationPluginMethodChannel extends AmapLocationPluginPlatform {
   /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy<br>
   /// <b>必须保证在调用定位功能之前调用, 建议首次启动App时弹出《隐私政策》并取得用户同意</b><br>
   /// [hasAgree] 隐私权政策是否已经取得用户同意<br>
+  @override
   void updatePrivacyAgree(bool hasAgree) {
     _methodChannel
         .invokeMethod('updatePrivacyStatement', {'hasAgree': hasAgree});

lib/amap_location_plugin_platform_interface.dart

@@ -111,7 +111,7 @@ abstract class AmapLocationPluginPlatform extends PlatformInterface {
   /// `errorCode`: 错误码，当定位失败时才会返回对应的错误码， 具体错误请参考：https://lbs.amap.com/api/android-location-sdk/guide/utilities/errorcode
   ///
   /// `errorInfo`: 错误信息， 当定位失败时才会返回
-  Stream<Map<String, Object>> onLocationChanged() {
+  Stream<Map<String, Object?>> onLocationChanged() {
     throw UnimplementedError('onLocationChanged() has not been implemented.');
   }
 

lib/amap_location_plugin_web.dart

@@ -3,96 +3,121 @@
 // package as the core of your plugin.
 // ignore: avoid_web_libraries_in_flutter
 
-import 'dart:convert';
-import 'dart:developer';
-import 'dart:ui';
+import 'dart:async';
 
 import 'package:amap_flutter_location/amap_location_plugin_platform_interface.dart';
-import 'package:flutter/material.dart';
+import 'package:amap_flutter_location/web/web_location_imp.dart';
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:js/js_util.dart';
 
 import 'amap_location_option.dart';
-import 'web/amap.dart';
-import 'web/loader.dart';
-import 'web/utils.dart';
+import 'package:location/location.dart';
 
 /// A web implementation of the TestWebPluginPlatform of the TestWebPlugin plugin.
 class AmapLocationPluginWeb extends AmapLocationPluginPlatform {
   /// Constructs a AmapLocationPluginWeb
   AmapLocationPluginWeb();
 
-  late AMap _aMap;
   String? _pluginKey;
+  Map<String, WebLocationImp> _webLocationImpMap = {};
+  StreamController<Map<String, Object?>>? _receiveStream;
+  StreamSubscription<Map<String, Object?>>? _subscription;
 
   static void registerWith(Registrar registrar) {
     AmapLocationPluginPlatform.instance = AmapLocationPluginWeb();
   }
 
+  /// 初始化key
   @override
   void initKey() {
     _pluginKey = DateTime.now().millisecondsSinceEpoch.toString();
   }
 
+  /// 隐私权政策弹窗展示告知用户
   @override
   void updatePrivacyShow(bool hasContains, bool hasShow) {
-    // 暂无要求
+    // 暂不需要
   }
 
+  /// 隐私权政策取得用户同意
   @override
   void updatePrivacyAgree(bool hasAgree) {
-    // 暂无要求
+    // 暂不需要
   }
 
+  /// 设置apiKey
   @override
   void setApiKey(String androidKey, String iosKey, String webKey) {
-    var promise = load(LoaderOptions(
-      key: webKey,
-      version: '1.4.15',
-      plugins: ['AMap.Geolocation'],
-    ));
-
-    promiseToFuture(promise).then((value) {
-      print('初始化成功');
-
-      MapOptions _mapOptions = MapOptions(
-        zoom: 10,
-      );
-      _aMap = AMap('container', _mapOptions);
-    }, onError: (e) {
-      print('初始化错误：$e');
-    });
+    // 暂不需要
   }
 
+  /// 设置定位参数
   @override
-  Stream<Map<String, Object>> onLocationChanged() {
-    return Stream.value({});
+  void setLocationOption(AMapLocationOption locationOption) {
+    Map option = locationOption.getOptionsMap();
+    option['pluginKey'] = _pluginKey;
+    _getWebLocationImp(option)?.setLocationOption(option);
   }
 
+  /// 开始定位
   @override
-  void setLocationOption(AMapLocationOption locationOption) {}
+  void startLocation() {
+    _getWebLocationImp({"pluginKey": _pluginKey})?.startLocation();
+  }
 
+  /// 停止定位
   @override
-  void startLocation() {
-    _aMap.plugin(['AMap.Geolocation'], allowInterop(() {
-      GeolocationOptions _geolocationOptions = GeolocationOptions(
-        enableHighAccuracy: false,
-        timeout: 10000,
-        convert: true,
-      );
-      var geolocation = Geolocation(_geolocationOptions);
-      geolocation.getCurrentPosition(allowInterop((status, result) {
-        Fluttertoast.showToast(
-            msg: "${status}  ${result.message}",
-            toastLength: Toast.LENGTH_LONG,
-            gravity: ToastGravity.CENTER,
-            // timeInSecForIos: 1,
-            backgroundColor: const Color(0xB3000000),
-            textColor: Colors.white,
-            fontSize: 17.0);
-        consoleLog("=====11111 ${status}  ${stringify(result)}");
-      }));
-    }));
+  void stopLocation() {
+    _getWebLocationImp({"pluginKey": _pluginKey})?.stopLocation();
+  }
+
+  /// 定位结果回调
+  @override
+  Stream<Map<String, Object?>> onLocationChanged() {
+    if (_receiveStream == null) {
+      _receiveStream = StreamController();
+      WebLocationImp? webLocationImp =
+          _getWebLocationImp({"pluginKey": _pluginKey});
+      _subscription = webLocationImp?.onLocationChanged()?.listen(
+          (Map<String, Object?> event) {
+        if (event['pluginKey'] == _pluginKey) {
+          Map<String, Object?> newEvent = Map<String, Object?>.of(event);
+          newEvent.remove('pluginKey');
+          _receiveStream?.add(newEvent);
+        }
+      }, onError: (Object error) {
+        print('onLocationChanged error: $error');
+        _receiveStream?.addError(error);
+      }, onDone: () {
+        print('onLocationChanged done');
+        _receiveStream?.close();
+      });
+    }
+    return _receiveStream!.stream;
+  }
+
+  /// 销毁定位
+  @override
+  void destroy() {
+    WebLocationImp? webLocationImp =
+        _getWebLocationImp({"pluginKey": _pluginKey});
+    webLocationImp?.destroy();
+    _webLocationImpMap.remove(webLocationImp);
+    if (_subscription != null) {
+      _receiveStream?.close();
+      _subscription?.cancel();
+      _receiveStream = null;
+      _subscription = null;
+    }
+  }
+
+  /// 获取web定位实现
+  WebLocationImp? _getWebLocationImp(Map? argsMap) {
+    String? pluginKey = argsMap?["pluginKey"];
+    if (pluginKey == null || pluginKey.isEmpty) return null;
+    if (!_webLocationImpMap.containsKey(pluginKey)) {
+      WebLocationImp webLocationImp = WebLocationImp(pluginKey: pluginKey);
+      _webLocationImpMap[pluginKey] = webLocationImp;
+    }
+    return _webLocationImpMap[pluginKey];
   }
 }

lib/web/amap.dart

-@JS('AMap')
-library amap;
-
-import 'package:js/js.dart';
-import 'dart:html' as html show window;
-
-// 这里`new Map(id)` 调用js的`new AMap.Map(id)`
-@JS('Map')
-class AMap {
-  external AMap(dynamic /*String|HTMLDivElement*/ div, MapOptions opts);
-
-  /// 加载插件
-  external plugin(dynamic /*String|List*/ name, void Function() callback);
-}
-
-@JS()
-@anonymous
-class MapOptions {
-  external LngLat get center;
-
-  external set center(LngLat v);
-
-  external factory MapOptions({
-    LngLat center,
-    num zoom,
-    String /*‘2D’|‘3D’*/ viewMode,
-  });
-}
-
-@JS()
-class LngLat {
-  external num getLng();
-
-  external num getLat();
-
-  external LngLat(num lng, num lat);
-}
-
-/// 定位
-@JS()
-class Geolocation {
-  external Geolocation(GeolocationOptions opts);
-
-  external getCurrentPosition(
-      void Function(String status, GeolocationResult result) callback);
-}
-
-@JS()
-@anonymous
-class GeolocationOptions {
-  external factory GeolocationOptions({
-    bool enableHighAccuracy, // 进行浏览器原生定位的时候是否尝试获取较高精度，可能影响定位效率，默认为false
-    num timeout, // 定位的超时时间，毫秒
-    bool convert, // 是否将定位结果转换为高德坐标
-  });
-}
-
-@JS()
-@anonymous
-class GeolocationResult {
-  external LngLat get position;
-
-  external String get message;
-}
+// @JS('AMap')
+// library amap;
+//
+// import 'package:js/js.dart';
+// import 'dart:html' as html show window;
+//
+// // 这里`new Map(id)` 调用js的`new AMap.Map(id)`
+// @JS('Map')
+// class AMap {
+//   external AMap(dynamic /*String|HTMLDivElement*/ div, MapOptions opts);
+//
+//   /// 加载插件
+//   external plugin(dynamic /*String|List*/ name, void Function() callback);
+// }
+//
+// @JS()
+// @anonymous
+// class MapOptions {
+//   external LngLat get center;
+//
+//   external set center(LngLat v);
+//
+//   external factory MapOptions({
+//     LngLat center,
+//     num zoom,
+//     String /*‘2D’|‘3D’*/ viewMode,
+//   });
+// }
+//
+// @JS()
+// class LngLat {
+//   external num getLng();
+//
+//   external num getLat();
+//
+//   external LngLat(num lng, num lat);
+// }
+//
+// /// 定位
+// @JS()
+// class Geolocation {
+//   external Geolocation(GeolocationOptions opts);
+//
+//   external getCurrentPosition(
+//       void Function(String status, GeolocationResult result) callback);
+// }
+//
+// @JS()
+// @anonymous
+// class GeolocationOptions {
+//   external factory GeolocationOptions({
+//     bool enableHighAccuracy, // 进行浏览器原生定位的时候是否尝试获取较高精度，可能影响定位效率，默认为false
+//     num timeout, // 定位的超时时间，毫秒
+//     bool convert, // 是否将定位结果转换为高德坐标
+//   });
+// }
+//
+// @JS()
+// @anonymous
+// class GeolocationResult {
+//   external LngLat get position;
+//
+//   external String get message;
+// }

lib/web/loader.dart

-@JS('AMapLoader')
-library loader;
-
-import 'package:js/js.dart';
-
-/// 高德地图 Loader js
-external load(LoaderOptions options);
-
-@JS()
-@anonymous
-class LoaderOptions {
-
-  external factory LoaderOptions({
-    ///您申请的key值
-    String key,
-    /// JSAPI 版本号
-    String version,
-    //同步加载的插件列表
-    List<String> plugins,
-  });
-}
+// @JS('AMapLoader')
+// library loader;
+//
+// import 'package:js/js.dart';
+//
+// /// 高德地图 Loader js
+// external load(LoaderOptions options);
+//
+// @JS()
+// @anonymous
+// class LoaderOptions {
+//
+//   external factory LoaderOptions({
+//     ///您申请的key值
+//     String key,
+//     /// JSAPI 版本号
+//     String version,
+//     //同步加载的插件列表
+//     List<String> plugins,
+//   });
+// }

lib/web/utils.dart

-@JS()
-library stringify;
-
-import 'package:js/js.dart';
-
-// Calls invoke JavaScript `JSON.stringify(obj)`.
-@JS('JSON.stringify')
-external String stringify(Object obj);
-
-@JS('console.log')
-external String consoleLog(Object obj);
+// @JS()
+// library stringify;
+//
+// import 'package:js/js.dart';
+//
+// // Calls invoke JavaScript `JSON.stringify(obj)`.
+// @JS('JSON.stringify')
+// external String stringify(Object obj);
+//
+// @JS('console.log')
+// external String consoleLog(Object obj);
\ No newline at end of file
+//
+// @JS()
+// external void alert(Object msg);
\ No newline at end of file

lib/web/web_location_imp.dart

+import 'dart:async';
+
+import 'package:location/location.dart';
+
+/// web端定位实现
+class WebLocationImp {
+  Location? _location;
+
+  String? pluginKey;
+
+  /// StreamController
+  StreamController<Map<String, Object?>>? streamController =
+      StreamController<Map<String, Object?>>();
+
+  WebLocationImp({required this.pluginKey}) {
+    _location ??= Location();
+  }
+
+  /// 开启定位
+  void startLocation() async {
+    try {
+      // 检测是否开启定位服务
+      bool? _serviceEnabled = await _location?.serviceEnabled();
+      if (_serviceEnabled == false) {
+        _serviceEnabled = await _location?.requestService();
+        if (_serviceEnabled == false) {
+          assert(false, "定位服务未开启");
+          return;
+        }
+      }
+      // 检测是否开启定位权限
+      PermissionStatus? _permissionGranted = await _location?.hasPermission();
+      if (_permissionGranted == PermissionStatus.denied) {
+        _permissionGranted = await _location?.requestPermission();
+        if (_permissionGranted != PermissionStatus.granted) {
+          assert(false, "定位权限未开启");
+          return;
+        }
+      }
+      // 获取定位信息
+      LocationData? locationData = await _location?.getLocation();
+      var map = {
+        "latitude": locationData?.latitude,
+        "longitude": locationData?.longitude,
+        "pluginKey": pluginKey,
+      };
+      streamController?.add(map);
+    } catch (e) {
+      print("定位获取异常：$e");
+      assert(false, "定位获取异常：$e");
+    }
+  }
+
+  /// 定位回调
+  Stream<Map<String, Object?>>? onLocationChanged() {
+    return streamController?.stream;
+  }
+
+  /// 设置定位参数
+  void setLocationOption(Map optionMap) {}
+
+  /// 停止定位
+  void stopLocation() {}
+
+  /// 销毁定位
+  void destroy() {
+    _location = null;
+    streamController?.close();
+    streamController = null;
+  }
+}

pubspec.yaml

@@ -13,9 +13,8 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   plugin_platform_interface: ^2.0.2
-  js: ^0.7.1
-  # toast https://pub.dev/packages/fluttertoast
-  fluttertoast: ^8.2.1
+  # https://pub.dev/packages/location
+  location: ^6.0.2
 
 dev_dependencies:
   flutter_test: