[new]增加轨迹查询入口

lib/di/get_it.config.dart

@@ -27,7 +27,7 @@ import '../module/main/main_controller.dart' as _i731;
 import '../module/member/member_controller.dart' as _i269;
 import '../module/mine/mine_controller.dart' as _i732;
 import '../module/splash/splash_controller.dart' as _i973;
-import '../module/trace/trace_controller.dart' as _i504;
+import '../module/track/track_controller.dart' as _i518;
 import '../socket/atmob_location_client.dart' as _i220;
 import 'network_module.dart' as _i567;
 
@@ -46,7 +46,7 @@ extension GetItInjectableX on _i174.GetIt {
     gh.factory<_i923.BrowserController>(() => _i923.BrowserController());
     gh.factory<_i973.SplashController>(() => _i973.SplashController());
     gh.factory<_i269.MemberController>(() => _i269.MemberController());
-    gh.factory<_i504.TraceController>(() => _i504.TraceController());
+    gh.factory<_i518.TrackController>(() => _i518.TrackController());
     gh.singleton<_i361.Dio>(() => networkModule.createDefaultDio());
     gh.lazySingleton<_i220.AtmobLocationClient>(
         () => _i220.AtmobLocationClient());

lib/module/friend/friend_controller.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
@@ -8,7 +6,6 @@ import 'package:location/base/base_controller.dart';
 import 'package:location/data/repositories/account_repository.dart';
 import 'package:location/data/repositories/friends_repository.dart';
 import 'package:location/module/friend/setting/friend_setting_page.dart';
-
 import '../../data/bean/user_info.dart';
 import '../../dialog/common_alert_dialog_impl.dart';
 import '../../dialog/common_confirm_dialog_impl.dart';
@@ -16,7 +13,7 @@ import '../../sdk/wechat/wechat_share_util.dart';
 import '../../utils/toast_util.dart';
 import '../login/login_page.dart';
 import '../member/member_page.dart';
-import '../trace/trace_page.dart';
+import '../track/track_page.dart';
 
 @injectable
 class FriendController extends BaseController {
@@ -91,6 +88,6 @@ class FriendController extends BaseController {
       });
       return;
     }
-    TracePage.start();
+    TrackPage.start();
   }
 }

lib/module/main/main_controller.dart

@@ -14,10 +14,8 @@ import 'package:location/handler/error_handler.dart';
 import 'package:location/module/friend/friend_page.dart';
 import 'package:location/module/login/login_page.dart';
 import 'package:location/module/member/member_page.dart';
-import 'package:location/module/trace/trace_page.dart';
 import 'package:location/resource/string.gen.dart';
 import 'package:location/sdk/map/map_helper.dart';
-import 'package:location/sdk/wechat/wechat_helper.dart';
 import 'package:location/utils/base_expand.dart';
 import 'package:location/utils/toast_util.dart';
 import '../../data/repositories/config_repository.dart';
@@ -32,6 +30,7 @@ import '../../utils/location_convert_marker_util.dart';
 import '../../utils/permission_util.dart';
 import '../add_friend/add_friend_page.dart';
 import '../mine/mine_page.dart';
+import '../track/track_page.dart';
 
 @injectable
 class MainController extends BaseController {
@@ -258,6 +257,6 @@ class MainController extends BaseController {
       });
       return;
     }
-    TracePage.start();
+    TrackPage.start();
   }
 }

lib/module/trace/trace_controller.dart

@@ -1,5 +0,0 @@
-import 'package:injectable/injectable.dart';
-import 'package:location/base/base_controller.dart';
-
-@injectable
-class TraceController extends BaseController {}

lib/module/trace/trace_page.dart

@@ -1,21 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/src/widgets/framework.dart';
-import 'package:get/get.dart';
-import 'package:get/get_core/src/get_main.dart';
-import 'package:location/base/base_page.dart';
-import 'package:location/module/trace/trace_controller.dart';
-
-import '../../router/app_pages.dart';
-
-class TracePage extends BasePage<TraceController> {
-  const TracePage({super.key});
-
-  static void start() {
-    Get.toNamed(RoutePath.trace);
-  }
-
-  @override
-  Widget buildBody(BuildContext context) {
-    return Text('这是轨迹查询页');
-  }
-}

lib/module/track/track_controller.dart

@@ -0,0 +1,19 @@
+import 'package:flutter_map/flutter_map.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
+import 'package:injectable/injectable.dart';
+import 'package:location/base/base_controller.dart';
+
+@injectable
+class TrackController extends BaseController {
+  final MapController mapController = MapController();
+
+  @override
+  void onReady() {
+    super.onReady();
+  }
+
+  void back() {
+    Get.back();
+  }
+}

