Merge pull request #12 from SWM-M3PRO/feature/M3-119-renderIndividual…

…Pixel M3-119 개인전 픽셀 표시하는 화면 만들기
SWM-M3PRO · Jun 28, 2024 · 20e8c5b · 20e8c5b
2 parents 4fecf81 + d77934c
commit 20e8c5b
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 11 deletions.
diff --git a/lib/controllers/map_controller.dart b/lib/controllers/map_controller.dart
@@ -1,24 +1,31 @@
 import 'dart:async';
 
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:location/location.dart';
 
-import '../service/individual_pixel_service.dart';
+import '../models/individual_pixel.dart';
+import '../service/pixel_service.dart';
+import '../widgets/pixel.dart';
 
 class MapController extends GetxController {
-  final IndividualPixelService individualPixelService = IndividualPixelService();
+  final PixelService individualPixelService = PixelService();
 
   static const String darkMapStylePath = 'assets/map_style/dark_map_style.txt';
   static const String userMarkerId = 'USER';
+  static const double latPerPixel = 0.000724;
+  static const double lonPerPixel = 0.000909;
+  static const int defaultUserId = 1;
 
   final Location location = Location();
-  late final String darkMapStyle;
+  late final String mapStyle;
   Completer<GoogleMapController> completer = Completer();
 
   late LocationData currentLocation;
 
+  RxList<Pixel> pixels = <Pixel>[].obs;
   RxList<Marker> markers = <Marker>[].obs;
   RxBool isLoading = true.obs;
 
@@ -27,9 +34,10 @@ class MapController extends GetxController {
     super.onInit();
     await _loadMapStyle();
     await updateCurrentLocation();
+    await _updateIndividualPixel();
     _createUserMarker();
     _trackUserLocation();
-    await individualPixelService.getIndividualPixels(currentLatitude: currentLocation.latitude!, currentLongitude: currentLocation.longitude!);
+    _trackPixels();
   }
 
   void _trackUserLocation() {
@@ -62,11 +70,47 @@ class MapController extends GetxController {
   }
 
   Future<void> _loadMapStyle() async {
-    darkMapStyle = await rootBundle.loadString(darkMapStylePath);
+    mapStyle = await rootBundle.loadString(darkMapStylePath);
   }
 
   void _updateMarkerPosition(LocationData newLocation, String markerId) {
     markers.removeWhere((marker) => marker.markerId.value == markerId);
     _addMarker(LatLng(newLocation.latitude!, newLocation.longitude!), markerId);
   }
+
+  Future<void> _updateIndividualPixel() async {
+    List<IndividualPixel> individualPixelList = await individualPixelService.getIndividualPixels(
+        currentLatitude: currentLocation.latitude!,
+        currentLongitude: currentLocation.longitude!,
+    );
+
+    pixels = [
+      for(var pixel in individualPixelList)
+        Pixel(
+            x: pixel.x,
+            y: pixel.y,
+            pixelId: pixel.pixelId,
+            polygonId: pixel.pixelId.toString(),
+            points: _getRectangleFromLatLng(topLeftPoint: LatLng(pixel.latitude, pixel.longitude)),
+            fillColor: (pixel.userId == defaultUserId) ? Colors.blue.withOpacity(0.3) : Colors.red.withOpacity(0.3),
+            strokeColor: (pixel.userId == defaultUserId) ? Colors.blue : Colors.red,
+            strokeWidth: 1,
+        ),
+    ].obs;
+  }
+
+  List<LatLng> _getRectangleFromLatLng({required LatLng topLeftPoint}) {
+    return List<LatLng>.of({
+      LatLng(topLeftPoint.latitude, topLeftPoint.longitude),
+      LatLng(topLeftPoint.latitude, topLeftPoint.longitude + lonPerPixel),
+      LatLng(topLeftPoint.latitude - latPerPixel, topLeftPoint.longitude + lonPerPixel),
+      LatLng(topLeftPoint.latitude - latPerPixel, topLeftPoint.longitude),
+    });
+  }
+
+  void _trackPixels() {
+    Timer.periodic(const Duration(seconds: 30), (timer) {
+      _updateIndividualPixel();
+    });
+  }
 }
diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
@@ -33,8 +33,9 @@ class MapScreen extends StatelessWidget {
               onMapCreated: (GoogleMapController ctrl) {
                 mapController.completer.complete(ctrl);
               },
-              style: mapController.darkMapStyle,
+              style: mapController.mapStyle,
               markers: Set<Marker>.of(mapController.markers),
+              polygons: Set<Polygon>.of(mapController.pixels),
             );
           }
         }),

diff --git a/lib/service/individual_pixel_service.dart → lib/service/pixel_service.dart b/lib/service/individual_pixel_service.dart → lib/service/pixel_service.dart
@@ -3,15 +3,15 @@ import 'package:dio/dio.dart';
 import '../models/individual_pixel.dart';
 import '../utils/dio_service.dart';
 
-class IndividualPixelService {
-  static final IndividualPixelService _instance =
-      IndividualPixelService._internal();
+class PixelService {
+  static final PixelService _instance =
+      PixelService._internal();
 
   final Dio dio = DioService().getDio();
 
-  IndividualPixelService._internal();
+  PixelService._internal();
 
-  factory IndividualPixelService() {
+  factory PixelService() {
     return _instance;
   }
 

diff --git a/lib/widgets/pixel.dart b/lib/widgets/pixel.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+class Pixel extends Polygon {
+  final int x;
+  final int y;
+  final int pixelId;
+
+  Pixel({
+    required this.x,
+    required this.y,
+    required this.pixelId,
+    required String polygonId,
+    super.points,
+    super.geodesic,
+    super.visible,
+    super.fillColor = const Color(0x00000000),
+    super.strokeColor = const Color(0x00000000),
+    super.strokeWidth = 0,
+    List<PatternItem> patterns = const <PatternItem>[],
+    super.consumeTapEvents,
+    super.onTap,
+  }) : super(
+    polygonId: PolygonId(polygonId),
+  );
+}