sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into build-addGateway-20240814

Browse Source
This commit is contained in:
魏少阳 2025-01-13 17:47:17 +08:00
commit d1513c4e3a
2 changed files with 116 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart
View File

@ -1,4 +1,3 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
@ -31,7 +30,9 @@ class LockAddressGaoDePage extends StatefulWidget {
class _LockAddressGaoDePageState extends State<LockAddressGaoDePage> class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
with RouteAware { with RouteAware {
final LockAddressGaoDeLogic logic = Get.put(LockAddressGaoDeLogic()); final LockAddressGaoDeLogic logic = Get.put(LockAddressGaoDeLogic());
final LockAddressGaoDeState state = Get.find<LockAddressGaoDeLogic>().state; final LockAddressGaoDeState state = Get
.find<LockAddressGaoDeLogic>()
.state;
// 高德地图 // 高德地图
static AMapApiKey amapApiKeys = static AMapApiKey amapApiKeys =
@ -52,51 +53,16 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
requestPermission(); requestPermission();
} }
// Future<void> requestPermission() async {
// final status = await Permission.location.request();
// AppLog.log("Permission.location.request()=status:$status");
// permissionStatus = status;
// if(Platform.isIOS){
// _setLocationOption();
// requestIOSLocation();
// }
// switch (status) {
// case PermissionStatus.denied:
// // AppLog.log("拒绝");
// break;
// case PermissionStatus.granted:
// if(Platform.isIOS){
// // _setLocationOption();
// // requestIOSLocation();
// }else{
// requestAndroidLocation();
// location.startLocation();
// }
// break;
// case PermissionStatus.limited:
// // AppLog.log("限制");
// break;
// case PermissionStatus.permanentlyDenied:
// // AppLog.log("永久的否认");
// break;
// case PermissionStatus.provisional:
// // AppLog.log("临时");
// break;
// default:
// // AppLog.log("其他状态");
// // requestLocation();
// break;
// }
// }
Future<void> requestPermission() async { Future<void> requestPermission() async {
final bool status = await PermissionDialog.request(Permission.location); final bool status = await PermissionDialog.request(Permission.location);
if(Platform.isIOS){ if (Platform.isIOS) {
_setLocationOption(); _setLocationOption();
requestIOSLocation(); requestIOSLocation();
} }
if (!Platform.isIOS || status) { if (!Platform.isIOS || status) {
_setLocationOption();
requestAndroidLocation(); requestAndroidLocation();
location.startLocation(); location.startLocation();
} }
@ -114,9 +80,8 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
} }
Future<void> requestIOSLocation() async { Future<void> requestIOSLocation() async {
location = AMapFlutterLocation() location.setLocationOption(AMapLocationOption());
..setLocationOption(AMapLocationOption()) location.onLocationChanged().listen((Map<String, Object> event) {
..onLocationChanged().listen((Map<String, Object> event) {
// AppLog.log("listenLocationChanged$event"); // AppLog.log("listenLocationChanged$event");
// EasyLoading.dismiss(); // EasyLoading.dismiss();
if (event.isNotEmpty) { if (event.isNotEmpty) {
@ -125,8 +90,8 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
}); });
// location.stopLocation(); // location.stopLocation();
} }
}) });
..startLocation(); location.startLocation();
} }
@override @override
@ -183,6 +148,9 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
onMapCreated: (AMapController controller) { onMapCreated: (AMapController controller) {
mapController = controller; mapController = controller;
}, },
onLocationChanged: (AMapLocation location) {
print("onLocationChanged ${location}");
},
), ),
), ),
Container( Container(
@ -242,7 +210,8 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
style: TextStyle(color: Colors.black, fontSize: 24.sp), style: TextStyle(color: Colors.black, fontSize: 24.sp),
), ),
onPressed: () { onPressed: () {
Get.toNamed(Routers.addLockSelectCountryPage, arguments: <String, Object>{ Get.toNamed(Routers.addLockSelectCountryPage,
arguments: <String, Object>{
'addressInfo': {}, 'addressInfo': {},
'pwdTimestamp': state.pwdTimestamp.value, 'pwdTimestamp': state.pwdTimestamp.value,
'lockInfo': state.lockInfo, 'lockInfo': state.lockInfo,
@ -262,7 +231,8 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
logic.showToast('还未获取到位置信息哦，请耐心等待一下！'.tr); logic.showToast('还未获取到位置信息哦，请耐心等待一下！'.tr);
return; return;
} }
Get.toNamed(Routers.saveLockPage, arguments: <String, Object?>{ Get.toNamed(Routers.saveLockPage,
arguments: <String, Object?>{
'addressInfo': addressInfo, 'addressInfo': addressInfo,
'pwdTimestamp': state.pwdTimestamp.value, 'pwdTimestamp': state.pwdTimestamp.value,
'lockInfo': state.lockInfo, 'lockInfo': state.lockInfo,

4
pubspec.yaml
View File

@ -193,11 +193,11 @@ dependencies:
easy_refresh: ^3.3.4 easy_refresh: ^3.3.4
#高德地图定位 #高德地图定位
amap_flutter_location: ^3.0.0 amap_flutter_location: 3.0.0
#权限使用 #权限使用
permission_handler: ^11.3.1 permission_handler: ^11.3.1
#高德地图地图 #高德地图地图
amap_flutter_map: ^3.0.0 amap_flutter_map: 3.0.0
# 谷歌地图 # 谷歌地图
google_maps_flutter: ^2.2.5 google_maps_flutter: ^2.2.5