Merge pull request #171 from TeamBeMe/feature/#169

Feature/#169
TeamBeMe · Feb 21, 2021 · dfd6444 · dfd6444
2 parents 6b928f2 + 118a477
commit dfd6444
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/BeMe/BeMe.xcodeproj/project.pbxproj b/BeMe/BeMe.xcodeproj/project.pbxproj
@@ -1934,7 +1934,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.053;
+				MARKETING_VERSION = 1.0552;
 				PRODUCT_BUNDLE_IDENTIFIER = com.teamBeMe.BeMe1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1957,7 +1957,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.053;
+				MARKETING_VERSION = 1.0552;
 				PRODUCT_BUNDLE_IDENTIFIER = com.teamBeMe.BeMe1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/BeMe/BeMe/Alarm/VCs/AlarmVC.swift b/BeMe/BeMe/Alarm/VCs/AlarmVC.swift
@@ -18,6 +18,7 @@ class AlarmVC: UIViewController {
     private var alarmArray: [Alarm] = [] {
         didSet {
             self.alarmTableView.reloadData()
+            LoadingHUD.hide()
         }
     }
 
@@ -27,6 +28,10 @@ class AlarmVC: UIViewController {
         super.viewWillAppear(animated)
         self.navigationController?.interactivePopGestureRecognizer?.delegate = nil
         getAlarms()
+
+    }
+    override func viewWillDisappear(_ animated: Bool) {
+        UIApplication.shared.applicationIconBadgeNumber = 0
     }
 
     override func viewDidLoad() {
@@ -57,6 +62,7 @@ extension AlarmVC {
                         self.alarmArray.append(contentsOf: ad.activities)
                     }
 
+
                 }
 
             case .requestErr(let message):

diff --git a/BeMe/BeMe/AppDelegate.swift b/BeMe/BeMe/AppDelegate.swift
@@ -88,7 +88,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
 
         application.registerForRemoteNotifications()
         Messaging.messaging().delegate = self
-        UIApplication.shared.applicationIconBadgeNumber = 0
+
 
         return true
     }

diff --git a/BeMe/BeMe/SceneDelegate.swift b/BeMe/BeMe/SceneDelegate.swift
@@ -26,6 +26,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         var rootVc = storyBoard.instantiateViewController(identifier: "UnderTabBarController")
         //        var storyBoard = UIStoryboard(name: "Onboarding", bundle: nil)
         //        var rootVc = storyBoard.instantiateViewController(identifier: "OnboardingVC")
+
         if let token = defaults.string(forKey: "token"){
             // 자동로그인 -> 메인뷰
 
@@ -95,13 +96,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // This occurs shortly after the scene enters the background, or when its session is discarded.
         // Release any resources associated with this scene that can be re-created the next time the scene connects.
         // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead).
+        NotificationCenter.default.addObserver(self, selector: #selector(showAlert(_:)), name: .fromPushAlert, object: nil)
     }
 
     func sceneDidBecomeActive(_ scene: UIScene) {
         // Called when the scene has moved from an inactive state to an active state.
         // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
 
-
+        NotificationCenter.default.addObserver(self, selector: #selector(showAlert(_:)), name: .fromPushAlert, object: nil)
 
     }
 
@@ -122,17 +124,20 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func sceneWillResignActive(_ scene: UIScene) {
         // Called when the scene will move from an active state to an inactive state.
         // This may occur due to temporary interruptions (ex. an incoming phone call).
+        NotificationCenter.default.addObserver(self, selector: #selector(showAlert(_:)), name: .fromPushAlert, object: nil)
     }
 
     func sceneWillEnterForeground(_ scene: UIScene) {
         // Called as the scene transitions from the background to the foreground.
         // Use this method to undo the changes made on entering the background.
+        NotificationCenter.default.addObserver(self, selector: #selector(showAlert(_:)), name: .fromPushAlert, object: nil)
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
         // Called as the scene transitions from the foreground to the background.
         // Use this method to save data, release shared resources, and store enough scene-specific state information
         // to restore the scene back to its current state.
+        NotificationCenter.default.addObserver(self, selector: #selector(showAlert(_:)), name: .fromPushAlert, object: nil)
     }