Merge branch 'master' of gitee.com:starlock-cn/app-starlock

star_lock/android/app/build.gradle

@@ -114,7 +114,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
-        signingConfig signingConfigs.pre
+        signingConfig signingConfigs.sky
 
         // 为减少体积，使用不同架构分包发布编译选项 flutter build apk --split-per-abi
         // 所以需要禁用ndk在同一个个包中包含多个架构
@@ -133,7 +133,7 @@ android {
                 universalApk true
             }
         }
-    }
+    }// /Users/sky/app-starlock/star_lock/android/app/sky.jks
     buildTypes {
         release {
             productFlavors.dev.signingConfig signingConfigs.pre
@@ -142,7 +142,10 @@ android {
             productFlavors.xhj.signingConfig signingConfigs.xhj
         }
         debug {
-            signingConfig signingConfigs.pre
+            productFlavors.dev.signingConfig signingConfigs.pre
+            productFlavors.pre.signingConfig signingConfigs.pre
+            productFlavors.sky.signingConfig signingConfigs.sky
+            productFlavors.xhj.signingConfig signingConfigs.xhj
         }
     }
 }

star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart

@@ -125,9 +125,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
             ],
           ),
         ),
-        SizedBox(
+        SizedBox(height: 30.h),
-          height: 30.h,
-        ),
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [

star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart

@@ -169,7 +169,7 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage> with RouteA
           ),
           SizedBox(
             child:
-            addressInfo != null ?
+            (addressInfo != null && addressInfo!.containsKey("latitude")) ?
             Column(
               children: [
                 SizedBox(