From adad457df1ca527693a16b1821be14158a0da8a0 Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Tue, 27 Jul 2021 11:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=AB=98=E5=BE=B7=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BEkey=20=E4=BF=AE=E6=94=B9=5Flocation=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=81=BF=E7=A9=BA=EF=BC=8C=E4=BD=BF=E5=BE=97=E9=AB=98=E5=BE=B7?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=8D=E5=8F=AF=E7=94=A8=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E5=8D=A1=E5=9C=A8=E5=90=AF=E5=8A=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml   | 2 +-
 lib/pages/one_alarm/widget/alarm_page.dart | 6 +++---
 lib/provider/app_provider.dart             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 538ec7d4..750c62b2 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
   <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区" android:icon="@mipmap/ic_launcher" android:networkSecurityConfig="@xml/network_security_config">
   <service android:name="com.amap.api.location.APSService"></service>
   <meta-data android:name="com.amap.api.v2.apikey"
-                 android:value="ee697f99e8381b7efde08b9976052bd0"/>
+                 android:value="717cf8c606307809bcbd6661123b9837"/>
     <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart
index 15e6ebad..eae234bf 100644
--- a/lib/pages/one_alarm/widget/alarm_page.dart
+++ b/lib/pages/one_alarm/widget/alarm_page.dart
@@ -68,8 +68,8 @@ class _AlarmPageState extends State<AlarmPage> {
               final appProvider =
                   Provider.of<AppProvider>(context, listen: false);
               LatLng _target = LatLng(
-                appProvider.location!['latitude'] as double,
-                appProvider.location!['longitude'] as double,
+                (appProvider.location?['latitude'] ?? 0) as double,
+                (appProvider.location?['longitude'] ?? 0 )as double,
               );
               _mapController = controller;
               _mapController!.moveCamera(
@@ -127,7 +127,7 @@ class _AlarmPageState extends State<AlarmPage> {
                               child: Text(
                                 (appProvider.location == null)
                                     ? '加载中……'
-                                    : appProvider.location!['address']
+                                    : (appProvider.location?['address'] ?? '')
                                         as String,
                                 style: TextStyle(
                                   color: Color(0xff666666),
diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart
index d5031218..3d5aeebf 100644
--- a/lib/provider/app_provider.dart
+++ b/lib/provider/app_provider.dart
@@ -174,8 +174,8 @@ class AppProvider extends ChangeNotifier {
       longitude = 116.46;
       latitude = 39.92;
     } else {
-      longitude = _location!['longitude'];
-      latitude = _location!['latitude'];
+      longitude = _location?['longitude']??116.46;
+      latitude = _location?['latitude']??39.92;
     }
 
     Response response = await Dio().get(