From 8dac5bc3b1b2741ae993427b271142fa2873099a Mon Sep 17 00:00:00 2001
From: yangjie <168149434@qq.com>
Date: Tue, 19 Nov 2024 17:23:45 +0800
Subject: [PATCH] namespace

---
 android/build.gradle                          |  6 +-
 .../overlays/marker/MarkersController.java    |  6 +-
 example/lib/main.dart                         | 90 ++++++++++---------
 example/lib/pages/overlays/marker_config.dart |  1 -
 4 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index b905546..08f17d6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,6 +22,9 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    if (project.android.hasProperty("namespace")) {
+        namespace = "com.amap.flutter.map"
+    }
     compileSdkVersion 34
 
     defaultConfig {
@@ -33,7 +36,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.amap.api:3dmap-location-search:10.0.800_loc6.4.5_sea9.7.2'
+//    implementation 'com.amap.api:3dmap-location-search:10.0.800_loc6.4.5_sea9.7.2'
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     implementation 'androidx.annotation:annotation:1.8.1'
 }
 
diff --git a/android/src/main/java/com/amap/flutter/map/overlays/marker/MarkersController.java b/android/src/main/java/com/amap/flutter/map/overlays/marker/MarkersController.java
index c1b6156..b36ef27 100644
--- a/android/src/main/java/com/amap/flutter/map/overlays/marker/MarkersController.java
+++ b/android/src/main/java/com/amap/flutter/map/overlays/marker/MarkersController.java
@@ -1,14 +1,12 @@
 package com.amap.flutter.map.overlays.marker;
 
+import android.graphics.Color;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
 import com.amap.api.maps.AMap;
-import com.amap.api.maps.model.LatLng;
-import com.amap.api.maps.model.Marker;
-import com.amap.api.maps.model.MarkerOptions;
-import com.amap.api.maps.model.Poi;
+import com.amap.api.maps.model.*;
 import com.amap.flutter.map.MyMethodCallHandler;
 import com.amap.flutter.map.overlays.AbstractOverlayController;
 import com.amap.flutter.map.utils.Const;
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 80fcedd..3c5dffd 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -7,6 +7,52 @@ import 'package:amap_map_example/routes.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 
+void main() {
+  runApp(MaterialApp(
+      themeMode: ThemeMode.light,
+      onGenerateRoute: RouteConfig.onGenerateRoute,
+      home: AMapDemo()));
+}
+
+enum DemoCategory {
+  basic,
+  interactive,
+  overlay,
+  extension;
+
+  String toDisplayTitle() {
+    switch (this) {
+      case basic:
+        return '创建地图';
+      case interactive:
+        return '与地图交互';
+      case overlay:
+        return '在地图上绘制';
+      case extension:
+        return '拓展插件';
+    }
+  }
+}
+
+class Demo {
+  const Demo({
+    required this.title,
+    required this.category,
+    required this.subtitle,
+    // Parameters below are required for non-study demos.
+    this.slug,
+    this.configurations = const [],
+  }) : assert(slug != null);
+
+  final String title;
+  final DemoCategory category;
+  final String subtitle;
+  final String? slug;
+  final List<DemoConfiguration> configurations;
+
+  String get describe => '$slug@${category.name}';
+}
+
 final List<Permission> needPermissionList = [
   Permission.location,
   Permission.storage,
@@ -92,48 +138,4 @@ class _AMapDemoState extends State<AMapDemo>
   }
 }
 
-void main() {
-  runApp(MaterialApp(
-      themeMode: ThemeMode.light,
-      onGenerateRoute: RouteConfig.onGenerateRoute,
-      home: AMapDemo()));
-}
 
-enum DemoCategory {
-  basic,
-  interactive,
-  overlay,
-  extension;
-
-  String toDisplayTitle() {
-    switch (this) {
-      case basic:
-        return '创建地图';
-      case interactive:
-        return '与地图交互';
-      case overlay:
-        return '在地图上绘制';
-      case extension:
-        return '拓展插件';
-    }
-  }
-}
-
-class Demo {
-  const Demo({
-    required this.title,
-    required this.category,
-    required this.subtitle,
-    // Parameters below are required for non-study demos.
-    this.slug,
-    this.configurations = const [],
-  }) : assert(slug != null);
-
-  final String title;
-  final DemoCategory category;
-  final String subtitle;
-  final String? slug;
-  final List<DemoConfiguration> configurations;
-
-  String get describe => '$slug@${category.name}';
-}
diff --git a/example/lib/pages/overlays/marker_config.dart b/example/lib/pages/overlays/marker_config.dart
index c516de1..230e45e 100644
--- a/example/lib/pages/overlays/marker_config.dart
+++ b/example/lib/pages/overlays/marker_config.dart
@@ -85,7 +85,6 @@ class _State extends State<MarkerConfigDemoPage> {
       onDragEnd: (markerId, endPosition) =>
           _onMarkerDragEnd(markerId, endPosition),
     );
-
     setState(() {
       _markers[marker.id] = marker;
     });