From 4eb2261d2a43639cda4a2212511f46ba064cab0b Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Sun, 8 Oct 2023 11:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme  |  2 +-
 YuMi/CustomUI/InputView/InputView/QInputBarView.m    |  4 ++--
 YuMi/Modules/YMLogin/Api/PILoginManager.m            |  7 ++++---
 .../YMLogin/View/NewLogin/XPLoginAuthCodeVC.h        |  1 +
 .../YMLogin/View/NewLogin/XPLoginAuthCodeVC.m        | 12 +++++++++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
index 9e3921f5..d258e3d3 100644
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/YuMi/CustomUI/InputView/InputView/QInputBarView.m b/YuMi/CustomUI/InputView/InputView/QInputBarView.m
index 6add27f5..04f3dbb1 100755
--- a/YuMi/CustomUI/InputView/InputView/QInputBarView.m
+++ b/YuMi/CustomUI/InputView/InputView/QInputBarView.m
@@ -413,9 +413,9 @@ const int UIInputTextViewMaxHeight = 147;
 	self.recordButton.selected = YES;
 	///开始录音
 	if (!self.audioRecordView.superview) {
-		[[UIApplication sharedApplication].keyWindow addSubview:self.audioRecordView];
+		[kWindow addSubview:self.audioRecordView];
 		[self.audioRecordView mas_makeConstraints:^(MASConstraintMaker *make) {
-			make.center.mas_equalTo(self.audioRecordView.superview);
+			make.center.mas_equalTo(kWindow);
 		}];
 		[self.audioRecordView configAudioRecord:@"message_tool_audio_record_first" title:YMLocalizedString(@"QInputBarView2") isAnimation:YES];
 		[self.audioRecordView beginAudioRecord];
diff --git a/YuMi/Modules/YMLogin/Api/PILoginManager.m b/YuMi/Modules/YMLogin/Api/PILoginManager.m
index 85efb051..8ff668e6 100644
--- a/YuMi/Modules/YMLogin/Api/PILoginManager.m
+++ b/YuMi/Modules/YMLogin/Api/PILoginManager.m
@@ -17,6 +17,7 @@
 #import "ThirdUserInfo.h"
 #import "AccountModel.h"
 #import "UserInfoModel.h"
+#import "XPLoginAuthCodeVC.h"
 @implementation PILoginManager
 +(void)loginWithVC:(MvpViewController *)VC isLoginPhone:(BOOL)isLoginPhone{
     AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
@@ -78,9 +79,9 @@
         [[AccountInfoStorage instance]saveHomeUserInfo:homeUserModel];
         if (userInfo.nick == nil || userInfo.avatar == nil) {
             if([isFlag isEqualToString:@"0"]){
-                LoginVerifCodeViewController *lvc = [[LoginVerifCodeViewController alloc] init];
-                lvc.type = VerifCodeType_AreaCode;
-                [VC.navigationController pushViewController:lvc animated:YES];
+                XPLoginAuthCodeVC *vc = [[XPLoginAuthCodeVC alloc]init];
+                vc.pi_isPush = YES;
+                [VC.navigationController pushViewController:vc animated:YES];
             }else{
                 LoginFullInfoViewController * FullVC = [[LoginFullInfoViewController alloc] init];
                 [VC.navigationController pushViewController:FullVC animated:YES];
diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.h b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.h
index 4a5626b9..ce32dd14 100644
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.h
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.h
@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XPLoginAuthCodeVC : MvpViewController
 @property(nonatomic,weak) id<XPLoginAuthCodeVCDelegate>delegate;
+@property(nonatomic,assign) BOOL pi_isPush;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m
index 8433b9ae..8227ce28 100644
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m
@@ -9,6 +9,7 @@
 #import "XPLoginInputView.h"
 #import <ReactiveObjC.h>
 #import "LoginVerifCodePresent.h"
+#import "LoginFullInfoViewController.h"
 @interface XPLoginAuthCodeVC ()
 ///背景
 @property(nonatomic,strong) UIImageView *bgImageView;
@@ -22,6 +23,9 @@
 @end
 
 @implementation XPLoginAuthCodeVC
+- (BOOL)isHiddenNavBar {
+    return YES;
+}
 - (LoginVerifCodePresent *)createPresenter {
     return [[LoginVerifCodePresent alloc] init];
 }
@@ -89,11 +93,17 @@
 - (void)bindAuthorizationCodeSuccess{
     [self hideHUD];
     [self showSuccessToast:YMLocalizedString(@"XPLoginAuthCodeVC2")];
+    self.loginBtn.enabled = YES;
+    if(self.pi_isPush == YES){
+        LoginFullInfoViewController * FullVC = [[LoginFullInfoViewController alloc] init];
+        [self.navigationController pushViewController:FullVC animated:YES];
+        return;
+    }
     [self dismissViewControllerAnimated:YES completion:nil];
     if(self.delegate && [self.delegate respondsToSelector:@selector(bindCodeSuccess)]){
         [self.delegate bindCodeSuccess];
     }
-    self.loginBtn.enabled = YES;
+    
 }
 -(void)bindAuthorizationCodeFail{
     [self hideHUD];