Release 4.8.0 - 2024-05-26
This commit is contained in:
@ -3,11 +3,13 @@ import 'package:camera/camera.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import 'package:rogapp/model/destination.dart';
|
||||
|
||||
class CustomCameraView extends StatefulWidget {
|
||||
final Function(String) onImageCaptured;
|
||||
final Destination? destination;
|
||||
|
||||
const CustomCameraView({Key? key, required this.onImageCaptured}) : super(key: key);
|
||||
const CustomCameraView({Key? key, required this.onImageCaptured, required this.destination}) : super(key: key);
|
||||
|
||||
@override
|
||||
_CustomCameraViewState createState() => _CustomCameraViewState();
|
||||
@ -19,11 +21,13 @@ class _CustomCameraViewState extends State<CustomCameraView> {
|
||||
int _selectedCameraIndex = 0;
|
||||
double _currentScale = 1.0;
|
||||
FlashMode _currentFlashMode = FlashMode.off;
|
||||
Destination? destination;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_initializeCamera();
|
||||
destination = widget.destination;
|
||||
}
|
||||
|
||||
Future<void> _initializeCamera() async {
|
||||
@ -98,7 +102,25 @@ class _CustomCameraViewState extends State<CustomCameraView> {
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CameraPreview(_controller!),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 60.0), // 上部に60ピクセルのパディングを追加
|
||||
child: CameraPreview(_controller!),
|
||||
),
|
||||
Positioned(
|
||||
bottom: 120.0,
|
||||
left: 16.0,
|
||||
right: 16.0,
|
||||
child: Center(
|
||||
child: Text(
|
||||
destination?.tags ?? '',
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
bottom: 16.0,
|
||||
left: 16.0,
|
||||
|
||||
@ -764,6 +764,7 @@ class DestinationController extends GetxController {
|
||||
onImageCaptured: (imagePath) {
|
||||
photos.add(File(imagePath));
|
||||
},
|
||||
destination: destination,
|
||||
),
|
||||
/*
|
||||
builder: (_) => CameraCamera(
|
||||
@ -973,7 +974,7 @@ class DestinationController extends GetxController {
|
||||
is_checkin: isCheckin,
|
||||
created_at: DateTime.now().millisecondsSinceEpoch);
|
||||
var res = await db.insertGps(gps_data);
|
||||
debugPrint("Saved GPS data into DB...:${gps_data}");
|
||||
//debugPrint("Saved GPS data into DB...:${gps_data}");
|
||||
}
|
||||
} catch (err) {
|
||||
print("errr ready gps ${err}");
|
||||
|
||||
@ -41,7 +41,7 @@ class _HistoryPageState extends State<HistoryPage> {
|
||||
} else if (snapshot.hasData) {
|
||||
final dests = snapshot.data;
|
||||
if (dests!.isNotEmpty) {
|
||||
debugPrint("----- history -----");
|
||||
debugPrint("----- 通過履歴表示 -----");
|
||||
return SizedBox(
|
||||
width: MediaQuery.of(context).size.width,
|
||||
height: MediaQuery.of(context).size.height,
|
||||
|
||||
@ -21,13 +21,13 @@ class PermissionController {
|
||||
*/
|
||||
|
||||
static Future<bool> checkStoragePermission() async {
|
||||
debugPrint("(gifunavi)== checkStoragePermission ==");
|
||||
//debugPrint("(gifunavi)== checkStoragePermission ==");
|
||||
final storagePermission = await Permission.storage.status;
|
||||
return storagePermission == PermissionStatus.granted;
|
||||
}
|
||||
|
||||
static Future<void> requestStoragePermission() async {
|
||||
debugPrint("(gifunavi)== requestStoragePermission ==");
|
||||
//debugPrint("(gifunavi)== requestStoragePermission ==");
|
||||
final storagePermission = await Permission.storage.request();
|
||||
|
||||
if (storagePermission == PermissionStatus.granted) {
|
||||
@ -43,26 +43,26 @@ class PermissionController {
|
||||
}
|
||||
|
||||
static Future<bool> checkLocationBasicPermission() async {
|
||||
debugPrint("(gifunavi)== checkLocationBasicPermission ==");
|
||||
//debugPrint("(gifunavi)== checkLocationBasicPermission ==");
|
||||
final locationPermission = await Permission.location.status;
|
||||
return locationPermission == PermissionStatus.granted;
|
||||
}
|
||||
|
||||
static Future<bool> checkLocationWhenInUsePermission() async {
|
||||
debugPrint("(gifunavi)== checkLocationWhenInUsePermission ==");
|
||||
//debugPrint("(gifunavi)== checkLocationWhenInUsePermission ==");
|
||||
final whenInUsePermission = await Permission.locationWhenInUse.status;
|
||||
return whenInUsePermission == PermissionStatus.granted;
|
||||
}
|
||||
|
||||
static Future<bool> checkLocationAlwaysPermission() async {
|
||||
debugPrint("(gifunavi)== checkLocationAlwaysPermission ==");
|
||||
//debugPrint("(gifunavi)== checkLocationAlwaysPermission ==");
|
||||
final alwaysPermission = await Permission.locationAlways.status;
|
||||
return alwaysPermission == PermissionStatus.granted;
|
||||
}
|
||||
|
||||
static bool isBasicPermission=false;
|
||||
static Future<void> requestLocationBasicPermissions() async {
|
||||
debugPrint("(gifunavi)== requestLocationBasicPermissions ==");
|
||||
//debugPrint("(gifunavi)== requestLocationBasicPermissions ==");
|
||||
try{
|
||||
if(!isBasicPermission){
|
||||
isBasicPermission=true;
|
||||
@ -84,7 +84,7 @@ class PermissionController {
|
||||
static bool isRequestedWhenInUsePermission = false;
|
||||
|
||||
static Future<void> requestLocationWhenInUsePermissions() async {
|
||||
debugPrint("(gifunavi)== requestLocationWhenInUsePermissions ==");
|
||||
//debugPrint("(gifunavi)== requestLocationWhenInUsePermissions ==");
|
||||
|
||||
try{
|
||||
if(!isRequestedWhenInUsePermission){
|
||||
@ -116,7 +116,7 @@ class PermissionController {
|
||||
static bool isRequestedAlwaysPermission = false;
|
||||
|
||||
static Future<void> requestLocationAlwaysPermissions() async {
|
||||
debugPrint("(gifunavi)== requestLocationAlwaysPermissions ==");
|
||||
//debugPrint("(gifunavi)== requestLocationAlwaysPermissions ==");
|
||||
|
||||
try {
|
||||
if( !isRequestedAlwaysPermission ){
|
||||
|
||||
Reference in New Issue
Block a user