Merge branch 'develop' of https://github.com/semicolonDSM/DDYZD_iOS i…

…nto main
semicolondsm · Apr 27, 2021 · 42ac3b9 · 42ac3b9
2 parents b7ace7e + 6e8afbf
commit 42ac3b9
Show file tree

Hide file tree

Showing 15 changed files with 5,751 additions and 5,362 deletions.
diff --git a/DDYZD_V2/DDYZD_V2.xcodeproj/project.pbxproj b/DDYZD_V2/DDYZD_V2.xcodeproj/project.pbxproj
@@ -812,7 +812,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.5;
+				MARKETING_VERSION = 2.5.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.semicolon.DDYZD-V2";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -837,7 +837,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.5;
+				MARKETING_VERSION = 2.5.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.semicolon.DDYZD-V2";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/DDYZD_V2/DDYZD_V2/Resource/AppDelegate.swift b/DDYZD_V2/DDYZD_V2/Resource/AppDelegate.swift
@@ -10,6 +10,7 @@ import UIKit
 import DSMSDK
 import Firebase
 import RxSwift
+import Siren
 import UserNotificationsUI
 
 @main
@@ -22,6 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         // Override point for customization after application launch.
 
         window?.backgroundColor = .white
+        window?.makeKeyAndVisible()
 
         DSMSDKCommon.initSDK(clientID: "ab840667ddcd41dc81b29f8f128a0e66",
                              clientSecret: "adbf21db93f240a8a2d1e4e3b446689c",
@@ -42,6 +44,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         application.registerForRemoteNotifications()
         AuthAPI().refreshToken().subscribe().disposed(by: disposeBag)
 
+        let siren = Siren.shared
+        siren.apiManager = APIManager(country: .korea) //기준 위치 대한민국 앱스토어로 변경
+        siren.presentationManager = PresentationManager(forceLanguageLocalization: .korean) //알림 메시지 한국어로
+        siren.rulesManager = RulesManager(majorUpdateRules: .persistent,
+                                          minorUpdateRules: .persistent,
+                                          patchUpdateRules: .persistent,
+                                          revisionUpdateRules: .persistent) // 하루에 한 번 확인, 다음에 업데이트 가능
+        siren.wail()
+
         return true
     }
 

diff --git a/DDYZD_V2/Podfile b/DDYZD_V2/Podfile
@@ -6,20 +6,28 @@ target 'DDYZD_V2' do
   use_frameworks!
 
   # Pods for DDYZD_V2
-
+
+  #Networking
   pod 'Alamofire', '~> 5.2'
-  pod 'DSMSDK', '~> 1.3.0'
-  pod 'Firebase/Messaging'
-  pod 'ImageSlideshow', '~> 1.9.0'
-  pod 'ImageSlideshow/Kingfisher', '~> 1.9.0'
-  pod 'KeychainSwift', '~> 19.0'
-  pod 'Kingfisher', '~> 6.0'
+  pod 'Socket.IO-Client-Swift', '~> 16.0.0'
+
+  #Rx
   pod 'RxAlamofire', '~> 6.1'
   pod 'RxCocoa', '~> 6.0'
   pod 'RxDataSources', '~> 5.0'
   pod 'RxSwift', '~> 6.0'
-  pod 'Socket.IO-Client-Swift', '~> 16.0.0'
+
+  #UI
   pod 'SwiftOverlays', '~> 5.0.1'
   pod 'Tabman', '~> 2.9'
+  pod 'ImageSlideshow', '~> 1.9.0'
+  pod 'ImageSlideshow/Kingfisher', '~> 1.9.0'
+  pod 'Kingfisher', '~> 6.0'
+
+  #ect
+  pod 'DSMSDK', '~> 1.3.0'
+  pod 'KeychainSwift', '~> 19.0'
+  pod 'Firebase/Messaging'
+  pod 'Siren', '~> 5.8'
 
 end
diff --git a/DDYZD_V2/Podfile.lock b/DDYZD_V2/Podfile.lock
@@ -83,6 +83,7 @@ PODS:
   - RxRelay (6.1.0):
     - RxSwift (= 6.1.0)
   - RxSwift (6.1.0)
+  - Siren (5.8.1)
   - Socket.IO-Client-Swift (16.0.1):
     - Starscream (~> 4.0)
   - Starscream (4.0.4)
@@ -102,6 +103,7 @@ DEPENDENCIES:
   - RxCocoa (~> 6.0)
   - RxDataSources (~> 5.0)
   - RxSwift (~> 6.0)
+  - Siren (~> 5.8)
   - Socket.IO-Client-Swift (~> 16.0.0)
   - SwiftOverlays (~> 5.0.1)
   - Tabman (~> 2.9)
@@ -130,6 +132,7 @@ SPEC REPOS:
     - RxDataSources
     - RxRelay
     - RxSwift
+    - Siren
     - Socket.IO-Client-Swift
     - Starscream
     - SwiftOverlays
@@ -158,11 +161,12 @@ SPEC CHECKSUMS:
   RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
   RxRelay: 483e1a19fad961b41f0b0c0bee506f46c1ae14fe
   RxSwift: a834e5c538e89eca0cae86f403f4fbf0336786ce
+  Siren: de768099aff1f1c9acda4247064788a4940b4bf3
   Socket.IO-Client-Swift: c116d6dc9fd6be9c259bacfe143f8725bce7d79e
   Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
   SwiftOverlays: ab459ea9194b0e96aaccaa00e9ead1bf6d46eef1
   Tabman: d8d6ab0b483c7db375a71ac227d3ef791b56a049
 
-PODFILE CHECKSUM: b6a7075f58c2ebfb75d1d20b2c12df34c9181dff
+PODFILE CHECKSUM: 60545ebd2304ef25f9afe55cc81fde0531f892b0
 
 COCOAPODS: 1.10.1
diff --git a/DDYZD_V2/Pods/Manifest.lock b/DDYZD_V2/Pods/Manifest.lock