SharedMapWidget és térkép nézet refraktorálása
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -84,6 +84,9 @@ class _StakeoutPanel extends GetView<MapSurveyController> {
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: Obx(() {
|
||||
final onTarget = controller.isOnTarget;
|
||||
final dy = controller.deltaY;
|
||||
final dx = controller.deltaX;
|
||||
final dist = controller.distanceToTarget;
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
@@ -108,17 +111,17 @@ class _StakeoutPanel extends GetView<MapSurveyController> {
|
||||
children: [
|
||||
_DeltaCell(
|
||||
label: 'ΔY',
|
||||
value: controller.deltaY,
|
||||
value: dy,
|
||||
unit: 'm',
|
||||
),
|
||||
_DeltaCell(
|
||||
label: 'ΔX',
|
||||
value: controller.deltaX,
|
||||
value: dx,
|
||||
unit: 'm',
|
||||
),
|
||||
_DeltaCell(
|
||||
label: 'Táv',
|
||||
value: controller.distanceToTarget,
|
||||
value: dist,
|
||||
unit: 'm',
|
||||
alwaysPositive: true,
|
||||
),
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:terepi_seged/pages/map_survey/presentations/controllers/map_survey_controller.dart';
|
||||
import 'package:terepi_seged/services/ntrip_service.dart';
|
||||
|
||||
class SettingsDialog extends StatelessWidget {
|
||||
final controller = Get.find<MapSurveyController>();
|
||||
@@ -17,19 +18,19 @@ class SettingsDialog extends StatelessWidget {
|
||||
children: [
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
if (controller.ntripUsernameController.text.isNotEmpty) {
|
||||
controller.ntripUserName.value =
|
||||
controller.ntripUsernameController.text;
|
||||
controller.saveNtripUserName(
|
||||
controller.ntripUsernameController.text);
|
||||
if (controller
|
||||
.ntripPasswordController.text.isNotEmpty) {
|
||||
controller.ntripPassword.value =
|
||||
controller.ntripPasswordController.text;
|
||||
controller.saveNtripPassword(
|
||||
controller.ntripPasswordController.text);
|
||||
}
|
||||
}
|
||||
// if (controller.ntripUsernameController.text.isNotEmpty) {
|
||||
// controller.ntripUserName.value =
|
||||
// controller.ntripUsernameController.text;
|
||||
// controller.saveNtripUserName(
|
||||
// controller.ntripUsernameController.text);
|
||||
// if (controller
|
||||
// .ntripPasswordController.text.isNotEmpty) {
|
||||
// controller.ntripPassword.value =
|
||||
// controller.ntripPasswordController.text;
|
||||
// controller.saveNtripPassword(
|
||||
// controller.ntripPasswordController.text);
|
||||
// }
|
||||
// }
|
||||
Get.back();
|
||||
},
|
||||
icon: const Icon(Icons.close)),
|
||||
@@ -38,19 +39,19 @@ class SettingsDialog extends StatelessWidget {
|
||||
overlayColor:
|
||||
MaterialStateProperty.all(Colors.transparent)),
|
||||
onPressed: () {
|
||||
if (controller.ntripUsernameController.text.isNotEmpty) {
|
||||
controller.ntripUserName.value =
|
||||
controller.ntripUsernameController.text;
|
||||
controller.saveNtripUserName(
|
||||
controller.ntripUsernameController.text);
|
||||
if (controller
|
||||
.ntripPasswordController.text.isNotEmpty) {
|
||||
controller.ntripPassword.value =
|
||||
controller.ntripPasswordController.text;
|
||||
controller.saveNtripPassword(
|
||||
controller.ntripPasswordController.text);
|
||||
}
|
||||
}
|
||||
// if (controller.ntripUsernameController.text.isNotEmpty) {
|
||||
// controller.ntripUserName.value =
|
||||
// controller.ntripUsernameController.text;
|
||||
// controller.saveNtripUserName(
|
||||
// controller.ntripUsernameController.text);
|
||||
// if (controller
|
||||
// .ntripPasswordController.text.isNotEmpty) {
|
||||
// controller.ntripPassword.value =
|
||||
// controller.ntripPasswordController.text;
|
||||
// controller.saveNtripPassword(
|
||||
// controller.ntripPasswordController.text);
|
||||
// }
|
||||
// }
|
||||
Get.back();
|
||||
},
|
||||
child: const Text(
|
||||
@@ -74,118 +75,118 @@ class SettingsDialog extends StatelessWidget {
|
||||
style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
Obx(() => Column(children: [
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-BE6A'),
|
||||
value: '10:06:1C:97:BE:6A',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-BE6A';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-BE6A');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-1DC6'),
|
||||
value: 'E8:31:CD:16:1D:C6',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-1DC6';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-1DC6');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-9C3A'),
|
||||
value: '08:3A:8D:14:9C:3A',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-9C3A';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-9C3A');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-72C2'),
|
||||
value: '10:06:1C:97:72:C2',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-72C2';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-72C2');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-FE16'),
|
||||
value: '10:06:1C:9F:FE:16',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-FE16';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-FE16');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-3B0A'),
|
||||
value: '10:C6:1C:9E:3B:0A',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-3B0A';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-3B0A');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-7FEA'),
|
||||
value: '10:06:1C:9C:7F:EA',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-7FEA';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-7FEA');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-A39E'),
|
||||
value: '10:06:1C:97:A3:9E',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-A39E';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-A39E');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-FF4E'),
|
||||
value: '98:CD:AC:62:FF:4E',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-FF4E';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-FF4E');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-8BB2'),
|
||||
value: 'E8:31:CD:14:8B:B2',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-8BB2';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-8BB2');
|
||||
}),
|
||||
RadioListTile(
|
||||
title: Text('TiGNSS Rover-FF36'),
|
||||
value: '98:CD:AC:62:FF:36',
|
||||
groupValue: controller.gpsAddress.value,
|
||||
onChanged: (value) {
|
||||
controller.gpsAddress.value = value!;
|
||||
controller.gpsName.value = 'TiGNSS Rover-FF36';
|
||||
controller.saveGpsAddress(value);
|
||||
controller.saveGpsName('TiGNSS Rover-FF36');
|
||||
})
|
||||
])),
|
||||
// Obx(() => Column(children: [
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-BE6A'),
|
||||
// value: '10:06:1C:97:BE:6A',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-BE6A';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-BE6A');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-1DC6'),
|
||||
// value: 'E8:31:CD:16:1D:C6',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-1DC6';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-1DC6');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-9C3A'),
|
||||
// value: '08:3A:8D:14:9C:3A',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-9C3A';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-9C3A');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-72C2'),
|
||||
// value: '10:06:1C:97:72:C2',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-72C2';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-72C2');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-FE16'),
|
||||
// value: '10:06:1C:9F:FE:16',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-FE16';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-FE16');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-3B0A'),
|
||||
// value: '10:C6:1C:9E:3B:0A',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-3B0A';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-3B0A');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-7FEA'),
|
||||
// value: '10:06:1C:9C:7F:EA',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-7FEA';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-7FEA');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-A39E'),
|
||||
// value: '10:06:1C:97:A3:9E',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-A39E';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-A39E');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-FF4E'),
|
||||
// value: '98:CD:AC:62:FF:4E',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-FF4E';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-FF4E');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-8BB2'),
|
||||
// value: 'E8:31:CD:14:8B:B2',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-8BB2';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-8BB2');
|
||||
// }),
|
||||
// RadioListTile(
|
||||
// title: Text('TiGNSS Rover-FF36'),
|
||||
// value: '98:CD:AC:62:FF:36',
|
||||
// groupValue: controller.gpsAddress.value,
|
||||
// onChanged: (value) {
|
||||
// controller.gpsAddress.value = value!;
|
||||
// controller.gpsName.value = 'TiGNSS Rover-FF36';
|
||||
// controller.saveGpsAddress(value);
|
||||
// controller.saveGpsName('TiGNSS Rover-FF36');
|
||||
// })
|
||||
// ])),
|
||||
const Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 20),
|
||||
child: Divider(
|
||||
@@ -329,7 +330,7 @@ class SettingsDialog extends StatelessWidget {
|
||||
SizedBox(
|
||||
height: 40,
|
||||
child: TextField(
|
||||
controller: controller.ntripUsernameController,
|
||||
controller: NtripService.to.usernameController,
|
||||
enableSuggestions: false,
|
||||
autocorrect: false,
|
||||
decoration: InputDecoration(
|
||||
@@ -351,10 +352,10 @@ class SettingsDialog extends StatelessWidget {
|
||||
child: TextField(
|
||||
keyboardType: TextInputType.visiblePassword,
|
||||
obscureText: controller.isShowPassword.value,
|
||||
focusNode: controller.passwordFieldFocusNode,
|
||||
//focusNode: controller.passwordFieldFocusNode,
|
||||
enableSuggestions: false,
|
||||
autocorrect: false,
|
||||
controller: controller.ntripPasswordController,
|
||||
controller: NtripService.to.passwordController,
|
||||
decoration: InputDecoration(
|
||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||
isDense: true,
|
||||
@@ -371,7 +372,7 @@ class SettingsDialog extends StatelessWidget {
|
||||
suffixIcon: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(0, 0, 4, 0),
|
||||
child: GestureDetector(
|
||||
onTap: controller.toggleShowPassword,
|
||||
//onTap: controller.toggleShowPassword,
|
||||
child: Icon(
|
||||
controller.isShowPassword.value
|
||||
? Icons.visibility_rounded
|
||||
|
||||
Reference in New Issue
Block a user