Merge branch 'master' into dev

# Conflicts:
#	lib/mine/vip_card_page.dart

android/app/build.gradle

@@ -100,6 +100,10 @@ android {
         }
     }
 
+    lintOptions {
+        checkReleaseBuilds false
+    }
+
     defaultConfig {
         applicationId "com.zsw.huixiang"
         minSdkVersion 21
@@ -109,7 +113,7 @@ android {
 
         ndk {
             /// 选择要添加的对应.so 库。
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
 
         manifestPlaceholders = mfph
@@ -137,19 +141,25 @@ android {
 
     buildTypes {
         release {
+//            debuggable true
+//            shrinkResources false
+//            minifyEnabled false
             signingConfig signingConfigs.config
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro'
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
+//            debuggable true
+//            shrinkResources false
+//            minifyEnabled false
             signingConfig signingConfigs.config
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro'
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         profile {
+//            debuggable true
+//            shrinkResources false
+//            minifyEnabled false
             signingConfig signingConfigs.config
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro'
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 

android/app/proguard-rules.pro

@@ -1,6 +1,19 @@
+
+# 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.** { *; }
+# -keep class com.google.firebase.** { *; } // uncomment this if you are using firebase in the project
+ -dontwarn io.flutter.embedding.**
+ -ignorewarnings
+
 # Build the ephemeral app in a module project.
 # Prevents: Warning: library class <plugin-package> depends on program class io.flutter.plugin.**
 # This is due to plugins (libraries) depending on the embedding (the program jar)
+
 -dontwarn io.flutter.plugin.**
 
 # The android.** package is provided by the OS at runtime.
@@ -30,6 +43,9 @@
 -keep class com.tencent.bigdata.baseapi.** {*;}
 -keep class com.tencent.bigdata.mqttchannel.** {*;}
 
+-keepclassmembers class * extends io.flutter.embedding.engine.plugins.FlutterPlugin {}
+-keepclassmembers class * implements io.flutter.plugin.common.MethodChannel.MethodCallHandler {}
+
 #andResGuard {
 #    whiteList = [
 #            "R.layout.mob_authorize_*",

android/gradle.properties

@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Xmx1536M
+#org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4096m 
 android.useAndroidX=true
 android.enableJetifier=true
 MobSDK.mobEnv=x

ios/Runner.xcodeproj/project.pbxproj

@@ -876,7 +876,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -917,7 +917,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 1.0.32;
+				MARKETING_VERSION = 1.0.33;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1103,7 +1103,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1144,7 +1144,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 1.0.32;
+				MARKETING_VERSION = 1.0.33;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1223,7 +1223,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1264,7 +1264,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 1.0.32;
+				MARKETING_VERSION = 1.0.33;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

lib/main.dart

@@ -67,6 +67,7 @@ import 'mine/manage_address_page.dart';
 import 'mine/roll_center_page.dart';
 
 void main() async {
+
   if (Platform.isAndroid) {
     SystemChrome.setSystemUIOverlayStyle(
         SystemUiOverlayStyle(statusBarColor: Colors.transparent));
@@ -75,7 +76,6 @@ void main() async {
   SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
   ]);
-
   SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
   Locale locale;
   if (sharedPreferences.containsKey("language") &&
@@ -84,7 +84,6 @@ void main() async {
   } else {
     locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW');
   }
-
   initSdk();
   bool isFirst = sharedPreferences.getBool("isFirst");
   print("isFirst:$isFirst");

lib/mine/vip_card_page.dart

@@ -95,6 +95,7 @@ class _VipCardPage extends State<VipCardPage> {
   }
 
   String assetsByName(String storeName) {
+    if (storeName == null) return "assets/image/icon_vip_bj.png";
     if (storeName.contains("百年川椒")) {
       return "assets/image/icon_vip_bj.png";
     } else if (storeName.contains("海峡姐妹")) {
@@ -167,7 +168,7 @@ class _VipCardPage extends State<VipCardPage> {
                               children: [
                                 Expanded(
                                   child: Text(
-                                    vipCard.tenantName,
+                                    vipCard.tenantName ?? "",
                                     overflow: TextOverflow.ellipsis,
                                     maxLines: 1,
                                     style: TextStyle(

lib/retrofit/retrofit_api.dart

@@ -61,7 +61,6 @@ abstract class ApiService {
         debugPrint("code = ${response.statusCode}");
         p(jsonEncode(response.data));
         Map map = response.data;
-
         if (map["code"] == 40005 || map["code"] == 40001) {
           SmartDialog.show(
             widget: LoginTips(