Skip to content

Commit

Permalink
Merge pull request #162 from Sopt-Mongle/feature/#160
Browse files Browse the repository at this point in the history
scenedelegate 수정
  • Loading branch information
qodhrkawk authored Nov 19, 2020
2 parents 8ff92c7 + 1d53a86 commit 0f8162a
Show file tree
Hide file tree
Showing 36 changed files with 32 additions and 29 deletions.
6 changes: 4 additions & 2 deletions Mongle/Mongle.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle;
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12;

PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -1332,7 +1333,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle;
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12;

PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
{
"images" : [
{
"filename" : "Icon-40.png",
"filename" : "Icon-40 (1)-1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-60.png",
"filename" : "Icon-60 (1).png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "Icon-58.png",
"filename" : "Icon-58 (1).png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-87.png",
"filename" : "Icon-87 (1).png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "Icon-80.png",
"filename" : "Icon-80 (1).png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-120.png",
"filename" : "Icon-120 (1)-1.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "Icon-121.png",
"filename" : "Icon-120 (1).png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "Icon-180.png",
"filename" : "Icon-180 (1).png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "Icon-20.png",
"filename" : "Icon-20 (1).png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "Icon-41.png",
"filename" : "Icon-40 (1).png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-29.png",
"filename" : "Icon-29 (1).png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "Icon-59.png",
"filename" : "Icon-58 (1)-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-42.png",
"filename" : "Icon-40 (1)-2.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "Icon-81.png",
"filename" : "Icon-80 (1)-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
Expand All @@ -103,7 +103,7 @@
"size" : "83.5x83.5"
},
{
"filename" : "Icon-1024.png",
"filename" : "appstore.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
25 changes: 13 additions & 12 deletions Mongle/Mongle/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,19 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
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.

let date = Date()
let formatter = DateFormatter()
formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
let originDate = UserDefaults.standard.string(forKey: "tokenTime")!
let ogD = formatter.date(from: originDate)
let calendar = Calendar.current
let diff = calendar.dateComponents([.minute], from: ogD!, to: date)

if diff.minute! > 210 {
let defaults = UserDefaults.standard
if let token = defaults.string(forKey: "token"){
let defaults = UserDefaults.standard
if let token = defaults.string(forKey: "token"){
let date = Date()
let formatter = DateFormatter()
formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
let originDate = UserDefaults.standard.string(forKey: "tokenTime")!
let ogD = formatter.date(from: originDate)
let calendar = Calendar.current
let diff = calendar.dateComponents([.minute], from: ogD!, to: date)

if diff.minute! > 210 {


// 둘러보기
if token == "guest" || token == "1"{

Expand Down

0 comments on commit 0f8162a

Please sign in to comment.