Merge pull request #134 from teamCA-PIN/feature/#114

Merge Feature/#114 into develop

Author: seohyun-106

CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/LoginViewController.swift

@@ -40,6 +40,7 @@ class LoginViewController: UIViewController {
     super.viewDidLoad()
     self.view.backgroundColor = .white
     self.navigationController?.navigationBar.isHidden = true
+    KeychainWrapper.standard.set(1, forKey: "loginVCFlag")
     layout()
     setTextField()
     keyboardObserver()

CA-PIN_IOS/CA-PIN_IOS/Screens/Login/ViewControllers/SplashViewController.swift

@@ -41,6 +41,7 @@ class SplashViewController: UIViewController {
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
                 if KeychainWrapper.standard.hasValue(forKey: "loginEmail") && KeychainWrapper.standard.hasValue(forKey: "loginPassword") {
+                  KeychainWrapper.standard.set(0, forKey: "loginVCFlag")
                     if let email = KeychainWrapper.standard.string(forKey: "loginEmail"),
                        let password = KeychainWrapper.standard.string(forKey: "loginPassword") {
                         self.login(ID: email, PW: password)

CA-PIN_IOS/CA-PIN_IOS/Screens/Mypage/ViewControllers/MypageViewController.swift

@@ -10,6 +10,7 @@ import Moya
 import RxMoya
 import RxSwift
 import SnapKit
+import SwiftKeychainWrapper
 import Then
 
 protocol PagingTabbarDelegate {
@@ -72,6 +73,8 @@ class MypageViewController: UIViewController {
   var categoryArray: [MyCategoryList] = [] /// 서버통신해서 카테고리 배열을 받아온다
   var categoryIdArray: [String] = [] /// 카테고리 아이디를 저장해놓는 배열 -> 카테고리 상세 페이지로 넘어갈 때 사용할 파라미터
 
+  var loginVCFlag: Int = 2
+  
   // MARK: - LifeCycle
   override func viewDidLoad() {
     super.viewDidLoad()
@@ -380,12 +383,19 @@ extension MypageViewController {
     }
   }
   @objc func backButtonClicked() {
-//    let mapVC = (self.navigationController?.children[2] as? MapViewController)!
-//    self.navigationController?.popToViewController(mapVC, animated: true)
-//    self.navigationController?.popViewController(animated: true)
-    let mapVC = self.navigationController?.children[2] as? MapViewController
-    if let vc = mapVC {
-      self.navigationController?.popToViewController(vc, animated: true)
+    var mapVC = self.navigationController?.children[1] as? MapViewController
+
+    loginVCFlag = KeychainWrapper.standard.integer(forKey: "loginVCFlag") ?? 2
+    
+    if loginVCFlag == 0 {
+      if let vc = mapVC {
+        self.navigationController?.popToViewController(vc, animated: true)
+      }
+    } else {
+      mapVC = self.navigationController?.children[2] as? MapViewController
+      if let vc = mapVC {
+        self.navigationController?.popToViewController(vc, animated: true)
+      }
     }
   }
   @objc func cafeTITestButtonClicked() {

CA-PIN_IOS/CA-PIN_IOS/Screens/Terms/LogoutPopUpViewController.swift

@@ -127,15 +127,12 @@ extension LogoutPopUpViewController {
     KeychainWrapper.standard.remove(forKey: "tokenAccess")
     KeychainWrapper.standard.remove(forKey: "tokenRefresh")
 
+    print(self.presentingViewController?.children)
     let loginVC = self.presentingViewController?.children[1] as? LoginViewController
     let endIndex = self.presentingViewController?.children.endIndex ?? 0
     let newSettingVC = self.presentingViewController?.children[endIndex-1] as? NewSettingViewController
-    if let dvc = loginVC {
-      self.dismiss(animated: false, completion: {
-        dvc.view.endEditing(true)
-        newSettingVC?.navigationController?.popToViewController(dvc, animated: true)
-      }
-    )
-    }
+    self.dismiss(animated: false, completion: {
+      newSettingVC?.navigationController?.popToRootViewController(animated: true)
+    })
   }
 }