Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

android/app/build.gradle

@@ -55,10 +55,7 @@ android {
     }
 
     dependencies {
-//        implementation fileTree(dir: 'libs', include: ['*.jar'])
-//        implementation('com.amap.api:map2d:6.0.0')
-//        implementation('com.amap.api:search:9.2.0')
-//        implementation('com.amap.api:location:6.1.0')
+//        implementation 'com.google.android.material:material:1.5.0'
         implementation('com.amap.api:3dmap:9.1.0')
     }
 

android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
     <!--允许读设备等信息，用于问题排查-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <application
-        android:label="farmer_client"
+        android:label="农忙助手"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

android/app/src/main/res/drawable/launch_background.xml

@@ -2,11 +2,10 @@
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@android:color/white" />
-
     <!-- You can insert your own image images here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+<!--    <item>-->
+<!--        <bitmap-->
+<!--            android:gravity="fill"-->
+<!--            android:src="@drawable/launch_image" />-->
+<!--    </item>-->
 </layer-list>

android/app/src/main/res/values/styles.xml

@@ -4,7 +4,8 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+<!--        <item name="android:windowBackground">@drawable/launch_image</item>-->
+        <item name="android:windowBackground">@drawable/launch_image</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -14,5 +15,6 @@
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
+<!--        <item name="android:windowBackground">@drawable/launch_background</item>-->
     </style>
 </resources>