From 65b18e1b99ee8313ea8236f39643db69515065da Mon Sep 17 00:00:00 2001
From: fmk <fengmeikan@hotmail.com>
Date: Mon, 13 Jun 2022 23:09:55 +0800
Subject: [PATCH] ios

---
 ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------
 lib/login/new_login_page.dart        |  6 +++---
 lib/main.dart                        |  4 ++--
 lib/main_page.dart                   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 999fefeb..f968fea7 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -616,7 +616,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -666,7 +666,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.14;
+				MARKETING_VERSION = 2.0.19;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -816,7 +816,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -866,7 +866,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.14;
+				MARKETING_VERSION = 2.0.19;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -907,7 +907,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -957,7 +957,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.14;
+				MARKETING_VERSION = 2.0.19;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/lib/login/new_login_page.dart b/lib/login/new_login_page.dart
index e5c776f3..dc051bf2 100644
--- a/lib/login/new_login_page.dart
+++ b/lib/login/new_login_page.dart
@@ -503,9 +503,9 @@ class _NewLoginPage extends State<NewLoginPage> {
                                 ),
                                 flex: 4,
                               ),
-                              SizedBox(
-                                width: 17.h,
-                              ),
+                              // SizedBox(
+                              //   width: 8.h,
+                              // ),
                               Expanded(
                                 child: Container(
                                   alignment: Alignment.bottomCenter,
diff --git a/lib/main.dart b/lib/main.dart
index 45a7e988..22f8a3ad 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -131,9 +131,9 @@ void main() async {
   Locale locale;
   if (sharedPreferences.containsKey("language") &&
       sharedPreferences.getString("language") == "zh") {
-    locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH');
-  } else {
     locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW');
+  } else {
+    locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH');
   }
   ImgCachePath();
   // initSdk();
diff --git a/lib/main_page.dart b/lib/main_page.dart
index acd0675c..9e047cd1 100644
--- a/lib/main_page.dart
+++ b/lib/main_page.dart
@@ -354,7 +354,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
     PackageInfo packageInfo = await PackageInfo.fromPlatform();
     BaseData<AppUpdate> baseData = await apiService.appVersion().catchError((onError) {});
     if (baseData != null && baseData.isSuccess) {
-      baseData.data.appLastVersion = "2.0.17";
+      // baseData.data.appLastVersion = "2.0.17";//
       // baseData.data.appLastVersionUp = "1.0.1";
       if(AppUtils.versionCompare(packageInfo.version,baseData.data?.appLastVersion)
           && AppUtils.versionCompare(value.getString("appLastVersion")??"1.0.0",baseData.data?.appLastVersion)){