Merge remote-tracking branch 'origin/develop' into develop

Darner-dan-uh · Dec 10, 2020 · 42e520b · 42e520b
2 parents fa3f236 + 315c42a
commit 42e520b
Show file tree

Hide file tree

Showing 108 changed files with 6,104 additions and 6,304 deletions.
diff --git a/Darner-dan-uh/Darner-dan-uh.xcodeproj/project.pbxproj b/Darner-dan-uh/Darner-dan-uh.xcodeproj/project.pbxproj
diff --git a/...arner-dan-uh.xcworkspace/xcuserdata/ihyun_wook.xcuserdatad/UserInterfaceState.xcuserstate b/...arner-dan-uh.xcworkspace/xcuserdata/ihyun_wook.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...h/Darner-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/UserInterfaceState.xcuserstate b/...h/Darner-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...er-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...er-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -23,6 +23,83 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+<<<<<<< HEAD
+            uuid = "3CD4F3E9-E608-4C22-8BC8-6ABF0193B77B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
+            landmarkName = "networkingResult(from:model:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DC131016-9AFE-4DB2-8672-43C9ABEBAC76"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "networkingResult(from:model:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "27E75686-1952-479C-840F-DFD819DA2BA6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "30"
+            endingLineNumber = "30"
+            landmarkName = "networkingResult(from:model:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "614C487C-ACEF-4706-933A-8FB062D56313"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "31"
+            endingLineNumber = "31"
+            landmarkName = "networkingResult(from:model:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "226D00FE-20AC-4341-B530-8A2BFA984771"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "36"
+            endingLineNumber = "36"
+            landmarkName = "networkingResult(from:model:)"
+            landmarkType = "7">
+=======
             uuid = "58BD4AF2-9CBD-44F9-9514-E520A4AC46A8"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -34,6 +111,7 @@
             endingLineNumber = "122"
             landmarkName = "parameter"
             landmarkType = "24">
+>>>>>>> MypageNetworking
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

diff --git a/Darner-dan-uh/Darner-dan-uh/Info.plist b/Darner-dan-uh/Darner-dan-uh/Info.plist
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIAppFonts</key>
 	<array>
 		<string>BinggraeMelona-Bold</string>
@@ -26,7 +31,7 @@
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>Mypage</string>
+	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/...uh/Darner-dan-uh/Source 2/ViewModel/Modules/Memorization/MemorizationViewController.swift b/...uh/Darner-dan-uh/Source 2/ViewModel/Modules/Memorization/MemorizationViewController.swift
@@ -0,0 +1,67 @@
+//
+//  MemorizationVC.swift
+//  Darner-dan-uh
+//
+//  Created by 이현욱 on 2020/10/08.
+//  Copyright © 2020 이현욱. All rights reserved.
+//
+
+import UIKit
+
+import RxSwift
+import RxCocoa
+final class MemorizationViewController: UIViewController {
+
+    var wordtupeStr: String!
+    var wordtypeInt: Int!
+    private let disposeBag = DisposeBag()
+
+    @IBOutlet weak var memorizeTapItem: UINavigationItem!
+    @IBOutlet weak var myPageBtn: UIButton!
+    @IBOutlet weak var lawBtn: UIButton!
+    @IBOutlet weak var traditionBtn: UIButton!
+    @IBOutlet weak var artBtn: UIButton!
+    @IBOutlet weak var harborBtn: UIButton!
+    @IBOutlet weak var agricultureBtn: UIButton!
+    @IBOutlet weak var militaryBtn: UIButton!
+    @IBOutlet weak var electricalEnergyBtn: UIButton!
+    @IBOutlet weak var coalBtn: UIButton!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        bindAction()
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.tabBarController?.tabBar.isHidden = false
+    }
+}
+
+extension MemorizationViewController {
+    private func bindAction() {
+        Observable.merge(lawBtn.rx.tap.map { self.wordtupeStr = "법률"; self.wordtypeInt = 1 },
+                         traditionBtn.rx.tap.map { self.wordtupeStr = "전통"; self.wordtypeInt = 2 },
+                         artBtn.rx.tap.map { self.wordtupeStr = "예술"; self.wordtypeInt = 3 },
+                         harborBtn.rx.tap.map { self.wordtupeStr = "항구"; self.wordtypeInt = 4 },
+                         agricultureBtn.rx.tap.map { self.wordtupeStr = "농업"; self.wordtypeInt = 5 },
+                         militaryBtn.rx.tap.map { self.wordtupeStr = "군사"; self.wordtypeInt = 6 },
+                         electricalEnergyBtn.rx.tap.map { self.wordtupeStr = "전력"; self.wordtypeInt = 7 },
+                         coalBtn.rx.tap.map { self.wordtupeStr = "석탄"; self.wordtypeInt = 8 }
+        ).debounce(.nanoseconds(1), scheduler: MainScheduler.instance)
+        .subscribe { _ in
+            let vc = self.makeVC(storyBoardName: .memo, identifier: .selectwordNumVC) as SelectWordNumViewController
+            vc.wordTypeStr = self.wordtupeStr
+            vc.wordTypeInt = self.wordtypeInt
+            self.navigationController?.pushViewController(vc, animated: true)
+        }.disposed(by: disposeBag)
+
+        myPageBtn.rx.tap
+            .debounce(.nanoseconds(1500), scheduler: MainScheduler.instance)
+            .subscribe({ _ in
+                let vc = self.makeVC(storyBoardName: .myPage, identifier: ViewControllerName.myCharacterVC)
+                self.present(vc, animated: true, completion: nil)
+            })
+            .disposed(by: disposeBag)
+    }
+}