release 4.8.9

lib/pages/destination/destination_controller.dart

@@ -16,6 +16,7 @@ import 'package:rogapp/model/gps_data.dart';
 import 'package:rogapp/pages/camera/camera_page.dart';
 import 'package:rogapp/pages/camera/custom_camera_view.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
+import 'package:rogapp/pages/team/team_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
 import 'package:rogapp/services/DatabaseService.dart';
 import 'package:rogapp/services/destination_service.dart';
@@ -44,6 +45,7 @@ import 'package:rogapp/pages/permission/permission.dart';
 class DestinationController extends GetxController {
   late LocationSettings locationSettings;		// 位置情報の設定を保持する変数です。
 
+  //late TeamController teamController = TeamController();
   //Timer? _GPStimer;					// GPSタイマーを保持する変数です。
 
   var destinationCount = 0.obs;				// 目的地の数を保持するReactive変数です。
@@ -161,11 +163,11 @@ class DestinationController extends GetxController {
     }
   }
 
-
   //
   //==== Akira .. GPS信号シミュレーション用 ======= ここまで
   */
 
+
   // ルートをクリアする関数です。
   void clearRoute() {
     indexController.routePoints.clear();
@@ -1156,9 +1158,13 @@ class DestinationController extends GetxController {
     //await _saveImageFromPath(imageurl);
     await _saveImageToGallery(imageurl);
 
+
+
     if (indexController.currentUser.isNotEmpty) {
       double cpNum = destination.cp!;
 
+      //int teamId = indexController.teamId.value; // teamIdを使用
+
       int userId = indexController.currentUser[0]["user"]["id"];
       //print("--- Pressed -----");
       String team = indexController.currentUser[0]["user"]['team_name'];
@@ -1222,6 +1228,11 @@ class DestinationController extends GetxController {
       if (indexController.currentUser.isNotEmpty) {
         double cpNum = destination.cp!;
 
+        //int teamId = indexController.teamId.value; // teamIdを使用
+        //Team team0 = teamController.teams[0];
+        //print("team={team0}");
+
+
         int userId = indexController.currentUser[0]["user"]["id"];
         //print("--- Pressed -----");
         String team = indexController.currentUser[0]["user"]['team_name'];
@@ -1238,7 +1249,7 @@ class DestinationController extends GetxController {
         // print("------ checkin event $eventCode ------");
         ExternalService()
             .makeCheckpoint(
-            userId,
+            userId, // teamIdを使用
             token,
             formattedDate,
             team,
@@ -1716,6 +1727,8 @@ class DestinationController extends GetxController {
     //print('----- %%%%%%%%%%%%%%%%%%%%% ----- $val');
     Map<String, dynamic> res = {};
     if (val == "wifi" || val == "mobile") {
+      //int teamId = indexController.teamId.value; // teamIdを使用
+
       String token = indexController.currentUser[0]["token"];
       DatabaseHelper db = DatabaseHelper.instance;
       db.allRogianing().then((value) {
@@ -1725,7 +1738,7 @@ class DestinationController extends GetxController {
           } else if (e.rog_action_type == 1) {
             var datetime = DateTime.fromMicrosecondsSinceEpoch(e.checkintime!);
             res = await ExternalService().makeCheckpoint(
-                e.user_id!,
+                e.user_id!, // teamId???
                 token,
                 getFormatedTime(datetime),
                 e.team_name!,
@@ -1735,7 +1748,7 @@ class DestinationController extends GetxController {
           } else if (e.rog_action_type == 2) {
             var datetime = DateTime.fromMicrosecondsSinceEpoch(e.checkintime!);
             res = await ExternalService().makeGoal(
-                e.user_id!,
+                e.user_id!,   // // teamId???
                 token,
                 e.team_name!,
                 e.image!,