lib/module/track/track_page.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
+import 'package:location/base/base_page.dart';
+import 'package:location/dialog/agreement_dialog.dart';
+import 'package:location/module/track/track_controller.dart';
+
+import '../../router/app_pages.dart';
+import '../../widget/common_view.dart';
+
+class TrackPage extends BasePage<TrackController> {
+  const TrackPage({super.key});
+
+  static void start() {
+    Get.toNamed(RoutePath.track);
+  }
+
+  @override
+  bool immersive() {
+    return true;
+  }
+
+  @override
+  Widget buildBody(BuildContext context) {
+    return Stack(
+      children: [
+        SizedBox(
+          width: double.infinity,
+          height: double.infinity,
+          child: MapWidget(
+            controller: controller.mapController,
+          ),
+        ),
+        SafeArea(
+          child: Container(
+            margin: EdgeInsets.only(top: 14.w, left: 12.w),
+            child: GestureDetector(
+                onTap: controller.back, child: CommonView.getBackBtnView()),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/router/app_pages.dart

@@ -10,13 +10,13 @@ import 'package:location/module/main/main_page.dart';
 import 'package:location/module/member/member_controller.dart';
 import 'package:location/module/member/member_page.dart';
 import 'package:location/module/mine/mine_page.dart';
-import 'package:location/module/trace/trace_controller.dart';
-import 'package:location/module/trace/trace_page.dart';
 import '../module/add_friend/add_friend_dialog_controller.dart';
 import '../module/login/login_page.dart';
 import '../module/main/main_controller.dart';
 import '../module/mine/mine_controller.dart';
 import '../module/splash/splash_page.dart';
+import '../module/track/track_controller.dart';
+import '../module/track/track_page.dart';
 
 abstract class AppPage {
   static final pages = <GetPage>[...generalPages];
@@ -32,7 +32,7 @@ abstract class RoutePath {
   static const friend = '/friend';
   static const friendSetting = '/friendSetting';
   static const member = '/member';
-  static const trace = '/trace';
+  static const track = '/track';
 }
 
 class AppBinding extends Bindings {
@@ -46,7 +46,7 @@ class AppBinding extends Bindings {
     lazyPut(() => getIt.get<FriendController>());
     lazyPut(() => getIt.get<FriendSettingController>());
     lazyPut(() => getIt.get<MemberController>());
-    lazyPut(() => getIt.get<TraceController>());
+    lazyPut(() => getIt.get<TrackController>());
   }
 
   void lazyPut<S>(InstanceBuilderCallback<S> builder) {
@@ -62,5 +62,5 @@ final generalPages = [
   GetPage(name: RoutePath.friend, page: () => FriendPage()),
   GetPage(name: RoutePath.friendSetting, page: () => FriendSettingPage()),
   GetPage(name: RoutePath.member, page: () => MemberPage()),
-  GetPage(name: RoutePath.trace, page: () => TracePage()),
+  GetPage(name: RoutePath.track, page: () => TrackPage()),
 ];

plugins/map_amap_android/android/src/main/java/com/atmob/map_amap_android/amap/AmapView.java

@@ -49,8 +49,11 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     private MarkersController markersController;
 
+    private final int viewId;
+
 
     public AmapView(Context context, Activity activity, BinaryMessenger messenger, int viewId, Map<String, Object> args, LifecycleOwner lifecycleProvider) {
+        this.viewId = viewId;
         channel = new MethodChannel(messenger, Constants.MAP_VIEW_CHANNEL_NAME + viewId);
         channel.setMethodCallHandler(this);
         myMethodCallHandlerMap = new HashMap<>(8);
@@ -59,7 +62,6 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
             mapView = new TextureMapView(context);
             AMap amap = mapView.getMap();
             initMapDefaultSetting(amap);
-
             markersController = new MarkersController(context, channel, amap);
             mapController = new MapController(context, channel, amap);
 
@@ -108,7 +110,7 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void dispose() {
-        LogUtil.i(TAG, "dispose==>");
+        LogUtil.i(TAG, "dispose==>" + viewId);
         try {
             if (disposed) {
                 return;
@@ -143,7 +145,7 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void onCreate(@NonNull LifecycleOwner owner) {
-        LogUtil.i(TAG, "onCreate==>");
+        LogUtil.i(TAG, "onCreate==>" + viewId);
         try {
             if (disposed) {
                 return;
@@ -158,13 +160,13 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void onStart(@NonNull LifecycleOwner owner) {
-        LogUtil.i(TAG, "onStart==>");
+        LogUtil.i(TAG, "onStart==>" + viewId);
     }
 
 
     @Override
     public void onResume(@NonNull LifecycleOwner owner) {
-        LogUtil.i(TAG, "onResume==>");
+        LogUtil.i(TAG, "onResume==>" + viewId);
         try {
             if (disposed) {
                 return;
@@ -179,7 +181,7 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void onPause(@NonNull LifecycleOwner owner) {
-        LogUtil.i(TAG, "onPause==>");
+        LogUtil.i(TAG, "onPause==>" + viewId);
         try {
             if (disposed) {
                 return;
@@ -192,12 +194,12 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void onStop(@NonNull LifecycleOwner owner) {
-        LogUtil.i(TAG, "onStop==>");
+        LogUtil.i(TAG, "onStop==>" + viewId);
     }
 
     @Override
     public void onDestroy(@NonNull LifecycleOwner owner) {
-        LogUtil.i(TAG, "onDestroy==>");
+        LogUtil.i(TAG, "onDestroy==>" + viewId);
         try {
             if (disposed) {
                 return;
@@ -210,7 +212,7 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle bundle) {
-        LogUtil.i(TAG, "onDestroy==>");
+        LogUtil.i(TAG, "onSaveInstanceState==>" + viewId);
         try {
             if (disposed) {
                 return;
@@ -223,7 +225,7 @@ public class AmapView implements PlatformView, DefaultLifecycleObserver, MethodC
 
     @Override
     public void onRestoreInstanceState(@Nullable Bundle bundle) {
-        LogUtil.i(TAG, "onDestroy==>");
+        LogUtil.i(TAG, "onRestoreInstanceState==>" + viewId);
         try {
             if (disposed) {
                 return;