Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+

@@ -43,8 +43,8 @@ android {
         applicationId "com.naji.one_key"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 114
-        versionName "1.1.4"
+        versionCode 115
+        versionName "1.1.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {

-7babc7873f8d177769b987ba4c6c2911
\ No newline at end of file
+860cea0521558e1c8a34a8bd64231ea0
\ No newline at end of file

@@ -140,4 +140,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.9.1

@@ -371,7 +371,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: 亚光 盖 (78U98359LM)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -404,7 +404,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 112;
+				CURRENT_PROJECT_VERSION = 115;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -417,7 +417,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -512,7 +512,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: 亚光 盖 (78U98359LM)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -545,7 +545,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 112;
+				CURRENT_PROJECT_VERSION = 115;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -558,7 +558,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
@@ -576,9 +576,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 112;
-				DEVELOPMENT_TEAM = 8J59HM8B82;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 115;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -590,10 +591,10 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
-				PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

@@ -68,7 +68,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
       ));
     WidgetsBinding.instance.addPostFrameCallback((_){
       if(widget.initialIndex==0)return;
-      initPlatformState();
+      Future.delayed(Duration(milliseconds: 300),(){
+        initPlatformState();
+      });
       Future.delayed(Duration(milliseconds: 30000),(){
         ContactModel.getInstance().uploadLocalContact(context);
       });
@@ -108,6 +110,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
           LogUtil.v("注册成功：$token");
 //          Utils.showToast("注册成功：$token");
           userTokenInit(token);
+          XgFlutterPlugin().setAppBadge(0);
         }
       },
       unRegistered: (String msg) async {
@@ -122,7 +125,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
       xgPushDidSetBadge: (String msg) async {
         print("flutter xgPushDidSetBadge: $msg");
         /// 在此可设置应用角标
-        /// XgFlutterPlugin().setAppBadge(0);;
+        XgFlutterPlugin().setAppBadge(0);
       },
       xgPushDidBindWithIdentifier: (String msg) async {
         print("flutter xgPushDidBindWithIdentifier: $msg");

@@ -41,7 +41,9 @@ class SmsPageState extends State<SmsPage>{
     userModel=Provider.of<UserModel>(context,listen: false);
     WidgetsBinding.instance.addPostFrameCallback((_){
       _getSmsContent();
-      ContactModel.getInstance().uploadLocalContact(context);
+      Future.delayed(Duration(milliseconds: 300),(){
+        ContactModel.getInstance().uploadLocalContact(context);
+      });
     });
   }