From 1bd2382d6a01057417e158bfb88395e88bdd0a80 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Fri, 15 Dec 2023 17:08:10 +0800
Subject: [PATCH] =?UTF-8?q?2.4.2=E7=89=88=E6=9C=AC=E5=8F=91=E7=89=88=20?=
 =?UTF-8?q?=E6=AD=A4commit=E7=BD=AE=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi.xcodeproj/project.pbxproj                                | 4 ++--
 YuMi/Global/YUMIMacroUitls.h                                  | 2 +-
 YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m | 3 ++-
 .../Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m | 3 ++-
 .../YMLogin/View/NewLogin/XPLoginPhoneViewController.m        | 3 ++-
 .../YMLogin/View/XPLoginVerifBindPhoneViewController.m        | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj
index 270eb501..3cdbc670 100644
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -12201,7 +12201,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.5;
+				MARKETING_VERSION = 20.20.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12236,7 +12236,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.5;
+				MARKETING_VERSION = 20.20.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h
index 3cac47c1..74bf2764 100644
--- a/YuMi/Global/YUMIMacroUitls.h
+++ b/YuMi/Global/YUMIMacroUitls.h
@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.4.1"
+#define PI_App_Version @"2.4.2"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"
diff --git a/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m b/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m
index 8ae55ecf..a664468d 100644
--- a/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m
+++ b/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m
@@ -47,7 +47,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
 	[self initSubViews];
 	[self initSubViewConstraints];
 	[self initEvents];
diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
index 54f27ba2..37e41eab 100644
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
@@ -44,7 +44,8 @@
 }
 
 - (void)viewDidLoad {
-	self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
 
     [super viewDidLoad];
     [self createUI];
diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m
index fd89df1e..0da92ca2 100644
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m
@@ -67,7 +67,8 @@
 
 - (void)viewDidLoad {
     self.selectType = 0;
-	self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [super viewDidLoad];
     [self createUI];
     [self racBind];
diff --git a/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m b/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m
index 80dfd725..24ccef00 100644
--- a/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m
+++ b/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m
@@ -54,7 +54,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [self initSubViews];
     [self initSubViewConstraints];
     [self setConfigs];