yangjie/amap_map
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/kuloud/amap_map

Browse Source 
# Conflicts:
#	android/build.gradle
#	pubspec.yaml
This commit is contained in:
yangjie
2025-03-18 08:21:02 +08:00
parent 9c16889c46 19c0c3bae6
commit d4d248d714
31 changed files with 229 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/types/marker.dart
View File

@ -96,12 +96,12 @@ class Marker extends BaseOverlay {
(alpha != null ? (alpha < 0 ? 0 : (alpha > 1 ? 1 : alpha)) : alpha),
// ignore: unnecessary_null_comparison
anchor = (anchor == null
? Offset(0.5, 1.0)
? const Offset(0.5, 1.0)
: ((anchor.dx < 0 ||
anchor.dx > 1 ||
anchor.dy < 0 ||
anchor.dy > 1)
? Offset(0.5, 1.0)
? const Offset(0.5, 1.0)
: anchor)),
super();

4
lib/src/types/polygon.dart
View File

@ -77,8 +77,8 @@ class Polygon extends BaseOverlay {
addIfPresent('id', id);
json['points'] = _pointsToJson();
addIfPresent('strokeWidth', strokeWidth);
addIfPresent('strokeColor', strokeColor.value);
addIfPresent('fillColor', fillColor.value);
addIfPresent('strokeColor', strokeColor.toARGB32());
addIfPresent('fillColor', fillColor.toARGB32());
addIfPresent('visible', visible);
addIfPresent('joinType', joinType.index);
return json;

2
lib/src/types/polyline.dart
View File

@ -155,7 +155,7 @@ class Polyline extends BaseOverlay {
addIfPresent('capType', capType.index);
addIfPresent('joinType', joinType.index);
addIfPresent('customTexture', customTexture?.toMap());
addIfPresent('color', color.value);
addIfPresent('color', color.toARGB32());
return json;
}

4
lib/src/types/ui.dart
View File

@ -167,8 +167,8 @@ class MyLocationStyleOptions {
}
addIfPresent('enabled', enabled);
addIfPresent('circleFillColor', circleFillColor?.value);
addIfPresent('circleStrokeColor', circleStrokeColor?.value);
addIfPresent('circleFillColor', circleFillColor?.toARGB32());
addIfPresent('circleStrokeColor', circleStrokeColor?.toARGB32());
addIfPresent('circleStrokeWidth', circleStrokeWidth);
addIfPresent('icon', icon?.toMap());
return json;