M3-209 Feat : 즐겨찾기 삭제 구현

SWM-M3PRO · Aug 8, 2024 · 049a7ea · 049a7ea
1 parent 22e10b1
commit 049a7ea
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/lib/controllers/main_controller.dart b/lib/controllers/main_controller.dart
@@ -1,13 +1,16 @@
 import 'package:get/get.dart';
 
 import '../service/fcm_service.dart';
+import '../service/my_place_service.dart';
 
 class MainController extends GetxController {
   final FcmService fcmService = FcmService();
+  final MyPlaceService myPlaceService = MyPlaceService();
 
   @override
   void onInit() async {
     super.onInit();
     fcmService.registerFcmToken();
+    myPlaceService.getMyPlaceInfo();
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -22,6 +22,7 @@ import 'screens/sign_up_screen.dart';
 import 'service/location_service.dart';
 import 'service/my_place_service.dart';
 import 'utils/user_manager.dart';
+import 'service/auth_service.dart';
 import 'widgets/common/internet_disconnect.dart';
 
 Future<void> main() async {
@@ -39,7 +40,7 @@ Future<void> main() async {
 
   KakaoSdk.init(nativeAppKey: dotenv.env['NATIVE_APP_KEY']!);
   LocationService().initBackgroundLocation();
-  String initialRoute = '/main';//await AuthService().isLogin() ? '/main' : '/permission';
+  String initialRoute = await AuthService().isLogin() ? '/main' : '/permission';
   runApp(
     MyApp(
       initialRoute: initialRoute,
@@ -51,7 +52,6 @@ class MyApp extends StatelessWidget {
   MyApp({super.key, required this.initialRoute});
 
   final String initialRoute;
-  final MyPlaceService myPlaceService = MyPlaceService();
   static bool checkInternet = true;
 
   final listener =
@@ -80,7 +80,6 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     final FirebaseAnalytics analytics = FirebaseAnalytics.instance;
     analytics.logAppOpen();
-    myPlaceService.getMyPlaceInfo();
 
     return MediaQuery(
       data: MediaQuery.of(context).copyWith(textScaler: TextScaler.noScaling),

diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
@@ -57,7 +57,6 @@ class MapScreen extends StatelessWidget {
                     },
                     myLocationEnabled: true,
                     style: mapController.mapStyle,
-                    markers: Set<Marker>.of(mapController.markers),
                     polygons: Set<Polygon>.of(mapController.pixels),
                   ),
                 );

diff --git a/lib/service/my_place_service.dart b/lib/service/my_place_service.dart
@@ -24,13 +24,17 @@ class MyPlaceService {
     myPlaces = MyPlace.listFromJson(response.data['data']);
     for (var e in myPlaces) {
       box.write(e.placeName.toString(), e.placePoint);
-      print('1111 ${e.placeName.toString()}, ${e.placePoint}');
+      print('1111');
     }
+
     return myPlaces;
   }
 
   Future<void> putMyPlaceInfo(
-      String placeName, double latitude, double longitude,) async {
+    String placeName,
+    double latitude,
+    double longitude,
+  ) async {
     int? userId = UserManager().getUserId();
     await dio.put(
       '/myplace',
@@ -42,4 +46,10 @@ class MyPlaceService {
       },
     );
   }
+
+  Future<void> deleteMyPlaceInfo(String placeName) async {
+    int? userId = UserManager().getUserId();
+    await dio
+        .delete('/myplace', data: {"userId": userId, "placeName": placeName});
+  }
 }
diff --git a/lib/utils/dio_service.dart b/lib/utils/dio_service.dart
@@ -29,7 +29,7 @@ class DioService {
     _dio.interceptors.add(
       InterceptorsWrapper(
         onRequest: (options, handler) async {
-          const accessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE3MjA3NTc5ODUsImV4cCI6MTgyMTYyMTk4NSwidXNlcklkIjo2MjJ9.HNTbCbz02o9-GsDxcdGG-VxJl0Q_xb1hBeu7ihg9oSY';//await secureStorage.readAccessToken();
+          final accessToken = await secureStorage.readAccessToken();
           options.headers.addAll({
             'Authorization': 'Bearer $accessToken',
           });

diff --git a/lib/widgets/map/my_place_bottom_sheet.dart b/lib/widgets/map/my_place_bottom_sheet.dart
@@ -66,10 +66,10 @@ class MyPlaceBottomSheet extends StatelessWidget {
               child: InkWell(
                 borderRadius: BorderRadius.circular(16),
                 onTap: () async{
-                  // await myPlaceService.putMyPlaceInfo(
-                  //     mapController.myPlaceName.value,
-                  //     mapController.selectedLatitude.value,
-                  //     mapController.selectedLongitude.value,);
+                  await myPlaceService.putMyPlaceInfo(
+                      mapController.myPlaceName.value,
+                      mapController.selectedLatitude.value,
+                      mapController.selectedLongitude.value,);
 
                   await mapController.writeLocalStorage(
                       mapController.myPlaceName.value,

diff --git a/lib/widgets/map/my_place_button_icon.dart b/lib/widgets/map/my_place_button_icon.dart
@@ -51,6 +51,7 @@ class MyPlaceButtonIcon extends StatelessWidget {
                     onPressed: () async {
                       mapController.deleteLocalStorage(place);
                       mapController.myPlaceButtonVisible.value = false;
+                      myPlaceService.deleteMyPlaceInfo(place);
                       Get.back();
                     },
                   ),