Skip to content

A
amap_flutter_map
提交 02d7dab9 authored 作者: guoqing's avatar guoqing
浏览文件
操作

Switch to amap_flutter_base_clx and clean imports

Migrate package usages from amap_flutter_base to amap_flutter_base_clx across example and library code. Remove unused imports, tidy formatting (add trailing commas, reformat multi-line calls/constructors), and simplify several method channel invocations for readability. Add new third_party/amap_flutter_base/lib/amap_flutter_base_clx.dart with the library parts and replace the original amap_flutter_base.dart with a stub TODO. Update exports and type imports to reference the new clx variant.
上级 052257f4
显示空白字符变更
内嵌 并排
正在显示 包含 134 行增加 和 134 行删除
example/lib/const_config.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
class ConstConfig {
static const AMapApiKey amapApiKeys =
......
example/lib/pages/interactive/move_camera_demo.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
......
example/lib/pages/interactive/poi_click_demo.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
......
example/lib/pages/map/change_map_type.dart
浏览文件 @ 02d7dab9
......@@ -64,7 +64,7 @@ class _PageBodyState extends State<_PageBody> {
onChanged: (value) => {
//改变当前地图样式为选中的样式
setState(() {
_mapType = value as MapType;
_mapType = value;
})
},
),
......
example/lib/pages/map/limit_map_bounds.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
......
example/lib/pages/map/map_all_config.dart
浏览文件 @ 02d7dab9
import 'dart:typed_data';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
import 'package:amap_flutter_map_example/widgets/amap_switch_button.dart';
......
example/lib/pages/map/multi_map.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:flutter/material.dart';
......
example/lib/pages/overlays/marker_add_after_map.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
......
example/lib/pages/overlays/marker_add_with_map.dart
浏览文件 @ 02d7dab9
import 'dart:math';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
......
example/lib/pages/overlays/marker_config.dart
浏览文件 @ 02d7dab9
......@@ -6,10 +6,8 @@ import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
import 'package:amap_flutter_map_example/widgets/amap_switch_button.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'dart:math';
class MarkerConfigDemoPage extends BasePage {
......
example/lib/pages/overlays/marker_custom_icon.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/const_config.dart';
......
example/lib/pages/overlays/place_polygon.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/widgets/amap_switch_button.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import "package:amap_flutter_map/amap_flutter_map.dart";
class PolygonDemoPage extends BasePage {
PolygonDemoPage(String title, String subTitle) : super(title, subTitle);
......
example/lib/pages/overlays/place_polyline.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:amap_flutter_map_example/widgets/amap_switch_button.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
class PolylineDemoPage extends BasePage {
PolylineDemoPage(String title, String subTitle) : super(title, subTitle);
......
example/lib/pages/overlays/polyline_geodesic.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
class PolylineGeodesicDemoPage extends BasePage {
PolylineGeodesicDemoPage(String title, String subTitle)
......
example/lib/pages/overlays/polyline_texture.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map_example/base_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
class PolylineTextureDemoPage extends BasePage {
PolylineTextureDemoPage(String title, String subTitle)
......
example/test/amap_tools_test.dart
浏览文件 @ 02d7dab9
import 'package:flutter_test/flutter_test.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
void main() {
test('Distance between two different point', () {
......
lib/amap_flutter_map.dart
浏览文件 @ 02d7dab9
......@@ -3,7 +3,7 @@ library amap_flutter_map;
import 'dart:async';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
import 'package:amap_flutter_map/src/core/amap_flutter_platform.dart';
import 'package:amap_flutter_map/src/core/map_event.dart';
import 'package:amap_flutter_map/src/core/method_channel_amap_flutter_map.dart';
......@@ -14,7 +14,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
export 'package:amap_flutter_map/src/types/types.dart';
export 'package:amap_flutter_base/amap_flutter_base.dart';
export 'package:amap_flutter_base/amap_flutter_base_clx.dart';
part 'src/amap_controller.dart';
part 'src/amap_widget.dart';
lib/src/core/map_event.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
import 'package:amap_flutter_map/src/types/input_tips_result.dart';
import 'package:amap_flutter_map/src/types/regeocode_result.dart';
///地图事件处理
class MapEvent<T> {
......
lib/src/core/method_channel_amap_flutter_map.dart
浏览文件 @ 02d7dab9
import 'dart:async';
import 'dart:typed_data';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
import 'package:amap_flutter_map/src/core/amap_flutter_platform.dart';
import 'package:amap_flutter_map/src/types/input_tips_result.dart';
import 'package:amap_flutter_map/src/types/poi_result.dart';
import 'package:amap_flutter_map/src/types/regeocode_result.dart';
import 'package:amap_flutter_map/src/types/types.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
......@@ -41,12 +37,9 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
Map<String, dynamic> newOptions, {
required int mapId,
}) {
return channel(mapId).invokeMethod<void>(
'map#update',
<String, dynamic>{
return channel(mapId).invokeMethod<void>('map#update', <String, dynamic>{
'options': newOptions,
},
);
});
}
/// 更新Marker的数据
......@@ -54,10 +47,9 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
MarkerUpdates markerUpdates, {
required int mapId,
}) {
return channel(mapId).invokeMethod<void>(
'markers#update',
markerUpdates.toMap(),
);
return channel(
mapId,
).invokeMethod<void>('markers#update', markerUpdates.toMap());
}
/// 更新polyline的数据
......@@ -65,10 +57,9 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
PolylineUpdates polylineUpdates, {
required int mapId,
}) {
return channel(mapId).invokeMethod<void>(
'polylines#update',
polylineUpdates.toMap(),
);
return channel(
mapId,
).invokeMethod<void>('polylines#update', polylineUpdates.toMap());
}
/// 更新polygon的数据
......@@ -76,10 +67,9 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
PolygonUpdates polygonUpdates, {
required int mapId,
}) {
return channel(mapId).invokeMethod<void>(
'polygons#update',
polygonUpdates.toMap(),
);
return channel(
mapId,
).invokeMethod<void>('polygons#update', polygonUpdates.toMap());
}
///判断 点坐标是否在polygon 多边形内
......@@ -102,7 +92,8 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
Widget buildView(
Map<String, dynamic> creationParams,
Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers,
void Function(int id) onPlatformViewCreated) {
void Function(int id) onPlatformViewCreated,
) {
if (defaultTargetPlatform == TargetPlatform.android) {
creationParams['debugMode'] = kDebugMode;
return AndroidView(
......@@ -190,8 +181,12 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
switch (call.method) {
case 'location#changed':
try {
_mapEventStreamController.add(LocationChangedEvent(
mapId, AMapLocation.fromMap(call.arguments['location'])!));
_mapEventStreamController.add(
LocationChangedEvent(
mapId,
AMapLocation.fromMap(call.arguments['location'])!,
),
);
} catch (e) {
print("location#changed error=======>" + e.toString());
}
......@@ -199,79 +194,106 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
case 'camera#onMove':
try {
_mapEventStreamController.add(CameraPositionMoveEvent(
mapId, CameraPosition.fromMap(call.arguments['position'])!));
_mapEventStreamController.add(
CameraPositionMoveEvent(
mapId,
CameraPosition.fromMap(call.arguments['position'])!,
),
);
} catch (e) {
print("camera#onMove error===>" + e.toString());
}
break;
case 'camera#onMoveEnd':
try {
_mapEventStreamController.add(CameraPositionMoveEndEvent(
mapId, CameraPosition.fromMap(call.arguments['position'])!));
_mapEventStreamController.add(
CameraPositionMoveEndEvent(
mapId,
CameraPosition.fromMap(call.arguments['position'])!,
),
);
} catch (e) {
print("camera#onMoveEnd error===>" + e.toString());
}
break;
case 'camera#searchPOIEvent':
try {
_mapEventStreamController.add(MapSearchPOIEvent(mapId,
PoiResult.toPoiResult(call.arguments['searchPOIResult'])!));
_mapEventStreamController.add(
MapSearchPOIEvent(
mapId,
PoiResult.toPoiResult(call.arguments['searchPOIResult'])!,
),
);
} catch (e) {
print("camera#searchPOIEvent error===>" + e.toString());
}
break;
case 'camera#searchInputTipsEvent':
print(
'----- camera#searchInputTipsEvent result: ${call.arguments['searchInputTipsResult']}');
'----- camera#searchInputTipsEvent result: ${call.arguments['searchInputTipsResult']}',
);
try {
_mapEventStreamController.add(MapSearchInputTipsEvent(
_mapEventStreamController.add(
MapSearchInputTipsEvent(
mapId,
InputTipsResult.toInputTipsResult(
call.arguments['searchInputTipsResult'])!));
call.arguments['searchInputTipsResult'],
)!,
),
);
} catch (e) {
print("camera#searchInputTipsEvent error===>" + e.toString());
}
break;
case 'camera#searchRegeocodeEvent':
try {
_mapEventStreamController.add(MapSearchRegeocodeEvent(
_mapEventStreamController.add(
MapSearchRegeocodeEvent(
mapId,
RegeocodeResult.toRegeocodeResult(
call.arguments['searchRegeocodeResult'])!));
call.arguments['searchRegeocodeResult'],
)!,
),
);
} catch (e) {
print("camera#searchRegeocodeEvent error===>" + e.toString());
}
break;
case 'map#onTap':
_mapEventStreamController.add(
MapTapEvent(mapId, LatLng.fromJson(call.arguments['latLng'])!));
MapTapEvent(mapId, LatLng.fromJson(call.arguments['latLng'])!),
);
break;
case 'map#onLongPress':
_mapEventStreamController.add(MapLongPressEvent(
mapId, LatLng.fromJson(call.arguments['latLng'])!));
_mapEventStreamController.add(
MapLongPressEvent(mapId, LatLng.fromJson(call.arguments['latLng'])!),
);
break;
case 'marker#onTap':
_mapEventStreamController.add(MarkerTapEvent(
mapId,
call.arguments['markerId'],
));
_mapEventStreamController.add(
MarkerTapEvent(mapId, call.arguments['markerId']),
);
break;
case 'marker#onDragEnd':
_mapEventStreamController.add(MarkerDragEndEvent(
_mapEventStreamController.add(
MarkerDragEndEvent(
mapId,
LatLng.fromJson(call.arguments['position'])!,
call.arguments['markerId']));
call.arguments['markerId'],
),
);
break;
case 'polyline#onTap':
_mapEventStreamController
.add(PolylineTapEvent(mapId, call.arguments['polylineId']));
_mapEventStreamController.add(
PolylineTapEvent(mapId, call.arguments['polylineId']),
);
break;
case 'map#onPoiTouched':
try {
_mapEventStreamController.add(MapPoiTouchEvent(
mapId, AMapPoi.fromJson(call.arguments['poi'])!));
_mapEventStreamController.add(
MapPoiTouchEvent(mapId, AMapPoi.fromJson(call.arguments['poi'])!),
);
} catch (e) {
print('map#onPoiTouched error===>' + e.toString());
}
......@@ -289,16 +311,16 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
return channel(mapId).invokeMethod<void>('camera#move', <String, dynamic>{
'cameraUpdate': cameraUpdate.toJson(),
'animated': animated,
'duration': duration
'duration': duration,
});
}
/// 展示marker InfoWindow
Future<void> showInfoWindow(String markerId, {required int mapId}) {
return channel(mapId)
.invokeMethod<void>('markers#showInfoWindow', <String, dynamic>{
'markerId': markerId,
});
return channel(mapId).invokeMethod<void>(
'markers#showInfoWindow',
<String, dynamic>{'markerId': markerId},
);
}
/// 隐藏marker InfoWindow
......@@ -308,16 +330,13 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
///设置地图每秒渲染的帧数
Future<void> setRenderFps(int fps, {required int mapId}) {
return channel(mapId)
.invokeMethod<void>('map#setRenderFps', <String, dynamic>{
'fps': fps,
});
return channel(
mapId,
).invokeMethod<void>('map#setRenderFps', <String, dynamic>{'fps': fps});
}
///截屏
Future<Uint8List?> takeSnapshot({
required int mapId,
}) {
Future<Uint8List?> takeSnapshot({required int mapId}) {
return channel(mapId).invokeMethod<Uint8List>('map#takeSnapshot');
}
......@@ -327,10 +346,16 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
}
// 地图可视区域
Future<void> searchPoi(String query, int searchType,
{required int mapId, double latitude = 0.0, double longitude = 0.0}) {
return channel(mapId)
.invokeMethod<dynamic>('camera#searchPOI', <String, dynamic>{
Future<void> searchPoi(
String query,
int searchType, {
required int mapId,
double latitude = 0.0,
double longitude = 0.0,
}) {
return channel(
mapId,
).invokeMethod<dynamic>('camera#searchPOI', <String, dynamic>{
'query': query,
'latitude': latitude,
'longitude': longitude,
......@@ -340,40 +365,37 @@ class MethodChannelAMapFlutterMap implements AMapFlutterPlatform {
// 地图搜索inputTip
Future<void> searchInput(String query, {required int mapId}) {
return channel(mapId)
.invokeMethod<dynamic>('camera#searchInput', <String, dynamic>{
'query': query,
});
return channel(mapId).invokeMethod<dynamic>(
'camera#searchInput',
<String, dynamic>{'query': query},
);
}
// 地图搜索regeocode
Future<void> searchRegeocode(double latitude, double longitude,
{required int mapId}) {
return channel(mapId)
.invokeMethod<dynamic>('camera#searchRegeocode', <String, dynamic>{
'latitude': latitude,
'longitude': longitude,
});
Future<void> searchRegeocode(
double latitude,
double longitude, {
required int mapId,
}) {
return channel(mapId).invokeMethod<dynamic>(
'camera#searchRegeocode',
<String, dynamic>{'latitude': latitude, 'longitude': longitude},
);
}
//获取地图审图号（普通地图）
Future<String?> getMapContentApprovalNumber({
required int mapId,
}) {
Future<String?> getMapContentApprovalNumber({required int mapId}) {
return channel(mapId).invokeMethod<String>('map#contentApprovalNumber');
}
//获取地图审图号（卫星地图）
Future<String?> getSatelliteImageApprovalNumber({
required int mapId,
}) {
return channel(mapId)
.invokeMethod<String>('map#satelliteImageApprovalNumber');
Future<String?> getSatelliteImageApprovalNumber({required int mapId}) {
return channel(
mapId,
).invokeMethod<String>('map#satelliteImageApprovalNumber');
}
Future<void> clearDisk({
required int mapId,
}) {
Future<void> clearDisk({required int mapId}) {
return channel(mapId).invokeMethod<void>('map#clearDisk');
}
}
lib/src/types/bitmap.dart
浏览文件 @ 02d7dab9
......@@ -6,7 +6,7 @@ import 'dart:async' show Future;
import 'dart:typed_data' show Uint8List;
import 'dart:ui';
import 'package:amap_flutter_base/amap_flutter_base.dart' show AMapUtil;
import 'package:amap_flutter_base/amap_flutter_base_clx.dart' show AMapUtil;
import 'package:flutter/material.dart'
show ImageConfiguration, AssetImage, AssetBundleImageKey;
import 'package:flutter/services.dart' show AssetBundle;
......
lib/src/types/camera.dart
浏览文件 @ 02d7dab9
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
/// 相机位置，包含可视区域的位置参数。
class CameraPosition {
......
lib/src/types/marker.dart
浏览文件 @ 02d7dab9
......@@ -4,7 +4,7 @@
import 'dart:ui' show Offset;
import 'package:amap_flutter_map/src/types/base_overlay.dart';
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
import 'bitmap.dart';
/// Marker拖动回调
......
lib/src/types/polygon.dart
浏览文件 @ 02d7dab9
......@@ -4,7 +4,7 @@
import 'package:flutter/foundation.dart' show listEquals;
import 'package:flutter/material.dart' show Color;
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
import 'base_overlay.dart';
import 'polyline.dart';
......
lib/src/types/polyline.dart
浏览文件 @ 02d7dab9
......@@ -5,7 +5,7 @@
import 'package:amap_flutter_map/src/types/bitmap.dart';
import 'package:flutter/foundation.dart' show listEquals;
import 'package:flutter/material.dart' show Color;
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_base/amap_flutter_base_clx.dart';
import 'base_overlay.dart';
/// 虚线类型
......
lib/src/types/ui.dart
浏览文件 @ 02d7dab9
import 'dart:typed_data';
import 'dart:ui' show Color;
import 'package:amap_flutter_base/amap_flutter_base.dart';
import 'package:amap_flutter_map/amap_flutter_map.dart';
/// 地图类型
......
third_party/amap_flutter_base/lib/amap_flutter_base.dart
浏览文件 @ 02d7dab9
library amap_flutter_base;
import 'dart:ui' show Offset;
import 'package:flutter/material.dart';
import 'dart:math';
part 'src/amap_api_key.dart';
part 'src/amap_tools.dart';
part 'src/callbacks.dart';
part 'src/location.dart';
part 'src/poi.dart';
part 'src/amap_utils.dart';
part 'src/amap_privacy_statement.dart';
// TODO Implement this library.
third_party/amap_flutter_base/lib/amap_flutter_base_clx.dart 0 → 100644
浏览文件 @ 02d7dab9
library amap_flutter_base;
import 'dart:ui' show Offset;
import 'package:flutter/material.dart';
import 'dart:math';
part 'src/amap_api_key.dart';
part 'src/amap_tools.dart';
part 'src/callbacks.dart';
part 'src/location.dart';
part 'src/poi.dart';
part 'src/amap_utils.dart';
part 'src/amap_privacy_statement.dart';
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论