Compare commits
26
Commits
b641e80d62
..
v0.0.7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2f7bfc158 | ||
|
|
d0a7700d02 | ||
|
|
9b52623ebe | ||
|
|
ab12e07847 | ||
|
|
98b9f1cd4c | ||
|
|
e889456bfa | ||
|
|
c0177b19e3 | ||
|
|
99abf60b52 | ||
|
|
6e09ea25dd | ||
|
|
9a429d476d | ||
|
|
7923d1b2b2 | ||
|
|
7525c7e368 | ||
|
|
e111f76731 | ||
|
|
5d7d5e6b54 | ||
|
|
bc77462c27 | ||
|
|
4437a1f436 | ||
|
|
1b2310b12b | ||
|
|
44ac4462a6 | ||
|
|
0374a7611e | ||
|
|
543f54dc4f | ||
|
|
3812cd740b | ||
|
|
86abb645ce | ||
|
|
3a9e393a20 | ||
|
|
058bd5ff71 | ||
|
|
a4dc26fda8 | ||
|
|
6130e63cfb |
@@ -0,0 +1,74 @@
|
|||||||
|
name: Build & Release Android APK
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
- 'V*' # Se déclenche quand vous poussez un tag comme v1.0.0, v1.0.1...
|
||||||
|
workflow_dispatch: # Permet aussi de lancer la compilation manuellement depuis l'interface Gitea
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-apk:
|
||||||
|
# Utilise votre runner hôte avec Docker
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- name: 📥 Récupération du code
|
||||||
|
run: |
|
||||||
|
echo "📥 Clonage du code source dans /data/build..."
|
||||||
|
rm -rf /data/build
|
||||||
|
git config --global --add safe.directory "*"
|
||||||
|
git clone --depth 1 "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@git.kevlar.cloud/${{ github.repository }}.git" /data/build
|
||||||
|
|
||||||
|
- name: 🔨 Compilation de l'APK (Conteneur Flutter / Android SDK)
|
||||||
|
run: |
|
||||||
|
echo "🚀 Démarrage de la compilation Flutter dans Docker..."
|
||||||
|
# Utilisation du volume partagé /data du conteneur runner
|
||||||
|
docker run --rm \
|
||||||
|
--volumes-from gitea-act-runner \
|
||||||
|
-w /data/build \
|
||||||
|
ghcr.io/cirruslabs/flutter:stable \
|
||||||
|
sh -c "git config --global --add safe.directory '*' && flutter pub get && flutter build apk --release"
|
||||||
|
|
||||||
|
echo "✅ APK généré avec succès dans /data/build/build/app/outputs/flutter-apk/app-release.apk"
|
||||||
|
|
||||||
|
- name: 📦 Publication de la Release sur Gitea & Upload de l'APK
|
||||||
|
run: |
|
||||||
|
which curl >/dev/null 2>&1 || apk add --no-cache curl
|
||||||
|
TAG_NAME="${{ github.ref_name }}"
|
||||||
|
if [ -z "$TAG_NAME" ] || [ "$TAG_NAME" = "main" ]; then
|
||||||
|
TAG_NAME="build-$(date +'%Y%m%d-%H%M%S')"
|
||||||
|
fi
|
||||||
|
|
||||||
|
APK_PATH="/data/build/build/app/outputs/flutter-apk/app-release.apk"
|
||||||
|
APK_NAME="bully-impact-${TAG_NAME}.apk"
|
||||||
|
|
||||||
|
echo "🚀 Création de la release $TAG_NAME sur Gitea..."
|
||||||
|
|
||||||
|
# 1. Création de la Release via l'API REST de Gitea
|
||||||
|
RELEASE_RESPONSE=$(curl -s -X POST "https://git.kevlar.cloud/api/v1/repos/${{ github.repository }}/releases" \
|
||||||
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "{
|
||||||
|
\"tag_name\": \"${TAG_NAME}\",
|
||||||
|
\"name\": \"Version ${TAG_NAME}\",
|
||||||
|
\"body\": \"Nouvelle version de l'application Bully Impact générée automatiquement par CI/CD.\",
|
||||||
|
\"draft\": false,
|
||||||
|
\"prerelease\": false
|
||||||
|
}")
|
||||||
|
|
||||||
|
RELEASE_ID=$(echo "$RELEASE_RESPONSE" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
||||||
|
|
||||||
|
if [ -z "$RELEASE_ID" ]; then
|
||||||
|
echo "❌ Erreur lors de la création de la release: $RELEASE_RESPONSE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "📦 Upload du fichier APK (Release ID: $RELEASE_ID)..."
|
||||||
|
|
||||||
|
# 2. Upload de l'APK en tant qu'asset téléchargeable
|
||||||
|
curl -s -X POST "https://git.kevlar.cloud/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets?name=${APK_NAME}" \
|
||||||
|
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||||
|
-H "Content-Type: application/vnd.android.package-archive" \
|
||||||
|
--data-binary @"$APK_PATH"
|
||||||
|
|
||||||
|
echo "🎉 Release terminée avec succès ! APK téléchargeable sur Gitea."
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
name: Deploy Backendia
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- 'backendia/**'
|
||||||
|
- 'docker-compose.prod.yml'
|
||||||
|
- '.gitea/workflows/deploy.yaml'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
# Correspond au label 'docker:host' de votre runner
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- name: 📥 Récupération du code
|
||||||
|
run: |
|
||||||
|
echo "📥 Récupération du code..."
|
||||||
|
git clone --depth 1 --branch ${{ github.ref_name }} "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@git.kevlar.cloud/${{ github.repository }}.git" .
|
||||||
|
|
||||||
|
- name: 🚀 Build et Déploiement Docker
|
||||||
|
run: |
|
||||||
|
echo "🚀 Démarrage du déploiement..."
|
||||||
|
docker rm -f backendia-prod 2>/dev/null || true
|
||||||
|
docker compose -f docker-compose.prod.yml up -d --build --remove-orphans --force-recreate
|
||||||
|
echo "🧹 Nettoyage des anciennes images inutilisées..."
|
||||||
|
docker image prune -f
|
||||||
|
echo "✅ Déploiement terminé avec succès !"
|
||||||
@@ -55,9 +55,11 @@ flutter test --coverage
|
|||||||
- Visualisation en temps réel des zones de score
|
- Visualisation en temps réel des zones de score
|
||||||
|
|
||||||
### Placement des impacts
|
### Placement des impacts
|
||||||
- **Éditeur d'impacts plein écran** : tap pour ajouter, tap sur un impact pour
|
- **Éditeur d'impacts plein écran** : tap pour ajouter (y compris juste à côté
|
||||||
l'éditer (score/suppression), appui long pour déplacer, pincer pour zoomer
|
ou par-dessus un impact existant), appui long pour déplacer, pincer pour zoomer
|
||||||
- Le placement est entièrement manuel ; le bouton ↻ de l'écran de plotting
|
- Un tap n'ouvre jamais d'édition de score : le score reste calculé
|
||||||
|
automatiquement d'après la position de l'impact
|
||||||
|
- Le placement est entièrement manuel ; le bouton ↻ de l'écran de synthèse
|
||||||
efface tous les impacts sans toucher à la calibration
|
efface tous les impacts sans toucher à la calibration
|
||||||
|
|
||||||
### Calcul des scores
|
### Calcul des scores
|
||||||
@@ -78,6 +80,19 @@ flutter test --coverage
|
|||||||
- **Distribution régionale** : répartition des tirs par quadrant
|
- **Distribution régionale** : répartition des tirs par quadrant
|
||||||
- Filtrage par période : session, semaine, mois, toutes les sessions
|
- Filtrage par période : session, semaine, mois, toutes les sessions
|
||||||
|
|
||||||
|
### Sauvegarde (export / import JSON)
|
||||||
|
- Bouton **Exporter** en bas de l'écran Statistiques : génère un fichier JSON
|
||||||
|
(sessions + cibles + impacts + calibration, armurerie + entretien, et un
|
||||||
|
instantané des statistiques calculées) puis ouvre la feuille de partage du
|
||||||
|
système (`share_plus`) pour l'envoyer où l'on veut
|
||||||
|
- Option « Inclure les photos des cibles » : photos encodées en base64 dans le
|
||||||
|
JSON (sauvegarde complète mais fichier lourd) ; sans elles le fichier reste léger
|
||||||
|
- Bouton **Importer** (`file_selector`) : aperçu du contenu avant confirmation,
|
||||||
|
puis fusion avec les données existantes — même identifiant = mise à jour,
|
||||||
|
donc réimporter deux fois ne crée pas de doublon et rien n'est effacé
|
||||||
|
- Les statistiques ne sont pas réimportées : elles sont recalculées à partir des
|
||||||
|
sessions. Elles figurent dans le fichier pour être exploitables telles quelles
|
||||||
|
|
||||||
### Historique des sessions
|
### Historique des sessions
|
||||||
- Sauvegarde des sessions avec date, score, notes
|
- Sauvegarde des sessions avec date, score, notes
|
||||||
- Visualisation des sessions passées
|
- Visualisation des sessions passées
|
||||||
@@ -119,3 +134,4 @@ session_list_item.dart Item de liste représentant une session
|
|||||||
history_chart.dart Graphique d'évolution des 10 dernières sessions
|
history_chart.dart Graphique d'évolution des 10 dernières sessions
|
||||||
statistics_screen.dart Écran statistiques avec filtrage par période
|
statistics_screen.dart Écran statistiques avec filtrage par période
|
||||||
heat_map_widget.dart Heat map avec gradient bleu→rouge
|
heat_map_widget.dart Heat map avec gradient bleu→rouge
|
||||||
|
backup_service.dart Export/import JSON des sessions, stats et armurerie
|
||||||
|
|||||||
@@ -7,6 +7,15 @@
|
|||||||
|
|
||||||
# The following line activates a set of recommended lints for Flutter apps,
|
# The following line activates a set of recommended lints for Flutter apps,
|
||||||
# packages, and plugins designed to encourage good coding practices.
|
# packages, and plugins designed to encourage good coding practices.
|
||||||
|
analyzer:
|
||||||
|
exclude:
|
||||||
|
- build/**
|
||||||
|
- android/**
|
||||||
|
- ios/**
|
||||||
|
- web/**
|
||||||
|
- windows/**
|
||||||
|
- macos/**
|
||||||
|
- linux/**
|
||||||
include: package:flutter_lints/flutter.yaml
|
include: package:flutter_lints/flutter.yaml
|
||||||
|
|
||||||
linter:
|
linter:
|
||||||
|
|||||||
@@ -1,2 +1,6 @@
|
|||||||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
|
# This builtInKotlin flag was added automatically by Flutter migrator
|
||||||
|
android.builtInKotlin=false
|
||||||
|
# This newDsl flag was added automatically by Flutter migrator
|
||||||
|
android.newDsl=false
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
@@ -0,0 +1,8 @@
|
|||||||
|
node_modules
|
||||||
|
npm-debug.log*
|
||||||
|
dashboard/node_modules
|
||||||
|
dashboard/.next
|
||||||
|
uploads
|
||||||
|
exports
|
||||||
|
.git
|
||||||
|
.env*
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
FROM node:20-bookworm-slim
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Dépendances système pour les modules natifs (sharp, sqlite3, opencv)
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
python3 \
|
||||||
|
make \
|
||||||
|
g++ \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
COPY package*.json ./
|
||||||
|
COPY dashboard/package*.json ./dashboard/
|
||||||
|
|
||||||
|
RUN npm install && npm rebuild sqlite3 --build-from-source
|
||||||
|
RUN cd dashboard && npm install
|
||||||
|
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Build du Dashboard Next.js
|
||||||
|
RUN cd dashboard && npm run build
|
||||||
|
|
||||||
|
# Dossiers nécessaires
|
||||||
|
RUN mkdir -p uploads/images uploads/data exports
|
||||||
|
|
||||||
|
EXPOSE 3000
|
||||||
|
|
||||||
|
ENV NODE_ENV=production
|
||||||
|
ENV PORT=3000
|
||||||
|
|
||||||
|
CMD ["node", "server.js"]
|
||||||
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
|
|||||||
import { Inter } from "next/font/google";
|
import { Inter } from "next/font/google";
|
||||||
import "./globals.css";
|
import "./globals.css";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { LayoutDashboard, Users, Image as ImageIcon } from "lucide-react";
|
import { LayoutDashboard, Users, ScrollText, Image as ImageIcon } from "lucide-react";
|
||||||
|
|
||||||
const inter = Inter({ subsets: ["latin"] });
|
const inter = Inter({ subsets: ["latin"] });
|
||||||
|
|
||||||
@@ -41,6 +41,13 @@ export default function RootLayout({
|
|||||||
<Users size={20} />
|
<Users size={20} />
|
||||||
Contributeurs
|
Contributeurs
|
||||||
</Link>
|
</Link>
|
||||||
|
<Link
|
||||||
|
href="/logs"
|
||||||
|
className="flex items-center gap-3 px-3 py-2 rounded-lg hover:bg-slate-800 transition-colors text-slate-300 hover:text-white"
|
||||||
|
>
|
||||||
|
<ScrollText size={20} />
|
||||||
|
Logs d'Uploads
|
||||||
|
</Link>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<div className="mt-auto pt-6 border-t border-slate-800">
|
<div className="mt-auto pt-6 border-t border-slate-800">
|
||||||
|
|||||||
@@ -0,0 +1,900 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState, useMemo, useEffect } from "react";
|
||||||
|
import {
|
||||||
|
ScrollText,
|
||||||
|
Search,
|
||||||
|
Download,
|
||||||
|
RefreshCw,
|
||||||
|
CheckCircle2,
|
||||||
|
XCircle,
|
||||||
|
Copy,
|
||||||
|
Check,
|
||||||
|
Trash2,
|
||||||
|
Smartphone,
|
||||||
|
Crosshair,
|
||||||
|
Calendar,
|
||||||
|
HardDrive,
|
||||||
|
Users,
|
||||||
|
ExternalLink,
|
||||||
|
Info,
|
||||||
|
Filter,
|
||||||
|
Eye,
|
||||||
|
ShieldAlert,
|
||||||
|
ShieldCheck,
|
||||||
|
Ban,
|
||||||
|
AlertTriangle
|
||||||
|
} from "lucide-react";
|
||||||
|
import { API_BASE_URL } from "@/lib/api";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
interface UploadLog {
|
||||||
|
id: number;
|
||||||
|
timestamp: string;
|
||||||
|
session_id: string | null;
|
||||||
|
wallet_hash: string | null;
|
||||||
|
image_filename: string | null;
|
||||||
|
json_filename: string | null;
|
||||||
|
file_size: number | null;
|
||||||
|
ip_address: string | null;
|
||||||
|
user_agent: string | null;
|
||||||
|
device_model: string | null;
|
||||||
|
device_os: string | null;
|
||||||
|
target_type: string | null;
|
||||||
|
weapon: string | null;
|
||||||
|
distance_meters: number | null;
|
||||||
|
impacts_count: number;
|
||||||
|
status: string;
|
||||||
|
target_valid?: number;
|
||||||
|
target_status?: string;
|
||||||
|
target_confidence?: number;
|
||||||
|
target_rings_count?: number;
|
||||||
|
target_details?: string | null;
|
||||||
|
error_message: string | null;
|
||||||
|
raw_metadata: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface BannedWallet {
|
||||||
|
wallet_hash: string;
|
||||||
|
reason: string;
|
||||||
|
banned_at: string;
|
||||||
|
banned_by: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface LogStats {
|
||||||
|
total_uploads: number;
|
||||||
|
success_count: number;
|
||||||
|
failed_count: number;
|
||||||
|
today_uploads: number;
|
||||||
|
unique_wallets: number;
|
||||||
|
total_bytes: number;
|
||||||
|
latest_upload: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function LogsManager({
|
||||||
|
initialLogs,
|
||||||
|
initialStats
|
||||||
|
}: {
|
||||||
|
initialLogs: UploadLog[];
|
||||||
|
initialStats: LogStats | null;
|
||||||
|
}) {
|
||||||
|
const [logs, setLogs] = useState<UploadLog[]>(initialLogs);
|
||||||
|
const [stats, setStats] = useState<LogStats | null>(initialStats);
|
||||||
|
const [bannedWallets, setBannedWallets] = useState<BannedWallet[]>([]);
|
||||||
|
const [searchTerm, setSearchTerm] = useState("");
|
||||||
|
const [statusFilter, setStatusFilter] = useState<"ALL" | "SUCCESS" | "FAILED" | "INVALID_TARGET" | "BANNED">("ALL");
|
||||||
|
const [copiedWallet, setCopiedWallet] = useState<string | null>(null);
|
||||||
|
const [selectedLog, setSelectedLog] = useState<UploadLog | null>(null);
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
const [showClearConfirm, setShowClearConfirm] = useState(false);
|
||||||
|
|
||||||
|
// Moderation state
|
||||||
|
const [banModalWallet, setBanModalWallet] = useState<string | null>(null);
|
||||||
|
const [banReason, setBanReason] = useState("Images non conformes / Fausse cible");
|
||||||
|
const [isSubmittingBan, setIsSubmittingBan] = useState(false);
|
||||||
|
|
||||||
|
const fetchBannedWallets = async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/moderation/banned`, { cache: 'no-store' });
|
||||||
|
if (res.ok) {
|
||||||
|
const data = await res.json();
|
||||||
|
setBannedWallets(data.banned || []);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Erreur récupération wallets bannis:", e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchBannedWallets();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const fetchLogs = async () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
const [logsRes, statsRes] = await Promise.all([
|
||||||
|
fetch(`${API_BASE_URL}/api/logs?limit=200`, { cache: 'no-store' }),
|
||||||
|
fetch(`${API_BASE_URL}/api/logs/stats`, { cache: 'no-store' }),
|
||||||
|
fetchBannedWallets()
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (logsRes.ok) {
|
||||||
|
const logsData = await logsRes.json();
|
||||||
|
setLogs(logsData.logs || []);
|
||||||
|
}
|
||||||
|
if (statsRes.ok) {
|
||||||
|
const statsData = await statsRes.json();
|
||||||
|
setStats(statsData.stats || null);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Erreur lors de la récupération des logs:", e);
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const copyToClipboard = (text: string) => {
|
||||||
|
navigator.clipboard.writeText(text);
|
||||||
|
setCopiedWallet(text);
|
||||||
|
setTimeout(() => setCopiedWallet(null), 2000);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isWalletBanned = (walletHash: string | null) => {
|
||||||
|
if (!walletHash) return false;
|
||||||
|
return bannedWallets.some(b => b.wallet_hash === walletHash);
|
||||||
|
};
|
||||||
|
|
||||||
|
const getBannedInfo = (walletHash: string | null) => {
|
||||||
|
if (!walletHash) return null;
|
||||||
|
return bannedWallets.find(b => b.wallet_hash === walletHash) || null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBanWallet = async () => {
|
||||||
|
if (!banModalWallet) return;
|
||||||
|
setIsSubmittingBan(true);
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/moderation/ban`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
wallet_hash: banModalWallet,
|
||||||
|
reason: banReason,
|
||||||
|
banned_by: 'Admin Dashboard'
|
||||||
|
})
|
||||||
|
});
|
||||||
|
if (res.ok) {
|
||||||
|
setBanModalWallet(null);
|
||||||
|
await fetchBannedWallets();
|
||||||
|
await fetchLogs();
|
||||||
|
} else {
|
||||||
|
alert("Erreur lors du bannissement.");
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Erreur ban:", e);
|
||||||
|
} finally {
|
||||||
|
setIsSubmittingBan(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleUnbanWallet = async (walletHash: string) => {
|
||||||
|
if (!confirm(`Voulez-vous vraiment débannir le wallet ${walletHash.substring(0, 10)}... ?`)) return;
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/moderation/ban/${walletHash}`, {
|
||||||
|
method: 'DELETE'
|
||||||
|
});
|
||||||
|
if (res.ok) {
|
||||||
|
await fetchBannedWallets();
|
||||||
|
await fetchLogs();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Erreur unban:", e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDeleteLog = async (id: number) => {
|
||||||
|
if (!confirm("Voulez-vous vraiment supprimer ce log ?")) return;
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/logs/${id}`, { method: 'DELETE' });
|
||||||
|
if (res.ok) {
|
||||||
|
setLogs(prev => prev.filter(l => l.id !== id));
|
||||||
|
fetchLogs();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Erreur suppression:", e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleClearAll = async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/logs`, { method: 'DELETE' });
|
||||||
|
if (res.ok) {
|
||||||
|
setLogs([]);
|
||||||
|
setShowClearConfirm(false);
|
||||||
|
fetchLogs();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Erreur vidage logs:", e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatFileSize = (bytes: number | null) => {
|
||||||
|
if (!bytes || bytes === 0) return "0 B";
|
||||||
|
const k = 1024;
|
||||||
|
const sizes = ["B", "KB", "MB", "GB"];
|
||||||
|
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||||
|
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
|
||||||
|
};
|
||||||
|
|
||||||
|
const filteredLogs = useMemo(() => {
|
||||||
|
return logs.filter(log => {
|
||||||
|
// Filter status
|
||||||
|
if (statusFilter === "SUCCESS" && log.status !== "SUCCESS") return false;
|
||||||
|
if (statusFilter === "FAILED" && log.status !== "FAILED") return false;
|
||||||
|
if (statusFilter === "INVALID_TARGET" && log.target_status === "VALID") return false;
|
||||||
|
if (statusFilter === "BANNED" && !isWalletBanned(log.wallet_hash)) return false;
|
||||||
|
|
||||||
|
// Filter search
|
||||||
|
if (!searchTerm.trim()) return true;
|
||||||
|
const term = searchTerm.toLowerCase();
|
||||||
|
return (
|
||||||
|
(log.wallet_hash && log.wallet_hash.toLowerCase().includes(term)) ||
|
||||||
|
(log.session_id && log.session_id.toLowerCase().includes(term)) ||
|
||||||
|
(log.image_filename && log.image_filename.toLowerCase().includes(term)) ||
|
||||||
|
(log.device_model && log.device_model.toLowerCase().includes(term)) ||
|
||||||
|
(log.weapon && log.weapon.toLowerCase().includes(term)) ||
|
||||||
|
(log.target_type && log.target_type.toLowerCase().includes(term)) ||
|
||||||
|
(log.target_status && log.target_status.toLowerCase().includes(term)) ||
|
||||||
|
(log.ip_address && log.ip_address.toLowerCase().includes(term))
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}, [logs, searchTerm, statusFilter, bannedWallets]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-8">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="p-2.5 bg-indigo-500/10 border border-indigo-500/20 rounded-xl text-indigo-400">
|
||||||
|
<ScrollText size={24} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h2 className="text-3xl font-bold tracking-tight">Journal & Contrôle des Uploads</h2>
|
||||||
|
<p className="text-slate-400 text-sm">
|
||||||
|
Historique des transferts, diagnostic OpenCV (détection cibles) et modération des wallets.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex flex-wrap items-center gap-3">
|
||||||
|
<button
|
||||||
|
onClick={fetchLogs}
|
||||||
|
disabled={isLoading}
|
||||||
|
className="flex items-center gap-2 px-4 py-2.5 bg-slate-900 border border-slate-800 hover:bg-slate-800 text-slate-300 hover:text-white rounded-xl text-sm font-semibold transition-all disabled:opacity-50"
|
||||||
|
title="Rafraîchir les logs"
|
||||||
|
>
|
||||||
|
<RefreshCw size={16} className={isLoading ? "animate-spin text-indigo-400" : ""} />
|
||||||
|
<span>Actualiser</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<a
|
||||||
|
href={`${API_BASE_URL}/api/logs/export?format=csv`}
|
||||||
|
download
|
||||||
|
className="flex items-center gap-2 px-4 py-2.5 bg-indigo-600 hover:bg-indigo-500 text-white rounded-xl text-sm font-semibold transition-all shadow-lg shadow-indigo-600/20 hover:scale-105 active:scale-95"
|
||||||
|
>
|
||||||
|
<Download size={16} />
|
||||||
|
<span>Exporter CSV</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
{!showClearConfirm ? (
|
||||||
|
<button
|
||||||
|
onClick={() => setShowClearConfirm(true)}
|
||||||
|
className="flex items-center gap-2 px-3 py-2.5 bg-slate-900 border border-slate-800 hover:border-rose-500/40 text-slate-400 hover:text-rose-400 rounded-xl text-sm transition-all"
|
||||||
|
title="Purger tous les logs"
|
||||||
|
>
|
||||||
|
<Trash2 size={16} />
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<div className="flex items-center gap-2 p-1 bg-rose-500/10 border border-rose-500/30 rounded-xl animate-in fade-in">
|
||||||
|
<span className="text-xs text-rose-400 px-2 font-semibold">Effacer tout ?</span>
|
||||||
|
<button
|
||||||
|
onClick={handleClearAll}
|
||||||
|
className="px-2.5 py-1 bg-rose-600 hover:bg-rose-500 text-white rounded-lg text-xs font-bold transition-all"
|
||||||
|
>
|
||||||
|
Oui
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setShowClearConfirm(false)}
|
||||||
|
className="px-2.5 py-1 bg-slate-800 hover:bg-slate-700 text-slate-300 rounded-lg text-xs transition-all"
|
||||||
|
>
|
||||||
|
Non
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* KPI Stats Cards */}
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-5">
|
||||||
|
<div className="bg-slate-900/80 border border-slate-800 p-5 rounded-2xl flex items-center justify-between shadow-sm">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<p className="text-xs text-slate-500 font-bold uppercase tracking-wider">Total Uploads</p>
|
||||||
|
<div className="flex items-baseline gap-2">
|
||||||
|
<p className="text-2xl font-bold">{stats?.total_uploads ?? logs.length}</p>
|
||||||
|
{stats && stats.total_uploads > 0 && (
|
||||||
|
<span className="text-xs font-semibold text-emerald-400">
|
||||||
|
{Math.round(((stats.success_count || 0) / stats.total_uploads) * 100)}% succès
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="w-11 h-11 bg-indigo-500/10 border border-indigo-500/20 text-indigo-400 rounded-xl flex items-center justify-center">
|
||||||
|
<ScrollText size={20} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-900/80 border border-slate-800 p-5 rounded-2xl flex items-center justify-between shadow-sm">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<p className="text-xs text-slate-500 font-bold uppercase tracking-wider">Aujourd'hui</p>
|
||||||
|
<p className="text-2xl font-bold text-indigo-400">{stats?.today_uploads ?? 0}</p>
|
||||||
|
</div>
|
||||||
|
<div className="w-11 h-11 bg-indigo-500/10 border border-indigo-500/20 text-indigo-400 rounded-xl flex items-center justify-center">
|
||||||
|
<Calendar size={20} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-900/80 border border-slate-800 p-5 rounded-2xl flex items-center justify-between shadow-sm">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<p className="text-xs text-slate-500 font-bold uppercase tracking-wider">Wallets Bannis</p>
|
||||||
|
<div className="flex items-baseline gap-2">
|
||||||
|
<p className="text-2xl font-bold text-rose-400">{bannedWallets.length}</p>
|
||||||
|
<span className="text-xs text-slate-500 font-mono">/ {stats?.unique_wallets ?? 0} total</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="w-11 h-11 bg-rose-500/10 border border-rose-500/20 text-rose-400 rounded-xl flex items-center justify-center">
|
||||||
|
<Ban size={20} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-900/80 border border-slate-800 p-5 rounded-2xl flex items-center justify-between shadow-sm">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<p className="text-xs text-slate-500 font-bold uppercase tracking-wider">Volume Transféré</p>
|
||||||
|
<p className="text-2xl font-bold text-emerald-400">
|
||||||
|
{formatFileSize(stats?.total_bytes || logs.reduce((acc, l) => acc + (l.file_size || 0), 0))}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="w-11 h-11 bg-emerald-500/10 border border-emerald-500/20 text-emerald-400 rounded-xl flex items-center justify-center">
|
||||||
|
<HardDrive size={20} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Filters & Search Toolbar */}
|
||||||
|
<div className="bg-slate-900 border border-slate-800 rounded-2xl p-4 flex flex-col md:flex-row gap-4 items-center justify-between">
|
||||||
|
{/* Search */}
|
||||||
|
<div className="relative w-full md:w-96">
|
||||||
|
<Search size={16} className="absolute left-3.5 top-1/2 -translate-y-1/2 text-slate-500" />
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={searchTerm}
|
||||||
|
onChange={(e) => setSearchTerm(e.target.value)}
|
||||||
|
placeholder="Rechercher par Wallet, Session, Cible, Image..."
|
||||||
|
className="w-full bg-slate-950 border border-slate-800 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 rounded-xl pl-10 pr-4 py-2 text-sm text-slate-200 placeholder-slate-500 outline-none transition-all"
|
||||||
|
/>
|
||||||
|
{searchTerm && (
|
||||||
|
<button
|
||||||
|
onClick={() => setSearchTerm("")}
|
||||||
|
className="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-slate-500 hover:text-slate-300"
|
||||||
|
>
|
||||||
|
Effacer
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Status & OpenCV Filter */}
|
||||||
|
<div className="flex items-center gap-2 w-full md:w-auto justify-start md:justify-end flex-wrap">
|
||||||
|
<span className="text-xs text-slate-500 font-semibold uppercase tracking-wider flex items-center gap-1.5 mr-1">
|
||||||
|
<Filter size={13} />
|
||||||
|
Filtre:
|
||||||
|
</span>
|
||||||
|
<div className="inline-flex bg-slate-950 p-1 rounded-xl border border-slate-800 flex-wrap gap-1">
|
||||||
|
<button
|
||||||
|
onClick={() => setStatusFilter("ALL")}
|
||||||
|
className={`px-2.5 py-1 text-xs font-semibold rounded-lg transition-all ${
|
||||||
|
statusFilter === "ALL"
|
||||||
|
? "bg-slate-800 text-white shadow-sm"
|
||||||
|
: "text-slate-400 hover:text-slate-200"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
Tous ({logs.length})
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setStatusFilter("SUCCESS")}
|
||||||
|
className={`px-2.5 py-1 text-xs font-semibold rounded-lg transition-all ${
|
||||||
|
statusFilter === "SUCCESS"
|
||||||
|
? "bg-emerald-500/20 text-emerald-300 border border-emerald-500/30"
|
||||||
|
: "text-slate-400 hover:text-emerald-400"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
Succès
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setStatusFilter("INVALID_TARGET")}
|
||||||
|
className={`px-2.5 py-1 text-xs font-semibold rounded-lg transition-all ${
|
||||||
|
statusFilter === "INVALID_TARGET"
|
||||||
|
? "bg-amber-500/20 text-amber-300 border border-amber-500/30"
|
||||||
|
: "text-slate-400 hover:text-amber-400"
|
||||||
|
}`}
|
||||||
|
title="Photos non reconnues comme cible par OpenCV"
|
||||||
|
>
|
||||||
|
⚠ Cibles Douteuses
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setStatusFilter("BANNED")}
|
||||||
|
className={`px-2.5 py-1 text-xs font-semibold rounded-lg transition-all ${
|
||||||
|
statusFilter === "BANNED"
|
||||||
|
? "bg-rose-500/20 text-rose-300 border border-rose-500/30"
|
||||||
|
: "text-slate-400 hover:text-rose-400"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
Bannis ({bannedWallets.length})
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Logs Table */}
|
||||||
|
<div className="bg-slate-900 border border-slate-800 rounded-2xl overflow-hidden shadow-xl shadow-black/20">
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="w-full text-left text-sm">
|
||||||
|
<thead className="bg-slate-950/60 border-b border-slate-800 text-slate-400 font-semibold text-xs uppercase tracking-wider">
|
||||||
|
<tr>
|
||||||
|
<th className="px-5 py-3.5">Date & Heure</th>
|
||||||
|
<th className="px-4 py-3.5">Diagnostic OpenCV</th>
|
||||||
|
<th className="px-4 py-3.5">Wallet Contributeur</th>
|
||||||
|
<th className="px-4 py-3.5">Session / Cible</th>
|
||||||
|
<th className="px-4 py-3.5">Appareil</th>
|
||||||
|
<th className="px-4 py-3.5">Fichier</th>
|
||||||
|
<th className="px-4 py-3.5 text-right">Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y divide-slate-800/60">
|
||||||
|
{filteredLogs.map((log) => {
|
||||||
|
const dateObj = new Date(log.timestamp);
|
||||||
|
const isValidDate = !isNaN(dateObj.getTime());
|
||||||
|
const formattedDate = isValidDate
|
||||||
|
? dateObj.toLocaleDateString("fr-FR", { day: "2-digit", month: "2-digit", year: "numeric" })
|
||||||
|
: log.timestamp;
|
||||||
|
const formattedTime = isValidDate
|
||||||
|
? dateObj.toLocaleTimeString("fr-FR", { hour: "2-digit", minute: "2-digit", second: "2-digit" })
|
||||||
|
: "";
|
||||||
|
|
||||||
|
const banned = isWalletBanned(log.wallet_hash);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<tr
|
||||||
|
key={log.id}
|
||||||
|
className="hover:bg-slate-800/40 transition-colors group"
|
||||||
|
>
|
||||||
|
{/* Timestamp */}
|
||||||
|
<td className="px-5 py-4 whitespace-nowrap">
|
||||||
|
<div className="flex flex-col">
|
||||||
|
<span className="font-semibold text-slate-200">{formattedDate}</span>
|
||||||
|
<span className="text-xs text-slate-500 font-mono">{formattedTime}</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
{/* OpenCV Diagnosis & Upload Status */}
|
||||||
|
<td className="px-4 py-4 whitespace-nowrap">
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
{log.status === "FAILED" ? (
|
||||||
|
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-[10px] font-bold bg-rose-500/10 text-rose-400 border border-rose-500/20 max-w-fit" title={log.error_message || "Échec upload"}>
|
||||||
|
<XCircle size={12} />
|
||||||
|
UPLOAD ÉCHEC
|
||||||
|
</span>
|
||||||
|
) : log.target_status === "VALID" ? (
|
||||||
|
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-[10px] font-bold bg-emerald-500/10 text-emerald-400 border border-emerald-500/20 max-w-fit" title={log.target_details || "Cible certifiée"}>
|
||||||
|
<ShieldCheck size={12} />
|
||||||
|
CIBLE CERTIFIÉE ({Math.round((log.target_confidence || 1) * 100)}%)
|
||||||
|
</span>
|
||||||
|
) : log.target_status === "SUSPICIOUS" ? (
|
||||||
|
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-[10px] font-bold bg-amber-500/10 text-amber-400 border border-amber-500/20 max-w-fit" title={log.target_details || "1 seul anneau détecté"}>
|
||||||
|
<AlertTriangle size={12} />
|
||||||
|
DOUTEUSE (1 ANNEAU)
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-[10px] font-bold bg-rose-500/10 text-rose-400 border border-rose-500/20 max-w-fit" title={log.target_details || "Aucun motif de cible"}>
|
||||||
|
<ShieldAlert size={12} />
|
||||||
|
NON RECONNUE
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{log.target_rings_count ? (
|
||||||
|
<span className="text-[10px] text-slate-500 font-mono">
|
||||||
|
{log.target_rings_count} anneaux concentriques
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
{/* Wallet Hash & Ban Badge */}
|
||||||
|
<td className="px-4 py-4">
|
||||||
|
{log.wallet_hash ? (
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span
|
||||||
|
onClick={() => setSearchTerm(log.wallet_hash || "")}
|
||||||
|
className="font-mono text-xs text-indigo-300 hover:text-indigo-200 bg-indigo-500/5 px-2 py-1 rounded border border-indigo-500/10 hover:border-indigo-500/30 cursor-pointer transition-colors"
|
||||||
|
title="Cliquer pour filtrer par ce wallet"
|
||||||
|
>
|
||||||
|
{log.wallet_hash.length > 16
|
||||||
|
? `${log.wallet_hash.substring(0, 8)}...${log.wallet_hash.substring(log.wallet_hash.length - 8)}`
|
||||||
|
: log.wallet_hash}
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
onClick={() => copyToClipboard(log.wallet_hash!)}
|
||||||
|
className="text-slate-500 hover:text-slate-300 transition-colors p-1"
|
||||||
|
title="Copier le hash du wallet"
|
||||||
|
>
|
||||||
|
{copiedWallet === log.wallet_hash ? (
|
||||||
|
<Check size={14} className="text-emerald-400" />
|
||||||
|
) : (
|
||||||
|
<Copy size={14} />
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{banned && (
|
||||||
|
<span className="inline-flex items-center gap-1 text-[10px] font-bold text-rose-400 bg-rose-500/10 px-1.5 py-0.5 rounded border border-rose-500/20 max-w-fit">
|
||||||
|
<Ban size={10} />
|
||||||
|
WALLET BANNI
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<span className="text-xs text-slate-500 italic">Anonyme / Non fourni</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
|
||||||
|
{/* Session & Target */}
|
||||||
|
<td className="px-4 py-4">
|
||||||
|
<div className="flex flex-col gap-1 max-w-[180px]">
|
||||||
|
{log.session_id && (
|
||||||
|
<div className="flex items-center gap-1 text-xs text-slate-300 font-mono truncate">
|
||||||
|
<span className="text-slate-500">ID:</span> {log.session_id}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="flex items-center flex-wrap gap-1.5">
|
||||||
|
{log.target_type && (
|
||||||
|
<span className="text-[10px] uppercase font-bold bg-slate-800 text-slate-300 px-1.5 py-0.5 rounded border border-slate-700">
|
||||||
|
{log.target_type}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{log.weapon && (
|
||||||
|
<span className="text-[10px] bg-slate-800 text-slate-400 px-1.5 py-0.5 rounded">
|
||||||
|
{log.weapon}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{log.impacts_count > 0 && (
|
||||||
|
<span className="text-[10px] font-bold text-indigo-400 bg-indigo-500/10 px-1.5 py-0.5 rounded border border-indigo-500/20 flex items-center gap-0.5">
|
||||||
|
<Crosshair size={10} />
|
||||||
|
{log.impacts_count} imp.
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
{/* Device & IP */}
|
||||||
|
<td className="px-4 py-4 whitespace-nowrap">
|
||||||
|
<div className="flex flex-col gap-0.5">
|
||||||
|
<div className="flex items-center gap-1.5 text-xs text-slate-300">
|
||||||
|
<Smartphone size={13} className="text-indigo-400" />
|
||||||
|
<span>{log.device_model || log.device_os || "Inconnu"}</span>
|
||||||
|
</div>
|
||||||
|
{log.ip_address && (
|
||||||
|
<span className="text-[11px] text-slate-500 font-mono">
|
||||||
|
{log.ip_address.replace("::ffff:", "")}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
{/* File & Size */}
|
||||||
|
<td className="px-4 py-4 whitespace-nowrap">
|
||||||
|
<div className="flex flex-col gap-0.5">
|
||||||
|
{log.image_filename ? (
|
||||||
|
<Link
|
||||||
|
href={`/photo/${log.image_filename}`}
|
||||||
|
className="text-xs text-indigo-400 hover:text-indigo-300 font-mono flex items-center gap-1 group/link truncate max-w-[130px]"
|
||||||
|
title={log.image_filename}
|
||||||
|
>
|
||||||
|
<span className="truncate">{log.image_filename}</span>
|
||||||
|
<ExternalLink size={12} className="opacity-0 group-hover/link:opacity-100 transition-opacity" />
|
||||||
|
</Link>
|
||||||
|
) : (
|
||||||
|
<span className="text-xs text-slate-500 italic">Aucun fichier</span>
|
||||||
|
)}
|
||||||
|
<span className="text-[11px] text-slate-500 font-mono">
|
||||||
|
{formatFileSize(log.file_size)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
{/* Actions */}
|
||||||
|
<td className="px-4 py-4 text-right whitespace-nowrap">
|
||||||
|
<div className="flex items-center justify-end gap-1.5">
|
||||||
|
{/* Ban / Unban Button */}
|
||||||
|
{log.wallet_hash && (
|
||||||
|
banned ? (
|
||||||
|
<button
|
||||||
|
onClick={() => handleUnbanWallet(log.wallet_hash!)}
|
||||||
|
className="p-1.5 text-slate-400 hover:text-emerald-400 hover:bg-slate-800 rounded-lg transition-colors"
|
||||||
|
title="Débannir ce wallet"
|
||||||
|
>
|
||||||
|
<ShieldCheck size={16} />
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<button
|
||||||
|
onClick={() => setBanModalWallet(log.wallet_hash)}
|
||||||
|
className="p-1.5 text-slate-500 hover:text-rose-400 hover:bg-slate-800 rounded-lg transition-colors"
|
||||||
|
title="Bannir définitivement ce wallet"
|
||||||
|
>
|
||||||
|
<Ban size={16} />
|
||||||
|
</button>
|
||||||
|
)
|
||||||
|
)}
|
||||||
|
|
||||||
|
<button
|
||||||
|
onClick={() => setSelectedLog(log)}
|
||||||
|
className="p-1.5 text-slate-400 hover:text-indigo-300 hover:bg-slate-800 rounded-lg transition-colors"
|
||||||
|
title="Voir les détails complets"
|
||||||
|
>
|
||||||
|
<Eye size={16} />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => handleDeleteLog(log.id)}
|
||||||
|
className="p-1.5 text-slate-500 hover:text-rose-400 hover:bg-slate-800 rounded-lg transition-colors"
|
||||||
|
title="Supprimer ce log"
|
||||||
|
>
|
||||||
|
<Trash2 size={16} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Empty state */}
|
||||||
|
{filteredLogs.length === 0 && (
|
||||||
|
<div className="py-20 flex flex-col items-center justify-center text-center px-4">
|
||||||
|
<div className="p-4 bg-slate-950 border border-slate-800 rounded-2xl text-slate-600 mb-3">
|
||||||
|
<ScrollText size={36} />
|
||||||
|
</div>
|
||||||
|
<h3 className="text-slate-300 font-bold text-base">Aucun log trouvé</h3>
|
||||||
|
<p className="text-slate-500 text-xs mt-1 max-w-sm">
|
||||||
|
{searchTerm || statusFilter !== "ALL"
|
||||||
|
? "Aucun enregistrement ne correspond à vos critères de recherche."
|
||||||
|
: "Les logs apparaîtront ici dès que des photos ou des sessions seront uploadées."}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Details Modal */}
|
||||||
|
{selectedLog && (
|
||||||
|
<div className="fixed inset-0 z-50 bg-black/70 backdrop-blur-sm flex items-center justify-center p-4">
|
||||||
|
<div className="bg-slate-900 border border-slate-800 rounded-2xl w-full max-w-2xl max-h-[85vh] flex flex-col overflow-hidden shadow-2xl animate-in zoom-in-95 duration-200">
|
||||||
|
{/* Modal Header */}
|
||||||
|
<div className="p-6 border-b border-slate-800 flex items-center justify-between bg-slate-950/50">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="p-2 bg-indigo-500/10 border border-indigo-500/20 rounded-xl text-indigo-400">
|
||||||
|
<Info size={20} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 className="font-bold text-lg text-slate-100">Détails du Log #{selectedLog.id}</h3>
|
||||||
|
<p className="text-xs text-slate-400">{new Date(selectedLog.timestamp).toLocaleString()}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => setSelectedLog(null)}
|
||||||
|
className="text-slate-400 hover:text-white p-2 hover:bg-slate-800 rounded-xl transition-colors"
|
||||||
|
>
|
||||||
|
✕
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Modal Content */}
|
||||||
|
<div className="p-6 overflow-y-auto space-y-6 text-sm">
|
||||||
|
{/* OpenCV Diagnostic Banner */}
|
||||||
|
<div className={`p-4 rounded-xl border flex flex-col gap-2 ${
|
||||||
|
selectedLog.target_status === "VALID"
|
||||||
|
? "bg-emerald-500/10 border-emerald-500/20 text-emerald-300"
|
||||||
|
: selectedLog.target_status === "SUSPICIOUS"
|
||||||
|
? "bg-amber-500/10 border-amber-500/20 text-amber-300"
|
||||||
|
: "bg-rose-500/10 border-rose-500/20 text-rose-300"
|
||||||
|
}`}>
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="flex items-center gap-2 font-bold">
|
||||||
|
{selectedLog.target_status === "VALID" ? <ShieldCheck size={18} /> : <AlertTriangle size={18} />}
|
||||||
|
Diagnostic OpenCV : {selectedLog.target_status || "VALID"}
|
||||||
|
</div>
|
||||||
|
<span className="text-xs font-mono font-bold px-2 py-0.5 rounded bg-black/30">
|
||||||
|
Confiance : {Math.round((selectedLog.target_confidence || 1) * 100)}%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p className="text-xs opacity-90">{selectedLog.target_details || "Cible détectée avec succès."}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* General Grid */}
|
||||||
|
<div className="grid grid-cols-2 gap-4">
|
||||||
|
<div className="bg-slate-950 p-4 rounded-xl border border-slate-800 space-y-1">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Wallet Hash</span>
|
||||||
|
<div className="font-mono text-xs text-indigo-300 break-all select-all">
|
||||||
|
{selectedLog.wallet_hash || "Non spécifié"}
|
||||||
|
</div>
|
||||||
|
{isWalletBanned(selectedLog.wallet_hash) && (
|
||||||
|
<span className="inline-block mt-1 text-[10px] text-rose-400 font-bold bg-rose-500/10 px-1.5 py-0.5 rounded border border-rose-500/20">
|
||||||
|
Banni ({getBannedInfo(selectedLog.wallet_hash)?.reason})
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-950 p-4 rounded-xl border border-slate-800 space-y-1">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Session ID</span>
|
||||||
|
<div className="font-mono text-xs text-slate-300 break-all select-all">
|
||||||
|
{selectedLog.session_id || "N/A"}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-950 p-4 rounded-xl border border-slate-800 space-y-1">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Appareil</span>
|
||||||
|
<div className="text-xs text-slate-300">
|
||||||
|
{selectedLog.device_model || "Inconnu"} ({selectedLog.device_os || "OS inconnu"})
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-950 p-4 rounded-xl border border-slate-800 space-y-1">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Adresse IP</span>
|
||||||
|
<div className="font-mono text-xs text-slate-300">
|
||||||
|
{selectedLog.ip_address || "Inconnue"}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-950 p-4 rounded-xl border border-slate-800 space-y-1">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Cible & Arme</span>
|
||||||
|
<div className="text-xs text-slate-300">
|
||||||
|
Type: <span className="font-bold text-white">{selectedLog.target_type || "N/A"}</span> | Arme: {selectedLog.weapon || "N/A"} | {selectedLog.distance_meters ? `${selectedLog.distance_meters}m` : ""}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-950 p-4 rounded-xl border border-slate-800 space-y-1">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Fichiers & Taille</span>
|
||||||
|
<div className="text-xs text-slate-300">
|
||||||
|
Image: <span className="font-mono">{selectedLog.image_filename || "N/A"}</span> ({formatFileSize(selectedLog.file_size)})
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Raw Metadata JSON */}
|
||||||
|
{selectedLog.raw_metadata && (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<span className="text-xs text-slate-500 font-bold uppercase tracking-wider">Données Brutes (JSON)</span>
|
||||||
|
<pre className="bg-slate-950 border border-slate-800 p-4 rounded-xl text-xs font-mono text-slate-300 overflow-x-auto max-h-48">
|
||||||
|
{(() => {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(JSON.parse(selectedLog.raw_metadata), null, 2);
|
||||||
|
} catch {
|
||||||
|
return selectedLog.raw_metadata;
|
||||||
|
}
|
||||||
|
})()}
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Modal Footer */}
|
||||||
|
<div className="p-4 border-t border-slate-800 bg-slate-950/50 flex justify-between items-center">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{selectedLog.image_filename && (
|
||||||
|
<Link
|
||||||
|
href={`/photo/${selectedLog.image_filename}`}
|
||||||
|
className="flex items-center gap-2 px-4 py-2 bg-indigo-600 hover:bg-indigo-500 text-white rounded-xl text-xs font-bold transition-all"
|
||||||
|
>
|
||||||
|
<Eye size={14} />
|
||||||
|
Ouvrir la session
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
{selectedLog.wallet_hash && (
|
||||||
|
isWalletBanned(selectedLog.wallet_hash) ? (
|
||||||
|
<button
|
||||||
|
onClick={() => handleUnbanWallet(selectedLog.wallet_hash!)}
|
||||||
|
className="px-3 py-2 bg-slate-800 hover:bg-emerald-600/30 text-emerald-400 rounded-xl text-xs font-bold transition-all border border-emerald-500/20"
|
||||||
|
>
|
||||||
|
Débannir ce wallet
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<button
|
||||||
|
onClick={() => {
|
||||||
|
setSelectedLog(null);
|
||||||
|
setBanModalWallet(selectedLog.wallet_hash);
|
||||||
|
}}
|
||||||
|
className="px-3 py-2 bg-rose-600/10 hover:bg-rose-600 text-rose-400 hover:text-white rounded-xl text-xs font-bold transition-all border border-rose-500/20"
|
||||||
|
>
|
||||||
|
Bannir ce wallet
|
||||||
|
</button>
|
||||||
|
)
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
onClick={() => setSelectedLog(null)}
|
||||||
|
className="px-4 py-2 bg-slate-800 hover:bg-slate-700 text-slate-300 rounded-xl text-xs font-semibold transition-all"
|
||||||
|
>
|
||||||
|
Fermer
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Ban Confirmation Modal */}
|
||||||
|
{banModalWallet && (
|
||||||
|
<div className="fixed inset-0 z-50 bg-black/75 backdrop-blur-sm flex items-center justify-center p-4">
|
||||||
|
<div className="bg-slate-900 border border-slate-800 rounded-2xl w-full max-w-md p-6 space-y-6 shadow-2xl animate-in zoom-in-95 duration-200">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="p-3 bg-rose-500/10 border border-rose-500/20 rounded-xl text-rose-400">
|
||||||
|
<Ban size={24} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 className="font-bold text-lg text-slate-100">Bannir un Wallet</h3>
|
||||||
|
<p className="text-xs text-slate-400">Bloquer définitivement tout upload futur de ce compte.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-slate-950 p-3 rounded-xl border border-slate-800 font-mono text-xs text-indigo-300 break-all">
|
||||||
|
{banModalWallet}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<label className="text-xs font-bold uppercase tracking-wider text-slate-400">
|
||||||
|
Motif du bannissement
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
value={banReason}
|
||||||
|
onChange={(e) => setBanReason(e.target.value)}
|
||||||
|
className="w-full bg-slate-950 border border-slate-800 focus:border-rose-500 rounded-xl px-3 py-2 text-sm text-slate-200 outline-none"
|
||||||
|
>
|
||||||
|
<option value="Images non conformes / Fausse cible">Images non conformes / Fausse cible</option>
|
||||||
|
<option value="Spam / Uploads abusifs répétés">Spam / Uploads abusifs répétés</option>
|
||||||
|
<option value="Contenu inapproprié ou illicite">Contenu inapproprié ou illicite</option>
|
||||||
|
<option value="Tentative de manipulation des données">Tentative de manipulation des données</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex justify-end gap-3 pt-2">
|
||||||
|
<button
|
||||||
|
onClick={() => setBanModalWallet(null)}
|
||||||
|
className="px-4 py-2 bg-slate-800 hover:bg-slate-700 text-slate-300 rounded-xl text-xs font-semibold transition-all"
|
||||||
|
>
|
||||||
|
Annuler
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={handleBanWallet}
|
||||||
|
disabled={isSubmittingBan}
|
||||||
|
className="px-4 py-2 bg-rose-600 hover:bg-rose-500 text-white rounded-xl text-xs font-bold transition-all disabled:opacity-50 flex items-center gap-1.5"
|
||||||
|
>
|
||||||
|
<Ban size={14} />
|
||||||
|
{isSubmittingBan ? "Bannissement..." : "Confirmer le Bannissement"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { fetchApi } from "@/lib/api";
|
||||||
|
import LogsManager from "./LogsManager";
|
||||||
|
|
||||||
|
export const metadata = {
|
||||||
|
title: "Logs d'Uploads | Bully IA Dashboard",
|
||||||
|
description: "Journal complet des téléversements de sessions et métadonnées",
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function LogsPage() {
|
||||||
|
let logs = [];
|
||||||
|
let stats = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const [logsRes, statsRes] = await Promise.all([
|
||||||
|
fetchApi('/api/logs?limit=100'),
|
||||||
|
fetchApi('/api/logs/stats')
|
||||||
|
]);
|
||||||
|
logs = logsRes.logs || [];
|
||||||
|
stats = statsRes.stats || null;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Erreur chargement initial des logs:", error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<LogsManager
|
||||||
|
initialLogs={logs}
|
||||||
|
initialStats={stats}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { fetchApi, API_BASE_URL } from "@/lib/api";
|
import { fetchApi } from "@/lib/api";
|
||||||
import DatasetToolbar from "@/components/DatasetToolbar";
|
import DatasetToolbar from "@/components/DatasetToolbar";
|
||||||
import { Calendar, User, Crosshair } from "lucide-react";
|
import { Calendar, User, Crosshair } from "lucide-react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
@@ -49,7 +49,7 @@ export default async function DashboardPage() {
|
|||||||
<div className="aspect-[3/4] relative overflow-hidden bg-slate-800">
|
<div className="aspect-[3/4] relative overflow-hidden bg-slate-800">
|
||||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||||
<img
|
<img
|
||||||
src={`${API_BASE_URL}${photo.imageUrl}`}
|
src={photo.imageUrl}
|
||||||
alt={photo.filename}
|
alt={photo.filename}
|
||||||
className="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500"
|
className="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { fetchApi, API_BASE_URL } from "@/lib/api";
|
import { fetchApi } from "@/lib/api";
|
||||||
import PhotoEditor from "@/components/PhotoEditor";
|
import PhotoEditor from "@/components/PhotoEditor";
|
||||||
import { ChevronLeft, Download } from "lucide-react";
|
import { ChevronLeft, Download } from "lucide-react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
@@ -33,7 +33,7 @@ export default async function PhotoDetailPage({ params }: { params: Promise<{ id
|
|||||||
|
|
||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<a
|
<a
|
||||||
href={`${API_BASE_URL}/uploads/images/${id}`}
|
href={`/uploads/images/${id}`}
|
||||||
download
|
download
|
||||||
className="flex items-center gap-2 bg-slate-800 hover:bg-slate-700 px-4 py-2 rounded-lg text-sm font-medium transition-colors"
|
className="flex items-center gap-2 bg-slate-800 hover:bg-slate-700 px-4 py-2 rounded-lg text-sm font-medium transition-colors"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ export default function PhotoEditor({ initialPhoto }: PhotoEditorProps) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<PhotoOverlay
|
<PhotoOverlay
|
||||||
imageUrl={`${API_BASE_URL}${initialPhoto.imageUrl}`}
|
imageUrl={initialPhoto.imageUrl}
|
||||||
impacts={impacts}
|
impacts={impacts}
|
||||||
targetCorners={photoData?.plotting?.target_corners || []}
|
targetCorners={photoData?.plotting?.target_corners || []}
|
||||||
isEditing={isEditing}
|
isEditing={isEditing}
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
export const API_BASE_URL = 'http://127.0.0.1:3000';
|
const isServer = typeof window === 'undefined';
|
||||||
|
export const API_BASE_URL = isServer
|
||||||
|
? `http://127.0.0.1:${process.env.PORT || 3000}`
|
||||||
|
: '';
|
||||||
|
|
||||||
export async function fetchApi(endpoint: string) {
|
export async function fetchApi(endpoint: string) {
|
||||||
const res = await fetch(`${API_BASE_URL}${endpoint}`, {
|
const res = await fetch(`${API_BASE_URL}${endpoint}`, {
|
||||||
|
|||||||
Generated
+577
-3
@@ -9,14 +9,526 @@
|
|||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@techstark/opencv-js": "^5.0.0-release.1",
|
||||||
"adm-zip": "^0.5.17",
|
"adm-zip": "^0.5.17",
|
||||||
"cors": "^2.8.6",
|
"cors": "^2.8.6",
|
||||||
"dotenv": "^17.4.2",
|
"dotenv": "^17.4.2",
|
||||||
"express": "^5.2.1",
|
"express": "^5.2.1",
|
||||||
"multer": "^2.1.1",
|
"multer": "^2.1.1",
|
||||||
|
"sharp": "^0.35.3",
|
||||||
"sqlite3": "^6.0.1"
|
"sqlite3": "^6.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@emnapi/runtime": {
|
||||||
|
"version": "1.11.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
|
||||||
|
"integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/colour": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-darwin-arm64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-darwin-arm64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-darwin-x64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-darwin-x64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-freebsd-wasm32": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"freebsd"
|
||||||
|
],
|
||||||
|
"dependencies": {
|
||||||
|
"@img/sharp-wasm32": "0.35.3"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-darwin-arm64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-darwin-x64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linux-arm": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==",
|
||||||
|
"cpu": [
|
||||||
|
"arm"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linux-arm64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linux-ppc64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==",
|
||||||
|
"cpu": [
|
||||||
|
"ppc64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linux-riscv64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==",
|
||||||
|
"cpu": [
|
||||||
|
"riscv64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linux-s390x": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==",
|
||||||
|
"cpu": [
|
||||||
|
"s390x"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linux-x64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linuxmusl-arm64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-libvips-linuxmusl-x64": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.2.tgz",
|
||||||
|
"integrity": "sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linux-arm": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==",
|
||||||
|
"cpu": [
|
||||||
|
"arm"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linux-arm": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linux-arm64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linux-arm64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linux-ppc64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==",
|
||||||
|
"cpu": [
|
||||||
|
"ppc64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linux-ppc64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linux-riscv64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==",
|
||||||
|
"cpu": [
|
||||||
|
"riscv64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linux-riscv64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linux-s390x": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==",
|
||||||
|
"cpu": [
|
||||||
|
"s390x"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linux-s390x": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linux-x64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linux-x64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linuxmusl-arm64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linuxmusl-arm64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-linuxmusl-x64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-libvips-linuxmusl-x64": "1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-wasm32": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==",
|
||||||
|
"license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@emnapi/runtime": "^1.11.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-webcontainers-wasm32": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==",
|
||||||
|
"cpu": [
|
||||||
|
"wasm32"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@img/sharp-wasm32": "0.35.3"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-win32-arm64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0 AND LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"win32"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-win32-ia32": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==",
|
||||||
|
"cpu": [
|
||||||
|
"ia32"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0 AND LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"win32"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": "^20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@img/sharp-win32-x64": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "Apache-2.0 AND LGPL-3.0-or-later",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"win32"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@isaacs/fs-minipass": {
|
"node_modules/@isaacs/fs-minipass": {
|
||||||
"version": "4.0.1",
|
"version": "4.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
|
||||||
@@ -29,6 +541,12 @@
|
|||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@techstark/opencv-js": {
|
||||||
|
"version": "5.0.0-release.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@techstark/opencv-js/-/opencv-js-5.0.0-release.1.tgz",
|
||||||
|
"integrity": "sha512-PIm+eB0MFtieXoNC2GRao0dv/02sehG+Nv2nSW5D6pQm6J/4WqvDHm0RyoqOmGYQm67jdGiaOdIeTShCY3PIUg==",
|
||||||
|
"license": "Apache-2.0"
|
||||||
|
},
|
||||||
"node_modules/abbrev": {
|
"node_modules/abbrev": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
|
||||||
@@ -1264,9 +1782,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/semver": {
|
"node_modules/semver": {
|
||||||
"version": "7.7.4",
|
"version": "7.8.5",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
|
||||||
"integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
|
"integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
"semver": "bin/semver.js"
|
"semver": "bin/semver.js"
|
||||||
@@ -1326,6 +1844,55 @@
|
|||||||
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/sharp": {
|
||||||
|
"version": "0.35.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.3.tgz",
|
||||||
|
"integrity": "sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@img/colour": "^1.1.0",
|
||||||
|
"detect-libc": "^2.1.2",
|
||||||
|
"semver": "^7.8.5"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.9.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@img/sharp-darwin-arm64": "0.35.3",
|
||||||
|
"@img/sharp-darwin-x64": "0.35.3",
|
||||||
|
"@img/sharp-freebsd-wasm32": "0.35.3",
|
||||||
|
"@img/sharp-libvips-darwin-arm64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-darwin-x64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linux-arm": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linux-arm64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linux-ppc64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linux-riscv64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linux-s390x": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linux-x64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linuxmusl-arm64": "1.3.2",
|
||||||
|
"@img/sharp-libvips-linuxmusl-x64": "1.3.2",
|
||||||
|
"@img/sharp-linux-arm": "0.35.3",
|
||||||
|
"@img/sharp-linux-arm64": "0.35.3",
|
||||||
|
"@img/sharp-linux-ppc64": "0.35.3",
|
||||||
|
"@img/sharp-linux-riscv64": "0.35.3",
|
||||||
|
"@img/sharp-linux-s390x": "0.35.3",
|
||||||
|
"@img/sharp-linux-x64": "0.35.3",
|
||||||
|
"@img/sharp-linuxmusl-arm64": "0.35.3",
|
||||||
|
"@img/sharp-linuxmusl-x64": "0.35.3",
|
||||||
|
"@img/sharp-webcontainers-wasm32": "0.35.3",
|
||||||
|
"@img/sharp-win32-arm64": "0.35.3",
|
||||||
|
"@img/sharp-win32-ia32": "0.35.3",
|
||||||
|
"@img/sharp-win32-x64": "0.35.3"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"@types/node": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/side-channel": {
|
"node_modules/side-channel": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
|
||||||
@@ -1581,6 +2148,13 @@
|
|||||||
"node": ">=0.6"
|
"node": ">=0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/tslib": {
|
||||||
|
"version": "2.8.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
|
||||||
|
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
|
||||||
|
"license": "0BSD",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"node_modules/tunnel-agent": {
|
"node_modules/tunnel-agent": {
|
||||||
"version": "0.6.0",
|
"version": "0.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
|
||||||
|
|||||||
@@ -12,11 +12,16 @@
|
|||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@techstark/opencv-js": "^5.0.0-release.1",
|
||||||
"adm-zip": "^0.5.17",
|
"adm-zip": "^0.5.17",
|
||||||
"cors": "^2.8.6",
|
"cors": "^2.8.6",
|
||||||
"dotenv": "^17.4.2",
|
"dotenv": "^17.4.2",
|
||||||
"express": "^5.2.1",
|
"express": "^5.2.1",
|
||||||
"multer": "^2.1.1",
|
"multer": "^2.1.1",
|
||||||
|
"next": "^16.2.4",
|
||||||
|
"react": "^19.2.4",
|
||||||
|
"react-dom": "^19.2.4",
|
||||||
|
"sharp": "^0.35.3",
|
||||||
"sqlite3": "^6.0.1"
|
"sqlite3": "^6.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+525
-14
@@ -7,6 +7,8 @@ const sqlite3 = require('sqlite3').verbose();
|
|||||||
const AdmZip = require('adm-zip');
|
const AdmZip = require('adm-zip');
|
||||||
|
|
||||||
|
|
||||||
|
const TargetValidator = require('./services/target_validator');
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
const PORT = process.env.PORT || 3000;
|
const PORT = process.env.PORT || 3000;
|
||||||
|
|
||||||
@@ -34,14 +36,128 @@ const db = new sqlite3.Database(dbPath, (err) => {
|
|||||||
console.error('Erreur de connexion à SQLite:', err.message);
|
console.error('Erreur de connexion à SQLite:', err.message);
|
||||||
} else {
|
} else {
|
||||||
console.log('Connecté à la base de données SQLite.');
|
console.log('Connecté à la base de données SQLite.');
|
||||||
|
db.serialize(() => {
|
||||||
db.run(`CREATE TABLE IF NOT EXISTS user_stats (
|
db.run(`CREATE TABLE IF NOT EXISTS user_stats (
|
||||||
wallet_hash TEXT PRIMARY KEY,
|
wallet_hash TEXT PRIMARY KEY,
|
||||||
photo_count INTEGER DEFAULT 0,
|
photo_count INTEGER DEFAULT 0,
|
||||||
last_upload DATETIME DEFAULT CURRENT_TIMESTAMP
|
last_upload DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
)`);
|
)`);
|
||||||
|
|
||||||
|
db.run(`CREATE TABLE IF NOT EXISTS banned_wallets (
|
||||||
|
wallet_hash TEXT PRIMARY KEY,
|
||||||
|
reason TEXT,
|
||||||
|
banned_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
banned_by TEXT DEFAULT 'Admin'
|
||||||
|
)`);
|
||||||
|
|
||||||
|
db.run(`CREATE TABLE IF NOT EXISTS upload_logs (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
timestamp DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
session_id TEXT,
|
||||||
|
wallet_hash TEXT,
|
||||||
|
image_filename TEXT,
|
||||||
|
json_filename TEXT,
|
||||||
|
file_size INTEGER,
|
||||||
|
ip_address TEXT,
|
||||||
|
user_agent TEXT,
|
||||||
|
device_model TEXT,
|
||||||
|
device_os TEXT,
|
||||||
|
target_type TEXT,
|
||||||
|
weapon TEXT,
|
||||||
|
distance_meters INTEGER,
|
||||||
|
impacts_count INTEGER DEFAULT 0,
|
||||||
|
status TEXT DEFAULT 'SUCCESS',
|
||||||
|
target_valid INTEGER DEFAULT 1,
|
||||||
|
target_status TEXT DEFAULT 'VALID',
|
||||||
|
target_confidence REAL DEFAULT 1.0,
|
||||||
|
target_rings_count INTEGER DEFAULT 0,
|
||||||
|
target_details TEXT,
|
||||||
|
error_message TEXT,
|
||||||
|
raw_metadata TEXT
|
||||||
|
)`);
|
||||||
|
|
||||||
|
// Migration safe des colonnes OpenCV si la table existait déjà
|
||||||
|
const migrations = [
|
||||||
|
"ALTER TABLE upload_logs ADD COLUMN target_valid INTEGER DEFAULT 1",
|
||||||
|
"ALTER TABLE upload_logs ADD COLUMN target_status TEXT DEFAULT 'VALID'",
|
||||||
|
"ALTER TABLE upload_logs ADD COLUMN target_confidence REAL DEFAULT 1.0",
|
||||||
|
"ALTER TABLE upload_logs ADD COLUMN target_rings_count INTEGER DEFAULT 0",
|
||||||
|
"ALTER TABLE upload_logs ADD COLUMN target_details TEXT"
|
||||||
|
];
|
||||||
|
migrations.forEach(sql => {
|
||||||
|
db.run(sql, () => {});
|
||||||
|
});
|
||||||
|
|
||||||
|
db.run(`CREATE INDEX IF NOT EXISTS idx_upload_logs_wallet ON upload_logs(wallet_hash)`);
|
||||||
|
db.run(`CREATE INDEX IF NOT EXISTS idx_upload_logs_timestamp ON upload_logs(timestamp)`);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Helper pour insérer un log d'upload
|
||||||
|
function logUploadEntry({
|
||||||
|
sessionId = null,
|
||||||
|
walletHash = null,
|
||||||
|
imageFilename = null,
|
||||||
|
jsonFilename = null,
|
||||||
|
fileSize = null,
|
||||||
|
ipAddress = null,
|
||||||
|
userAgent = null,
|
||||||
|
deviceModel = null,
|
||||||
|
deviceOs = null,
|
||||||
|
targetType = null,
|
||||||
|
weapon = null,
|
||||||
|
distanceMeters = null,
|
||||||
|
impactsCount = 0,
|
||||||
|
status = 'SUCCESS',
|
||||||
|
targetValid = 1,
|
||||||
|
targetStatus = 'VALID',
|
||||||
|
targetConfidence = 1.0,
|
||||||
|
targetRingsCount = 0,
|
||||||
|
targetDetails = null,
|
||||||
|
errorMessage = null,
|
||||||
|
rawMetadata = null
|
||||||
|
}) {
|
||||||
|
const query = `
|
||||||
|
INSERT INTO upload_logs (
|
||||||
|
session_id, wallet_hash, image_filename, json_filename, file_size,
|
||||||
|
ip_address, user_agent, device_model, device_os, target_type,
|
||||||
|
weapon, distance_meters, impacts_count, status,
|
||||||
|
target_valid, target_status, target_confidence, target_rings_count, target_details,
|
||||||
|
error_message, raw_metadata
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`;
|
||||||
|
db.run(query, [
|
||||||
|
sessionId,
|
||||||
|
walletHash,
|
||||||
|
imageFilename,
|
||||||
|
jsonFilename,
|
||||||
|
fileSize,
|
||||||
|
ipAddress,
|
||||||
|
userAgent,
|
||||||
|
deviceModel,
|
||||||
|
deviceOs,
|
||||||
|
targetType,
|
||||||
|
weapon,
|
||||||
|
distanceMeters,
|
||||||
|
impactsCount,
|
||||||
|
status,
|
||||||
|
targetValid ? 1 : 0,
|
||||||
|
targetStatus,
|
||||||
|
targetConfidence,
|
||||||
|
targetRingsCount,
|
||||||
|
targetDetails,
|
||||||
|
errorMessage,
|
||||||
|
rawMetadata ? JSON.stringify(rawMetadata) : null
|
||||||
|
], function(err) {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur lors de l'insertion dans upload_logs:", err.message);
|
||||||
|
} else {
|
||||||
|
console.log(`[LOG] Upload enregistré (ID: ${this.lastID}) - Statut: ${status} - OpenCV: ${targetStatus}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Configuration de multer pour le stockage des fichiers
|
// Configuration de multer pour le stockage des fichiers
|
||||||
const storage = multer.diskStorage({
|
const storage = multer.diskStorage({
|
||||||
destination: function (req, file, cb) {
|
destination: function (req, file, cb) {
|
||||||
@@ -81,10 +197,22 @@ app.get('/api/health', (req, res) => {
|
|||||||
|
|
||||||
// Route pour l'upload de photo + données JSON
|
// Route pour l'upload de photo + données JSON
|
||||||
// Attend un form-data avec un champ nommé 'photo' et un champ texte 'plotting'
|
// Attend un form-data avec un champ nommé 'photo' et un champ texte 'plotting'
|
||||||
app.post('/api/upload', upload.single('photo'), (req, res) => {
|
app.post('/api/upload', upload.single('photo'), async (req, res) => {
|
||||||
|
const ipAddress = req.headers['x-forwarded-for'] || req.socket.remoteAddress || req.ip || '';
|
||||||
|
const userAgent = req.headers['user-agent'] || '';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (!req.file) {
|
if (!req.file) {
|
||||||
return res.status(400).json({ error: 'Aucune photo fournie' });
|
logUploadEntry({
|
||||||
|
ipAddress,
|
||||||
|
userAgent,
|
||||||
|
status: 'FAILED',
|
||||||
|
errorMessage: 'Aucune photo fournie'
|
||||||
|
});
|
||||||
|
return res.status(400).json({
|
||||||
|
code: 'MISSING_PHOTO',
|
||||||
|
error: 'Aucune photo fournie dans la requête'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let plottingData = {};
|
let plottingData = {};
|
||||||
@@ -93,10 +221,75 @@ app.post('/api/upload', upload.single('photo'), (req, res) => {
|
|||||||
plottingData = JSON.parse(req.body.plotting);
|
plottingData = JSON.parse(req.body.plotting);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Erreur parsing JSON:", e);
|
console.error("Erreur parsing JSON:", e);
|
||||||
return res.status(400).json({ error: 'Le champ plotting doit être un JSON valide' });
|
logUploadEntry({
|
||||||
|
imageFilename: req.file.filename,
|
||||||
|
fileSize: req.file.size,
|
||||||
|
ipAddress,
|
||||||
|
userAgent,
|
||||||
|
status: 'FAILED',
|
||||||
|
errorMessage: 'Le champ plotting doit être un JSON valide'
|
||||||
|
});
|
||||||
|
return res.status(400).json({
|
||||||
|
code: 'INVALID_PLOTTING_JSON',
|
||||||
|
error: 'Le champ plotting contient un format JSON invalide'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const walletHash = plottingData.wallet_hash || null;
|
||||||
|
const sessionId = plottingData.session_id || null;
|
||||||
|
|
||||||
|
// 1. Vérification du bannissement de wallet
|
||||||
|
if (walletHash) {
|
||||||
|
const bannedEntry = await new Promise((resolve) => {
|
||||||
|
db.get('SELECT * FROM banned_wallets WHERE wallet_hash = ?', [walletHash], (err, row) => {
|
||||||
|
resolve(row || null);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if (bannedEntry) {
|
||||||
|
// Supprimer le fichier image temporaire pour ne pas consommer d'espace
|
||||||
|
if (req.file.path && fs.existsSync(req.file.path)) {
|
||||||
|
try { fs.unlinkSync(req.file.path); } catch (e) {}
|
||||||
|
}
|
||||||
|
const banReason = bannedEntry.reason || 'Non-respect des règles de contribution / Image non conforme';
|
||||||
|
logUploadEntry({
|
||||||
|
sessionId,
|
||||||
|
walletHash,
|
||||||
|
imageFilename: req.file.filename,
|
||||||
|
fileSize: req.file.size,
|
||||||
|
ipAddress,
|
||||||
|
userAgent,
|
||||||
|
status: 'FAILED',
|
||||||
|
errorMessage: `Upload bloqué : wallet banni (${banReason})`
|
||||||
|
});
|
||||||
|
console.warn(`[MODÉRATION] Upload rejeté pour wallet banni: ${walletHash}`);
|
||||||
|
return res.status(403).json({
|
||||||
|
code: 'WALLET_BANNED',
|
||||||
|
error: 'Votre participation au programme d\'entraînement IA a été suspendue par la modération.',
|
||||||
|
reason: banReason,
|
||||||
|
banned_at: bannedEntry.banned_at
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Validation de la cible par OpenCV
|
||||||
|
let validation = {
|
||||||
|
isValid: true,
|
||||||
|
status: 'VALID',
|
||||||
|
confidence: 1.0,
|
||||||
|
ringsCount: 0,
|
||||||
|
bestCenter: null,
|
||||||
|
details: 'Analyse non effectuée'
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
validation = await TargetValidator.validateTarget(req.file.path);
|
||||||
|
console.log(`[OPENCV] Diagnostic cible pour ${req.file.filename}: ${validation.status} (${Math.round(validation.confidence * 100)}% conf, ${validation.ringsCount} anneaux)`);
|
||||||
|
} catch (cvErr) {
|
||||||
|
console.error("[OPENCV] Erreur analyse cible:", cvErr);
|
||||||
|
}
|
||||||
|
|
||||||
// Nom de base sans l'extension
|
// Nom de base sans l'extension
|
||||||
const baseFilename = path.parse(req.file.filename).name;
|
const baseFilename = path.parse(req.file.filename).name;
|
||||||
const jsonFilename = `${baseFilename}.json`;
|
const jsonFilename = `${baseFilename}.json`;
|
||||||
@@ -105,8 +298,13 @@ app.post('/api/upload', upload.single('photo'), (req, res) => {
|
|||||||
// Sauvegarde du JSON dans uploads/data/
|
// Sauvegarde du JSON dans uploads/data/
|
||||||
fs.writeFileSync(jsonFilePath, JSON.stringify(plottingData, null, 2));
|
fs.writeFileSync(jsonFilePath, JSON.stringify(plottingData, null, 2));
|
||||||
|
|
||||||
|
// Extraction des métadonnées
|
||||||
|
const deviceInfo = plottingData.device_info || {};
|
||||||
|
const targetMeta = plottingData.target_metadata || {};
|
||||||
|
const impacts = plottingData.plotting?.impacts || [];
|
||||||
|
const impactsCount = Array.isArray(impacts) ? impacts.length : 0;
|
||||||
|
|
||||||
// Mise à jour de la BDD si on a un wallet_hash
|
// Mise à jour de la BDD si on a un wallet_hash
|
||||||
const walletHash = plottingData.wallet_hash;
|
|
||||||
if (walletHash) {
|
if (walletHash) {
|
||||||
db.run(`
|
db.run(`
|
||||||
INSERT INTO user_stats (wallet_hash, photo_count, last_upload)
|
INSERT INTO user_stats (wallet_hash, photo_count, last_upload)
|
||||||
@@ -123,11 +321,36 @@ app.post('/api/upload', upload.single('photo'), (req, res) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Enregistrement dans la table des logs d'upload avec diagnostic OpenCV
|
||||||
|
logUploadEntry({
|
||||||
|
sessionId,
|
||||||
|
walletHash,
|
||||||
|
imageFilename: req.file.filename,
|
||||||
|
jsonFilename,
|
||||||
|
fileSize: req.file.size,
|
||||||
|
ipAddress,
|
||||||
|
userAgent,
|
||||||
|
deviceModel: deviceInfo.model || null,
|
||||||
|
deviceOs: deviceInfo.os || null,
|
||||||
|
targetType: targetMeta.type || null,
|
||||||
|
weapon: targetMeta.weapon || null,
|
||||||
|
distanceMeters: targetMeta.distance_meters || null,
|
||||||
|
impactsCount,
|
||||||
|
status: 'SUCCESS',
|
||||||
|
targetValid: validation.isValid ? 1 : 0,
|
||||||
|
targetStatus: validation.status,
|
||||||
|
targetConfidence: validation.confidence,
|
||||||
|
targetRingsCount: validation.ringsCount,
|
||||||
|
targetDetails: validation.details,
|
||||||
|
rawMetadata: plottingData
|
||||||
|
});
|
||||||
|
|
||||||
console.log(`Données reçues et sauvegardées:`);
|
console.log(`Données reçues et sauvegardées:`);
|
||||||
console.log(`- Image: uploads/images/${req.file.filename}`);
|
console.log(`- Image: uploads/images/${req.file.filename}`);
|
||||||
console.log(`- JSON : uploads/data/${jsonFilename}`);
|
console.log(`- JSON : uploads/data/${jsonFilename}`);
|
||||||
|
|
||||||
res.status(200).json({
|
res.status(200).json({
|
||||||
|
code: 'UPLOAD_SUCCESS',
|
||||||
message: 'Photo et données uploadées avec succès',
|
message: 'Photo et données uploadées avec succès',
|
||||||
file: {
|
file: {
|
||||||
filename: req.file.filename,
|
filename: req.file.filename,
|
||||||
@@ -136,14 +359,254 @@ app.post('/api/upload', upload.single('photo'), (req, res) => {
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
filename: jsonFilename
|
filename: jsonFilename
|
||||||
}
|
},
|
||||||
|
target_validation: validation
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors de l\'upload:', error);
|
console.error('Erreur lors de l\'upload:', error);
|
||||||
res.status(500).json({ error: 'Erreur interne du serveur lors de l\'upload' });
|
logUploadEntry({
|
||||||
|
imageFilename: req.file ? req.file.filename : null,
|
||||||
|
fileSize: req.file ? req.file.size : null,
|
||||||
|
ipAddress,
|
||||||
|
userAgent,
|
||||||
|
status: 'FAILED',
|
||||||
|
errorMessage: error.message || 'Erreur interne lors de l\'upload'
|
||||||
|
});
|
||||||
|
res.status(500).json({
|
||||||
|
code: 'SERVER_ERROR',
|
||||||
|
error: error.message || 'Erreur interne du serveur lors de l\'upload'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Routes de Modération : Gestion des bannissements de wallets
|
||||||
|
app.get('/api/moderation/banned', (req, res) => {
|
||||||
|
db.all('SELECT * FROM banned_wallets ORDER BY banned_at DESC', [], (err, rows) => {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur lecture wallets bannis:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lecture wallets bannis' });
|
||||||
|
}
|
||||||
|
res.json({ banned: rows || [] });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
app.post('/api/moderation/ban', (req, res) => {
|
||||||
|
const { wallet_hash, reason, banned_by } = req.body;
|
||||||
|
if (!wallet_hash) {
|
||||||
|
return res.status(400).json({ error: 'wallet_hash obligatoire' });
|
||||||
|
}
|
||||||
|
|
||||||
|
db.run(
|
||||||
|
`INSERT INTO banned_wallets (wallet_hash, reason, banned_by, banned_at)
|
||||||
|
VALUES (?, ?, ?, CURRENT_TIMESTAMP)
|
||||||
|
ON CONFLICT(wallet_hash) DO UPDATE SET
|
||||||
|
reason = excluded.reason,
|
||||||
|
banned_at = CURRENT_TIMESTAMP`,
|
||||||
|
[wallet_hash, reason || 'Contenu invalide ou non conforme aux règles', banned_by || 'Admin'],
|
||||||
|
function(err) {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur bannissement:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lors du bannissement du wallet' });
|
||||||
|
}
|
||||||
|
console.log(`[MODÉRATION] Wallet ${wallet_hash} banni (Motif: ${reason})`);
|
||||||
|
res.json({ message: 'Wallet banni avec succès', wallet_hash });
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
app.delete('/api/moderation/ban/:wallet_hash', (req, res) => {
|
||||||
|
const wallet_hash = req.params.wallet_hash;
|
||||||
|
db.run('DELETE FROM banned_wallets WHERE wallet_hash = ?', [wallet_hash], function(err) {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur débannissement:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lors du débannissement' });
|
||||||
|
}
|
||||||
|
console.log(`[MODÉRATION] Wallet ${wallet_hash} débanni`);
|
||||||
|
res.json({ message: 'Wallet débanni avec succès', wallet_hash });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route pour relancer l'analyse OpenCV sur une photo déjà existante
|
||||||
|
app.post('/api/moderation/verify/:filename', async (req, res) => {
|
||||||
|
const filename = req.params.filename;
|
||||||
|
const imgPath = path.join(imagesDir, filename);
|
||||||
|
if (!fs.existsSync(imgPath)) {
|
||||||
|
return res.status(404).json({ error: 'Image non trouvée' });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const result = await TargetValidator.validateTarget(imgPath);
|
||||||
|
res.json({ filename, validation: result });
|
||||||
|
} catch (e) {
|
||||||
|
res.status(500).json({ error: e.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route pour lister les logs avec filtres, recherche et pagination
|
||||||
|
app.get('/api/logs', (req, res) => {
|
||||||
|
const limit = Math.min(Math.max(parseInt(req.query.limit) || 50, 1), 200);
|
||||||
|
const offset = Math.max(parseInt(req.query.offset) || 0, 0);
|
||||||
|
const wallet = req.query.wallet || req.query.wallet_hash;
|
||||||
|
const status = req.query.status;
|
||||||
|
const search = req.query.search;
|
||||||
|
|
||||||
|
let whereClauses = [];
|
||||||
|
let params = [];
|
||||||
|
|
||||||
|
if (wallet) {
|
||||||
|
whereClauses.push("wallet_hash LIKE ?");
|
||||||
|
params.push(`%${wallet}%`);
|
||||||
|
}
|
||||||
|
if (status) {
|
||||||
|
whereClauses.push("status = ?");
|
||||||
|
params.push(status);
|
||||||
|
}
|
||||||
|
if (search) {
|
||||||
|
whereClauses.push("(session_id LIKE ? OR wallet_hash LIKE ? OR device_model LIKE ? OR weapon LIKE ? OR target_type LIKE ? OR image_filename LIKE ?)");
|
||||||
|
const s = `%${search}%`;
|
||||||
|
params.push(s, s, s, s, s, s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const whereSql = whereClauses.length > 0 ? `WHERE ${whereClauses.join(' AND ')}` : '';
|
||||||
|
|
||||||
|
db.get(`SELECT COUNT(*) as total FROM upload_logs ${whereSql}`, params, (err, countRow) => {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur comptage logs:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lors du comptage des logs' });
|
||||||
|
}
|
||||||
|
|
||||||
|
const total = countRow ? countRow.total : 0;
|
||||||
|
const query = `
|
||||||
|
SELECT * FROM upload_logs
|
||||||
|
${whereSql}
|
||||||
|
ORDER BY timestamp DESC, id DESC
|
||||||
|
LIMIT ? OFFSET ?
|
||||||
|
`;
|
||||||
|
|
||||||
|
db.all(query, [...params, limit, offset], (err, rows) => {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur lecture logs:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lors de la lecture des logs' });
|
||||||
|
}
|
||||||
|
res.json({
|
||||||
|
logs: rows,
|
||||||
|
total,
|
||||||
|
limit,
|
||||||
|
offset
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route pour les statistiques des logs
|
||||||
|
app.get('/api/logs/stats', (req, res) => {
|
||||||
|
const statsQuery = `
|
||||||
|
SELECT
|
||||||
|
COUNT(*) as total_uploads,
|
||||||
|
SUM(CASE WHEN status = 'SUCCESS' THEN 1 ELSE 0 END) as success_count,
|
||||||
|
SUM(CASE WHEN status = 'FAILED' THEN 1 ELSE 0 END) as failed_count,
|
||||||
|
SUM(CASE WHEN date(timestamp, 'localtime') = date('now', 'localtime') THEN 1 ELSE 0 END) as today_uploads,
|
||||||
|
COUNT(DISTINCT wallet_hash) as unique_wallets,
|
||||||
|
SUM(COALESCE(file_size, 0)) as total_bytes,
|
||||||
|
MAX(timestamp) as latest_upload
|
||||||
|
FROM upload_logs
|
||||||
|
`;
|
||||||
|
|
||||||
|
db.get(statsQuery, [], (err, stats) => {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur stats logs:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur calcul statistiques' });
|
||||||
|
}
|
||||||
|
res.json({
|
||||||
|
status: 'ok',
|
||||||
|
stats: stats || {
|
||||||
|
total_uploads: 0,
|
||||||
|
success_count: 0,
|
||||||
|
failed_count: 0,
|
||||||
|
today_uploads: 0,
|
||||||
|
unique_wallets: 0,
|
||||||
|
total_bytes: 0,
|
||||||
|
latest_upload: null
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route pour exporter les logs (CSV ou JSON)
|
||||||
|
app.get('/api/logs/export', (req, res) => {
|
||||||
|
const format = req.query.format || 'csv';
|
||||||
|
|
||||||
|
db.all('SELECT * FROM upload_logs ORDER BY timestamp DESC, id DESC', [], (err, rows) => {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur export logs:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur export logs' });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (format === 'json') {
|
||||||
|
res.setHeader('Content-Disposition', `attachment; filename=upload_logs_${Date.now()}.json`);
|
||||||
|
res.setHeader('Content-Type', 'application/json');
|
||||||
|
return res.send(JSON.stringify(rows, null, 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
// CSV Export
|
||||||
|
const headers = [
|
||||||
|
'ID', 'Date/Heure', 'Statut', 'Wallet Hash', 'Session ID',
|
||||||
|
'Image', 'JSON', 'Taille (octets)', 'Cible', 'Arme', 'Distance (m)',
|
||||||
|
'Impacts', 'Modèle Appareil', 'OS', 'IP', 'Erreur'
|
||||||
|
];
|
||||||
|
|
||||||
|
const csvLines = [headers.join(';')];
|
||||||
|
|
||||||
|
rows.forEach(r => {
|
||||||
|
const line = [
|
||||||
|
r.id,
|
||||||
|
`"${r.timestamp || ''}"`,
|
||||||
|
`"${r.status || ''}"`,
|
||||||
|
`"${r.wallet_hash || ''}"`,
|
||||||
|
`"${r.session_id || ''}"`,
|
||||||
|
`"${r.image_filename || ''}"`,
|
||||||
|
`"${r.json_filename || ''}"`,
|
||||||
|
r.file_size || 0,
|
||||||
|
`"${r.target_type || ''}"`,
|
||||||
|
`"${r.weapon || ''}"`,
|
||||||
|
r.distance_meters || '',
|
||||||
|
r.impacts_count || 0,
|
||||||
|
`"${r.device_model || ''}"`,
|
||||||
|
`"${r.device_os || ''}"`,
|
||||||
|
`"${r.ip_address || ''}"`,
|
||||||
|
`"${(r.error_message || '').replace(/"/g, '""')}"`
|
||||||
|
];
|
||||||
|
csvLines.push(line.join(';'));
|
||||||
|
});
|
||||||
|
|
||||||
|
res.setHeader('Content-Disposition', `attachment; filename=upload_logs_${Date.now()}.csv`);
|
||||||
|
res.setHeader('Content-Type', 'text/csv; charset=utf-8');
|
||||||
|
res.send('\uFEFF' + csvLines.join('\r\n'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route pour supprimer un log spécifique
|
||||||
|
app.delete('/api/logs/:id', (req, res) => {
|
||||||
|
const id = req.params.id;
|
||||||
|
db.run('DELETE FROM upload_logs WHERE id = ?', [id], function(err) {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur suppression log:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lors de la suppression' });
|
||||||
|
}
|
||||||
|
res.json({ message: 'Log supprimé avec succès', deletedId: id });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route pour vider les logs
|
||||||
|
app.delete('/api/logs', (req, res) => {
|
||||||
|
db.run('DELETE FROM upload_logs', [], function(err) {
|
||||||
|
if (err) {
|
||||||
|
console.error("Erreur vidage logs:", err);
|
||||||
|
return res.status(500).json({ error: 'Erreur lors de la réinitialisation des logs' });
|
||||||
|
}
|
||||||
|
res.json({ message: 'Tous les logs ont été effacés', changes: this.changes });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// Route pour récupérer toutes les photos disponibles
|
// Route pour récupérer toutes les photos disponibles
|
||||||
app.get('/api/photos', (req, res) => {
|
app.get('/api/photos', (req, res) => {
|
||||||
try {
|
try {
|
||||||
@@ -164,20 +627,42 @@ app.get('/api/photos', (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Route pour récupérer les statistiques d'un wallet_hash
|
// Route pour récupérer les statistiques d'un wallet_hash + statut de modération
|
||||||
app.get('/api/stats/:wallet_hash', (req, res) => {
|
app.get('/api/stats/:wallet_hash', (req, res) => {
|
||||||
const walletHash = req.params.wallet_hash;
|
const walletHash = req.params.wallet_hash;
|
||||||
|
|
||||||
db.get('SELECT photo_count, last_upload FROM user_stats WHERE wallet_hash = ?', [walletHash], (err, row) => {
|
db.get('SELECT photo_count, last_upload FROM user_stats WHERE wallet_hash = ?', [walletHash], (err, statRow) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
return res.status(500).json({ error: 'Erreur lors de la lecture des statistiques' });
|
return res.status(500).json({ error: 'Erreur lors de la lecture des statistiques' });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (row) {
|
db.get('SELECT reason, banned_at FROM banned_wallets WHERE wallet_hash = ?', [walletHash], (bErr, bannedRow) => {
|
||||||
res.json({ status: 'ok', stats: row });
|
const isBanned = !!bannedRow;
|
||||||
} else {
|
const stats = statRow || { photo_count: 0, last_upload: null };
|
||||||
res.json({ status: 'ok', stats: { photo_count: 0, last_upload: null } });
|
res.json({
|
||||||
|
status: 'ok',
|
||||||
|
stats,
|
||||||
|
is_banned: isBanned,
|
||||||
|
ban_reason: bannedRow ? bannedRow.reason : null,
|
||||||
|
banned_at: bannedRow ? bannedRow.banned_at : null
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Route directe pour vérifier l'état de modération d'un wallet
|
||||||
|
app.get('/api/moderation/status/:wallet_hash', (req, res) => {
|
||||||
|
const walletHash = req.params.wallet_hash;
|
||||||
|
db.get('SELECT reason, banned_at FROM banned_wallets WHERE wallet_hash = ?', [walletHash], (err, bannedRow) => {
|
||||||
|
if (err) {
|
||||||
|
return res.status(500).json({ error: 'Erreur lecture statut modération' });
|
||||||
}
|
}
|
||||||
|
res.json({
|
||||||
|
wallet_hash: walletHash,
|
||||||
|
is_banned: !!bannedRow,
|
||||||
|
ban_reason: bannedRow ? bannedRow.reason : null,
|
||||||
|
banned_at: bannedRow ? bannedRow.banned_at : null
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -333,10 +818,33 @@ app.use((err, req, res, next) => {
|
|||||||
res.status(500).json({ error: err.message || 'Une erreur inattendue est survenue' });
|
res.status(500).json({ error: err.message || 'Une erreur inattendue est survenue' });
|
||||||
});
|
});
|
||||||
|
|
||||||
// Démarrer le serveur
|
// Intégration du Dashboard Next.js
|
||||||
|
const dashboardDir = path.join(__dirname, 'dashboard');
|
||||||
|
const dev = process.env.NODE_ENV !== 'production';
|
||||||
|
|
||||||
|
let nextApp;
|
||||||
|
try {
|
||||||
|
const next = require('next');
|
||||||
|
nextApp = next({ dev, dir: dashboardDir });
|
||||||
|
} catch (e) {
|
||||||
|
console.warn("Module 'next' non disponible, mode API seule.");
|
||||||
|
}
|
||||||
|
|
||||||
|
async function startServer() {
|
||||||
|
if (nextApp) {
|
||||||
|
try {
|
||||||
|
await nextApp.prepare();
|
||||||
|
const handle = nextApp.getRequestHandler();
|
||||||
|
app.use((req, res) => handle(req, res));
|
||||||
|
console.log("Dashboard Next.js initialisé avec succès.");
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Erreur d'initialisation du Dashboard Next.js:", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
app.listen(PORT, () => {
|
app.listen(PORT, () => {
|
||||||
console.log(`=================================`);
|
console.log(`=================================`);
|
||||||
console.log(`Serveur Backend IA démarré`);
|
console.log(`Serveur Backend IA & Dashboard démarré`);
|
||||||
console.log(`Port: ${PORT}`);
|
console.log(`Port: ${PORT}`);
|
||||||
console.log(`Dossiers:`);
|
console.log(`Dossiers:`);
|
||||||
console.log(` - Images: ${imagesDir}`);
|
console.log(` - Images: ${imagesDir}`);
|
||||||
@@ -344,3 +852,6 @@ app.listen(PORT, () => {
|
|||||||
console.log(` - Export: ${exportsDir}`);
|
console.log(` - Export: ${exportsDir}`);
|
||||||
console.log(`=================================`);
|
console.log(`=================================`);
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
startServer();
|
||||||
|
|||||||
@@ -0,0 +1,230 @@
|
|||||||
|
const cvPromise = require('@techstark/opencv-js');
|
||||||
|
const sharp = require('sharp');
|
||||||
|
|
||||||
|
let cvInstance = null;
|
||||||
|
|
||||||
|
async function getCV() {
|
||||||
|
if (!cvInstance) {
|
||||||
|
cvInstance = await cvPromise;
|
||||||
|
}
|
||||||
|
return cvInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Service de validation OpenCV pour vérifier si une image reçue est bien une cible de tir.
|
||||||
|
*/
|
||||||
|
class TargetValidator {
|
||||||
|
/**
|
||||||
|
* Analyse une image et renvoie le diagnostic OpenCV
|
||||||
|
* @param {string|Buffer} imageInput - Chemin du fichier ou Buffer de l'image
|
||||||
|
* @returns {Promise<{
|
||||||
|
* isValid: boolean,
|
||||||
|
* status: 'VALID' | 'SUSPICIOUS' | 'INVALID',
|
||||||
|
* confidence: number,
|
||||||
|
* ringsCount: number,
|
||||||
|
* bestCenter: { x: number, y: number, radius: number } | null,
|
||||||
|
* details: string
|
||||||
|
* }>}
|
||||||
|
*/
|
||||||
|
static async validateTarget(imageInput) {
|
||||||
|
const cv = await getCV();
|
||||||
|
|
||||||
|
let src = null;
|
||||||
|
let gray = null;
|
||||||
|
let blurred = null;
|
||||||
|
let circles = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 1. Charger et décoder l'image avec Sharp pour obtenir les pixels bruts RGBA
|
||||||
|
const { data, info } = await sharp(imageInput)
|
||||||
|
.ensureAlpha() // 4 canaux RGBA
|
||||||
|
.raw()
|
||||||
|
.toBuffer({ resolveWithObject: true });
|
||||||
|
|
||||||
|
const width = info.width;
|
||||||
|
const height = info.height;
|
||||||
|
const minDim = Math.min(width, height);
|
||||||
|
|
||||||
|
// 2. Créer une Mat OpenCV à partir des pixels RGBA
|
||||||
|
src = new cv.Mat(height, width, cv.CV_8UC4);
|
||||||
|
src.data.set(data);
|
||||||
|
|
||||||
|
// 3. Conversion en niveaux de gris
|
||||||
|
gray = new cv.Mat();
|
||||||
|
cv.cvtColor(src, gray, cv.COLOR_RGBA2GRAY);
|
||||||
|
|
||||||
|
// 4. Flou Gaussien pour réduire le bruit
|
||||||
|
blurred = new cv.Mat();
|
||||||
|
const ksize = new cv.Size(9, 9);
|
||||||
|
cv.GaussianBlur(gray, blurred, ksize, 2, 2, cv.BORDER_DEFAULT);
|
||||||
|
|
||||||
|
// 5. Détection multi-bandes pour capturer tous les anneaux concentriques
|
||||||
|
// (Puisque minDist dans HoughCircles empêche la détection de cercles concentriques sur un seul passage)
|
||||||
|
const detectedCircles = [];
|
||||||
|
const bands = [
|
||||||
|
{ min: Math.floor(minDim * 0.04), max: Math.floor(minDim * 0.18), p2: 45 },
|
||||||
|
{ min: Math.floor(minDim * 0.18), max: Math.floor(minDim * 0.35), p2: 48 },
|
||||||
|
{ min: Math.floor(minDim * 0.35), max: Math.floor(minDim * 0.55), p2: 50 }
|
||||||
|
];
|
||||||
|
|
||||||
|
circles = new cv.Mat();
|
||||||
|
|
||||||
|
for (const band of bands) {
|
||||||
|
cv.HoughCircles(
|
||||||
|
blurred,
|
||||||
|
circles,
|
||||||
|
cv.HOUGH_GRADIENT,
|
||||||
|
1,
|
||||||
|
Math.max(Math.floor(minDim * 0.05), 10),
|
||||||
|
100,
|
||||||
|
band.p2,
|
||||||
|
band.min,
|
||||||
|
band.max
|
||||||
|
);
|
||||||
|
|
||||||
|
if (circles.cols > 0 && circles.data32F) {
|
||||||
|
for (let i = 0; i < circles.cols; i++) {
|
||||||
|
const x = circles.data32F[i * 3];
|
||||||
|
const y = circles.data32F[i * 3 + 1];
|
||||||
|
const r = circles.data32F[i * 3 + 2];
|
||||||
|
if (!isNaN(x) && !isNaN(y) && !isNaN(r) && r > 0) {
|
||||||
|
detectedCircles.push({ x, y, r });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Si aucun cercle dans les bandes, tentative globale tolérante
|
||||||
|
if (detectedCircles.length === 0) {
|
||||||
|
cv.HoughCircles(
|
||||||
|
blurred,
|
||||||
|
circles,
|
||||||
|
cv.HOUGH_GRADIENT,
|
||||||
|
1,
|
||||||
|
Math.max(Math.floor(minDim * 0.08), 10),
|
||||||
|
100,
|
||||||
|
35,
|
||||||
|
Math.floor(minDim * 0.05),
|
||||||
|
Math.floor(minDim * 0.55)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (circles.cols > 0 && circles.data32F) {
|
||||||
|
for (let i = 0; i < circles.cols; i++) {
|
||||||
|
const x = circles.data32F[i * 3];
|
||||||
|
const y = circles.data32F[i * 3 + 1];
|
||||||
|
const r = circles.data32F[i * 3 + 2];
|
||||||
|
if (!isNaN(x) && !isNaN(y) && !isNaN(r) && r > 0) {
|
||||||
|
detectedCircles.push({ x, y, r });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Si aucun cercle détecté
|
||||||
|
if (detectedCircles.length === 0) {
|
||||||
|
return {
|
||||||
|
isValid: false,
|
||||||
|
status: 'INVALID',
|
||||||
|
confidence: 0.02,
|
||||||
|
ringsCount: 0,
|
||||||
|
bestCenter: null,
|
||||||
|
details: 'Aucun motif circulaire ou cible détecté sur cette photo.'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. Clustering des cercles pour trouver les anneaux concentriques
|
||||||
|
const tolerance = minDim * 0.07; // Tolérance de 7% pour le décalage de centre
|
||||||
|
const clusters = [];
|
||||||
|
|
||||||
|
for (const circle of detectedCircles) {
|
||||||
|
let added = false;
|
||||||
|
for (const cluster of clusters) {
|
||||||
|
// Prendre le centre moyen actuel du cluster
|
||||||
|
const avgClusterX = cluster.reduce((sum, c) => sum + c.x, 0) / cluster.length;
|
||||||
|
const avgClusterY = cluster.reduce((sum, c) => sum + c.y, 0) / cluster.length;
|
||||||
|
const dist = Math.sqrt(Math.pow(circle.x - avgClusterX, 2) + Math.pow(circle.y - avgClusterY, 2));
|
||||||
|
|
||||||
|
if (dist < tolerance) {
|
||||||
|
// Vérifier que le rayon n'est pas un doublon exact (< 10px de différence)
|
||||||
|
const isDuplicate = cluster.some(c => Math.abs(c.r - circle.r) < minDim * 0.03);
|
||||||
|
if (!isDuplicate) {
|
||||||
|
cluster.push(circle);
|
||||||
|
}
|
||||||
|
added = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!added) {
|
||||||
|
clusters.push([circle]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trier les clusters par nombre de cercles concentriques décroissant
|
||||||
|
clusters.sort((a, b) => b.length - a.length);
|
||||||
|
const bestCluster = clusters[0];
|
||||||
|
const ringsCount = bestCluster.length;
|
||||||
|
|
||||||
|
// Calculer le centre moyen du meilleur cluster
|
||||||
|
const avgX = bestCluster.reduce((acc, c) => acc + c.x, 0) / ringsCount;
|
||||||
|
const avgY = bestCluster.reduce((acc, c) => acc + c.y, 0) / ringsCount;
|
||||||
|
const maxR = Math.max(...bestCluster.map(c => c.r));
|
||||||
|
|
||||||
|
// 7. Évaluation du statut et de la confiance
|
||||||
|
if (ringsCount >= 3) {
|
||||||
|
return {
|
||||||
|
isValid: true,
|
||||||
|
status: 'VALID',
|
||||||
|
confidence: Math.min(0.92 + (ringsCount - 3) * 0.02, 0.99),
|
||||||
|
ringsCount,
|
||||||
|
bestCenter: { x: avgX, y: avgY, radius: maxR },
|
||||||
|
details: `Cible certifiée : ${ringsCount} anneaux concentriques identifiés.`
|
||||||
|
};
|
||||||
|
} else if (ringsCount === 2) {
|
||||||
|
return {
|
||||||
|
isValid: true,
|
||||||
|
status: 'VALID',
|
||||||
|
confidence: 0.85,
|
||||||
|
ringsCount,
|
||||||
|
bestCenter: { x: avgX, y: avgY, radius: maxR },
|
||||||
|
details: `Cible confirmée : ${ringsCount} anneaux concentriques détectés.`
|
||||||
|
};
|
||||||
|
} else if (ringsCount === 1) {
|
||||||
|
return {
|
||||||
|
isValid: true,
|
||||||
|
status: 'SUSPICIOUS',
|
||||||
|
confidence: 0.50,
|
||||||
|
ringsCount: 1,
|
||||||
|
bestCenter: { x: avgX, y: avgY, radius: maxR },
|
||||||
|
details: 'Un seul anneau détecté, confirmation visuelle recommandée.'
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
return {
|
||||||
|
isValid: false,
|
||||||
|
status: 'INVALID',
|
||||||
|
confidence: 0.1,
|
||||||
|
ringsCount: 0,
|
||||||
|
bestCenter: null,
|
||||||
|
details: 'Motif de cible non conforme.'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Erreur TargetValidator OpenCV:', error);
|
||||||
|
return {
|
||||||
|
isValid: false,
|
||||||
|
status: 'INVALID',
|
||||||
|
confidence: 0.0,
|
||||||
|
ringsCount: 0,
|
||||||
|
bestCenter: null,
|
||||||
|
details: `Erreur d'analyse OpenCV: ${error.message}`
|
||||||
|
};
|
||||||
|
} finally {
|
||||||
|
// 8. Nettoyage mémoire
|
||||||
|
if (src && !src.isDeleted()) src.delete();
|
||||||
|
if (gray && !gray.isDeleted()) gray.delete();
|
||||||
|
if (blurred && !blurred.isDeleted()) blurred.delete();
|
||||||
|
if (circles && !circles.isDeleted()) circles.delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = TargetValidator;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
name: backendia
|
||||||
|
|
||||||
|
services:
|
||||||
|
backendia:
|
||||||
|
build:
|
||||||
|
context: ./backendia
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
container_name: backendia-prod
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "3005:3000"
|
||||||
|
environment:
|
||||||
|
- NODE_ENV=production
|
||||||
|
- PORT=3000
|
||||||
|
volumes:
|
||||||
|
- backendia_uploads:/app/uploads
|
||||||
|
- backendia_exports:/app/exports
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
backendia_uploads:
|
||||||
|
backendia_exports:
|
||||||
+1
-1
@@ -27,7 +27,7 @@ class BullyApp extends StatelessWidget {
|
|||||||
Locale('fr', 'FR'), // Français
|
Locale('fr', 'FR'), // Français
|
||||||
],
|
],
|
||||||
locale: const Locale('fr', 'FR'), // Force l'interface en français
|
locale: const Locale('fr', 'FR'), // Force l'interface en français
|
||||||
home: const MainNavigationHolder(),
|
home: MainNavigationHolder(key: mainNavKey),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -590,6 +590,16 @@ class DatabaseHelper {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Toutes les entrées de maintenance, armes confondues (export/sauvegarde).
|
||||||
|
Future<List<MaintenanceEntry>> getAllMaintenance() async {
|
||||||
|
final db = await database;
|
||||||
|
final maps = await db.query(
|
||||||
|
AppConstants.maintenanceTable,
|
||||||
|
orderBy: 'date DESC',
|
||||||
|
);
|
||||||
|
return List.generate(maps.length, (i) => MaintenanceEntry.fromMap(maps[i]));
|
||||||
|
}
|
||||||
|
|
||||||
Future<List<MaintenanceEntry>> getMaintenanceForWeapon(String weaponId) async {
|
Future<List<MaintenanceEntry>> getMaintenanceForWeapon(String weaponId) async {
|
||||||
final db = await database;
|
final db = await database;
|
||||||
final maps = await db.query(
|
final maps = await db.query(
|
||||||
|
|||||||
@@ -131,6 +131,29 @@ class SessionRepository {
|
|||||||
return await _databaseHelper.getStatistics();
|
return await _databaseHelper.getStatistics();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Enregistre une session déjà construite (import de sauvegarde).
|
||||||
|
/// Les identifiants existants sont écrasés : réimporter deux fois la même
|
||||||
|
/// sauvegarde ne crée pas de doublons.
|
||||||
|
Future<void> saveSession(Session session) async {
|
||||||
|
await _databaseHelper.insertSession(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Copie une image dans le dossier des cibles de l'app (import de sauvegarde).
|
||||||
|
Future<String> saveImageBytes(List<int> bytes, String extension) async {
|
||||||
|
final appDir = await getApplicationDocumentsDirectory();
|
||||||
|
final imagesDir = Directory(path.join(appDir.path, 'target_images'));
|
||||||
|
|
||||||
|
if (!await imagesDir.exists()) {
|
||||||
|
await imagesDir.create(recursive: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
final fileName = '${_uuid.v4()}$extension';
|
||||||
|
final destPath = path.join(imagesDir.path, fileName);
|
||||||
|
await File(destPath).writeAsBytes(bytes);
|
||||||
|
|
||||||
|
return destPath;
|
||||||
|
}
|
||||||
|
|
||||||
String generateId() {
|
String generateId() {
|
||||||
return _uuid.v4();
|
return _uuid.v4();
|
||||||
}
|
}
|
||||||
@@ -170,6 +193,11 @@ class SessionRepository {
|
|||||||
return await _databaseHelper.getAllWeapons();
|
return await _databaseHelper.getAllWeapons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Enregistre une arme déjà construite (import de sauvegarde).
|
||||||
|
Future<void> saveWeapon(Weapon weapon) async {
|
||||||
|
await _databaseHelper.insertWeapon(weapon);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> updateWeapon(Weapon weapon) async {
|
Future<void> updateWeapon(Weapon weapon) async {
|
||||||
await _databaseHelper.updateWeapon(weapon);
|
await _databaseHelper.updateWeapon(weapon);
|
||||||
}
|
}
|
||||||
@@ -208,6 +236,16 @@ class SessionRepository {
|
|||||||
return await _databaseHelper.getMaintenanceForWeapon(weaponId);
|
return await _databaseHelper.getMaintenanceForWeapon(weaponId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Tout l'historique de maintenance de l'armurerie (export de sauvegarde).
|
||||||
|
Future<List<MaintenanceEntry>> getAllMaintenance() async {
|
||||||
|
return await _databaseHelper.getAllMaintenance();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Enregistre une entrée de maintenance déjà construite (import).
|
||||||
|
Future<void> saveMaintenanceEntry(MaintenanceEntry entry) async {
|
||||||
|
await _databaseHelper.insertMaintenance(entry);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> deleteMaintenanceEntry(String id) async {
|
Future<void> deleteMaintenanceEntry(String id) async {
|
||||||
await _databaseHelper.deleteMaintenance(id);
|
await _databaseHelper.deleteMaintenance(id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ class AnalysisProvider extends ChangeNotifier {
|
|||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Efface tous les impacts en un clic (bouton ↻ de l'écran Plotting).
|
/// Efface tous les impacts en un clic (bouton ↻ de l'écran Synthèse).
|
||||||
/// La calibration (centre, rayon, anneaux) n'est pas touchée.
|
/// La calibration (centre, rayon, anneaux) n'est pas touchée.
|
||||||
void clearShots() {
|
void clearShots() {
|
||||||
_shots.clear();
|
_shots.clear();
|
||||||
@@ -241,15 +241,18 @@ class AnalysisProvider extends ChangeNotifier {
|
|||||||
/// Exporte l'image et le json vers le backend IA.
|
/// Exporte l'image et le json vers le backend IA.
|
||||||
/// [sessionId], [distance] et [weapon] proviennent du SessionProvider de
|
/// [sessionId], [distance] et [weapon] proviennent du SessionProvider de
|
||||||
/// l'écran appelant, pour que le dataset contienne les vraies métadonnées.
|
/// l'écran appelant, pour que le dataset contienne les vraies métadonnées.
|
||||||
Future<bool> exportToAiBackend({
|
Future<AiExportResult> exportToAiBackend({
|
||||||
String? sessionId,
|
String? sessionId,
|
||||||
int? distance,
|
int? distance,
|
||||||
String? weapon,
|
String? weapon,
|
||||||
}) async {
|
}) async {
|
||||||
if (_imagePath == null || _targetType == null) {
|
if (_imagePath == null || _targetType == null) {
|
||||||
_errorMessage = "Impossible d'export : image ou type de cible manquant.";
|
_errorMessage = "Impossible d'exporter : image ou type de cible manquant.";
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
return false;
|
return AiExportResult.error(
|
||||||
|
code: 'MISSING_DATA',
|
||||||
|
message: "Impossible d'exporter : image ou type de cible manquant.",
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
final service = AiExportService();
|
final service = AiExportService();
|
||||||
@@ -257,7 +260,7 @@ class AnalysisProvider extends ChangeNotifier {
|
|||||||
_state = AnalysisState.loading;
|
_state = AnalysisState.loading;
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
|
|
||||||
final success = await service.exportData(
|
final result = await service.exportData(
|
||||||
imagePath: _imagePath!,
|
imagePath: _imagePath!,
|
||||||
sessionId: sessionId ?? 'export',
|
sessionId: sessionId ?? 'export',
|
||||||
targetType: _targetType!,
|
targetType: _targetType!,
|
||||||
@@ -270,11 +273,11 @@ class AnalysisProvider extends ChangeNotifier {
|
|||||||
);
|
);
|
||||||
|
|
||||||
_state = AnalysisState.success;
|
_state = AnalysisState.success;
|
||||||
if (!success) {
|
if (!result.isSuccess) {
|
||||||
_errorMessage = "Échec de l'export vers le serveur IA.";
|
_errorMessage = result.message;
|
||||||
}
|
}
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
return success;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Save the session
|
/// Save the session
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
/// Écran principal de Plotting et d'analyse - Interface centrale de traitement des cibles.
|
/// Écran principal de Synthèse et d'analyse - Interface centrale de traitement des cibles.
|
||||||
///
|
///
|
||||||
/// Affiche d'abord la calibration de la cible, puis l'overlay des anneaux et impacts détectés.
|
/// Affiche d'abord la calibration de la cible, puis l'overlay des anneaux et impacts détectés.
|
||||||
/// Permet le calcul des scores et statistiques de groupement (Plotting).
|
/// Permet le calcul des scores et statistiques de groupement (Synthèse), et
|
||||||
|
/// c'est de là que l'on termine la session. L'ajout des impacts, lui, se fait
|
||||||
|
/// dans l'éditeur d'impacts plein écran.
|
||||||
library;
|
library;
|
||||||
|
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
@@ -9,6 +11,7 @@ import 'dart:math' as math;
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../../main_navigation_holder.dart';
|
||||||
import '../../core/constants/app_constants.dart';
|
import '../../core/constants/app_constants.dart';
|
||||||
import '../../core/theme/app_theme.dart';
|
import '../../core/theme/app_theme.dart';
|
||||||
import '../../data/models/target_type.dart';
|
import '../../data/models/target_type.dart';
|
||||||
@@ -16,6 +19,7 @@ import '../../data/repositories/session_repository.dart';
|
|||||||
import '../../services/score_calculator_service.dart';
|
import '../../services/score_calculator_service.dart';
|
||||||
import '../../services/grouping_analyzer_service.dart';
|
import '../../services/grouping_analyzer_service.dart';
|
||||||
import '../../services/wallet_identity_service.dart';
|
import '../../services/wallet_identity_service.dart';
|
||||||
|
import '../../services/ai_export_service.dart';
|
||||||
import '../session/session_provider.dart';
|
import '../session/session_provider.dart';
|
||||||
import 'analysis_provider.dart';
|
import 'analysis_provider.dart';
|
||||||
import 'impact_editor_screen.dart';
|
import 'impact_editor_screen.dart';
|
||||||
@@ -109,6 +113,9 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
bool _isCalibrating = true;
|
bool _isCalibrating = true;
|
||||||
bool _isAtBottom = false;
|
bool _isAtBottom = false;
|
||||||
|
|
||||||
|
// Affichage du réglage manuel de l'espacement des anneaux.
|
||||||
|
bool _showSpacing = false;
|
||||||
|
|
||||||
final ScrollController _scrollController = ScrollController();
|
final ScrollController _scrollController = ScrollController();
|
||||||
final GlobalKey _imageKey = GlobalKey();
|
final GlobalKey _imageKey = GlobalKey();
|
||||||
|
|
||||||
@@ -139,10 +146,15 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
|
|
||||||
/// Repasse en mode calibration.
|
/// Repasse en mode calibration.
|
||||||
///
|
///
|
||||||
/// La cible du mode Plotting est désormais un élément fixe (aucun zoom à
|
/// La cible du mode Synthèse est désormais un élément fixe (aucun zoom à
|
||||||
/// réinitialiser) : on se contente donc de rebasculer l'état.
|
/// réinitialiser) : on se contente donc de rebasculer l'état.
|
||||||
void _enterCalibration() {
|
void _enterCalibration() {
|
||||||
setState(() => _isCalibrating = true);
|
setState(() {
|
||||||
|
_isCalibrating = true;
|
||||||
|
// La calibration est reconstruite à neuf (espacement manuel désactivé) :
|
||||||
|
// on aligne l'état du panneau pour ne pas afficher un mode inactif.
|
||||||
|
_showSpacing = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Ouvre l'éditeur d'impacts (plein écran) en PARTAGEANT le provider courant.
|
/// Ouvre l'éditeur d'impacts (plein écran) en PARTAGEANT le provider courant.
|
||||||
@@ -152,8 +164,8 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
/// déplacés ou supprimés sont donc immédiatement répercutés ici.
|
/// déplacés ou supprimés sont donc immédiatement répercutés ici.
|
||||||
///
|
///
|
||||||
/// Au retour, quel que soit le résultat (validation OU retour arrière), on
|
/// Au retour, quel que soit le résultat (validation OU retour arrière), on
|
||||||
/// revient TOUJOURS sur le Plotting. L'éditeur d'impacts n'est ouvert que
|
/// revient TOUJOURS sur la Synthèse. L'éditeur d'impacts n'est ouvert que
|
||||||
/// depuis le Plotting : il doit donc y ramener, jamais sur la calibration.
|
/// depuis la Synthèse : il doit donc y ramener, jamais sur la calibration.
|
||||||
Future<void> _openImpactEditor(AnalysisProvider provider) async {
|
Future<void> _openImpactEditor(AnalysisProvider provider) async {
|
||||||
await Navigator.of(context).push<bool>(
|
await Navigator.of(context).push<bool>(
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
@@ -181,6 +193,181 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
return widget.originalImagePath ?? provider.imagePath!;
|
return widget.originalImagePath ?? provider.imagePath!;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Panneau de réglages de la calibration (taille + espacement).
|
||||||
|
///
|
||||||
|
/// Rendu AU-DESSUS de l'image (et non plus en surimpression) pour ne pas
|
||||||
|
/// masquer la cible. Les valeurs affichées viennent du provider ; les
|
||||||
|
/// modifications sont poussées dans l'état de [TargetCalibration] via sa clé.
|
||||||
|
Widget _buildCalibrationSettings(AnalysisProvider provider) {
|
||||||
|
final radius = provider.targetRadius.clamp(
|
||||||
|
TargetCalibrationState.minRadius,
|
||||||
|
TargetCalibrationState.maxRadius,
|
||||||
|
);
|
||||||
|
final spacing =
|
||||||
|
(provider.targetRadius > 0
|
||||||
|
? provider.targetInnerRadius / provider.targetRadius
|
||||||
|
: 0.1)
|
||||||
|
.clamp(
|
||||||
|
TargetCalibrationState.minSpacing,
|
||||||
|
TargetCalibrationState.maxSpacing,
|
||||||
|
);
|
||||||
|
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(12, 0, 12, 4),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 36,
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'Taille',
|
||||||
|
style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
const Icon(Icons.zoom_out, size: 16),
|
||||||
|
Expanded(
|
||||||
|
child: Slider(
|
||||||
|
value: radius,
|
||||||
|
min: TargetCalibrationState.minRadius,
|
||||||
|
max: TargetCalibrationState.maxRadius,
|
||||||
|
activeColor: AppTheme.primaryColor,
|
||||||
|
onChanged: (value) =>
|
||||||
|
_calibrationKey.currentState?.setRadius(value),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const Icon(Icons.zoom_in, size: 16),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 32,
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const Expanded(
|
||||||
|
child: Text(
|
||||||
|
'Options d\'espacement avancées',
|
||||||
|
style: TextStyle(fontSize: 11, fontWeight: FontWeight.w500),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Switch(
|
||||||
|
value: _showSpacing,
|
||||||
|
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||||
|
onChanged: (value) {
|
||||||
|
setState(() => _showSpacing = value);
|
||||||
|
_calibrationKey.currentState?.setSpacingMode(value);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (_showSpacing)
|
||||||
|
SizedBox(
|
||||||
|
height: 36,
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'Espacement',
|
||||||
|
style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
const Icon(Icons.compress, size: 16),
|
||||||
|
Expanded(
|
||||||
|
child: Slider(
|
||||||
|
value: spacing,
|
||||||
|
min: TargetCalibrationState.minSpacing,
|
||||||
|
max: TargetCalibrationState.maxSpacing,
|
||||||
|
activeColor: Colors.orange,
|
||||||
|
onChanged: (value) =>
|
||||||
|
_calibrationKey.currentState?.setSpacingRatio(value),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const Icon(Icons.expand, size: 16),
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.refresh, size: 20),
|
||||||
|
tooltip: 'Réinitialiser l\'espacement',
|
||||||
|
constraints: const BoxConstraints(),
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||||
|
onPressed: () =>
|
||||||
|
_calibrationKey.currentState?.resetSpacing(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Indication affichée sous le titre en mode Synthèse.
|
||||||
|
///
|
||||||
|
/// Rien n'indiquait comment ajouter un impact une fois la calibration
|
||||||
|
/// validée : ce rappel pointe vers le geste (toucher la cible).
|
||||||
|
Widget _buildSyntheseHint(AnalysisProvider provider) {
|
||||||
|
final hasShots = provider.shotCount > 0;
|
||||||
|
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
hasShots ? Icons.touch_app : Icons.add_location_alt,
|
||||||
|
size: 16,
|
||||||
|
color: AppTheme.primaryColor,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Flexible(
|
||||||
|
child: Text(
|
||||||
|
hasShots
|
||||||
|
? 'Touchez la cible pour modifier vos impacts'
|
||||||
|
: 'Touchez la cible pour placer vos impacts',
|
||||||
|
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Bouton flottant du bas de l'écran.
|
||||||
|
///
|
||||||
|
/// En calibration : VALIDER. En synthèse : tant qu'aucun impact n'est placé,
|
||||||
|
/// on ne propose pas de terminer la session mais de placer un impact (le
|
||||||
|
/// bouton ouvre l'éditeur, comme un tap sur la cible).
|
||||||
|
Widget _buildBottomAction(BuildContext context, AnalysisProvider provider) {
|
||||||
|
if (_isCalibrating) {
|
||||||
|
return FloatingActionButton.extended(
|
||||||
|
// Même bouton bleu flottant que « TERMINER LA SESSION » :
|
||||||
|
// on fige la calibration puis on bascule sur la Synthèse.
|
||||||
|
onPressed: () {
|
||||||
|
_calibrationKey.currentState?.commitCalibration();
|
||||||
|
setState(() => _isCalibrating = false);
|
||||||
|
},
|
||||||
|
backgroundColor: AppTheme.primaryColor,
|
||||||
|
icon: const Icon(Icons.check),
|
||||||
|
label: const Text('VALIDER'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (provider.shotCount == 0) {
|
||||||
|
return FloatingActionButton.extended(
|
||||||
|
onPressed: () => _openImpactEditor(provider),
|
||||||
|
backgroundColor: AppTheme.primaryColor,
|
||||||
|
icon: const Icon(Icons.add_location_alt),
|
||||||
|
label: const Text('PLACER UN IMPACT'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return FloatingActionButton.extended(
|
||||||
|
onPressed: () => _showSaveSessionDialog(context, provider),
|
||||||
|
backgroundColor: AppTheme.primaryColor,
|
||||||
|
icon: const Icon(Icons.save),
|
||||||
|
label: const Text('TERMINER LA SESSION'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final provider = context.watch<AnalysisProvider>();
|
final provider = context.watch<AnalysisProvider>();
|
||||||
@@ -189,10 +376,10 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
? sessionProvider.targetCount + 1
|
? sessionProvider.targetCount + 1
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
final titlePrefix = _isCalibrating ? 'Calibration' : 'Plotting';
|
final titlePrefix = _isCalibrating ? 'Calibration' : 'Synthèse';
|
||||||
final title = targetNumber != null
|
final title = targetNumber != null
|
||||||
? '$titlePrefix - Cible $targetNumber'
|
? '$titlePrefix - Cible $targetNumber'
|
||||||
: (_isCalibrating ? 'Calibration' : 'Plotting du Tir');
|
: (_isCalibrating ? 'Calibration' : 'Synthèse du Tir');
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
@@ -216,7 +403,7 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// Retour Plotting -> Calibration : on réinitialise le zoom.
|
// Retour Synthèse -> Calibration : on réinitialise le zoom.
|
||||||
_enterCalibration();
|
_enterCalibration();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -229,22 +416,21 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
controller: _scrollController,
|
controller: _scrollController,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Padding(
|
// Plus de bloc vide au-dessus de l'image : l'indicateur n'occupe
|
||||||
padding: const EdgeInsets.all(AppConstants.defaultPadding),
|
// de la place que pendant le chargement.
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
if (provider.state == AnalysisState.loading)
|
if (provider.state == AnalysisState.loading)
|
||||||
const Center(
|
const Padding(
|
||||||
child: Padding(
|
|
||||||
padding: EdgeInsets.symmetric(vertical: 8.0),
|
padding: EdgeInsets.symmetric(vertical: 8.0),
|
||||||
child: CircularProgressIndicator(),
|
child: Center(child: CircularProgressIndicator()),
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
|
|
||||||
|
// Réglages de calibration : au-dessus de la photo pour ne rien
|
||||||
|
// masquer de la cible.
|
||||||
|
if (_isCalibrating)
|
||||||
|
_buildCalibrationSettings(provider)
|
||||||
|
else
|
||||||
|
_buildSyntheseHint(provider),
|
||||||
|
|
||||||
AspectRatio(
|
AspectRatio(
|
||||||
aspectRatio: provider.imageAspectRatio,
|
aspectRatio: provider.imageAspectRatio,
|
||||||
child: _isCalibrating
|
child: _isCalibrating
|
||||||
@@ -338,6 +524,14 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
shotCount: provider.shotCount,
|
shotCount: provider.shotCount,
|
||||||
scoreResult: provider.scoreResult,
|
scoreResult: provider.scoreResult,
|
||||||
targetType: provider.targetType!,
|
targetType: provider.targetType!,
|
||||||
|
// Cumul de la session : cibles déjà validées + cible
|
||||||
|
// en cours (absent hors session).
|
||||||
|
sessionTotalScore: sessionProvider.isSessionActive
|
||||||
|
? sessionProvider.totalSessionScore +
|
||||||
|
provider.totalScore
|
||||||
|
: null,
|
||||||
|
sessionTargetCount:
|
||||||
|
sessionProvider.targetCount + 1,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
if (provider.groupingResult != null &&
|
if (provider.groupingResult != null &&
|
||||||
@@ -450,25 +644,7 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
padding: _isAtBottom
|
padding: _isAtBottom
|
||||||
? EdgeInsets.zero
|
? EdgeInsets.zero
|
||||||
: const EdgeInsets.all(16.0),
|
: const EdgeInsets.all(16.0),
|
||||||
child: _isCalibrating
|
child: _buildBottomAction(context, provider),
|
||||||
? FloatingActionButton.extended(
|
|
||||||
// Même bouton bleu flottant que « TERMINER LA SESSION » :
|
|
||||||
// on fige la calibration puis on bascule sur le Plotting.
|
|
||||||
onPressed: () {
|
|
||||||
_calibrationKey.currentState?.commitCalibration();
|
|
||||||
setState(() => _isCalibrating = false);
|
|
||||||
},
|
|
||||||
backgroundColor: AppTheme.primaryColor,
|
|
||||||
icon: const Icon(Icons.check),
|
|
||||||
label: const Text('VALIDER'),
|
|
||||||
)
|
|
||||||
: FloatingActionButton.extended(
|
|
||||||
onPressed: () =>
|
|
||||||
_showSaveSessionDialog(context, provider),
|
|
||||||
backgroundColor: AppTheme.primaryColor,
|
|
||||||
icon: const Icon(Icons.save),
|
|
||||||
label: const Text('TERMINER LA SESSION'),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -490,7 +666,7 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Affichage du plotting en LECTURE SEULE.
|
/// Affichage de la synthèse en LECTURE SEULE.
|
||||||
///
|
///
|
||||||
/// La cible est un élément d'écran FIXE : elle ne se déplace pas et ne se
|
/// La cible est un élément d'écran FIXE : elle ne se déplace pas et ne se
|
||||||
/// zoome pas (plus d'InteractiveViewer). Un tap n'importe où sur la cible
|
/// zoome pas (plus d'InteractiveViewer). Un tap n'importe où sur la cible
|
||||||
@@ -528,77 +704,93 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _showSaveSessionDialog(BuildContext context, AnalysisProvider provider) {
|
Future<void> _showSaveSessionDialog(
|
||||||
|
BuildContext context,
|
||||||
|
AnalysisProvider provider,
|
||||||
|
) async {
|
||||||
|
// L'option « Participer à l'entraînement IA » (Paramètres) est lue AVANT
|
||||||
|
// d'ouvrir la popup : elle décide de la présence du bouton d'export.
|
||||||
|
final canExport =
|
||||||
|
await WalletIdentityService().isUploadEnabled() &&
|
||||||
|
provider.state == AnalysisState.success;
|
||||||
|
|
||||||
|
if (!context.mounted) return;
|
||||||
|
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) => AlertDialog(
|
builder: (context) => AlertDialog(
|
||||||
title: const Text('Session Terminee'),
|
// Protège des petits écrans / grandes polices : la popup défile au
|
||||||
content: Column(
|
// lieu de déborder.
|
||||||
mainAxisSize: MainAxisSize.min,
|
scrollable: true,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
// En-tête bleu pleine largeur : le titre occupe toute la bande, d'où
|
||||||
|
// les paddings mis à zéro.
|
||||||
|
titlePadding: EdgeInsets.zero,
|
||||||
|
contentPadding: const EdgeInsets.fromLTRB(20, 16, 20, 16),
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(16),
|
||||||
|
),
|
||||||
|
clipBehavior: Clip.antiAlias,
|
||||||
|
title: Container(
|
||||||
|
width: double.infinity,
|
||||||
|
color: AppTheme.primaryColor,
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
|
||||||
|
child: const Row(
|
||||||
children: [
|
children: [
|
||||||
Text('Nombre de tirs: ${provider.shotCount}'),
|
Icon(Icons.flag, color: Colors.white),
|
||||||
Text('Score total: ${provider.totalScore}'),
|
SizedBox(width: 10),
|
||||||
const SizedBox(height: 16),
|
Text(
|
||||||
const Text('Voulez-vous enregistrer cette session ?'),
|
'Session terminée',
|
||||||
// Export vers le backend IA : proposé ici (et non plus dans
|
style: TextStyle(
|
||||||
// l'AppBar). Visible seulement si l'option est activée dans les
|
color: Colors.white,
|
||||||
// Paramètres ET si l'analyse a réussi.
|
fontSize: 18,
|
||||||
FutureBuilder<bool>(
|
fontWeight: FontWeight.bold,
|
||||||
future: WalletIdentityService().isUploadEnabled(),
|
|
||||||
builder: (context, snapshot) {
|
|
||||||
final isEnabled = snapshot.data ?? false;
|
|
||||||
if (!isEnabled ||
|
|
||||||
provider.state != AnalysisState.success) {
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
}
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 12),
|
|
||||||
child: OutlinedButton.icon(
|
|
||||||
icon: const Icon(Icons.cloud_upload),
|
|
||||||
label: const Text('Exporter pour IA'),
|
|
||||||
onPressed: () async {
|
|
||||||
if (provider.state != AnalysisState.success) return;
|
|
||||||
|
|
||||||
// On capture messenger et session AVANT l'await pour
|
|
||||||
// éviter tout usage de context après un gap async.
|
|
||||||
final messenger = ScaffoldMessenger.of(context);
|
|
||||||
final sp = context.read<SessionProvider>();
|
|
||||||
|
|
||||||
messenger.showSnackBar(
|
|
||||||
const SnackBar(
|
|
||||||
content: Text('Exportation en cours...'),
|
|
||||||
),
|
),
|
||||||
);
|
|
||||||
|
|
||||||
final success = await provider.exportToAiBackend(
|
|
||||||
sessionId: sp.activeSessionId,
|
|
||||||
distance: sp.distance,
|
|
||||||
weapon: sp.currentWeapon,
|
|
||||||
);
|
|
||||||
|
|
||||||
messenger.hideCurrentSnackBar();
|
|
||||||
messenger.showSnackBar(
|
|
||||||
SnackBar(
|
|
||||||
content: Text(
|
|
||||||
success
|
|
||||||
? 'Export réussi vers le backend IA !'
|
|
||||||
: (provider.errorMessage ??
|
|
||||||
'Erreur d\'export'),
|
|
||||||
),
|
|
||||||
backgroundColor: success
|
|
||||||
? AppTheme.successColor
|
|
||||||
: AppTheme.errorColor,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
actions: [
|
),
|
||||||
|
// Les boutons sont dans le contenu (et non dans `actions`) pour être
|
||||||
|
// tous à la même largeur, alignés les uns sous les autres.
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
_buildDialogRecap(context, provider),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
const Text('Voulez-vous enregistrer cette session ?'),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
_buildDialogButton(
|
||||||
|
icon: const Icon(Icons.add_a_photo, color: Colors.white),
|
||||||
|
label: 'AJOUTER UNE CIBLE',
|
||||||
|
color: AppTheme.secondaryColor,
|
||||||
|
onPressed: () => _saveAndAddTarget(context, provider),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
_buildDialogButton(
|
||||||
|
icon: const Icon(Icons.save, color: Colors.white),
|
||||||
|
label: 'TERMINER TOUT',
|
||||||
|
color: AppTheme.primaryColor,
|
||||||
|
onPressed: () => _finishSession(context, provider),
|
||||||
|
),
|
||||||
|
// Bouton d'export : uniquement si l'entraînement IA est autorisé.
|
||||||
|
if (canExport) ...[
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
_buildDialogButton(
|
||||||
|
icon: Image.asset(
|
||||||
|
'assets/icons/cloud_save.png',
|
||||||
|
width: 24,
|
||||||
|
height: 24,
|
||||||
|
// L'icône est un trait noir : on la recolore en blanc pour
|
||||||
|
// qu'elle ressorte sur le bouton.
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
label: 'TERMINER TOUT ET EXPORTER',
|
||||||
|
color: AppTheme.warningColor,
|
||||||
|
onPressed: () =>
|
||||||
|
_finishSession(context, provider, export: true),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
const SizedBox(height: 4),
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
@@ -620,8 +812,72 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
},
|
},
|
||||||
child: const Text('ANNULER'),
|
child: const Text('ANNULER'),
|
||||||
),
|
),
|
||||||
ElevatedButton(
|
],
|
||||||
onPressed: () async {
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Rappel chiffré (tirs / score) en tête de la popup de fin de session.
|
||||||
|
Widget _buildDialogRecap(BuildContext context, AnalysisProvider provider) {
|
||||||
|
return Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: AppTheme.primaryColor.withValues(alpha: 0.10),
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
_buildRecapValue(context, '${provider.shotCount}', 'Tirs'),
|
||||||
|
_buildRecapValue(context, '${provider.totalScore}', 'Score total'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildRecapValue(BuildContext context, String value, String label) {
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
value,
|
||||||
|
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: AppTheme.primaryColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(label, style: Theme.of(context).textTheme.bodySmall),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Bouton pleine largeur de la popup, aux couleurs du thème.
|
||||||
|
Widget _buildDialogButton({
|
||||||
|
required Widget icon,
|
||||||
|
required String label,
|
||||||
|
required Color color,
|
||||||
|
required VoidCallback onPressed,
|
||||||
|
}) {
|
||||||
|
return ElevatedButton.icon(
|
||||||
|
icon: icon,
|
||||||
|
label: Text(label, style: const TextStyle(fontWeight: FontWeight.bold)),
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: color,
|
||||||
|
foregroundColor: Colors.white,
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 14),
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onPressed: onPressed,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Enregistre la cible courante et enchaîne sur une nouvelle capture.
|
||||||
|
Future<void> _saveAndAddTarget(
|
||||||
|
BuildContext context,
|
||||||
|
AnalysisProvider provider,
|
||||||
|
) async {
|
||||||
try {
|
try {
|
||||||
final sessionProvider = context.read<SessionProvider>();
|
final sessionProvider = context.read<SessionProvider>();
|
||||||
final analysis = await provider.saveSession(
|
final analysis = await provider.saveSession(
|
||||||
@@ -638,9 +894,7 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
Navigator.pushAndRemoveUntil(
|
Navigator.pushAndRemoveUntil(
|
||||||
context,
|
context,
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(builder: (context) => const CaptureScreen()),
|
||||||
builder: (context) => const CaptureScreen(),
|
|
||||||
),
|
|
||||||
(route) => route.isFirst,
|
(route) => route.isFirst,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -654,13 +908,24 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
child: const Text('AJOUTER UNE CIBLE'),
|
|
||||||
),
|
/// Clôture la session et revient sur l'onglet Statistiques.
|
||||||
ElevatedButton(
|
///
|
||||||
onPressed: () async {
|
/// Avec [export], la cible est en plus envoyée au backend d'entraînement IA.
|
||||||
try {
|
/// L'enregistrement local reste prioritaire : un échec d'export n'empêche
|
||||||
|
/// jamais la session d'être sauvegardée.
|
||||||
|
Future<void> _finishSession(
|
||||||
|
BuildContext context,
|
||||||
|
AnalysisProvider provider, {
|
||||||
|
bool export = false,
|
||||||
|
}) async {
|
||||||
|
// Messenger et session capturés AVANT les await : le contexte de la popup
|
||||||
|
// ne sera plus valide ensuite.
|
||||||
|
final messenger = ScaffoldMessenger.of(context);
|
||||||
final sessionProvider = context.read<SessionProvider>();
|
final sessionProvider = context.read<SessionProvider>();
|
||||||
|
|
||||||
|
try {
|
||||||
await provider.saveSession(
|
await provider.saveSession(
|
||||||
sessionId: sessionProvider.activeSessionId,
|
sessionId: sessionProvider.activeSessionId,
|
||||||
weaponName: sessionProvider.currentWeapon,
|
weaponName: sessionProvider.currentWeapon,
|
||||||
@@ -669,14 +934,92 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
date: sessionProvider.sessionDate,
|
date: sessionProvider.sessionDate,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
AiExportResult? exportResult;
|
||||||
|
if (export) {
|
||||||
|
messenger.showSnackBar(
|
||||||
|
const SnackBar(content: Text('Exportation vers le serveur IA en cours...')),
|
||||||
|
);
|
||||||
|
exportResult = await provider.exportToAiBackend(
|
||||||
|
sessionId: sessionProvider.activeSessionId,
|
||||||
|
distance: sessionProvider.distance,
|
||||||
|
weapon: sessionProvider.currentWeapon,
|
||||||
|
);
|
||||||
|
messenger.hideCurrentSnackBar();
|
||||||
|
}
|
||||||
|
|
||||||
if (context.mounted) {
|
if (context.mounted) {
|
||||||
sessionProvider.endSession();
|
sessionProvider.endSession();
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
Navigator.of(context).popUntil((route) => route.isFirst);
|
Navigator.of(context).popUntil((route) => route.isFirst);
|
||||||
|
// Fin de session : on atterrit sur les statistiques.
|
||||||
|
openMainTab(mainTabStats);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exportResult != null) {
|
||||||
|
if (exportResult.isBanned) {
|
||||||
|
messenger.showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Row(
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.block, color: Colors.white),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
'Participation IA suspendue : ${exportResult.reason ?? "Non-respect des règles"}',
|
||||||
|
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
backgroundColor: AppTheme.errorColor,
|
||||||
|
duration: const Duration(seconds: 6),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else if (exportResult.isSuccess) {
|
||||||
|
final targetStatus = exportResult.targetValidation?['status'];
|
||||||
|
final isCertified = targetStatus == 'VALID';
|
||||||
|
messenger.showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
isCertified ? Icons.verified : Icons.cloud_done,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
isCertified
|
||||||
|
? 'Export réussi ! Cible certifiée par l\'IA.'
|
||||||
|
: exportResult.message,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
backgroundColor: AppTheme.successColor,
|
||||||
|
duration: const Duration(seconds: 4),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
messenger.showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Row(
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.warning_amber_rounded, color: Colors.white),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: Text('Échec de l\'export : ${exportResult.message}'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
backgroundColor: AppTheme.errorColor,
|
||||||
|
duration: const Duration(seconds: 4),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (context.mounted) {
|
messenger.showSnackBar(
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
|
||||||
SnackBar(
|
SnackBar(
|
||||||
content: Text('Erreur: $e'),
|
content: Text('Erreur: $e'),
|
||||||
backgroundColor: AppTheme.errorColor,
|
backgroundColor: AppTheme.errorColor,
|
||||||
@@ -684,11 +1027,4 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
child: const Text('TERMINER TOUT'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -7,8 +7,11 @@
|
|||||||
/// scroll vertical ou une transformation parente.
|
/// scroll vertical ou une transformation parente.
|
||||||
///
|
///
|
||||||
/// Interactions :
|
/// Interactions :
|
||||||
/// - Tap sur zone vide -> ajoute un impact
|
/// - Tap -> ajoute TOUJOURS un impact, même juste à côté
|
||||||
/// - Tap sur un impact -> ouvre l'édition (score / suppression)
|
/// (ou par-dessus) un impact existant. Aucun tap
|
||||||
|
/// n'ouvre d'édition de score : on peut donc
|
||||||
|
/// placer un impact au pouce près sans être
|
||||||
|
/// interrompu par une popup.
|
||||||
/// - Appui long + glisser -> déplace l'impact
|
/// - Appui long + glisser -> déplace l'impact
|
||||||
///
|
///
|
||||||
/// L'état des impacts est partagé avec l'écran d'analyse via le MÊME
|
/// L'état des impacts est partagé avec l'écran d'analyse via le MÊME
|
||||||
@@ -24,7 +27,6 @@ import '../../core/theme/app_theme.dart';
|
|||||||
import '../../data/models/shot.dart';
|
import '../../data/models/shot.dart';
|
||||||
import 'analysis_provider.dart';
|
import 'analysis_provider.dart';
|
||||||
import 'widgets/target_overlay.dart';
|
import 'widgets/target_overlay.dart';
|
||||||
import 'widgets/shot_details_sheet.dart';
|
|
||||||
|
|
||||||
class ImpactEditorScreen extends StatefulWidget {
|
class ImpactEditorScreen extends StatefulWidget {
|
||||||
const ImpactEditorScreen({super.key});
|
const ImpactEditorScreen({super.key});
|
||||||
@@ -73,8 +75,11 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Renvoie l'impact le plus proche de [rel] dans la tolérance, sinon null.
|
/// Renvoie l'impact le plus proche de [rel] dans la tolérance, sinon null.
|
||||||
|
///
|
||||||
|
/// Utilisé uniquement par l'appui long (déplacement) : le tap simple, lui,
|
||||||
|
/// ajoute toujours un impact sans chercher à en sélectionner un.
|
||||||
Shot? _hitTestShot(AnalysisProvider provider, Offset rel,
|
Shot? _hitTestShot(AnalysisProvider provider, Offset rel,
|
||||||
{double tolerance = 0.04}) {
|
{double tolerance = 0.06}) {
|
||||||
Shot? closest;
|
Shot? closest;
|
||||||
double minDistance = double.infinity;
|
double minDistance = double.infinity;
|
||||||
for (final shot in provider.shots) {
|
for (final shot in provider.shots) {
|
||||||
@@ -100,7 +105,7 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
|
|||||||
title: Text('Placement des impacts (${provider.shotCount})'),
|
title: Text('Placement des impacts (${provider.shotCount})'),
|
||||||
leading: IconButton(
|
leading: IconButton(
|
||||||
icon: const Icon(Icons.arrow_back),
|
icon: const Icon(Icons.arrow_back),
|
||||||
tooltip: 'Retour au plotting',
|
tooltip: 'Retour à la synthèse',
|
||||||
onPressed: () => Navigator.pop(context, false),
|
onPressed: () => Navigator.pop(context, false),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -134,7 +139,7 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
|
|||||||
color: Colors.white10,
|
color: Colors.white10,
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||||
child: const Text(
|
child: const Text(
|
||||||
'Tap : ajouter • Tap sur impact : éditer • Appui long : déplacer • Pincer : zoomer',
|
'Tap : ajouter un impact • Appui long : déplacer • Pincer : zoomer',
|
||||||
style: TextStyle(color: Colors.white70, fontSize: 12),
|
style: TextStyle(color: Colors.white70, fontSize: 12),
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
),
|
),
|
||||||
@@ -151,24 +156,20 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
|
|||||||
child: Center(
|
child: Center(
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
behavior: HitTestBehavior.opaque,
|
behavior: HitTestBehavior.opaque,
|
||||||
// TAP : éditer si on touche un impact, sinon ajouter.
|
// TAP : ajoute un impact, sans exception. Même collé à un
|
||||||
|
// impact existant, le tap crée le nouvel impact au lieu
|
||||||
|
// d'ouvrir l'édition du score.
|
||||||
onTapUp: (details) {
|
onTapUp: (details) {
|
||||||
if (_movingShotId != null) return;
|
if (_movingShotId != null) return;
|
||||||
final rel = _toImageRelative(details.globalPosition);
|
final rel = _toImageRelative(details.globalPosition);
|
||||||
if (rel == null) return;
|
if (rel == null) return;
|
||||||
|
|
||||||
final hit = _hitTestShot(provider, rel);
|
|
||||||
if (hit != null) {
|
|
||||||
showShotDetailsSheet(context, provider, hit);
|
|
||||||
} else {
|
|
||||||
provider.addShot(rel.dx, rel.dy);
|
provider.addShot(rel.dx, rel.dy);
|
||||||
}
|
|
||||||
},
|
},
|
||||||
// APPUI LONG : on saisit l'impact le plus proche pour le déplacer.
|
// APPUI LONG : on saisit l'impact le plus proche pour le déplacer.
|
||||||
onLongPressStart: (details) {
|
onLongPressStart: (details) {
|
||||||
final rel = _toImageRelative(details.globalPosition);
|
final rel = _toImageRelative(details.globalPosition);
|
||||||
if (rel == null) return;
|
if (rel == null) return;
|
||||||
final hit = _hitTestShot(provider, rel, tolerance: 0.06);
|
final hit = _hitTestShot(provider, rel);
|
||||||
if (hit != null) {
|
if (hit != null) {
|
||||||
setState(() => _movingShotId = hit.id);
|
setState(() => _movingShotId = hit.id);
|
||||||
}
|
}
|
||||||
@@ -204,10 +205,10 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
|
|||||||
shots: provider.shots,
|
shots: provider.shots,
|
||||||
showRings: true,
|
showRings: true,
|
||||||
zoomScale: _currentZoomScale,
|
zoomScale: _currentZoomScale,
|
||||||
// L'ajout et la sélection sont gérés par le
|
// Aucun onShotTapped : les impacts ne captent plus le
|
||||||
// GestureDetector parent ci-dessus.
|
// toucher, tout va au GestureDetector parent qui
|
||||||
onShotTapped: (shot) =>
|
// ajoute un impact (y compris pile sur un impact
|
||||||
showShotDetailsSheet(context, provider, shot),
|
// existant).
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -17,12 +17,22 @@ class ScoreCard extends StatelessWidget {
|
|||||||
final ScoreResult? scoreResult;
|
final ScoreResult? scoreResult;
|
||||||
final TargetType targetType;
|
final TargetType targetType;
|
||||||
|
|
||||||
|
/// Score cumulé de la session (cibles déjà validées + cible en cours).
|
||||||
|
///
|
||||||
|
/// null hors session : le bandeau de session n'est alors pas affiché.
|
||||||
|
final int? sessionTotalScore;
|
||||||
|
|
||||||
|
/// Nombre de cibles comptabilisées dans [sessionTotalScore].
|
||||||
|
final int sessionTargetCount;
|
||||||
|
|
||||||
const ScoreCard({
|
const ScoreCard({
|
||||||
super.key,
|
super.key,
|
||||||
required this.totalScore,
|
required this.totalScore,
|
||||||
required this.shotCount,
|
required this.shotCount,
|
||||||
this.scoreResult,
|
this.scoreResult,
|
||||||
required this.targetType,
|
required this.targetType,
|
||||||
|
this.sessionTotalScore,
|
||||||
|
this.sessionTargetCount = 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -46,13 +56,23 @@ class ScoreCard extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
|
if (sessionTotalScore != null) ...[
|
||||||
|
Flexible(child: _buildSessionBadge(context)),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
],
|
||||||
MetricInfoButton(
|
MetricInfoButton(
|
||||||
title: 'Score',
|
title: 'Score',
|
||||||
explanations: [
|
explanations: [
|
||||||
MetricExplanation(
|
MetricExplanation(
|
||||||
'Total',
|
'Total',
|
||||||
'Somme des points de tous vos impacts, sur le maximum '
|
'Somme des points de tous vos impacts sur CETTE cible, '
|
||||||
'possible (nombre d\'impacts × $maxScore points).',
|
'sur le maximum possible (nombre d\'impacts × '
|
||||||
|
'$maxScore points).',
|
||||||
|
),
|
||||||
|
const MetricExplanation(
|
||||||
|
'Session',
|
||||||
|
'Score cumulé de toutes les cibles de la session en '
|
||||||
|
'cours, cible affichée comprise.',
|
||||||
),
|
),
|
||||||
const MetricExplanation(
|
const MetricExplanation(
|
||||||
'Impacts',
|
'Impacts',
|
||||||
@@ -122,6 +142,30 @@ class ScoreCard extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Bandeau compact rappelant le score total de la session en cours.
|
||||||
|
Widget _buildSessionBadge(BuildContext context) {
|
||||||
|
// Le nombre de cibles n'est rappelé qu'à partir de la deuxième : sur la
|
||||||
|
// première il n'apporte rien et allonge le bandeau pour rien.
|
||||||
|
final cibles = sessionTargetCount > 1 ? ' ($sessionTargetCount cibles)' : '';
|
||||||
|
|
||||||
|
return Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: AppTheme.primaryColor.withValues(alpha: 0.15),
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
'Session : $sessionTotalScore pts$cibles',
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: AppTheme.primaryColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Widget _buildScoreStat(
|
Widget _buildScoreStat(
|
||||||
BuildContext context,
|
BuildContext context,
|
||||||
String label,
|
String label,
|
||||||
|
|||||||
@@ -1,85 +0,0 @@
|
|||||||
/// Bottom sheet de détails d'un impact : modification du score et suppression.
|
|
||||||
///
|
|
||||||
/// Partagée entre l'écran d'analyse (consultation du plotting) et l'éditeur
|
|
||||||
/// d'impacts plein écran, qui opèrent sur le même AnalysisProvider.
|
|
||||||
library;
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
import '../../../data/models/shot.dart';
|
|
||||||
import '../analysis_provider.dart';
|
|
||||||
|
|
||||||
void showShotDetailsSheet(
|
|
||||||
BuildContext context,
|
|
||||||
AnalysisProvider provider,
|
|
||||||
Shot shot,
|
|
||||||
) {
|
|
||||||
showModalBottomSheet(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => Container(
|
|
||||||
padding: const EdgeInsets.all(24),
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
'Impact #${provider.shots.indexOf(shot) + 1}',
|
|
||||||
style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
|
|
||||||
),
|
|
||||||
Text(
|
|
||||||
'ID: ${shot.id}',
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.bodySmall
|
|
||||||
?.copyWith(color: Colors.grey, fontSize: 10),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
ListTile(
|
|
||||||
leading: const Icon(Icons.score),
|
|
||||||
title: const Text('Modifier le score'),
|
|
||||||
trailing: DropdownButton<int>(
|
|
||||||
value: shot.score.clamp(0, 10),
|
|
||||||
items: List.generate(11, (index) => index)
|
|
||||||
.map(
|
|
||||||
(s) => DropdownMenuItem(
|
|
||||||
value: s,
|
|
||||||
child: Text(
|
|
||||||
'$s',
|
|
||||||
style: const TextStyle(
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
fontSize: 18,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.toList(),
|
|
||||||
onChanged: (newScore) {
|
|
||||||
if (newScore != null) {
|
|
||||||
provider.updateShotScore(shot.id, newScore);
|
|
||||||
Navigator.pop(context);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 24),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: OutlinedButton.icon(
|
|
||||||
onPressed: () {
|
|
||||||
provider.removeShot(shot.id);
|
|
||||||
Navigator.pop(context);
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.delete, color: Colors.red),
|
|
||||||
label: const Text(
|
|
||||||
'SUPPRIMER',
|
|
||||||
style: TextStyle(color: Colors.red),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,6 @@ library;
|
|||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import '../../../core/theme/app_theme.dart';
|
|
||||||
import '../../../data/models/target_type.dart';
|
import '../../../data/models/target_type.dart';
|
||||||
|
|
||||||
class TargetCalibration extends StatefulWidget {
|
class TargetCalibration extends StatefulWidget {
|
||||||
@@ -44,6 +43,15 @@ class TargetCalibration extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class TargetCalibrationState extends State<TargetCalibration> {
|
class TargetCalibrationState extends State<TargetCalibration> {
|
||||||
|
/// Bornes du rayon global (mesurées pour laisser de la liberté sans
|
||||||
|
/// débordement incontrôlé).
|
||||||
|
static const double minRadius = 0.3;
|
||||||
|
static const double maxRadius = 0.95;
|
||||||
|
|
||||||
|
/// Bornes de l'espacement : max bridé à 0.70 pour confiner le dernier cercle.
|
||||||
|
static const double minSpacing = 0.01;
|
||||||
|
static const double maxSpacing = 0.70;
|
||||||
|
|
||||||
late double _centerX;
|
late double _centerX;
|
||||||
late double _centerY;
|
late double _centerY;
|
||||||
late double _radius;
|
late double _radius;
|
||||||
@@ -154,9 +162,9 @@ class TargetCalibrationState extends State<TargetCalibration> {
|
|||||||
builder: (context, constraints) {
|
builder: (context, constraints) {
|
||||||
final size = constraints.biggest;
|
final size = constraints.biggest;
|
||||||
|
|
||||||
return Stack(
|
// Les réglages (taille / espacement) sont rendus par l'écran hôte
|
||||||
children: [
|
// AU-DESSUS de l'image : rien ne vient masquer la cible ici.
|
||||||
GestureDetector(
|
return GestureDetector(
|
||||||
onScaleStart: (details) {
|
onScaleStart: (details) {
|
||||||
_baseRadiusBeforeScale = _radius;
|
_baseRadiusBeforeScale = _radius;
|
||||||
final tapX = details.localFocalPoint.dx / size.width;
|
final tapX = details.localFocalPoint.dx / size.width;
|
||||||
@@ -186,125 +194,68 @@ class TargetCalibrationState extends State<TargetCalibration> {
|
|||||||
isDraggingInnerRadius: false,
|
isDraggingInnerRadius: false,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Positioned(
|
// ---------------------------------------------------------------------------
|
||||||
top: 10,
|
// API publique pilotée par l'écran hôte (panneau de réglages hors de l'image)
|
||||||
left: 40,
|
// ---------------------------------------------------------------------------
|
||||||
right: 40,
|
|
||||||
child: Column(
|
/// Espacement courant (rayon du premier anneau, en fraction du rayon global).
|
||||||
mainAxisSize: MainAxisSize.min,
|
double get spacingRatio => _currentEspacementRatio;
|
||||||
children: [
|
|
||||||
Container(
|
/// Mode d'espacement manuel actif ou non.
|
||||||
margin: const EdgeInsets.only(bottom: 8),
|
bool get isSpacingModeEnabled => _showEspacement;
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 2),
|
|
||||||
decoration: BoxDecoration(
|
/// Applique une nouvelle taille globale (rayon normalisé).
|
||||||
color: Colors.black54,
|
void setRadius(double value) {
|
||||||
borderRadius: BorderRadius.circular(20),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
const Text(
|
|
||||||
'Options d\'espacement avancées',
|
|
||||||
style: TextStyle(color: Colors.white70, fontSize: 11, fontWeight: FontWeight.w500),
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
height: 28,
|
|
||||||
child: Switch(
|
|
||||||
value: _showEspacement,
|
|
||||||
activeThumbColor: const Color(0xFF00FF00),
|
|
||||||
onChanged: (bool value) {
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_showEspacement = value;
|
_radius = value.clamp(minRadius, maxRadius);
|
||||||
// Quand on désactive l'espacement manuel, on restaure la configuration d'usine !
|
_innerRadius = _radius * _currentEspacementRatio;
|
||||||
if (!value) {
|
// Si le mode avancé n'est pas coché, on applique la taille pure sans
|
||||||
|
// détruire le ratio d'origine.
|
||||||
|
_initRingRadii(forceRecalculate: _showEspacement);
|
||||||
|
});
|
||||||
|
_notifyChange();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Agrandit / réduit la cible de [deltaPixels] pixels.
|
||||||
|
///
|
||||||
|
/// La conversion utilise la plus petite dimension de [size], exactement comme
|
||||||
|
/// le painter, pour que le pas corresponde bien à un pixel à l'écran.
|
||||||
|
void adjustRadiusByPixels(double deltaPixels, Size size) {
|
||||||
|
final minDim = size.width < size.height ? size.width : size.height;
|
||||||
|
if (minDim <= 0) return;
|
||||||
|
setRadius(_radius + deltaPixels / minDim);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Active ou non le réglage manuel de l'espacement.
|
||||||
|
///
|
||||||
|
/// À la désactivation, on restaure la configuration d'usine.
|
||||||
|
void setSpacingMode(bool enabled) {
|
||||||
|
setState(() {
|
||||||
|
_showEspacement = enabled;
|
||||||
|
if (!enabled) {
|
||||||
_initRingRadii(forceRecalculate: false);
|
_initRingRadii(forceRecalculate: false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
_notifyChange();
|
_notifyChange();
|
||||||
},
|
}
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Slider pour la taille (toujours visible)
|
/// Applique un nouvel espacement entre les anneaux.
|
||||||
Container(
|
void setSpacingRatio(double value) {
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: Colors.black54,
|
|
||||||
borderRadius: BorderRadius.circular(20),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
const Text('Taille ', style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold)),
|
|
||||||
const Icon(Icons.zoom_out, color: Colors.white, size: 16),
|
|
||||||
Expanded(
|
|
||||||
child: Slider(
|
|
||||||
// SÉCURITÉ : Ouverture mesurée des bornes pour plus de liberté sans débordement incontrôlé
|
|
||||||
value: _radius.clamp(0.3, 0.95),
|
|
||||||
min: 0.3,
|
|
||||||
max: 0.95,
|
|
||||||
activeColor: AppTheme.primaryColor,
|
|
||||||
onChanged: (value) {
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_radius = value;
|
_currentEspacementRatio = value.clamp(minSpacing, maxSpacing);
|
||||||
_innerRadius = _radius * _currentEspacementRatio;
|
|
||||||
// CORRECTION : Si le mode avancé n'est pas coché, on applique la taille pure sans détruire le ratio d'origine
|
|
||||||
_initRingRadii(forceRecalculate: _showEspacement);
|
|
||||||
});
|
|
||||||
_notifyChange();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const Icon(Icons.zoom_in, color: Colors.white, size: 16),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Affichage conditionnel du slider d'espacement orange
|
|
||||||
if (_showEspacement) ...[
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Container(
|
|
||||||
padding: const EdgeInsets.fromLTRB(16, 4, 4, 4),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: Colors.black54,
|
|
||||||
borderRadius: BorderRadius.circular(20),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
const Text('Espacement ', style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold)),
|
|
||||||
const Icon(Icons.compress, color: Colors.white, size: 16),
|
|
||||||
Expanded(
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Slider(
|
|
||||||
value: _currentEspacementRatio,
|
|
||||||
min: 0.01,
|
|
||||||
// SÉCURITÉ : Écartement max bridé à 0.70 pour confiner le dernier cercle
|
|
||||||
max: 0.70,
|
|
||||||
activeColor: Colors.orange,
|
|
||||||
onChanged: (value) {
|
|
||||||
setState(() {
|
|
||||||
_currentEspacementRatio = value;
|
|
||||||
_innerRadius = _radius * _currentEspacementRatio;
|
_innerRadius = _radius * _currentEspacementRatio;
|
||||||
_initRingRadii(forceRecalculate: true);
|
_initRingRadii(forceRecalculate: true);
|
||||||
});
|
});
|
||||||
_notifyChange();
|
_notifyChange();
|
||||||
},
|
}
|
||||||
),
|
|
||||||
),
|
/// Restaure le vrai profil d'usine détecté sur l'image.
|
||||||
const Icon(Icons.expand, color: Colors.white, size: 16),
|
void resetSpacing() {
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
// CORRECTION DU BOUTON RESET : Restaure désormais le vrai profil d'usine de l'IA
|
|
||||||
IconButton(
|
|
||||||
icon: const Icon(Icons.refresh, color: Colors.white70, size: 20),
|
|
||||||
onPressed: () {
|
|
||||||
setState(() {
|
setState(() {
|
||||||
if (_originalRingRadii != null) {
|
if (_originalRingRadii != null) {
|
||||||
_initRingRadii(forceRecalculate: false);
|
_initRingRadii(forceRecalculate: false);
|
||||||
@@ -319,22 +270,6 @@ class TargetCalibrationState extends State<TargetCalibration> {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
_notifyChange();
|
_notifyChange();
|
||||||
},
|
|
||||||
tooltip: 'Réinitialiser l\'espacement',
|
|
||||||
constraints: const BoxConstraints(),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget buildDirectionalControls(BuildContext context, Size size) {
|
Widget buildDirectionalControls(BuildContext context, Size size) {
|
||||||
@@ -348,7 +283,8 @@ class TargetCalibrationState extends State<TargetCalibration> {
|
|||||||
child: Row(
|
child: Row(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
_buildSignLabel('−'),
|
// Réduit la cible d'un pixel.
|
||||||
|
_buildSizeButton('−', () => adjustRadiusByPixels(-1, size)),
|
||||||
const SizedBox(width: 12),
|
const SizedBox(width: 12),
|
||||||
Column(
|
Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
@@ -366,17 +302,27 @@ class TargetCalibrationState extends State<TargetCalibration> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(width: 12),
|
const SizedBox(width: 12),
|
||||||
_buildSignLabel('+'),
|
// Agrandit la cible d'un pixel.
|
||||||
|
_buildSizeButton('+', () => adjustRadiusByPixels(1, size)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Symbole purement décoratif affiché de part et d'autre de la croix.
|
/// Bouton − / + de part et d'autre de la croix : ajuste la TAILLE de la cible.
|
||||||
Widget _buildSignLabel(String text) {
|
Widget _buildSizeButton(String sign, VoidCallback onPressed) {
|
||||||
return Text(
|
return Container(
|
||||||
text,
|
decoration: BoxDecoration(color: Colors.black87, borderRadius: BorderRadius.circular(8)),
|
||||||
style: const TextStyle(color: Colors.white54, fontSize: 28, fontWeight: FontWeight.bold),
|
child: IconButton(
|
||||||
|
icon: Text(
|
||||||
|
sign,
|
||||||
|
style: const TextStyle(color: Colors.white, fontSize: 24, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
onPressed: onPressed,
|
||||||
|
padding: EdgeInsets.zero,
|
||||||
|
constraints: const BoxConstraints(minWidth: 44, minHeight: 44),
|
||||||
|
tooltip: sign == '+' ? 'Agrandir la cible' : 'Réduire la cible',
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -415,7 +361,7 @@ class TargetCalibrationState extends State<TargetCalibration> {
|
|||||||
void _onScaleUpdate(ScaleUpdateDetails details, Size size) {
|
void _onScaleUpdate(ScaleUpdateDetails details, Size size) {
|
||||||
setState(() {
|
setState(() {
|
||||||
if (details.pointerCount == 2) {
|
if (details.pointerCount == 2) {
|
||||||
_radius = (_baseRadiusBeforeScale * details.scale).clamp(0.3, 0.95);
|
_radius = (_baseRadiusBeforeScale * details.scale).clamp(minRadius, maxRadius);
|
||||||
_innerRadius = _radius * _currentEspacementRatio;
|
_innerRadius = _radius * _currentEspacementRatio;
|
||||||
_initRingRadii(forceRecalculate: _showEspacement);
|
_initRingRadii(forceRecalculate: _showEspacement);
|
||||||
} else if (_isDraggingCenter) {
|
} else if (_isDraggingCenter) {
|
||||||
|
|||||||
@@ -53,7 +53,10 @@ class TargetOverlay extends StatelessWidget {
|
|||||||
// Désormais :
|
// Désormais :
|
||||||
// - L'AJOUT d'impact est géré par le GestureDetector parent (analysis_screen).
|
// - L'AJOUT d'impact est géré par le GestureDetector parent (analysis_screen).
|
||||||
// - Seule la SÉLECTION d'un impact existant est gérée ici, via des petites
|
// - Seule la SÉLECTION d'un impact existant est gérée ici, via des petites
|
||||||
// zones de tap localisées (deferToChild) placées sur chaque impact.
|
// zones de tap localisées (deferToChild) placées sur chaque impact —
|
||||||
|
// et UNIQUEMENT si [onShotTapped] est fourni. Sans callback, aucune zone
|
||||||
|
// de tap n'est créée : un tap pile sur un impact traverse jusqu'au parent
|
||||||
|
// au lieu d'être absorbé dans le vide.
|
||||||
return IgnorePointer(
|
return IgnorePointer(
|
||||||
ignoring: false,
|
ignoring: false,
|
||||||
child: CustomPaint(
|
child: CustomPaint(
|
||||||
@@ -73,6 +76,8 @@ class TargetOverlay extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
child: LayoutBuilder(
|
child: LayoutBuilder(
|
||||||
builder: (context, constraints) {
|
builder: (context, constraints) {
|
||||||
|
final onTapped = onShotTapped;
|
||||||
|
if (onTapped == null) return const SizedBox.expand();
|
||||||
return Stack(
|
return Stack(
|
||||||
children: shots.map((shot) {
|
children: shots.map((shot) {
|
||||||
final x = shot.x * constraints.maxWidth;
|
final x = shot.x * constraints.maxWidth;
|
||||||
@@ -89,7 +94,7 @@ class TargetOverlay extends StatelessWidget {
|
|||||||
// Le reste de la surface reste donc disponible pour le
|
// Le reste de la surface reste donc disponible pour le
|
||||||
// pinch/pan de l'InteractiveViewer.
|
// pinch/pan de l'InteractiveViewer.
|
||||||
behavior: HitTestBehavior.deferToChild,
|
behavior: HitTestBehavior.deferToChild,
|
||||||
onTap: () => onShotTapped?.call(shot),
|
onTap: () => onTapped(shot),
|
||||||
child: Container(
|
child: Container(
|
||||||
width: tapSize,
|
width: tapSize,
|
||||||
height: tapSize,
|
height: tapSize,
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ class CropScreen extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _CropScreenState extends State<CropScreen> {
|
class _CropScreenState extends State<CropScreen> {
|
||||||
|
// Bornes et pas de la rotation, partagés par la jauge et les boutons − / +.
|
||||||
|
static const double _minRotation = -15.0;
|
||||||
|
static const double _maxRotation = 15.0;
|
||||||
|
static const double _rotationStep = 0.1;
|
||||||
|
|
||||||
final ImageCropService _cropService = ImageCropService();
|
final ImageCropService _cropService = ImageCropService();
|
||||||
|
|
||||||
// États de transformation
|
// États de transformation
|
||||||
@@ -113,7 +118,7 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: Text(
|
child: Text(
|
||||||
'Alignez et pivotez la cible sur la croix',
|
'Zoomer au maximum puis aligner votre cible',
|
||||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.8), fontSize: 14, fontWeight: FontWeight.w500),
|
style: TextStyle(color: Colors.white.withValues(alpha: 0.8), fontSize: 14, fontWeight: FontWeight.w500),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -155,7 +160,8 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
|
|
||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
|
|
||||||
// CROIX DIRECTIONNELLE — déplace la photo pixel par pixel.
|
// CROIX DIRECTIONNELLE — déplace la photo pixel par pixel,
|
||||||
|
// encadrée par les deux boutons de rotation fine.
|
||||||
_buildDirectionalPad(),
|
_buildDirectionalPad(),
|
||||||
|
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
@@ -180,12 +186,13 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
),
|
),
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
const Icon(Icons.rotate_left, color: Colors.white38, size: 20),
|
// Les icônes de sens de rotation ont rejoint les boutons − / +
|
||||||
|
// de la croix directionnelle.
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Slider(
|
child: Slider(
|
||||||
value: _rotation,
|
value: _rotation,
|
||||||
min: -15.0,
|
min: _minRotation,
|
||||||
max: 15.0,
|
max: _maxRotation,
|
||||||
divisions: 300,
|
divisions: 300,
|
||||||
label: '${_rotation.toStringAsFixed(1)}°',
|
label: '${_rotation.toStringAsFixed(1)}°',
|
||||||
activeColor: const Color(0xFF1A73E8),
|
activeColor: const Color(0xFF1A73E8),
|
||||||
@@ -197,7 +204,6 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const Icon(Icons.rotate_right, color: Colors.white38, size: 20),
|
|
||||||
const SizedBox(width: 4),
|
const SizedBox(width: 4),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: const Icon(Icons.restart_alt, color: Colors.white54, size: 20),
|
icon: const Icon(Icons.restart_alt, color: Colors.white54, size: 20),
|
||||||
@@ -363,12 +369,18 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Croix directionnelle compacte pour déplacer la photo pixel par pixel.
|
// Croix directionnelle compacte pour déplacer la photo pixel par pixel.
|
||||||
// Les symboles « − » et « + » de part et d'autre sont purement décoratifs.
|
// Les boutons « − » et « + » de part et d'autre pivotent l'image de 0,1°.
|
||||||
Widget _buildDirectionalPad() {
|
Widget _buildDirectionalPad() {
|
||||||
return Row(
|
return Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
_buildCropSignLabel('−'),
|
_buildRotationButton(
|
||||||
|
icon: Icons.rotate_left,
|
||||||
|
sign: '−',
|
||||||
|
iconFirst: true,
|
||||||
|
tooltip: 'Pivoter vers la gauche',
|
||||||
|
onPressed: () => _rotateBy(-_rotationStep),
|
||||||
|
),
|
||||||
const SizedBox(width: 10),
|
const SizedBox(width: 10),
|
||||||
Column(
|
Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
@@ -386,7 +398,13 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(width: 10),
|
const SizedBox(width: 10),
|
||||||
_buildCropSignLabel('+'),
|
_buildRotationButton(
|
||||||
|
icon: Icons.rotate_right,
|
||||||
|
sign: '+',
|
||||||
|
iconFirst: false,
|
||||||
|
tooltip: 'Pivoter vers la droite',
|
||||||
|
onPressed: () => _rotateBy(_rotationStep),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -404,10 +422,40 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildCropSignLabel(String text) {
|
// Bouton de rotation : l'icône de sens est accolée au signe − / +.
|
||||||
return Text(
|
Widget _buildRotationButton({
|
||||||
text,
|
required IconData icon,
|
||||||
style: const TextStyle(color: Colors.white54, fontSize: 24, fontWeight: FontWeight.bold),
|
required String sign,
|
||||||
|
required bool iconFirst,
|
||||||
|
required String tooltip,
|
||||||
|
required VoidCallback onPressed,
|
||||||
|
}) {
|
||||||
|
final content = [
|
||||||
|
Icon(icon, color: Colors.white70, size: 20),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
Text(
|
||||||
|
sign,
|
||||||
|
style: const TextStyle(color: Colors.white, fontSize: 22, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
|
||||||
|
return Tooltip(
|
||||||
|
message: tooltip,
|
||||||
|
child: Material(
|
||||||
|
color: Colors.black54,
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: InkWell(
|
||||||
|
onTap: onPressed,
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: iconFirst ? content : content.reversed.toList(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -417,6 +465,17 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Pivote l'image de [delta] degrés, dans les mêmes bornes que la jauge.
|
||||||
|
///
|
||||||
|
/// La valeur est arrondie au dixième pour rester calée sur les crans de la
|
||||||
|
/// jauge (300 divisions sur 30°) et sur l'affichage.
|
||||||
|
void _rotateBy(double delta) {
|
||||||
|
setState(() {
|
||||||
|
final value = (_rotation + delta).clamp(_minRotation, _maxRotation);
|
||||||
|
_rotation = (value * 10).roundToDouble() / 10;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void _onScaleStart(ScaleStartDetails details) {
|
void _onScaleStart(ScaleStartDetails details) {
|
||||||
_baseScale = _scale;
|
_baseScale = _scale;
|
||||||
_startFocalPoint = details.focalPoint;
|
_startFocalPoint = details.focalPoint;
|
||||||
|
|||||||
@@ -7,7 +7,12 @@ import '../../data/repositories/session_repository.dart';
|
|||||||
import 'weapon_detail_screen.dart';
|
import 'weapon_detail_screen.dart';
|
||||||
|
|
||||||
class WeaponListScreen extends StatefulWidget {
|
class WeaponListScreen extends StatefulWidget {
|
||||||
const WeaponListScreen({super.key});
|
/// Incrémenté par la navigation à chaque ouverture de l'onglet Armurerie
|
||||||
|
/// (l'écran est gardé vivant par l'IndexedStack et ne se rafraîchit pas
|
||||||
|
/// seul : sans ça, un import de sauvegarde resterait invisible).
|
||||||
|
final int refreshTick;
|
||||||
|
|
||||||
|
const WeaponListScreen({super.key, this.refreshTick = 0});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<WeaponListScreen> createState() => _WeaponListScreenState();
|
State<WeaponListScreen> createState() => _WeaponListScreenState();
|
||||||
@@ -23,6 +28,14 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
|
|||||||
_loadWeapons();
|
_loadWeapons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(WeaponListScreen oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.refreshTick != widget.refreshTick) {
|
||||||
|
_loadWeapons();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> _loadWeapons() async {
|
Future<void> _loadWeapons() async {
|
||||||
final repository = context.read<SessionRepository>();
|
final repository = context.read<SessionRepository>();
|
||||||
final weapons = await repository.getWeapons();
|
final weapons = await repository.getWeapons();
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
import '../../main_navigation_holder.dart';
|
||||||
import '../../core/constants/app_constants.dart';
|
import '../../core/constants/app_constants.dart';
|
||||||
import '../../core/theme/app_theme.dart';
|
import '../../core/theme/app_theme.dart';
|
||||||
import '../../data/repositories/session_repository.dart';
|
import '../../data/repositories/session_repository.dart';
|
||||||
@@ -14,7 +15,12 @@ import '../session/session_provider.dart';
|
|||||||
import 'widgets/stats_card.dart';
|
import 'widgets/stats_card.dart';
|
||||||
|
|
||||||
class HomeScreen extends StatefulWidget {
|
class HomeScreen extends StatefulWidget {
|
||||||
const HomeScreen({super.key});
|
/// Incrémenté par la navigation à chaque ouverture de l'onglet Accueil
|
||||||
|
/// (l'écran est gardé vivant par l'IndexedStack : sans ça, un import de
|
||||||
|
/// sauvegarde resterait invisible sur le dashboard).
|
||||||
|
final int refreshTick;
|
||||||
|
|
||||||
|
const HomeScreen({super.key, this.refreshTick = 0});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<HomeScreen> createState() => _HomeScreenState();
|
State<HomeScreen> createState() => _HomeScreenState();
|
||||||
@@ -34,6 +40,14 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
_loadStats();
|
_loadStats();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(HomeScreen oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.refreshTick != widget.refreshTick) {
|
||||||
|
_loadStats();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void didChangeDependencies() {
|
void didChangeDependencies() {
|
||||||
super.didChangeDependencies();
|
super.didChangeDependencies();
|
||||||
@@ -230,6 +244,8 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
backgroundColor: AppTheme.successColor,
|
backgroundColor: AppTheme.successColor,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
// Fin de session : on bascule sur les statistiques.
|
||||||
|
openMainTab(mainTabStats);
|
||||||
},
|
},
|
||||||
child: const Text('TERMINER', style: TextStyle(color: Colors.redAccent)),
|
child: const Text('TERMINER', style: TextStyle(color: Colors.redAccent)),
|
||||||
),
|
),
|
||||||
@@ -339,7 +355,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: StatsCard(
|
child: StatsCard(
|
||||||
icon: Icons.emoji_events,
|
icon: Icons.emoji_events,
|
||||||
title: 'Meilleur',
|
title: 'Meilleur score',
|
||||||
value: '${_stats!['bestScore']}',
|
value: '${_stats!['bestScore']}',
|
||||||
color: AppTheme.successColor,
|
color: AppTheme.successColor,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -22,7 +22,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
String? _identityPhrase;
|
String? _identityPhrase;
|
||||||
int? _photoCount;
|
int? _photoCount;
|
||||||
bool _isLoadingStats = false;
|
bool _isLoadingStats = false;
|
||||||
|
bool _isCheckingStatus = false;
|
||||||
bool _isUploadEnabled = false;
|
bool _isUploadEnabled = false;
|
||||||
|
bool _isBanned = false;
|
||||||
|
String? _banReason;
|
||||||
|
String _serverUrl = 'https://backendia.kevlar.cloud';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
@@ -32,11 +36,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
|
|
||||||
Future<void> _loadIdentity() async {
|
Future<void> _loadIdentity() async {
|
||||||
final phrase = await _walletService.getIdentityPhrase();
|
final phrase = await _walletService.getIdentityPhrase();
|
||||||
|
final serverUrl = await _walletService.getServerBaseUrl();
|
||||||
|
final isBanned = await _walletService.isBanned();
|
||||||
|
final banReason = await _walletService.getBanReason();
|
||||||
final isEnabled = await _walletService.isUploadEnabled();
|
final isEnabled = await _walletService.isUploadEnabled();
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_identityPhrase = phrase;
|
_identityPhrase = phrase;
|
||||||
_isUploadEnabled = isEnabled;
|
_serverUrl = serverUrl;
|
||||||
|
_isBanned = isBanned;
|
||||||
|
_banReason = banReason;
|
||||||
|
_isUploadEnabled = isEnabled && !isBanned;
|
||||||
});
|
});
|
||||||
_fetchStats(phrase);
|
_fetchStats(phrase);
|
||||||
}
|
}
|
||||||
@@ -47,19 +57,21 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
try {
|
try {
|
||||||
final phraseBytes = utf8.encode(phrase);
|
final phraseBytes = utf8.encode(phrase);
|
||||||
final walletHash = sha256.convert(phraseBytes).toString();
|
final walletHash = sha256.convert(phraseBytes).toString();
|
||||||
|
final baseUrl = await _walletService.getServerBaseUrl();
|
||||||
|
|
||||||
// Utilise 10.0.2.2 pour l'émulateur Android, sinon localhost
|
final response = await http.get(
|
||||||
final baseUrl = Theme.of(context).platform == TargetPlatform.android
|
Uri.parse('$baseUrl/api/stats/$walletHash'),
|
||||||
? 'http://10.0.2.2:3000'
|
headers: {'X-API-KEY': WalletIdentityService.apiKey},
|
||||||
: 'http://localhost:3000';
|
).timeout(
|
||||||
|
const Duration(seconds: 4),
|
||||||
final response = await http.get(Uri.parse('$baseUrl/api/stats/$walletHash'));
|
);
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
final data = jsonDecode(response.body);
|
final data = jsonDecode(response.body);
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_photoCount = data['stats']['photo_count'] ?? 0;
|
_photoCount = data['stats']['photo_count'] ?? 0;
|
||||||
|
_serverUrl = baseUrl;
|
||||||
_isLoadingStats = false;
|
_isLoadingStats = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -72,6 +84,72 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Action manuelle de l'utilisateur pour vérifier et synchroniser son statut auprès du serveur
|
||||||
|
Future<void> _refreshAccountStatus() async {
|
||||||
|
setState(() => _isCheckingStatus = true);
|
||||||
|
try {
|
||||||
|
final isBanned = await _walletService.syncBanStatus();
|
||||||
|
final banReason = await _walletService.getBanReason();
|
||||||
|
final isEnabled = await _walletService.isUploadEnabled();
|
||||||
|
|
||||||
|
if (_identityPhrase != null) {
|
||||||
|
await _fetchStats(_identityPhrase!);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
_isBanned = isBanned;
|
||||||
|
_banReason = banReason;
|
||||||
|
_isUploadEnabled = isEnabled && !isBanned;
|
||||||
|
_isCheckingStatus = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (isBanned) {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Row(
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.block, color: Colors.white),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Text('Compte toujours suspendu : ${_banReason ?? "Non-respect des règles"}'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
backgroundColor: AppTheme.errorColor,
|
||||||
|
duration: const Duration(seconds: 5),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
const SnackBar(
|
||||||
|
content: Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.check_circle, color: Colors.white),
|
||||||
|
SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Text('Statut actualisé : votre compte est actif et autorisé !'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
backgroundColor: AppTheme.successColor,
|
||||||
|
duration: Duration(seconds: 4),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() => _isCheckingStatus = false);
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text('Impossible de joindre le serveur : $e'),
|
||||||
|
backgroundColor: AppTheme.errorColor,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _copyToClipboard() {
|
void _copyToClipboard() {
|
||||||
if (_identityPhrase != null) {
|
if (_identityPhrase != null) {
|
||||||
Clipboard.setData(ClipboardData(text: _identityPhrase!));
|
Clipboard.setData(ClipboardData(text: _identityPhrase!));
|
||||||
@@ -182,8 +260,34 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _showOptInDisclaimer(bool value) {
|
void _showOptInDisclaimer(bool value) {
|
||||||
|
if (_isBanned) {
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.block, color: AppTheme.errorColor),
|
||||||
|
SizedBox(width: 10),
|
||||||
|
Expanded(child: Text('Programme IA Suspendu')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
content: Text(
|
||||||
|
'Votre participation au programme d\'entraînement a été suspendue par la modération pour le motif suivant :\n\n'
|
||||||
|
'« ${_banReason ?? "Envois non conformes ou inappropriés"} »\n\n'
|
||||||
|
'L\'envoi de photos pour l\'entraînement est définitivement désactivé sur cet appareil.',
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: const Text('Compris'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!value) {
|
if (!value) {
|
||||||
// Si on désactive, pas besoin de disclaimer, on le fait direct.
|
|
||||||
_walletService.setUploadEnabled(false);
|
_walletService.setUploadEnabled(false);
|
||||||
setState(() {
|
setState(() {
|
||||||
_isUploadEnabled = false;
|
_isUploadEnabled = false;
|
||||||
@@ -196,28 +300,69 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
barrierDismissible: false,
|
barrierDismissible: false,
|
||||||
builder: (context) => AlertDialog(
|
builder: (context) => AlertDialog(
|
||||||
title: const Text('Participer à l\'entraînement IA', textAlign: TextAlign.center),
|
title: const Text('Participer à l\'entraînement IA', textAlign: TextAlign.center),
|
||||||
content: const Column(
|
content: SingleChildScrollView(
|
||||||
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Icon(Icons.psychology, size: 48, color: AppTheme.primaryColor),
|
const Center(
|
||||||
SizedBox(height: 16),
|
child: Icon(Icons.psychology, size: 48, color: AppTheme.primaryColor),
|
||||||
Text(
|
),
|
||||||
'En activant cette option, vous acceptez d\'envoyer vos photos de cibles à notre serveur sécurisé.',
|
const SizedBox(height: 16),
|
||||||
|
const Text(
|
||||||
|
'En activant cette option, vous acceptez d\'envoyer vos photos de cibles au serveur d\'entraînement IA.',
|
||||||
style: TextStyle(fontWeight: FontWeight.bold),
|
style: TextStyle(fontWeight: FontWeight.bold),
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
),
|
),
|
||||||
SizedBox(height: 12),
|
const SizedBox(height: 14),
|
||||||
Text(
|
const Text(
|
||||||
'🔒 Anonymat Garanti : L\'envoi est totalement anonymisé. Votre identité est remplacée par un hash cryptographique incassable.',
|
'🔒 Anonymat Garanti : L\'envoi est totalement anonymisé. Votre identité est remplacée par un hash cryptographique.',
|
||||||
style: TextStyle(fontSize: 13),
|
style: TextStyle(fontSize: 13),
|
||||||
),
|
),
|
||||||
SizedBox(height: 12),
|
const SizedBox(height: 10),
|
||||||
Text(
|
const Text(
|
||||||
'🎁 Avantages Futurs : Votre contribution (Hash de Wallet) sera comptabilisée. Lors de la sortie publique de notre IA, les participants actifs recevront des fonctionnalités premium ou des badges exclusifs en récompense !',
|
'🎁 Récompenses : Vos contributions sont enregistrées pour vous donner accès à des fonctionnalités exclusives.',
|
||||||
style: TextStyle(fontSize: 13),
|
style: TextStyle(fontSize: 13),
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 14),
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: AppTheme.errorColor.withValues(alpha: 0.1),
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
border: Border.all(color: AppTheme.errorColor.withValues(alpha: 0.4)),
|
||||||
|
),
|
||||||
|
child: const Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.warning_amber_rounded, color: AppTheme.errorColor, size: 20),
|
||||||
|
SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'Règles strictes & Bannissement',
|
||||||
|
style: TextStyle(
|
||||||
|
color: AppTheme.errorColor,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 13,
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
'Vous vous engagez à n\'envoyer que de réelles cibles de tir conformes. '
|
||||||
|
'Tout envoi de photos non conformes, fausses cibles, images floues ou contenu inapproprié '
|
||||||
|
'entraînera le bannissement immédiat et définitif de votre compte. '
|
||||||
|
'L\'application perdra définitivement la possibilité d\'envoyer des photos.',
|
||||||
|
style: TextStyle(fontSize: 12, height: 1.4),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
actions: [
|
actions: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () => Navigator.pop(context),
|
onPressed: () => Navigator.pop(context),
|
||||||
@@ -238,7 +383,70 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
child: const Text('J\'accepte', style: TextStyle(color: Colors.white)),
|
child: const Text('J\'accepte les règles', style: TextStyle(color: Colors.white)),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _showEditServerUrlDialog() {
|
||||||
|
final urlController = TextEditingController(text: _serverUrl);
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('Adresse du Serveur IA'),
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'Indiquez l\'URL du serveur backend IA :',
|
||||||
|
style: TextStyle(fontSize: 13, color: Colors.grey),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
TextField(
|
||||||
|
controller: urlController,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
hintText: 'https://backendia.kevlar.cloud',
|
||||||
|
border: OutlineInputBorder(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
const Text(
|
||||||
|
'💡 Serveur officiel : https://backendia.kevlar.cloud',
|
||||||
|
style: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
ElevatedButton(
|
||||||
|
style: ElevatedButton.styleFrom(backgroundColor: AppTheme.primaryColor),
|
||||||
|
onPressed: () async {
|
||||||
|
final newUrl = urlController.text.trim();
|
||||||
|
if (newUrl.isNotEmpty) {
|
||||||
|
await _walletService.setServerBaseUrl(newUrl);
|
||||||
|
setState(() {
|
||||||
|
_serverUrl = newUrl;
|
||||||
|
});
|
||||||
|
if (_identityPhrase != null) {
|
||||||
|
_fetchStats(_identityPhrase!);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!context.mounted) return;
|
||||||
|
Navigator.pop(context);
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
const SnackBar(
|
||||||
|
content: Text('Adresse du serveur IA mise à jour'),
|
||||||
|
backgroundColor: AppTheme.successColor,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: const Text('Enregistrer', style: TextStyle(color: Colors.white)),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -363,7 +571,77 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
),
|
),
|
||||||
|
|
||||||
const SizedBox(height: 24),
|
const SizedBox(height: 24),
|
||||||
_buildSectionHeader('Configuration Serveur IA'),
|
_buildSectionHeader('Programme d\'Entraînement IA'),
|
||||||
|
if (_isBanned) ...[
|
||||||
|
Card(
|
||||||
|
elevation: 0,
|
||||||
|
color: AppTheme.errorColor.withValues(alpha: 0.12),
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12.0),
|
||||||
|
side: BorderSide(color: AppTheme.errorColor.withValues(alpha: 0.6), width: 1.5),
|
||||||
|
),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
const Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.block, color: AppTheme.errorColor, size: 22),
|
||||||
|
SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
'Participation au programme IA suspendue',
|
||||||
|
style: TextStyle(
|
||||||
|
color: AppTheme.errorColor,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'Motif : ${_banReason ?? "Envois d'images non appropriées ou fausses cibles."}',
|
||||||
|
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w600),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
const Text(
|
||||||
|
'Suite à des envois non conformes, la possibilité de participer au programme d\'entraînement et d\'envoyer des photos a été révoquée pour cet identifiant.',
|
||||||
|
style: TextStyle(fontSize: 12, color: Colors.grey, height: 1.3),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 14),
|
||||||
|
SizedBox(
|
||||||
|
width: double.infinity,
|
||||||
|
child: ElevatedButton.icon(
|
||||||
|
icon: _isCheckingStatus
|
||||||
|
? const SizedBox(
|
||||||
|
width: 16,
|
||||||
|
height: 16,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
|
||||||
|
)
|
||||||
|
: const Icon(Icons.refresh, size: 18),
|
||||||
|
label: Text(
|
||||||
|
_isCheckingStatus ? 'Vérification...' : 'ACTUALISER MON STATUT',
|
||||||
|
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: AppTheme.errorColor,
|
||||||
|
foregroundColor: Colors.white,
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 12),
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onPressed: _isCheckingStatus ? null : _refreshAccountStatus,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
] else ...[
|
||||||
Card(
|
Card(
|
||||||
elevation: 0,
|
elevation: 0,
|
||||||
color: Colors.transparent,
|
color: Colors.transparent,
|
||||||
@@ -371,7 +649,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
child: SwitchListTile(
|
child: SwitchListTile(
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0),
|
contentPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0),
|
||||||
title: const Text('Participer à l\'entraînement IA', style: TextStyle(fontWeight: FontWeight.w500)),
|
title: const Text('Participer à l\'entraînement IA', style: TextStyle(fontWeight: FontWeight.w500)),
|
||||||
subtitle: const Text('Aidez-nous à améliorer la détection tout en gagnant des avantages', style: TextStyle(fontSize: 12)),
|
subtitle: const Text('Aidez-nous à améliorer la détection (soumis aux règles strictes)', style: TextStyle(fontSize: 12)),
|
||||||
secondary: const Icon(Icons.psychology, color: AppTheme.textPrimary),
|
secondary: const Icon(Icons.psychology, color: AppTheme.textPrimary),
|
||||||
value: _isUploadEnabled,
|
value: _isUploadEnabled,
|
||||||
activeThumbColor: AppTheme.primaryColor,
|
activeThumbColor: AppTheme.primaryColor,
|
||||||
@@ -387,12 +665,16 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
context: context,
|
context: context,
|
||||||
icon: Icons.cloud_outlined,
|
icon: Icons.cloud_outlined,
|
||||||
title: 'Adresse du Serveur IA',
|
title: 'Adresse du Serveur IA',
|
||||||
subtitle: 'http://localhost:3000/api/upload',
|
subtitle: _serverUrl,
|
||||||
onTap: () {
|
onTap: _showEditServerUrlDialog,
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
),
|
||||||
const SnackBar(content: Text('Changement d\'adresse à venir')),
|
if (_isUploadEnabled)
|
||||||
);
|
_buildSettingsTile(
|
||||||
},
|
context: context,
|
||||||
|
icon: Icons.sync,
|
||||||
|
title: 'Actualiser mon statut',
|
||||||
|
subtitle: _isCheckingStatus ? 'Vérification en cours...' : 'Vérifier l\'état du compte auprès du serveur',
|
||||||
|
onTap: _isCheckingStatus ? () {} : _refreshAccountStatus,
|
||||||
),
|
),
|
||||||
if (_isUploadEnabled)
|
if (_isUploadEnabled)
|
||||||
_buildSettingsTile(
|
_buildSettingsTile(
|
||||||
@@ -408,6 +690,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
],
|
||||||
|
|
||||||
const SizedBox(height: 24),
|
const SizedBox(height: 24),
|
||||||
_buildSectionHeader('À propos'),
|
_buildSectionHeader('À propos'),
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
|
import 'dart:io';
|
||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
import 'dart:ui' as ui;
|
import 'dart:ui' as ui;
|
||||||
|
import 'package:file_selector/file_selector.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:fl_chart/fl_chart.dart'; // La librairie pour les courbes
|
import 'package:fl_chart/fl_chart.dart'; // La librairie pour les courbes
|
||||||
|
import 'package:path/path.dart' as p;
|
||||||
|
import 'package:share_plus/share_plus.dart';
|
||||||
import '../../core/widgets/metric_info_button.dart';
|
import '../../core/widgets/metric_info_button.dart';
|
||||||
import '../../data/models/session.dart';
|
import '../../data/models/session.dart';
|
||||||
import '../../data/repositories/session_repository.dart';
|
import '../../data/repositories/session_repository.dart';
|
||||||
|
import '../../services/backup_service.dart';
|
||||||
import '../../services/statistics_service.dart';
|
import '../../services/statistics_service.dart';
|
||||||
|
|
||||||
class StatisticsScreen extends StatefulWidget {
|
class StatisticsScreen extends StatefulWidget {
|
||||||
@@ -43,6 +48,10 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
|
|||||||
bool _showingB = false; // false = on affiche A, true = on affiche B
|
bool _showingB = false; // false = on affiche A, true = on affiche B
|
||||||
bool get _compareMode => _compareA != null && _compareB != null;
|
bool get _compareMode => _compareA != null && _compareB != null;
|
||||||
|
|
||||||
|
// --- Sauvegarde (export/import JSON) ---
|
||||||
|
bool _isBackupBusy = false;
|
||||||
|
final GlobalKey _exportButtonKey = GlobalKey();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
@@ -374,6 +383,11 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
|
|||||||
_buildBiasWarning(),
|
_buildBiasWarning(),
|
||||||
],
|
],
|
||||||
|
|
||||||
|
const SizedBox(height: 25),
|
||||||
|
|
||||||
|
// 5. SAUVEGARDE : export/import de toutes les données
|
||||||
|
_buildBackupSection(),
|
||||||
|
|
||||||
const SizedBox(height: 30),
|
const SizedBox(height: 30),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -882,6 +896,263 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- SAUVEGARDE : EXPORT / IMPORT JSON ---
|
||||||
|
|
||||||
|
Widget _buildBackupSection() {
|
||||||
|
final theme = Theme.of(context);
|
||||||
|
return Container(
|
||||||
|
padding: const EdgeInsets.all(16),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.save_alt, color: theme.textTheme.titleMedium?.color, size: 20),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'Sauvegarde',
|
||||||
|
style: TextStyle(
|
||||||
|
color: theme.textTheme.titleMedium?.color,
|
||||||
|
fontSize: 16,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
'Exporte toutes tes sessions, tes stats et ton armurerie dans un '
|
||||||
|
'fichier JSON, à envoyer où tu veux. L\'import fusionne le fichier '
|
||||||
|
'avec tes données actuelles (rien n\'est effacé).',
|
||||||
|
style: TextStyle(
|
||||||
|
color: theme.textTheme.bodySmall?.color?.withValues(alpha: 0.6),
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: ElevatedButton.icon(
|
||||||
|
key: _exportButtonKey,
|
||||||
|
onPressed: _isBackupBusy ? null : _exportBackup,
|
||||||
|
icon: const Icon(Icons.ios_share, size: 18),
|
||||||
|
label: const Text('Exporter'),
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 14),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: OutlinedButton.icon(
|
||||||
|
onPressed: _isBackupBusy ? null : _importBackup,
|
||||||
|
icon: const Icon(Icons.file_download_outlined, size: 18),
|
||||||
|
label: const Text('Importer'),
|
||||||
|
style: OutlinedButton.styleFrom(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 14),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (_isBackupBusy) ...[
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
const LinearProgressIndicator(minHeight: 2),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
BackupService _backupService() =>
|
||||||
|
BackupService(repository: context.read<SessionRepository>());
|
||||||
|
|
||||||
|
Future<void> _exportBackup() async {
|
||||||
|
final includeImages = await _askIncludeImages();
|
||||||
|
if (includeImages == null || !mounted) return;
|
||||||
|
|
||||||
|
setState(() => _isBackupBusy = true);
|
||||||
|
try {
|
||||||
|
final file = await _backupService().exportToFile(
|
||||||
|
includeImages: includeImages,
|
||||||
|
);
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
// sharePositionOrigin : obligatoire pour l'iPad, ignoré ailleurs.
|
||||||
|
final box = _exportButtonKey.currentContext?.findRenderObject() as RenderBox?;
|
||||||
|
final origin = box != null && box.hasSize
|
||||||
|
? box.localToGlobal(Offset.zero) & box.size
|
||||||
|
: null;
|
||||||
|
|
||||||
|
await SharePlus.instance.share(
|
||||||
|
ShareParams(
|
||||||
|
files: [XFile(file.path, mimeType: 'application/json')],
|
||||||
|
fileNameOverrides: [p.basename(file.path)],
|
||||||
|
subject: 'Sauvegarde IMPACT',
|
||||||
|
text: 'Sauvegarde de mes sessions de tir (${p.basename(file.path)})',
|
||||||
|
sharePositionOrigin: origin,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
_showMessage('Export impossible : $e', isError: true);
|
||||||
|
} finally {
|
||||||
|
if (mounted) setState(() => _isBackupBusy = false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Les photos de cibles alourdissent énormément le fichier : on laisse le
|
||||||
|
/// choix entre une sauvegarde légère (données seules) et une sauvegarde
|
||||||
|
/// complète (photos encodées dans le JSON).
|
||||||
|
Future<bool?> _askIncludeImages() {
|
||||||
|
var includeImages = false;
|
||||||
|
return showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => StatefulBuilder(
|
||||||
|
builder: (context, setDialogState) => AlertDialog(
|
||||||
|
title: const Text('Exporter mes données'),
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'Le fichier contiendra toutes tes sessions (cibles, impacts, '
|
||||||
|
'scores), tes statistiques et ton armurerie.',
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
SwitchListTile(
|
||||||
|
contentPadding: EdgeInsets.zero,
|
||||||
|
value: includeImages,
|
||||||
|
onChanged: (v) => setDialogState(() => includeImages = v),
|
||||||
|
title: const Text('Inclure les photos des cibles'),
|
||||||
|
subtitle: const Text(
|
||||||
|
'Sauvegarde complète, mais fichier beaucoup plus lourd.',
|
||||||
|
style: TextStyle(fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: () => Navigator.pop(context, includeImages),
|
||||||
|
child: const Text('Exporter'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _importBackup() async {
|
||||||
|
const jsonGroup = XTypeGroup(
|
||||||
|
label: 'Sauvegarde IMPACT (.json)',
|
||||||
|
extensions: ['json'],
|
||||||
|
// Android renvoie parfois un type générique pour un .json : on accepte
|
||||||
|
// large, le contenu est validé à la lecture de toute façon.
|
||||||
|
mimeTypes: ['application/json', 'text/plain', 'application/octet-stream'],
|
||||||
|
uniformTypeIdentifiers: ['public.json', 'public.text'],
|
||||||
|
);
|
||||||
|
|
||||||
|
final picked = await openFile(acceptedTypeGroups: const [jsonGroup]);
|
||||||
|
if (picked == null || !mounted) return;
|
||||||
|
|
||||||
|
setState(() => _isBackupBusy = true);
|
||||||
|
try {
|
||||||
|
final service = _backupService();
|
||||||
|
final preview = await service.readBackup(File(picked.path));
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
final confirmed = await _confirmImport(preview);
|
||||||
|
if (confirmed != true || !mounted) return;
|
||||||
|
|
||||||
|
final result = await service.applyBackup(preview);
|
||||||
|
await _loadStatistics();
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
final details = [
|
||||||
|
'${result.sessions} session(s)',
|
||||||
|
'${result.weapons} arme(s)',
|
||||||
|
if (result.maintenance > 0) '${result.maintenance} entretien(s)',
|
||||||
|
if (result.images > 0) '${result.images} photo(s)',
|
||||||
|
].join(' · ');
|
||||||
|
_showMessage(
|
||||||
|
result.errors.isEmpty
|
||||||
|
? 'Import terminé : $details'
|
||||||
|
: 'Import terminé : $details — ${result.errors.length} entrée(s) ignorée(s)',
|
||||||
|
);
|
||||||
|
} on BackupFormatException catch (e) {
|
||||||
|
_showMessage(e.message, isError: true);
|
||||||
|
} catch (e) {
|
||||||
|
_showMessage('Import impossible : $e', isError: true);
|
||||||
|
} finally {
|
||||||
|
if (mounted) setState(() => _isBackupBusy = false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool?> _confirmImport(BackupPreview preview) {
|
||||||
|
final date = preview.exportedAt;
|
||||||
|
final dateLabel = date == null
|
||||||
|
? null
|
||||||
|
: '${date.day.toString().padLeft(2, '0')}/'
|
||||||
|
'${date.month.toString().padLeft(2, '0')}/${date.year}';
|
||||||
|
|
||||||
|
return showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('Importer cette sauvegarde ?'),
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
if (dateLabel != null) Text('Exportée le $dateLabel'),
|
||||||
|
if (dateLabel != null) const SizedBox(height: 8),
|
||||||
|
Text('• ${preview.sessionCount} session(s)'),
|
||||||
|
Text('• ${preview.targetCount} cible(s), ${preview.shotCount} impact(s)'),
|
||||||
|
Text('• ${preview.weaponCount} arme(s), ${preview.maintenanceCount} entretien(s)'),
|
||||||
|
Text(preview.hasImages
|
||||||
|
? '• Photos des cibles incluses'
|
||||||
|
: '• Sans photos de cibles'),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
const Text(
|
||||||
|
'Les données actuelles sont conservées. Une session déjà '
|
||||||
|
'présente est simplement mise à jour.',
|
||||||
|
style: TextStyle(fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: () => Navigator.pop(context, true),
|
||||||
|
child: const Text('Importer'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _showMessage(String message, {bool isError = false}) {
|
||||||
|
if (!mounted) return;
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(message),
|
||||||
|
backgroundColor: isError ? Colors.red.shade700 : null,
|
||||||
|
duration: const Duration(seconds: 4),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _HeatMapPainter extends CustomPainter {
|
class _HeatMapPainter extends CustomPainter {
|
||||||
|
|||||||
@@ -5,6 +5,23 @@ import 'features/statistics/statistics_screen.dart';
|
|||||||
import 'features/garage/weapon_list_screen.dart';
|
import 'features/garage/weapon_list_screen.dart';
|
||||||
import 'core/theme/app_theme.dart';
|
import 'core/theme/app_theme.dart';
|
||||||
|
|
||||||
|
/// Index des onglets de la barre de navigation principale.
|
||||||
|
const int mainTabHome = 0;
|
||||||
|
const int mainTabHistory = 1;
|
||||||
|
const int mainTabStats = 2;
|
||||||
|
const int mainTabGarage = 3;
|
||||||
|
|
||||||
|
/// Clé du holder : permet de piloter l'onglet actif depuis n'importe quel
|
||||||
|
/// écran (ex. fin de session -> onglet Stats).
|
||||||
|
final GlobalKey<State<MainNavigationHolder>> mainNavKey =
|
||||||
|
GlobalKey<State<MainNavigationHolder>>();
|
||||||
|
|
||||||
|
/// Ouvre l'onglet [index] de la navigation principale.
|
||||||
|
void openMainTab(int index) {
|
||||||
|
final state = mainNavKey.currentState;
|
||||||
|
if (state is _MainNavigationHolderState) state.selectTab(index);
|
||||||
|
}
|
||||||
|
|
||||||
class MainNavigationHolder extends StatefulWidget {
|
class MainNavigationHolder extends StatefulWidget {
|
||||||
const MainNavigationHolder({super.key});
|
const MainNavigationHolder({super.key});
|
||||||
|
|
||||||
@@ -20,22 +37,27 @@ class _MainNavigationHolderState extends State<MainNavigationHolder> {
|
|||||||
// rafraîchissent pas seuls).
|
// rafraîchissent pas seuls).
|
||||||
int _statsTick = 0;
|
int _statsTick = 0;
|
||||||
int _historyTick = 0;
|
int _historyTick = 0;
|
||||||
|
int _homeTick = 0;
|
||||||
|
int _garageTick = 0;
|
||||||
|
|
||||||
void _onItemTapped(int index) {
|
void selectTab(int index) {
|
||||||
|
if (!mounted) return;
|
||||||
setState(() {
|
setState(() {
|
||||||
_selectedIndex = index;
|
_selectedIndex = index;
|
||||||
if (index == 1) _historyTick++;
|
if (index == mainTabHome) _homeTick++;
|
||||||
if (index == 2) _statsTick++;
|
if (index == mainTabHistory) _historyTick++;
|
||||||
|
if (index == mainTabStats) _statsTick++;
|
||||||
|
if (index == mainTabGarage) _garageTick++;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final screens = [
|
final screens = [
|
||||||
const HomeScreen(),
|
HomeScreen(refreshTick: _homeTick),
|
||||||
HistoryScreen(refreshTick: _historyTick),
|
HistoryScreen(refreshTick: _historyTick),
|
||||||
StatisticsScreen(refreshTick: _statsTick),
|
StatisticsScreen(refreshTick: _statsTick),
|
||||||
const WeaponListScreen(),
|
WeaponListScreen(refreshTick: _garageTick),
|
||||||
];
|
];
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: IndexedStack(
|
body: IndexedStack(
|
||||||
@@ -54,7 +76,7 @@ class _MainNavigationHolderState extends State<MainNavigationHolder> {
|
|||||||
),
|
),
|
||||||
child: BottomNavigationBar(
|
child: BottomNavigationBar(
|
||||||
currentIndex: _selectedIndex,
|
currentIndex: _selectedIndex,
|
||||||
onTap: _onItemTapped,
|
onTap: selectTab,
|
||||||
type: BottomNavigationBarType.fixed,
|
type: BottomNavigationBarType.fixed,
|
||||||
backgroundColor: Theme.of(context).cardColor,
|
backgroundColor: Theme.of(context).cardColor,
|
||||||
selectedItemColor: AppTheme.primaryColor,
|
selectedItemColor: AppTheme.primaryColor,
|
||||||
|
|||||||
@@ -8,16 +8,62 @@ import '../data/models/shot.dart';
|
|||||||
import '../data/models/target_type.dart';
|
import '../data/models/target_type.dart';
|
||||||
import 'wallet_identity_service.dart';
|
import 'wallet_identity_service.dart';
|
||||||
|
|
||||||
class AiExportService {
|
/// Résultat détaillé de l'exportation vers le serveur IA
|
||||||
// Utilise 10.0.2.2 pour l'émulateur Android, sinon localhost.
|
class AiExportResult {
|
||||||
// Pour un appareil physique, il faudra utiliser l'IP locale du PC (ex: 192.168.1.X).
|
final bool isSuccess;
|
||||||
static String get _defaultApiUrl {
|
final String code;
|
||||||
if (Platform.isAndroid) {
|
final String message;
|
||||||
return 'http://10.0.2.2:3000/api/upload';
|
final String? reason;
|
||||||
}
|
final bool isBanned;
|
||||||
return 'http://localhost:3000/api/upload';
|
final Map<String, dynamic>? targetValidation;
|
||||||
|
|
||||||
|
AiExportResult({
|
||||||
|
required this.isSuccess,
|
||||||
|
required this.code,
|
||||||
|
required this.message,
|
||||||
|
this.reason,
|
||||||
|
this.isBanned = false,
|
||||||
|
this.targetValidation,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory AiExportResult.success({
|
||||||
|
String? message,
|
||||||
|
Map<String, dynamic>? targetValidation,
|
||||||
|
}) {
|
||||||
|
return AiExportResult(
|
||||||
|
isSuccess: true,
|
||||||
|
code: 'UPLOAD_SUCCESS',
|
||||||
|
message: message ?? 'Export réussi vers le serveur IA !',
|
||||||
|
targetValidation: targetValidation,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
factory AiExportResult.banned({
|
||||||
|
String? reason,
|
||||||
|
String? message,
|
||||||
|
}) {
|
||||||
|
return AiExportResult(
|
||||||
|
isSuccess: false,
|
||||||
|
code: 'WALLET_BANNED',
|
||||||
|
isBanned: true,
|
||||||
|
reason: reason,
|
||||||
|
message: message ?? 'Votre participation au programme d\'entraînement IA a été suspendue par la modération.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
factory AiExportResult.error({
|
||||||
|
String? code,
|
||||||
|
required String message,
|
||||||
|
}) {
|
||||||
|
return AiExportResult(
|
||||||
|
isSuccess: false,
|
||||||
|
code: code ?? 'UPLOAD_ERROR',
|
||||||
|
message: message,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AiExportService {
|
||||||
/// Extrait les informations de l'appareil
|
/// Extrait les informations de l'appareil
|
||||||
Future<Map<String, dynamic>> _getDeviceInfo() async {
|
Future<Map<String, dynamic>> _getDeviceInfo() async {
|
||||||
final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
|
final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
|
||||||
@@ -45,7 +91,7 @@ class AiExportService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Exporte l'image et les données de plotting vers le serveur
|
/// Exporte l'image et les données de plotting vers le serveur
|
||||||
Future<bool> exportData({
|
Future<AiExportResult> exportData({
|
||||||
required String imagePath,
|
required String imagePath,
|
||||||
required String sessionId,
|
required String sessionId,
|
||||||
required TargetType targetType,
|
required TargetType targetType,
|
||||||
@@ -58,23 +104,24 @@ class AiExportService {
|
|||||||
String? apiUrl,
|
String? apiUrl,
|
||||||
}) async {
|
}) async {
|
||||||
try {
|
try {
|
||||||
final url = Uri.parse(apiUrl ?? _defaultApiUrl);
|
final walletService = WalletIdentityService();
|
||||||
|
final baseUrl = await walletService.getServerBaseUrl();
|
||||||
|
final effectiveUrl = apiUrl ?? '$baseUrl/api/upload';
|
||||||
|
final url = Uri.parse(effectiveUrl);
|
||||||
final request = http.MultipartRequest('POST', url);
|
final request = http.MultipartRequest('POST', url);
|
||||||
|
request.headers['X-API-KEY'] = WalletIdentityService.apiKey;
|
||||||
|
|
||||||
// 1. Prepare image
|
// 1. Prepare image
|
||||||
final file = File(imagePath);
|
final file = File(imagePath);
|
||||||
if (!await file.exists()) {
|
if (!await file.exists()) {
|
||||||
throw Exception('Le fichier image n\'existe pas');
|
return AiExportResult.error(
|
||||||
|
code: 'FILE_NOT_FOUND',
|
||||||
|
message: 'Le fichier image cible est introuvable.',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read image metadata (approximate dimensions since decoding image can be heavy)
|
|
||||||
// On the frontend we usually have aspectRatio, here we use generic values if not available.
|
|
||||||
final deviceData = await _getDeviceInfo();
|
final deviceData = await _getDeviceInfo();
|
||||||
|
|
||||||
// We approximate the target corners from center and radius
|
|
||||||
// radius is relative (0 to 1). We need image width/height to get pixels.
|
|
||||||
// But we can just pass relative corners as well, or a normalized bounding box.
|
|
||||||
// Let's create normalized corners (0 to 1).
|
|
||||||
final corners = [
|
final corners = [
|
||||||
{"norm_x": targetCenterX - targetRadius, "norm_y": targetCenterY - targetRadius},
|
{"norm_x": targetCenterX - targetRadius, "norm_y": targetCenterY - targetRadius},
|
||||||
{"norm_x": targetCenterX + targetRadius, "norm_y": targetCenterY - targetRadius},
|
{"norm_x": targetCenterX + targetRadius, "norm_y": targetCenterY - targetRadius},
|
||||||
@@ -98,7 +145,6 @@ class AiExportService {
|
|||||||
}).toList();
|
}).toList();
|
||||||
|
|
||||||
// Get and hash the wallet identity
|
// Get and hash the wallet identity
|
||||||
final walletService = WalletIdentityService();
|
|
||||||
final phrase = await walletService.getIdentityPhrase();
|
final phrase = await walletService.getIdentityPhrase();
|
||||||
final phraseBytes = utf8.encode(phrase);
|
final phraseBytes = utf8.encode(phrase);
|
||||||
final walletHash = sha256.convert(phraseBytes).toString();
|
final walletHash = sha256.convert(phraseBytes).toString();
|
||||||
@@ -113,7 +159,6 @@ class AiExportService {
|
|||||||
"type": targetType.name,
|
"type": targetType.name,
|
||||||
"distance_meters": distanceMeters,
|
"distance_meters": distanceMeters,
|
||||||
"weapon": weaponName,
|
"weapon": weaponName,
|
||||||
// The backend could extract exact width/height from the image.
|
|
||||||
},
|
},
|
||||||
"plotting": {
|
"plotting": {
|
||||||
"target_corners": corners,
|
"target_corners": corners,
|
||||||
@@ -121,29 +166,61 @@ class AiExportService {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Add fields to request
|
|
||||||
request.fields['plotting'] = jsonEncode(plottingJson);
|
request.fields['plotting'] = jsonEncode(plottingJson);
|
||||||
|
|
||||||
// Add file
|
|
||||||
request.files.add(
|
request.files.add(
|
||||||
await http.MultipartFile.fromPath('photo', imagePath),
|
await http.MultipartFile.fromPath('photo', imagePath),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Send request
|
final streamedResponse = await request.send().timeout(
|
||||||
final response = await request.send();
|
const Duration(seconds: 15),
|
||||||
|
onTimeout: () => throw Exception('Délai d\'attente dépassé (timeout)'),
|
||||||
|
);
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
final responseBody = await streamedResponse.stream.bytesToString();
|
||||||
final responseData = await response.stream.bytesToString();
|
Map<String, dynamic> responseJson = {};
|
||||||
debugPrint('Export réussi: $responseData');
|
try {
|
||||||
return true;
|
responseJson = jsonDecode(responseBody);
|
||||||
|
} catch (_) {}
|
||||||
|
|
||||||
|
final statusCode = streamedResponse.statusCode;
|
||||||
|
|
||||||
|
if (statusCode == 200) {
|
||||||
|
debugPrint('Export réussi: $responseBody');
|
||||||
|
return AiExportResult.success(
|
||||||
|
message: responseJson['message'] ?? 'Photo et données exportées avec succès.',
|
||||||
|
targetValidation: responseJson['target_validation'] as Map<String, dynamic>?,
|
||||||
|
);
|
||||||
|
} else if (statusCode == 403 || responseJson['code'] == 'WALLET_BANNED') {
|
||||||
|
final reason = responseJson['reason'] ?? 'Non-respect des règles de contribution';
|
||||||
|
debugPrint('Export rejeté (banni): $reason');
|
||||||
|
// Persister le bannissement localement et couper l'envoi de photos
|
||||||
|
await walletService.setBanned(true, reason: reason);
|
||||||
|
return AiExportResult.banned(
|
||||||
|
reason: reason,
|
||||||
|
message: responseJson['error'] ?? 'Votre wallet a été suspendu par la modération.',
|
||||||
|
);
|
||||||
|
} else if (statusCode == 400) {
|
||||||
|
return AiExportResult.error(
|
||||||
|
code: responseJson['code'] ?? 'BAD_REQUEST',
|
||||||
|
message: responseJson['error'] ?? 'Requête d\'export invalide.',
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
final errorData = await response.stream.bytesToString();
|
return AiExportResult.error(
|
||||||
debugPrint('Erreur d\'export: ${response.statusCode} - $errorData');
|
code: responseJson['code'] ?? 'SERVER_ERROR',
|
||||||
return false;
|
message: responseJson['error'] ?? 'Erreur serveur ($statusCode).',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
} on SocketException {
|
||||||
|
return AiExportResult.error(
|
||||||
|
code: 'NETWORK_ERROR',
|
||||||
|
message: 'Impossible de joindre le serveur IA. Vérifiez l\'adresse IP ou votre connexion.',
|
||||||
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
debugPrint('Exception lors de l\'export: $e');
|
debugPrint('Exception lors de l\'export: $e');
|
||||||
return false;
|
return AiExportResult.error(
|
||||||
|
code: 'UNKNOWN_ERROR',
|
||||||
|
message: 'Erreur lors de l\'export: $e',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,426 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:path/path.dart' as p;
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
|
||||||
|
import '../data/models/maintenance.dart';
|
||||||
|
import '../data/models/session.dart';
|
||||||
|
import '../data/models/shot.dart';
|
||||||
|
import '../data/models/target_analysis.dart';
|
||||||
|
import '../data/models/weapon.dart';
|
||||||
|
import '../data/repositories/session_repository.dart';
|
||||||
|
import 'statistics_service.dart';
|
||||||
|
|
||||||
|
/// Résumé d'un fichier de sauvegarde, affiché avant de confirmer un import.
|
||||||
|
class BackupPreview {
|
||||||
|
final int sessionCount;
|
||||||
|
final int targetCount;
|
||||||
|
final int shotCount;
|
||||||
|
final int weaponCount;
|
||||||
|
final int maintenanceCount;
|
||||||
|
final bool hasImages;
|
||||||
|
final DateTime? exportedAt;
|
||||||
|
final Map<String, dynamic> raw;
|
||||||
|
|
||||||
|
const BackupPreview({
|
||||||
|
required this.sessionCount,
|
||||||
|
required this.targetCount,
|
||||||
|
required this.shotCount,
|
||||||
|
required this.weaponCount,
|
||||||
|
required this.maintenanceCount,
|
||||||
|
required this.hasImages,
|
||||||
|
required this.exportedAt,
|
||||||
|
required this.raw,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Résultat d'un import : ce qui a réellement été écrit en base.
|
||||||
|
class ImportResult {
|
||||||
|
final int sessions;
|
||||||
|
final int weapons;
|
||||||
|
final int maintenance;
|
||||||
|
final int images;
|
||||||
|
final List<String> errors;
|
||||||
|
|
||||||
|
const ImportResult({
|
||||||
|
required this.sessions,
|
||||||
|
required this.weapons,
|
||||||
|
required this.maintenance,
|
||||||
|
required this.images,
|
||||||
|
required this.errors,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Erreur « propre » d'import : message directement affichable à l'utilisateur.
|
||||||
|
class BackupFormatException implements Exception {
|
||||||
|
final String message;
|
||||||
|
BackupFormatException(this.message);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => message;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Import / export de l'intégralité des données de l'app dans un fichier JSON :
|
||||||
|
/// sessions (avec cibles, impacts et calibration), armurerie (armes +
|
||||||
|
/// maintenance) et un instantané des statistiques calculées.
|
||||||
|
///
|
||||||
|
/// Les statistiques ne sont pas réimportées : elles sont recalculées à partir
|
||||||
|
/// des sessions. Elles figurent dans le fichier pour pouvoir être lues telles
|
||||||
|
/// quelles (analyse externe, IA, tableur).
|
||||||
|
class BackupService {
|
||||||
|
static const String formatId = 'impact.backup';
|
||||||
|
static const int formatVersion = 1;
|
||||||
|
|
||||||
|
final SessionRepository _repository;
|
||||||
|
final StatisticsService _statisticsService;
|
||||||
|
|
||||||
|
BackupService({
|
||||||
|
required SessionRepository repository,
|
||||||
|
StatisticsService? statisticsService,
|
||||||
|
}) : _repository = repository,
|
||||||
|
_statisticsService = statisticsService ?? StatisticsService();
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- EXPORT
|
||||||
|
|
||||||
|
/// Construit le fichier de sauvegarde et renvoie le fichier écrit dans le
|
||||||
|
/// dossier temporaire, prêt à être passé à la feuille de partage du système.
|
||||||
|
Future<File> exportToFile({bool includeImages = false}) async {
|
||||||
|
final json = await buildBackupJson(includeImages: includeImages);
|
||||||
|
|
||||||
|
final tempDir = await getTemporaryDirectory();
|
||||||
|
final file = File(p.join(tempDir.path, _buildFileName()));
|
||||||
|
await file.writeAsString(
|
||||||
|
const JsonEncoder.withIndent(' ').convert(json),
|
||||||
|
flush: true,
|
||||||
|
);
|
||||||
|
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
|
||||||
|
String _buildFileName() {
|
||||||
|
final now = DateTime.now();
|
||||||
|
String two(int v) => v.toString().padLeft(2, '0');
|
||||||
|
return 'impact_sauvegarde_${now.year}-${two(now.month)}-${two(now.day)}'
|
||||||
|
'_${two(now.hour)}${two(now.minute)}.json';
|
||||||
|
}
|
||||||
|
|
||||||
|
@visibleForTesting
|
||||||
|
Future<Map<String, dynamic>> buildBackupJson({
|
||||||
|
bool includeImages = false,
|
||||||
|
}) async {
|
||||||
|
final sessions = await _repository.getAllSessions();
|
||||||
|
final weapons = await _repository.getWeapons();
|
||||||
|
final maintenance = await _repository.getAllMaintenance();
|
||||||
|
|
||||||
|
// Maintenance regroupée par arme : une arme reste autonome dans le fichier.
|
||||||
|
final maintenanceByWeapon = <String, List<MaintenanceEntry>>{};
|
||||||
|
for (final entry in maintenance) {
|
||||||
|
(maintenanceByWeapon[entry.weaponId] ??= []).add(entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
var totalTargets = 0;
|
||||||
|
var totalShots = 0;
|
||||||
|
final sessionsJson = <Map<String, dynamic>>[];
|
||||||
|
for (final session in sessions) {
|
||||||
|
final analysesJson = <Map<String, dynamic>>[];
|
||||||
|
for (final analysis in session.analyses) {
|
||||||
|
totalTargets++;
|
||||||
|
totalShots += analysis.shots.length;
|
||||||
|
analysesJson.add(await _analysisToJson(analysis, includeImages));
|
||||||
|
}
|
||||||
|
sessionsJson.add({
|
||||||
|
...session.toMap(),
|
||||||
|
'analyses': analysesJson,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
'format': formatId,
|
||||||
|
'version': formatVersion,
|
||||||
|
'app': 'bully',
|
||||||
|
'exported_at': DateTime.now().toIso8601String(),
|
||||||
|
'includes_images': includeImages,
|
||||||
|
'counts': {
|
||||||
|
'sessions': sessions.length,
|
||||||
|
'targets': totalTargets,
|
||||||
|
'shots': totalShots,
|
||||||
|
'weapons': weapons.length,
|
||||||
|
'maintenance': maintenance.length,
|
||||||
|
},
|
||||||
|
'statistics': _statisticsToJson(sessions),
|
||||||
|
'weapons': weapons
|
||||||
|
.map((w) => {
|
||||||
|
...w.toMap(),
|
||||||
|
'maintenance': (maintenanceByWeapon[w.id] ?? [])
|
||||||
|
.map((e) => e.toMap())
|
||||||
|
.toList(),
|
||||||
|
})
|
||||||
|
.toList(),
|
||||||
|
'sessions': sessionsJson,
|
||||||
|
// Maintenance orpheline (arme supprimée) : conservée pour ne rien perdre.
|
||||||
|
'orphan_maintenance': maintenance
|
||||||
|
.where((e) => !weapons.any((w) => w.id == e.weaponId))
|
||||||
|
.map((e) => e.toMap())
|
||||||
|
.toList(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Map<String, dynamic>> _analysisToJson(
|
||||||
|
TargetAnalysis analysis,
|
||||||
|
bool includeImages,
|
||||||
|
) async {
|
||||||
|
final json = <String, dynamic>{
|
||||||
|
...analysis.toMap(),
|
||||||
|
'shots': analysis.shots.map((s) => s.toMap()).toList(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (includeImages) {
|
||||||
|
try {
|
||||||
|
final file = File(analysis.imagePath);
|
||||||
|
if (await file.exists()) {
|
||||||
|
json['image_extension'] = p.extension(analysis.imagePath);
|
||||||
|
json['image_base64'] = base64Encode(await file.readAsBytes());
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// Une photo illisible ne doit pas faire échouer toute la sauvegarde.
|
||||||
|
debugPrint('Sauvegarde : image ignorée (${analysis.id}) : $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return json;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> _statisticsToJson(List<Session> sessions) {
|
||||||
|
final stats = _statisticsService.calculateStatistics(
|
||||||
|
sessions,
|
||||||
|
period: StatsPeriod.all,
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
'total_shots': stats.totalShots,
|
||||||
|
'total_score': stats.totalScore,
|
||||||
|
'average_score': stats.avgScore,
|
||||||
|
'max_score': stats.maxScore,
|
||||||
|
'min_score': stats.minScore,
|
||||||
|
'precision': {
|
||||||
|
'avg_distance_from_center': stats.precision.avgDistanceFromCenter,
|
||||||
|
'grouping_diameter': stats.precision.groupingDiameter,
|
||||||
|
'precision_score': stats.precision.precisionScore,
|
||||||
|
'consistency_score': stats.precision.consistencyScore,
|
||||||
|
},
|
||||||
|
'std_dev': {
|
||||||
|
'x': stats.stdDev.stdDevX,
|
||||||
|
'y': stats.stdDev.stdDevY,
|
||||||
|
'radial': stats.stdDev.stdDevRadial,
|
||||||
|
'score': stats.stdDev.stdDevScore,
|
||||||
|
'mean_x': stats.stdDev.meanX,
|
||||||
|
'mean_y': stats.stdDev.meanY,
|
||||||
|
'mean_score': stats.stdDev.meanScore,
|
||||||
|
},
|
||||||
|
'regional': {
|
||||||
|
'quadrants': stats.regional.quadrantDistribution,
|
||||||
|
'sectors': stats.regional.sectorDistribution,
|
||||||
|
'dominant_direction': stats.regional.dominantDirection,
|
||||||
|
'bias_x': stats.regional.biasX,
|
||||||
|
'bias_y': stats.regional.biasY,
|
||||||
|
},
|
||||||
|
'heat_map': {
|
||||||
|
'grid_size': stats.heatMap.gridSize,
|
||||||
|
'max_shots_in_zone': stats.heatMap.maxShotsInZone,
|
||||||
|
'zones': [
|
||||||
|
for (final row in stats.heatMap.zones)
|
||||||
|
for (final zone in row)
|
||||||
|
{
|
||||||
|
'row': zone.row,
|
||||||
|
'col': zone.col,
|
||||||
|
'shot_count': zone.shotCount,
|
||||||
|
'intensity': zone.intensity,
|
||||||
|
'avg_score': zone.avgScore,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- IMPORT
|
||||||
|
|
||||||
|
/// Lit et valide un fichier de sauvegarde sans rien écrire en base.
|
||||||
|
Future<BackupPreview> readBackup(File file) async {
|
||||||
|
late final dynamic decoded;
|
||||||
|
try {
|
||||||
|
decoded = jsonDecode(await file.readAsString());
|
||||||
|
} catch (e) {
|
||||||
|
throw BackupFormatException(
|
||||||
|
'Fichier illisible : ce n\'est pas un JSON valide.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (decoded is! Map<String, dynamic>) {
|
||||||
|
throw BackupFormatException('Fichier illisible : format inattendu.');
|
||||||
|
}
|
||||||
|
if (decoded['format'] != formatId) {
|
||||||
|
throw BackupFormatException(
|
||||||
|
'Ce fichier n\'est pas une sauvegarde IMPACT.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final version = (decoded['version'] as num?)?.toInt() ?? 0;
|
||||||
|
if (version > formatVersion) {
|
||||||
|
throw BackupFormatException(
|
||||||
|
'Sauvegarde créée par une version plus récente de l\'application '
|
||||||
|
'(format $version). Mettez l\'app à jour pour l\'importer.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final sessions = _asList(decoded['sessions']);
|
||||||
|
final weapons = _asList(decoded['weapons']);
|
||||||
|
|
||||||
|
var targets = 0;
|
||||||
|
var shots = 0;
|
||||||
|
var hasImages = false;
|
||||||
|
for (final session in sessions) {
|
||||||
|
for (final analysis in _asList(session['analyses'])) {
|
||||||
|
targets++;
|
||||||
|
shots += _asList(analysis['shots']).length;
|
||||||
|
if (analysis['image_base64'] != null) hasImages = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var maintenance = _asList(decoded['orphan_maintenance']).length;
|
||||||
|
for (final weapon in weapons) {
|
||||||
|
maintenance += _asList(weapon['maintenance']).length;
|
||||||
|
}
|
||||||
|
|
||||||
|
return BackupPreview(
|
||||||
|
sessionCount: sessions.length,
|
||||||
|
targetCount: targets,
|
||||||
|
shotCount: shots,
|
||||||
|
weaponCount: weapons.length,
|
||||||
|
maintenanceCount: maintenance,
|
||||||
|
hasImages: hasImages,
|
||||||
|
exportedAt: DateTime.tryParse(decoded['exported_at'] as String? ?? ''),
|
||||||
|
raw: decoded,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Écrit en base le contenu d'une sauvegarde déjà lue par [readBackup].
|
||||||
|
///
|
||||||
|
/// Fusion : les entrées existantes portant le même identifiant sont
|
||||||
|
/// remplacées, les autres sont conservées. Réimporter deux fois la même
|
||||||
|
/// sauvegarde ne crée donc pas de doublons.
|
||||||
|
Future<ImportResult> applyBackup(BackupPreview preview) async {
|
||||||
|
final errors = <String>[];
|
||||||
|
var importedSessions = 0;
|
||||||
|
var importedWeapons = 0;
|
||||||
|
var importedMaintenance = 0;
|
||||||
|
var importedImages = 0;
|
||||||
|
|
||||||
|
// 1. Armurerie d'abord : les sessions y font référence par weapon_id.
|
||||||
|
for (final weaponJson in _asList(preview.raw['weapons'])) {
|
||||||
|
try {
|
||||||
|
await _repository.saveWeapon(Weapon.fromMap(weaponJson));
|
||||||
|
importedWeapons++;
|
||||||
|
} catch (e) {
|
||||||
|
errors.add('Arme ignorée : $e');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (final entryJson in _asList(weaponJson['maintenance'])) {
|
||||||
|
try {
|
||||||
|
await _repository.saveMaintenanceEntry(
|
||||||
|
MaintenanceEntry.fromMap(entryJson),
|
||||||
|
);
|
||||||
|
importedMaintenance++;
|
||||||
|
} catch (e) {
|
||||||
|
errors.add('Entretien ignoré : $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Sessions, cibles et impacts.
|
||||||
|
for (final sessionJson in _asList(preview.raw['sessions'])) {
|
||||||
|
try {
|
||||||
|
final analyses = <TargetAnalysis>[];
|
||||||
|
for (final analysisJson in _asList(sessionJson['analyses'])) {
|
||||||
|
final shots = _asList(analysisJson['shots'])
|
||||||
|
.map((s) => Shot.fromMap(s))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
var map = _normalizeAnalysis(analysisJson);
|
||||||
|
final imagePath = await _restoreImage(analysisJson);
|
||||||
|
if (imagePath != null) {
|
||||||
|
map = {...map, 'image_path': imagePath};
|
||||||
|
importedImages++;
|
||||||
|
}
|
||||||
|
|
||||||
|
analyses.add(TargetAnalysis.fromMap(map, shots));
|
||||||
|
}
|
||||||
|
await _repository.saveSession(Session.fromMap(sessionJson, analyses));
|
||||||
|
importedSessions++;
|
||||||
|
} catch (e) {
|
||||||
|
errors.add('Session ignorée : $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Maintenance dont l'arme a été supprimée avant l'export.
|
||||||
|
for (final entryJson in _asList(preview.raw['orphan_maintenance'])) {
|
||||||
|
try {
|
||||||
|
await _repository.saveMaintenanceEntry(
|
||||||
|
MaintenanceEntry.fromMap(entryJson),
|
||||||
|
);
|
||||||
|
importedMaintenance++;
|
||||||
|
} catch (e) {
|
||||||
|
errors.add('Entretien ignoré : $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ImportResult(
|
||||||
|
sessions: importedSessions,
|
||||||
|
weapons: importedWeapons,
|
||||||
|
maintenance: importedMaintenance,
|
||||||
|
images: importedImages,
|
||||||
|
errors: errors,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recrée la photo de cible si la sauvegarde l'embarque, et renvoie son
|
||||||
|
/// nouveau chemin local. `null` si la sauvegarde est sans photos : le chemin
|
||||||
|
/// d'origine est alors conservé (l'app affiche un placeholder s'il est mort).
|
||||||
|
Future<String?> _restoreImage(Map<String, dynamic> analysisJson) async {
|
||||||
|
final encoded = analysisJson['image_base64'] as String?;
|
||||||
|
if (encoded == null || encoded.isEmpty) return null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
final bytes = base64Decode(encoded);
|
||||||
|
final extension = analysisJson['image_extension'] as String? ?? '.jpg';
|
||||||
|
return await _repository.saveImageBytes(bytes, extension);
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('Import : image ignorée : $e');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// JSON ne distingue pas 1 de 1.0 : une valeur ronde relue devient un `int`
|
||||||
|
/// et casse les `as double?` des modèles. On reforce donc les doubles.
|
||||||
|
Map<String, dynamic> _normalizeAnalysis(Map<String, dynamic> json) {
|
||||||
|
const doubleKeys = [
|
||||||
|
'grouping_diameter',
|
||||||
|
'grouping_center_x',
|
||||||
|
'grouping_center_y',
|
||||||
|
'target_center_x',
|
||||||
|
'target_center_y',
|
||||||
|
'target_radius',
|
||||||
|
];
|
||||||
|
|
||||||
|
final map = Map<String, dynamic>.from(json);
|
||||||
|
for (final key in doubleKeys) {
|
||||||
|
map[key] = (map[key] as num?)?.toDouble();
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Map<String, dynamic>> _asList(dynamic value) {
|
||||||
|
if (value is! List) return const [];
|
||||||
|
return value.whereType<Map<String, dynamic>>().toList();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'package:crypto/crypto.dart';
|
import 'package:crypto/crypto.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:device_info_plus/device_info_plus.dart';
|
import 'package:device_info_plus/device_info_plus.dart';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
@@ -9,6 +10,9 @@ import 'package:flutter/foundation.dart';
|
|||||||
class WalletIdentityService {
|
class WalletIdentityService {
|
||||||
static const String _prefsKey = 'wallet_identity_phrase';
|
static const String _prefsKey = 'wallet_identity_phrase';
|
||||||
static const String _uploadEnabledKey = 'is_ai_upload_enabled';
|
static const String _uploadEnabledKey = 'is_ai_upload_enabled';
|
||||||
|
static const String _bannedKey = 'wallet_is_banned';
|
||||||
|
static const String _banReasonKey = 'wallet_ban_reason';
|
||||||
|
static const String _serverUrlKey = 'ai_server_url';
|
||||||
|
|
||||||
// A standard list of 256 words (8 bits of entropy per word)
|
// A standard list of 256 words (8 bits of entropy per word)
|
||||||
static const List<String> _wordList = [
|
static const List<String> _wordList = [
|
||||||
@@ -40,18 +44,102 @@ class WalletIdentityService {
|
|||||||
'bulk', 'bullet', 'bundle', 'bunker', 'burden', 'burger', 'burst', 'bus', 'business', 'butter'
|
'bulk', 'bullet', 'bundle', 'bunker', 'burden', 'burger', 'burst', 'bus', 'business', 'butter'
|
||||||
];
|
];
|
||||||
|
|
||||||
/// Vérifie si l'utilisateur a accepté l'envoi de données à l'IA
|
/// URL par défaut du serveur de production
|
||||||
|
static const String defaultServerUrl = 'https://backendia.kevlar.cloud';
|
||||||
|
|
||||||
|
/// Clé d'authentification API secrète pour le backend
|
||||||
|
static const String apiKey = 'bully_secret_api_key_2026_x89';
|
||||||
|
|
||||||
|
/// Retourne l'URL de base du serveur configuré (par défaut: https://backendia.kevlar.cloud)
|
||||||
|
Future<String> getServerBaseUrl() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final customUrl = prefs.getString(_serverUrlKey);
|
||||||
|
if (customUrl != null && customUrl.trim().isNotEmpty) {
|
||||||
|
return customUrl.trim().replaceAll(RegExp(r'/api/upload/?$'), '');
|
||||||
|
}
|
||||||
|
return defaultServerUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Définit une URL personnalisée pour le serveur IA
|
||||||
|
Future<void> setServerBaseUrl(String url) async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final cleanUrl = url.trim().replaceAll(RegExp(r'/api/upload/?$'), '');
|
||||||
|
await prefs.setString(_serverUrlKey, cleanUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Vérifie si l'utilisateur a accepté l'envoi de données à l'IA (et n'est pas banni)
|
||||||
Future<bool> isUploadEnabled() async {
|
Future<bool> isUploadEnabled() async {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final isBanned = prefs.getBool(_bannedKey) ?? false;
|
||||||
|
if (isBanned) return false;
|
||||||
return prefs.getBool(_uploadEnabledKey) ?? false;
|
return prefs.getBool(_uploadEnabledKey) ?? false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Active ou désactive l'envoi de données
|
/// Active ou désactive l'envoi de données
|
||||||
Future<void> setUploadEnabled(bool enabled) async {
|
Future<void> setUploadEnabled(bool enabled) async {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final isBanned = prefs.getBool(_bannedKey) ?? false;
|
||||||
|
if (isBanned) {
|
||||||
|
await prefs.setBool(_uploadEnabledKey, false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
await prefs.setBool(_uploadEnabledKey, enabled);
|
await prefs.setBool(_uploadEnabledKey, enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Vérifie si ce wallet/utilisateur est banni en local
|
||||||
|
Future<bool> isBanned() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
return prefs.getBool(_bannedKey) ?? false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Récupère le motif de bannissement enregistré
|
||||||
|
Future<String?> getBanReason() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
return prefs.getString(_banReasonKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Enregistre l'état de bannissement et le motif
|
||||||
|
Future<void> setBanned(bool banned, {String? reason}) async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
await prefs.setBool(_bannedKey, banned);
|
||||||
|
if (banned) {
|
||||||
|
await prefs.setString(_banReasonKey, reason ?? 'Photos non conformes aux règles de tir');
|
||||||
|
await prefs.setBool(_uploadEnabledKey, false);
|
||||||
|
} else {
|
||||||
|
await prefs.remove(_banReasonKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Synchronise le statut de modération/bannissement avec le serveur backend
|
||||||
|
Future<bool> syncBanStatus() async {
|
||||||
|
try {
|
||||||
|
final phrase = await getIdentityPhrase();
|
||||||
|
final phraseBytes = utf8.encode(phrase);
|
||||||
|
final walletHash = sha256.convert(phraseBytes).toString();
|
||||||
|
final baseUrl = await getServerBaseUrl();
|
||||||
|
|
||||||
|
final res = await http.get(
|
||||||
|
Uri.parse('$baseUrl/api/stats/$walletHash'),
|
||||||
|
headers: {'X-API-KEY': apiKey},
|
||||||
|
).timeout(
|
||||||
|
const Duration(seconds: 4),
|
||||||
|
);
|
||||||
|
if (res.statusCode == 200) {
|
||||||
|
final data = jsonDecode(res.body);
|
||||||
|
final isBannedOnServer = data['is_banned'] == true;
|
||||||
|
if (isBannedOnServer) {
|
||||||
|
await setBanned(true, reason: data['ban_reason']);
|
||||||
|
} else {
|
||||||
|
await setBanned(false);
|
||||||
|
}
|
||||||
|
return isBannedOnServer;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('Erreur synchro ban: $e');
|
||||||
|
}
|
||||||
|
return await isBanned();
|
||||||
|
}
|
||||||
|
|
||||||
/// Gets the unique 15-word identity phrase
|
/// Gets the unique 15-word identity phrase
|
||||||
Future<String> getIdentityPhrase() async {
|
Future<String> getIdentityPhrase() async {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
|||||||
@@ -7,9 +7,13 @@
|
|||||||
#include "generated_plugin_registrant.h"
|
#include "generated_plugin_registrant.h"
|
||||||
|
|
||||||
#include <file_selector_linux/file_selector_plugin.h>
|
#include <file_selector_linux/file_selector_plugin.h>
|
||||||
|
#include <url_launcher_linux/url_launcher_plugin.h>
|
||||||
|
|
||||||
void fl_register_plugins(FlPluginRegistry* registry) {
|
void fl_register_plugins(FlPluginRegistry* registry) {
|
||||||
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
|
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
|
||||||
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
|
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
|
||||||
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
|
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
|
||||||
|
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
|
||||||
|
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
|
||||||
|
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
list(APPEND FLUTTER_PLUGIN_LIST
|
list(APPEND FLUTTER_PLUGIN_LIST
|
||||||
file_selector_linux
|
file_selector_linux
|
||||||
|
url_launcher_linux
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND FLUTTER_FFI_PLUGIN_LIST
|
list(APPEND FLUTTER_FFI_PLUGIN_LIST
|
||||||
|
|||||||
@@ -7,12 +7,14 @@ import Foundation
|
|||||||
|
|
||||||
import device_info_plus
|
import device_info_plus
|
||||||
import file_selector_macos
|
import file_selector_macos
|
||||||
|
import share_plus
|
||||||
import shared_preferences_foundation
|
import shared_preferences_foundation
|
||||||
import sqflite_darwin
|
import sqflite_darwin
|
||||||
|
|
||||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||||
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
|
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
|
||||||
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
|
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
|
||||||
|
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
|
||||||
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
|
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
|
||||||
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
|
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -201,6 +201,30 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.1"
|
version: "7.0.1"
|
||||||
|
file_selector:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: file_selector
|
||||||
|
sha256: bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.0"
|
||||||
|
file_selector_android:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: file_selector_android
|
||||||
|
sha256: "89243030ea4b3463fb402b44d5eeacc4ccb1c46a88870cb2a5080d693200c1ed"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.5.2+6"
|
||||||
|
file_selector_ios:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: file_selector_ios
|
||||||
|
sha256: e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.5.3+5"
|
||||||
file_selector_linux:
|
file_selector_linux:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -225,6 +249,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.7.0"
|
version: "2.7.0"
|
||||||
|
file_selector_web:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: file_selector_web
|
||||||
|
sha256: "73181fbc5257776d8ecaa6a94ab3c8e920ad143b9132a6d984a9271dfc6928d3"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.9.5"
|
||||||
file_selector_windows:
|
file_selector_windows:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -709,6 +741,22 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.2.0"
|
version: "1.2.0"
|
||||||
|
share_plus:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: share_plus
|
||||||
|
sha256: "34f00f9becd2743c1fb05363d624f9f70d37f7ccdcdda47450bc0b8c9d327b8c"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "13.3.0"
|
||||||
|
share_plus_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: share_plus_platform_interface
|
||||||
|
sha256: "365ef7379fc22507256adda3385152942ffce08935452bc972c2e52a0bebae41"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "7.2.0"
|
||||||
shared_preferences:
|
shared_preferences:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -898,6 +946,38 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.0"
|
version: "1.4.0"
|
||||||
|
url_launcher_linux:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: url_launcher_linux
|
||||||
|
sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "3.2.2"
|
||||||
|
url_launcher_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: url_launcher_platform_interface
|
||||||
|
sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.3.2"
|
||||||
|
url_launcher_web:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: url_launcher_web
|
||||||
|
sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.3"
|
||||||
|
url_launcher_windows:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: url_launcher_windows
|
||||||
|
sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "3.1.5"
|
||||||
uuid:
|
uuid:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
|||||||
+4
-4
@@ -70,6 +70,8 @@ dependencies:
|
|||||||
shared_preferences: ^2.5.5
|
shared_preferences: ^2.5.5
|
||||||
crypto: ^3.0.7
|
crypto: ^3.0.7
|
||||||
camera: ^0.12.0+1
|
camera: ^0.12.0+1
|
||||||
|
share_plus: ^13.3.0
|
||||||
|
file_selector: ^1.1.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
@@ -93,10 +95,8 @@ flutter:
|
|||||||
# the material Icons class.
|
# the material Icons class.
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|
||||||
# To add assets to your application, add an assets section, like this:
|
assets:
|
||||||
# assets:
|
- assets/icons/
|
||||||
# - images/a_dot_burr.jpeg
|
|
||||||
# - images/a_dot_ham.jpeg
|
|
||||||
|
|
||||||
# An image asset can refer to one or more resolution-specific "variants", see
|
# An image asset can refer to one or more resolution-specific "variants", see
|
||||||
# https://flutter.dev/to/resolution-aware-images
|
# https://flutter.dev/to/resolution-aware-images
|
||||||
|
|||||||
@@ -0,0 +1,372 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
import 'package:bully/data/models/maintenance.dart';
|
||||||
|
import 'package:bully/data/models/session.dart';
|
||||||
|
import 'package:bully/data/models/shot.dart';
|
||||||
|
import 'package:bully/data/models/target_analysis.dart';
|
||||||
|
import 'package:bully/data/models/target_type.dart';
|
||||||
|
import 'package:bully/data/models/weapon.dart';
|
||||||
|
import 'package:bully/data/repositories/session_repository.dart';
|
||||||
|
import 'package:bully/services/backup_service.dart';
|
||||||
|
|
||||||
|
/// Dépôt en mémoire : évite d'ouvrir une vraie base SQLite dans les tests.
|
||||||
|
class _FakeRepository extends SessionRepository {
|
||||||
|
final List<Session> sessions;
|
||||||
|
final List<Weapon> weapons;
|
||||||
|
final List<MaintenanceEntry> maintenance;
|
||||||
|
final List<List<int>> savedImages = [];
|
||||||
|
|
||||||
|
_FakeRepository({
|
||||||
|
List<Session>? sessions,
|
||||||
|
List<Weapon>? weapons,
|
||||||
|
List<MaintenanceEntry>? maintenance,
|
||||||
|
}) : sessions = sessions ?? [],
|
||||||
|
weapons = weapons ?? [],
|
||||||
|
maintenance = maintenance ?? [];
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<Session>> getAllSessions({int? limit, int? offset}) async =>
|
||||||
|
sessions;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<Weapon>> getWeapons() async => weapons;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<MaintenanceEntry>> getAllMaintenance() async => maintenance;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> saveSession(Session session) async {
|
||||||
|
sessions.removeWhere((s) => s.id == session.id);
|
||||||
|
sessions.add(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> saveWeapon(Weapon weapon) async {
|
||||||
|
weapons.removeWhere((w) => w.id == weapon.id);
|
||||||
|
weapons.add(weapon);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> saveMaintenanceEntry(MaintenanceEntry entry) async {
|
||||||
|
maintenance.removeWhere((e) => e.id == entry.id);
|
||||||
|
maintenance.add(entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<String> saveImageBytes(List<int> bytes, String extension) async {
|
||||||
|
savedImages.add(bytes);
|
||||||
|
return '/imported/image_${savedImages.length}$extension';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Session _session({String id = 's1', String weapon = 'Glock 17'}) {
|
||||||
|
return Session(
|
||||||
|
id: id,
|
||||||
|
weapon: weapon,
|
||||||
|
weaponId: 'w1',
|
||||||
|
maxShotsPerTarget: 5,
|
||||||
|
createdAt: DateTime(2026, 3, 14, 10, 30),
|
||||||
|
notes: 'Entraînement',
|
||||||
|
distance: 25,
|
||||||
|
analyses: [
|
||||||
|
TargetAnalysis(
|
||||||
|
id: '$id-a1',
|
||||||
|
sessionId: id,
|
||||||
|
targetType: TargetType.concentric,
|
||||||
|
imagePath: '/photos/$id.jpg',
|
||||||
|
totalScore: 18,
|
||||||
|
groupingDiameter: 0.12,
|
||||||
|
groupingCenterX: 0.5,
|
||||||
|
groupingCenterY: 0.48,
|
||||||
|
createdAt: DateTime(2026, 3, 14, 10, 35),
|
||||||
|
targetCenterX: 0.5,
|
||||||
|
targetCenterY: 0.5,
|
||||||
|
targetRadius: 0.4,
|
||||||
|
shots: [
|
||||||
|
Shot(id: '$id-t1', x: 0.5, y: 0.5, score: 10, analysisId: '$id-a1'),
|
||||||
|
Shot(id: '$id-t2', x: 0.55, y: 0.52, score: 8, analysisId: '$id-a1'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Weapon _weapon() => Weapon(
|
||||||
|
id: 'w1',
|
||||||
|
name: 'Glock 17',
|
||||||
|
type: WeaponType.handgun,
|
||||||
|
caliber: '9mm',
|
||||||
|
magazineCount: 3,
|
||||||
|
magazineCapacity: 17,
|
||||||
|
createdAt: DateTime(2025, 1, 5),
|
||||||
|
optic: 'Point rouge',
|
||||||
|
customName: 'La bleue',
|
||||||
|
);
|
||||||
|
|
||||||
|
MaintenanceEntry _maintenance() => MaintenanceEntry(
|
||||||
|
id: 'm1',
|
||||||
|
weaponId: 'w1',
|
||||||
|
type: MaintenanceType.cleaning,
|
||||||
|
description: 'Nettoyage complet',
|
||||||
|
date: DateTime(2026, 2, 1),
|
||||||
|
roundsSinceLastMaintenance: 500,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// Sérialise puis relit la sauvegarde comme le ferait un vrai fichier partagé.
|
||||||
|
Future<BackupPreview> _roundTrip(
|
||||||
|
Map<String, dynamic> json,
|
||||||
|
BackupService service,
|
||||||
|
) async {
|
||||||
|
final dir = await Directory.systemTemp.createTemp('impact_backup_test');
|
||||||
|
addTearDown(() => dir.delete(recursive: true));
|
||||||
|
final file = File('${dir.path}/backup.json');
|
||||||
|
await file.writeAsString(jsonEncode(json));
|
||||||
|
return service.readBackup(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
group('export', () {
|
||||||
|
test('la sauvegarde contient sessions, armurerie et stats', () async {
|
||||||
|
final source = _FakeRepository(
|
||||||
|
sessions: [_session()],
|
||||||
|
weapons: [_weapon()],
|
||||||
|
maintenance: [_maintenance()],
|
||||||
|
);
|
||||||
|
final json = await BackupService(repository: source).buildBackupJson();
|
||||||
|
|
||||||
|
expect(json['format'], BackupService.formatId);
|
||||||
|
expect(json['counts'], {
|
||||||
|
'sessions': 1,
|
||||||
|
'targets': 1,
|
||||||
|
'shots': 2,
|
||||||
|
'weapons': 1,
|
||||||
|
'maintenance': 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Les stats sont recalculées et écrites telles quelles dans le fichier.
|
||||||
|
final stats = json['statistics'] as Map<String, dynamic>;
|
||||||
|
expect(stats['total_shots'], 2);
|
||||||
|
expect(stats['total_score'], 18);
|
||||||
|
|
||||||
|
// L'entretien voyage avec son arme.
|
||||||
|
final weapon = (json['weapons'] as List).single as Map<String, dynamic>;
|
||||||
|
expect((weapon['maintenance'] as List), hasLength(1));
|
||||||
|
expect(json['orphan_maintenance'], isEmpty);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('sans photos, aucune image n\'est encodée', () async {
|
||||||
|
final source = _FakeRepository(sessions: [_session()]);
|
||||||
|
final json = await BackupService(repository: source).buildBackupJson();
|
||||||
|
|
||||||
|
final session = (json['sessions'] as List).single as Map<String, dynamic>;
|
||||||
|
final analysis = (session['analyses'] as List).single as Map<String, dynamic>;
|
||||||
|
expect(analysis.containsKey('image_base64'), isFalse);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('l\'entretien d\'une arme supprimée n\'est pas perdu', () async {
|
||||||
|
final source = _FakeRepository(maintenance: [_maintenance()]);
|
||||||
|
final json = await BackupService(repository: source).buildBackupJson();
|
||||||
|
|
||||||
|
expect(json['orphan_maintenance'], hasLength(1));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
group('import', () {
|
||||||
|
test('aller-retour complet : tout est restauré à l\'identique', () async {
|
||||||
|
final source = _FakeRepository(
|
||||||
|
sessions: [_session()],
|
||||||
|
weapons: [_weapon()],
|
||||||
|
maintenance: [_maintenance()],
|
||||||
|
);
|
||||||
|
final json = await BackupService(repository: source).buildBackupJson();
|
||||||
|
|
||||||
|
final target = _FakeRepository();
|
||||||
|
final service = BackupService(repository: target);
|
||||||
|
final preview = await _roundTrip(json, service);
|
||||||
|
|
||||||
|
expect(preview.sessionCount, 1);
|
||||||
|
expect(preview.shotCount, 2);
|
||||||
|
expect(preview.weaponCount, 1);
|
||||||
|
expect(preview.maintenanceCount, 1);
|
||||||
|
expect(preview.hasImages, isFalse);
|
||||||
|
|
||||||
|
final result = await service.applyBackup(preview);
|
||||||
|
expect(result.errors, isEmpty);
|
||||||
|
expect(result.sessions, 1);
|
||||||
|
expect(result.weapons, 1);
|
||||||
|
expect(result.maintenance, 1);
|
||||||
|
|
||||||
|
final session = target.sessions.single;
|
||||||
|
expect(session.id, 's1');
|
||||||
|
expect(session.weapon, 'Glock 17');
|
||||||
|
expect(session.distance, 25);
|
||||||
|
expect(session.createdAt, DateTime(2026, 3, 14, 10, 30));
|
||||||
|
expect(session.totalShots, 2);
|
||||||
|
expect(session.totalScore, 18);
|
||||||
|
expect(session.analyses.single.targetRadius, 0.4);
|
||||||
|
expect(session.analyses.single.shots.first.score, 10);
|
||||||
|
|
||||||
|
expect(target.weapons.single.customName, 'La bleue');
|
||||||
|
expect(target.weapons.single.magazineCapacity, 17);
|
||||||
|
expect(target.maintenance.single.roundsSinceLastMaintenance, 500);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('réimporter deux fois ne crée pas de doublon', () async {
|
||||||
|
final source = _FakeRepository(
|
||||||
|
sessions: [_session()],
|
||||||
|
weapons: [_weapon()],
|
||||||
|
);
|
||||||
|
final json = await BackupService(repository: source).buildBackupJson();
|
||||||
|
|
||||||
|
final target = _FakeRepository();
|
||||||
|
final service = BackupService(repository: target);
|
||||||
|
await service.applyBackup(await _roundTrip(json, service));
|
||||||
|
await service.applyBackup(await _roundTrip(json, service));
|
||||||
|
|
||||||
|
expect(target.sessions, hasLength(1));
|
||||||
|
expect(target.weapons, hasLength(1));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('les photos embarquées sont réécrites sur le disque', () async {
|
||||||
|
final bytes = utf8.encode('fausse-image');
|
||||||
|
final json = {
|
||||||
|
'format': BackupService.formatId,
|
||||||
|
'version': 1,
|
||||||
|
'sessions': [
|
||||||
|
{
|
||||||
|
'id': 's1',
|
||||||
|
'weapon': 'Glock 17',
|
||||||
|
'max_shots_per_target': 5,
|
||||||
|
'created_at': '2026-03-14T10:30:00.000',
|
||||||
|
'distance': 25,
|
||||||
|
'analyses': [
|
||||||
|
{
|
||||||
|
'id': 'a1',
|
||||||
|
'session_id': 's1',
|
||||||
|
'target_type': 'concentric',
|
||||||
|
'image_path': '/ancien/chemin.jpg',
|
||||||
|
'total_score': 10,
|
||||||
|
'created_at': '2026-03-14T10:35:00.000',
|
||||||
|
'image_extension': '.jpg',
|
||||||
|
'image_base64': base64Encode(bytes),
|
||||||
|
'shots': [
|
||||||
|
{'id': 't1', 'x': 0.5, 'y': 0.5, 'score': 10, 'analysis_id': 'a1'},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
final target = _FakeRepository();
|
||||||
|
final service = BackupService(repository: target);
|
||||||
|
final preview = await _roundTrip(json, service);
|
||||||
|
expect(preview.hasImages, isTrue);
|
||||||
|
|
||||||
|
final result = await service.applyBackup(preview);
|
||||||
|
expect(result.images, 1);
|
||||||
|
expect(target.savedImages.single, bytes);
|
||||||
|
expect(target.sessions.single.analyses.single.imagePath,
|
||||||
|
'/imported/image_1.jpg');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('un nombre entier là où un décimal est attendu ne casse rien', () async {
|
||||||
|
// JSON ne distingue pas 1 de 1.0 : un fichier édité à la main peut
|
||||||
|
// livrer des entiers là où les modèles attendent des doubles.
|
||||||
|
final json = {
|
||||||
|
'format': BackupService.formatId,
|
||||||
|
'version': 1,
|
||||||
|
'sessions': [
|
||||||
|
{
|
||||||
|
'id': 's1',
|
||||||
|
'weapon': 'Glock 17',
|
||||||
|
'max_shots_per_target': 5,
|
||||||
|
'created_at': '2026-03-14T10:30:00.000',
|
||||||
|
'analyses': [
|
||||||
|
{
|
||||||
|
'id': 'a1',
|
||||||
|
'session_id': 's1',
|
||||||
|
'target_type': 'concentric',
|
||||||
|
'image_path': '/photo.jpg',
|
||||||
|
'total_score': 10,
|
||||||
|
'created_at': '2026-03-14T10:35:00.000',
|
||||||
|
'target_radius': 1,
|
||||||
|
'grouping_diameter': 0,
|
||||||
|
'shots': const [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
final target = _FakeRepository();
|
||||||
|
final service = BackupService(repository: target);
|
||||||
|
final result = await service.applyBackup(await _roundTrip(json, service));
|
||||||
|
|
||||||
|
expect(result.errors, isEmpty);
|
||||||
|
expect(target.sessions.single.analyses.single.targetRadius, 1.0);
|
||||||
|
expect(target.sessions.single.analyses.single.groupingDiameter, 0.0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('un fichier étranger est refusé avec un message clair', () async {
|
||||||
|
final service = BackupService(repository: _FakeRepository());
|
||||||
|
final dir = await Directory.systemTemp.createTemp('impact_backup_test');
|
||||||
|
addTearDown(() => dir.delete(recursive: true));
|
||||||
|
|
||||||
|
final notJson = File('${dir.path}/photo.jpg');
|
||||||
|
await notJson.writeAsString('pas du json du tout');
|
||||||
|
expect(
|
||||||
|
() => service.readBackup(notJson),
|
||||||
|
throwsA(isA<BackupFormatException>()),
|
||||||
|
);
|
||||||
|
|
||||||
|
final otherJson = File('${dir.path}/autre.json');
|
||||||
|
await otherJson.writeAsString('{"hello": "world"}');
|
||||||
|
expect(
|
||||||
|
() => service.readBackup(otherJson),
|
||||||
|
throwsA(isA<BackupFormatException>()),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('une sauvegarde plus récente que l\'app est refusée', () async {
|
||||||
|
final service = BackupService(repository: _FakeRepository());
|
||||||
|
final dir = await Directory.systemTemp.createTemp('impact_backup_test');
|
||||||
|
addTearDown(() => dir.delete(recursive: true));
|
||||||
|
|
||||||
|
final file = File('${dir.path}/futur.json');
|
||||||
|
await file.writeAsString(jsonEncode({
|
||||||
|
'format': BackupService.formatId,
|
||||||
|
'version': BackupService.formatVersion + 1,
|
||||||
|
}));
|
||||||
|
|
||||||
|
expect(
|
||||||
|
() => service.readBackup(file),
|
||||||
|
throwsA(isA<BackupFormatException>()),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('une session corrompue est ignorée sans bloquer les autres', () async {
|
||||||
|
final valid = await BackupService(
|
||||||
|
repository: _FakeRepository(sessions: [_session()]),
|
||||||
|
).buildBackupJson();
|
||||||
|
// On injecte une session sans date : elle doit être la seule écartée.
|
||||||
|
(valid['sessions'] as List).add({
|
||||||
|
'id': 'corrompue',
|
||||||
|
'weapon': 'X',
|
||||||
|
'max_shots_per_target': 5,
|
||||||
|
'analyses': const [],
|
||||||
|
});
|
||||||
|
|
||||||
|
final target = _FakeRepository();
|
||||||
|
final service = BackupService(repository: target);
|
||||||
|
final result = await service.applyBackup(await _roundTrip(valid, service));
|
||||||
|
|
||||||
|
expect(result.sessions, 1);
|
||||||
|
expect(result.errors, hasLength(1));
|
||||||
|
expect(target.sessions.single.id, 's1');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -8,10 +8,16 @@
|
|||||||
|
|
||||||
#include <file_selector_windows/file_selector_windows.h>
|
#include <file_selector_windows/file_selector_windows.h>
|
||||||
#include <permission_handler_windows/permission_handler_windows_plugin.h>
|
#include <permission_handler_windows/permission_handler_windows_plugin.h>
|
||||||
|
#include <share_plus/share_plus_windows_plugin_c_api.h>
|
||||||
|
#include <url_launcher_windows/url_launcher_windows.h>
|
||||||
|
|
||||||
void RegisterPlugins(flutter::PluginRegistry* registry) {
|
void RegisterPlugins(flutter::PluginRegistry* registry) {
|
||||||
FileSelectorWindowsRegisterWithRegistrar(
|
FileSelectorWindowsRegisterWithRegistrar(
|
||||||
registry->GetRegistrarForPlugin("FileSelectorWindows"));
|
registry->GetRegistrarForPlugin("FileSelectorWindows"));
|
||||||
PermissionHandlerWindowsPluginRegisterWithRegistrar(
|
PermissionHandlerWindowsPluginRegisterWithRegistrar(
|
||||||
registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
|
registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
|
||||||
|
SharePlusWindowsPluginCApiRegisterWithRegistrar(
|
||||||
|
registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
|
||||||
|
UrlLauncherWindowsRegisterWithRegistrar(
|
||||||
|
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
list(APPEND FLUTTER_PLUGIN_LIST
|
list(APPEND FLUTTER_PLUGIN_LIST
|
||||||
file_selector_windows
|
file_selector_windows
|
||||||
permission_handler_windows
|
permission_handler_windows
|
||||||
|
share_plus
|
||||||
|
url_launcher_windows
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND FLUTTER_FFI_PLUGIN_LIST
|
list(APPEND FLUTTER_FFI_PLUGIN_LIST
|
||||||
|
|||||||
Reference in New Issue
Block a user