diff --git a/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.bin b/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.bin index 67f65d3..5caf522 100644 Binary files a/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.bin and b/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.lock b/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.lock index b98ea0d..c369689 100644 Binary files a/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.lock and b/Src/UAV/DroneRecognitionApp/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.bin b/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.bin index 78a151a..c9d7cb0 100644 Binary files a/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.bin and b/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.lock b/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.lock index 77129d5..1eafcdd 100644 Binary files a/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.lock and b/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/resourceHashesCache.bin b/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/resourceHashesCache.bin index 5ea7d56..5de5e79 100644 Binary files a/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/Src/UAV/DroneRecognitionApp/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/Src/UAV/DroneRecognitionApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Src/UAV/DroneRecognitionApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6f3e405..5c639ae 100644 Binary files a/Src/UAV/DroneRecognitionApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Src/UAV/DroneRecognitionApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/intermediates/apk/debug/app-debug.apk b/Src/UAV/DroneRecognitionApp/app/build/intermediates/apk/debug/app-debug.apk index da1d51d..92e2b24 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/intermediates/apk/debug/app-debug.apk and b/Src/UAV/DroneRecognitionApp/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/Src/UAV/DroneRecognitionApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index d3e152e..a5901bf 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/Src/UAV/DroneRecognitionApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Src/UAV/DroneRecognitionApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index de5c109..877037b 100644 --- a/Src/UAV/DroneRecognitionApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Src/UAV/DroneRecognitionApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sun Jul 13 00:33:51 CST 2025 +#Sun Jul 13 00:54:46 CST 2025 base.0=D\:\\softwaregit\\AIDAP\\Src\\UAV\\DroneRecognitionApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=D\:\\softwaregit\\AIDAP\\Src\\UAV\\DroneRecognitionApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.2=D\:\\softwaregit\\AIDAP\\Src\\UAV\\DroneRecognitionApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\14\\classes.dex diff --git a/Src/UAV/DroneRecognitionApp/app/build/intermediates/javac/debug/classes/com/example/dronerecognition/MapFragment.class b/Src/UAV/DroneRecognitionApp/app/build/intermediates/javac/debug/classes/com/example/dronerecognition/MapFragment.class index b56913f..1e7b801 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/intermediates/javac/debug/classes/com/example/dronerecognition/MapFragment.class and b/Src/UAV/DroneRecognitionApp/app/build/intermediates/javac/debug/classes/com/example/dronerecognition/MapFragment.class differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/intermediates/project_dex_archive/debug/out/com/example/dronerecognition/MapFragment.dex b/Src/UAV/DroneRecognitionApp/app/build/intermediates/project_dex_archive/debug/out/com/example/dronerecognition/MapFragment.dex index 3422d1a..90cc1a1 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/intermediates/project_dex_archive/debug/out/com/example/dronerecognition/MapFragment.dex and b/Src/UAV/DroneRecognitionApp/app/build/intermediates/project_dex_archive/debug/out/com/example/dronerecognition/MapFragment.dex differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$1.class.uniqueId0 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$1.class.uniqueId0 deleted file mode 100644 index 5605841..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$1.class.uniqueId0 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$2.class.uniqueId13 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$2.class.uniqueId13 deleted file mode 100644 index 54bc11c..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$2.class.uniqueId13 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter$OnItemClickListener.class.uniqueId12 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter$OnItemClickListener.class.uniqueId12 deleted file mode 100644 index 78798d0..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter$OnItemClickListener.class.uniqueId12 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter$ViewHolder.class.uniqueId9 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter$ViewHolder.class.uniqueId9 deleted file mode 100644 index 0b2ed78..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter$ViewHolder.class.uniqueId9 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter.class.uniqueId6 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter.class.uniqueId6 deleted file mode 100644 index e7ef655..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryAdapter.class.uniqueId6 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryItem.class.uniqueId3 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryItem.class.uniqueId3 deleted file mode 100644 index eb8345a..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment$HistoryItem.class.uniqueId3 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment.class.uniqueId1 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment.class.uniqueId1 deleted file mode 100644 index 1d73544..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/HistoryFragment.class.uniqueId1 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/LoginActivity.class.uniqueId14 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/LoginActivity.class.uniqueId14 deleted file mode 100644 index 92d9295..0000000 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/LoginActivity.class.uniqueId14 and /dev/null differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId10 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId2 similarity index 57% rename from Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId10 rename to Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId2 index 1af2bd0..0e044ad 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId10 and b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId2 differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$1.class.uniqueId2 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$1.class.uniqueId1 similarity index 100% rename from Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$1.class.uniqueId2 rename to Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$1.class.uniqueId1 diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$2.class.uniqueId7 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$2.class.uniqueId6 similarity index 100% rename from Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$2.class.uniqueId7 rename to Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$2.class.uniqueId6 diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$4.class.uniqueId8 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$4.class.uniqueId0 similarity index 100% rename from Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$4.class.uniqueId8 rename to Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$4.class.uniqueId0 diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$5.class.uniqueId11 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$5.class.uniqueId3 similarity index 100% rename from Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$5.class.uniqueId11 rename to Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment$5.class.uniqueId3 diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment.class.uniqueId4 b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment.class.uniqueId4 index a0e95d1..b56913f 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment.class.uniqueId4 and b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MapFragment.class.uniqueId4 differ diff --git a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 5f636ef..c0cd553 100644 Binary files a/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/Src/UAV/DroneRecognitionApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/Src/UAV/DroneRecognitionApp/app/src/main/java/com/example/dronerecognition/MapFragment.java b/Src/UAV/DroneRecognitionApp/app/src/main/java/com/example/dronerecognition/MapFragment.java index 5eacfe3..183f0ad 100644 --- a/Src/UAV/DroneRecognitionApp/app/src/main/java/com/example/dronerecognition/MapFragment.java +++ b/Src/UAV/DroneRecognitionApp/app/src/main/java/com/example/dronerecognition/MapFragment.java @@ -1384,69 +1384,65 @@ public class MapFragment extends Fragment { * 保存并发送路径 */ private void saveAndSendRoutes(List routes) { - // 这里需要获取当前选中的敌人和驻扎点信息 - // 由于路径规划是在特定上下文中进行的，我们需要保存这些信息 if (currentPlannedRoutes != null && !currentPlannedRoutes.isEmpty()) { - // 显示任务创建对话框 - showCreateMissionDialog(routes); + try { + // 直接发送路径规划消息给驻扎点用户，不创建新任务 + sendRouteMessageDirectly(routes); + + Toast.makeText(requireContext(), "✅ 路径已发送", Toast.LENGTH_LONG).show(); + + } catch (Exception e) { + Log.e("MapFragment", "发送路径失败", e); + Toast.makeText(requireContext(), "❌ 发送路径失败: " + e.getMessage(), Toast.LENGTH_SHORT).show(); + } } else { Toast.makeText(requireContext(), "没有可保存的路径数据", Toast.LENGTH_SHORT).show(); } } /** - * 显示创建任务对话框 + * 直接发送路径消息 */ - private void showCreateMissionDialog(List routes) { - View dialogView = getLayoutInflater().inflate(R.layout.dialog_new_mission, null); - EditText etMissionName = dialogView.findViewById(R.id.etMissionName); - EditText etMissionDescription = dialogView.findViewById(R.id.etMissionDescription); + private void sendRouteMessageDirectly(List routes) { + if (!sessionManager.isCommander() || routes.isEmpty()) { + return; + } - // 设置默认任务名称 - etMissionName.setText("路径规划任务 - " + getCurrentTime()); + // 创建路径规划消息 + RouteMessage routeMessage = new RouteMessage(); + routeMessage.setCommanderName(sessionManager.getCurrentUserRealName()); + routeMessage.setCommanderId(sessionManager.getCurrentUserId()); + routeMessage.setMissionName("路径规划任务 - " + getCurrentTime()); + routeMessage.setMissionDescription("指挥员规划的路径任务"); + routeMessage.setMissionId(0); // 临时任务ID + routeMessage.setRoutes(routes); - new AlertDialog.Builder(requireContext()) - .setTitle("📋 创建新任务") - .setView(dialogView) - .setPositiveButton("✅ 创建", (dialog, which) -> { - String missionName = etMissionName.getText().toString().trim(); - String missionDescription = etMissionDescription.getText().toString().trim(); - - if (missionName.isEmpty()) { - Toast.makeText(requireContext(), "请输入任务名称", Toast.LENGTH_SHORT).show(); - return; - } - - // 创建任务并保存路径 - createMissionAndSaveRoutes(missionName, missionDescription, routes); - }) - .setNegativeButton("❌ 取消", null) - .show(); - } - - /** - * 创建任务并保存路径 - */ - private void createMissionAndSaveRoutes(String missionName, String missionDescription, List routes) { - try { - // 获取当前选中的敌人（这里需要根据实际情况获取） - // 暂时使用一个默认的敌人ID，实际应用中应该从当前上下文中获取 - long enemyId = 1; // 临时值，需要根据实际情况修改 - - // 创建任务 - long missionId = databaseHelper.insertMission(missionName, missionDescription, enemyId, new ArrayList<>()); - - // 保存路径 - saveRoutes(missionId, null, getBaseStationIdsFromRoutes(routes)); - - Toast.makeText(requireContext(), "✅ 任务创建成功，路径已发送", Toast.LENGTH_LONG).show(); - - } catch (Exception e) { - Log.e("MapFragment", "创建任务失败", e); - Toast.makeText(requireContext(), "❌ 创建任务失败: " + e.getMessage(), Toast.LENGTH_SHORT).show(); + // 设置目标位置（使用路径的终点） + if (!routes.isEmpty() && routes.get(0).getRoutePoints() != null && !routes.get(0).getRoutePoints().isEmpty()) { + List points = routes.get(0).getRoutePoints(); + LatLng endPoint = points.get(points.size() - 1); + routeMessage.setTargetEnemyLocation(String.format("%.6f, %.6f", endPoint.latitude, endPoint.longitude)); + } else { + routeMessage.setTargetEnemyLocation("未知位置"); + } + + // 获取目标驻扎点名称列表 + List targetBaseStations = new ArrayList<>(); + for (RouteData route : routes) { + BaseStationData baseStation = databaseHelper.getBaseStationById(route.getBaseStationId()); + if (baseStation != null) { + targetBaseStations.add(baseStation.getName()); + } } + routeMessage.setTargetBaseStations(targetBaseStations); + + // 发送路径规划消息 + RouteCommunicationService routeCommService = RouteCommunicationService.getInstance(requireContext()); + routeCommService.sendRoute(routeMessage); } + + /** * 从路径数据中提取驻扎点ID列表 */