dbs289 5 tahun lalu
induk
melakukan
0e79f752e4
2 mengubah file dengan 27 tambahan dan 29 penghapusan
  1. 8 8
      MCPlus.xcodeproj/project.pbxproj
  2. 19 21
      MCPlus/AppDelegate.swift

+ 8 - 8
MCPlus.xcodeproj/project.pbxproj

@@ -8269,7 +8269,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 7W97E82MGQ;
 				ENABLE_BITCODE = NO;
@@ -8281,7 +8281,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 6;
+				MARKETING_VERSION = 7;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lemonhc.lemonplus.fatima.dev;
 				PRODUCT_NAME = "fatima local POC";
@@ -8303,7 +8303,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 7W97E82MGQ;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8314,7 +8314,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 6;
+				MARKETING_VERSION = 7;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lemonhc.lemonplus.fatima.dev;
 				PRODUCT_NAME = "fatima local POC";
@@ -8335,7 +8335,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 7W97E82MGQ;
 				ENABLE_BITCODE = NO;
@@ -8347,7 +8347,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 6;
+				MARKETING_VERSION = 7;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lemonhc.lemonplus.fatima.inhouse;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8369,7 +8369,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 7W97E82MGQ;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8380,7 +8380,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 6;
+				MARKETING_VERSION = 7;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lemonhc.lemonplus.fatima.inhouse;
 				PRODUCT_NAME = "$(TARGET_NAME)";

+ 19 - 21
MCPlus/AppDelegate.swift

@@ -100,29 +100,27 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
     
     func applicationDidBecomeActive(_ application: UIApplication) {
-        
-        self.versionCheck()
+//        self.versionCheck()
         
         //화면잠금 모드로 고고씽
         // 지문인식을 받기 위해 지문인식 창이 떴다가 다시 돌아오는 경우도 applicationDidBecomeActive: 함수가 호출된다
-        
-        let formatString = "yyyy-MM-dd hh:mm:ss"
-        let now = Date()
-        let savedTime = (self.userDefaults.object(forKey: "fingerprintAuthTime") as? String)?.fromDate(format: formatString)
-        
-        let diff = (savedTime?.timeIntervalSince(now) ?? 0) * -1
-        
-        if diff > 1 || savedTime == nil{
-            do{
-                guard let info = Bundle.main.infoDictionary else{ return }
-                
-                if info["LockScreenUse"] as? Bool == true{
-                    let VC = ScreenLockViewController()
-                    VC.modalPresentationStyle = .fullScreen
-                    self.window?.rootViewController?.present(VC, animated: true, completion: nil)
-                }
-            }
-        }
+//        let formatString = "yyyy-MM-dd hh:mm:ss"
+//        let now = Date()
+//        let savedTime = (self.userDefaults.object(forKey: "fingerprintAuthTime") as? String)?.fromDate(format: formatString)
+//        
+//        let diff = (savedTime?.timeIntervalSince(now) ?? 0) * -1
+//        
+//        if diff > 1 || savedTime == nil{
+//            do{
+//                guard let info = Bundle.main.infoDictionary else{ return }
+//                
+//                if info["LockScreenUse"] as? Bool == true{
+//                    let VC = ScreenLockViewController()
+//                    VC.modalPresentationStyle = .fullScreen
+//                    self.window?.rootViewController?.present(VC, animated: true, completion: nil)
+//                }
+//            }
+//        }
         
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
         if let cookiesData = self.userDefaults.object(forKey: "Cookies") as? Data{
@@ -198,7 +196,7 @@ extension AppDelegate{
         
         var versionCheckUrl:String = "\(MCarePlusConstants.DOMAIN_NAME)\(MCarePlusConstants.APP_NAME)\(Constants.API_TYPE_VERSION_CHECK).json"
         
-        var infoDic:Dictionary = Bundle.main.infoDictionary!
+        let infoDic:Dictionary = Bundle.main.infoDictionary!
         let appName = infoDic["CFBundleName"] as? String
         if appName!.isEqualToString(find: "lemon_local") {
             versionCheckUrl = "\(MCarePlusConstants.DOMAIN_NAME)mcare-plus\(Constants.API_TYPE_VERSION_CHECK).json"