From 7616f65a96126696991583f72ba4effe78f9cd5f Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Tue, 30 Mar 2021 11:29:30 +0800
Subject: [PATCH] update dio version & add proguard file

---
 android/app/build.gradle       | 10 ++++------
 android/app/proguard-rules.pro | 18 ++++++++++++++++++
 pubspec.lock                   |  2 +-
 pubspec.yaml                   |  4 ++--
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 android/app/proguard-rules.pro

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 88b9c8d9..3948aa5e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -84,12 +84,10 @@ android {
 
     buildTypes {
         release {
-            release {
-                signingConfig signingConfigs.release
-                minifyEnabled true
-                useProguard true
-                proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            }
+            signingConfig signingConfigs.release
+            minifyEnabled true
+            useProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
new file mode 100644
index 00000000..dde36c15
--- /dev/null
+++ b/android/app/proguard-rules.pro
@@ -0,0 +1,18 @@
+## Flutter wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }
+-dontwarn io.flutter.embedding.**
+
+## AMap 3D Map
+-keep   class com.amap.api.maps.**{*;}
+-keep   class com.autonavi.**{*;}
+-keep   class com.amap.api.trace.**{*;}
+
+## AMap Location
+-keep class com.amap.api.location.**{*;}
+-keep class com.amap.api.fence.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index e9f28f52..2927def0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -184,7 +184,7 @@ packages:
       name: dio
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0-prev3"
+    version: "4.0.0"
   extended_text:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b4342ca4..33f9bad9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: akuCommunity
 description: A new Flutter project.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.1.10-dev+17
+version: 1.1.21-dev+27
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -40,7 +40,7 @@ dependencies:
   #滑块
   flutter_slidable: ^0.6.0-nullsafety.0
   #http
-  dio: ^4.0.0-prev3
+  dio: ^4.0.0
   #骨架
   shimmer: ^2.0.0-nullsafety.0
   #随机二维码