chaerinHan · revelvu · Dec 9, 2020 · Dec 9, 2020 · Dec 9, 2020 · Dec 9, 2020
diff --git a/Button/btn_Day1.png b/Button/btn_Day1.png
diff --git a/Button/btn_Day2.png b/Button/btn_Day2.png
diff --git a/Button/btn_Day3.png b/Button/btn_Day3.png
diff --git a/Button/btn_Review.png b/Button/btn_Review.png
diff --git a/Button/btn_back.png b/Button/btn_back.png
diff --git a/Button/btn_cl.png b/Button/btn_cl.png
diff --git a/Button/btn_exp.png b/Button/btn_exp.png
diff --git a/Button/btn_help.jpg b/Button/btn_help.jpg
diff --git a/Button/btn_home.png b/Button/btn_home.png
diff --git a/Button/btn_listen.jpg b/Button/btn_listen.jpg
diff --git a/Button/btn_next_black.png b/Button/btn_next_black.png
diff --git a/Button/btn_next_blue.png b/Button/btn_next_blue.png
diff --git a/Button/btn_next_white.png b/Button/btn_next_white.png
diff --git a/Button/btn_pass.jpg b/Button/btn_pass.jpg
diff --git a/Button/btn_re.jpg b/Button/btn_re.jpg
diff --git a/Button/btn_speak.jpg b/Button/btn_speak.jpg
diff --git a/Button/btn_word.png b/Button/btn_word.png
diff --git a/Button/listen.png b/Button/listen.png
diff --git a/HHJ_Capstone_2020.xcodeproj/project.pbxproj b/HHJ_Capstone_2020.xcodeproj/project.pbxproj
diff --git a/...proj/project.xcworkspace/xcuserdata/chaerinhan.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/chaerinhan.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...oject.xcworkspace/xcuserdata/digitalmedia-2017.xcuserdatad/UserInterfaceState.xcuserstate b/...oject.xcworkspace/xcuserdata/digitalmedia-2017.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/HHJ_Capstone_2020/Assets.xcassets/AppIcon.appiconset/Contents.json b/HHJ_Capstone_2020/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -11,11 +11,13 @@
       "size" : "20x20"
     },
     {
+      "filename" : "Logo_58px.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "Logo_87px.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"

diff --git a/HHJ_Capstone_2020/Assets.xcassets/AppIcon.appiconset/Logo_58px.png b/HHJ_Capstone_2020/Assets.xcassets/AppIcon.appiconset/Logo_58px.png
diff --git a/HHJ_Capstone_2020/Assets.xcassets/AppIcon.appiconset/Logo_87px.png b/HHJ_Capstone_2020/Assets.xcassets/AppIcon.appiconset/Logo_87px.png
diff --git a/HHJ_Capstone_2020/Base.lproj/Main.storyboard b/HHJ_Capstone_2020/Base.lproj/Main.storyboard
diff --git a/HHJ_Capstone_2020/Day1/Day1_3.0.15.0.swift b/HHJ_Capstone_2020/Day1/Day1_3.0.15.0.swift
@@ -23,36 +23,33 @@ class Day1_3_0_15_0: UIViewController {
                     NotificationCenter.default.addObserver(self,selector:Selector(("playerDidFinishPlaying")), name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: url)
                     sound.prepareToPlay()
                     sound.play()
-                    if sound.play() {
-                        nextButton.isHidden = true
-                    }
 
                 } catch let error {
                     print(error.localizedDescription)
                 }
             }
     }
 
-//    @objc func playerDidFinishPlaying(sender: Notification) {
-//        // Your code here
-//        // isHidden = false 면 보여준다
-//        nextButton.isHidden = false
-//
-//    }
+    @objc func playerDidFinishPlaying(sender: Notification) {
+        // Your code here
+        // isHidden = false 면 보여준다
+        nextButton.isHidden = false
+
+    }
     func playerDidFinishPlaying() {
     // Your code here
         nextButton.isHidden = false
     }
     override func viewDidLoad() {
+        // Do any additional setup after loading the view.
         super.viewDidLoad()
-
+//        nextButton.isHidden = true // 화면 처음 실행할 때는 "다음페이지"버튼 숨기기
         playAudio()
-        // Do any additional setup after loading the view.
-        nextButton.isHidden = true
-        playerDidFinishPlaying()
+//        playerDidFinishPlaying()
+//        nextButton.isHidden = true
 
     }
-    
+
 
     /*
     // MARK: - Navigation

diff --git a/HHJ_Capstone_2020/Day1/Day1_3_1_ViewController.swift b/HHJ_Capstone_2020/Day1/Day1_3_1_ViewController.swift
@@ -23,7 +23,7 @@ class Day1_3_1_ViewController: UIViewController, SFSpeechRecognizerDelegate {
     @IBOutlet weak var nextButton: UIButton!
 
     @IBAction func nextPage (_ sender: Any ) {
-        if record_count <= 6 {
+        if record_count <= 5 {
             nextButton.isHidden = true
         }
         else {
@@ -33,7 +33,7 @@ class Day1_3_1_ViewController: UIViewController, SFSpeechRecognizerDelegate {
     }
     // 변수
     var user_recorded: String! // 사용자가 말한 문장 저장
-    var record_count: Int! = 1 // 말하는 횟수 제한
+    var record_count: Int! = 0 // 말하는 횟수 제한
 
 
     // 말한 것을 인식
@@ -64,53 +64,46 @@ class Day1_3_1_ViewController: UIViewController, SFSpeechRecognizerDelegate {
         let answer_split = answer?.split(separator: " ")
         let user_recorded_split = user_recorded?.split(separator: " ")
 
-        if answer_split == user_recorded_split {
-            if record_count == 2 {
+        if answer_split == user_recorded_split { // 일치 할 경우
+            if record_count == 1 {
                 firstImg.backgroundColor = UIColor.blue
             }
-            else if record_count == 3 {
+            else if record_count == 2 {
                 secondImg.backgroundColor = UIColor.blue
             }
-            else if record_count == 4 {
+            else if record_count == 3 {
                 thirdImg.backgroundColor = UIColor.blue
             }
-            else if record_count == 5 {
+            else if record_count == 4 {
                 fourthImg.backgroundColor = UIColor.blue
             }
-            else if record_count == 6 {
+            else if record_count == 5 {
                 fifthImg.backgroundColor = UIColor.blue
             }
-            else {
-                // 혹시나 6번 할까봐
-            }
-
         }
-        else {
-            if record_count == 2 {
+        else { // 불일치 할 경우
+            if record_count == 1 {
                 firstImg.backgroundColor = UIColor.red
             }
-            else if record_count == 3 {
+            else if record_count == 2 {
                 secondImg.backgroundColor = UIColor.red
             }
-            else if record_count == 4 {
+            else if record_count == 3 {
                 thirdImg.backgroundColor = UIColor.red
             }
-            else if record_count == 5 {
+            else if record_count == 4 {
                 fourthImg.backgroundColor = UIColor.red
             }
-            else if record_count == 6 {
+            else if record_count == 5 {
                 fifthImg.backgroundColor = UIColor.red
             }
-            else {
-                // 혹시나 6번 할까봐
-            }
         }
     }
 
     // MARK: - Speech To Text
     @IBAction func speechToText(_ sender: Any) {
         // 횟수 제한
-        if record_count <= 6 {
+        if record_count <= 5 {
             if audioEngine.isRunning { // 현재 음성인식 수행중이라면
                         audioEngine.stop() // 오디오 입력 중단
                         recognitionRequest?.endAudio() // 음성인식 역시 중단

diff --git a/HHJ_Capstone_2020/Info.plist b/HHJ_Capstone_2020/Info.plist
@@ -2,12 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSSpeechRecognitionUsageDescription</key>
-	<string>Zedd&apos;s App</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>test</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>고운영어</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -24,6 +22,10 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>test</string>
+	<key>NSSpeechRecognitionUsageDescription</key>
+	<string>Zedd's App</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

diff --git a/HHJ_Capstone_2020/Main/DayMenuViewController.swift b/HHJ_Capstone_2020/Main/DayMenuViewController.swift
@@ -9,7 +9,6 @@ import UIKit
 
 class DayMenuViewController: UIViewController {
 
-
     @IBOutlet weak var chapterLabel: UILabel!
 
     var receiveItem = ""

diff --git a/Image/background_day.jpg b/Image/background_day.jpg
diff --git a/Image/background_home.jpg b/Image/background_home.jpg
diff --git a/Image/hm_a.png b/Image/hm_a.png
diff --git a/Image/hm_b.png b/Image/hm_b.png
diff --git a/Image/picture16.jpg b/Image/picture16.jpg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,6 @@ import UIKit

		class DayMenuViewController: UIViewController {


		@IBOutlet weak var chapterLabel: UILabel!

		var receiveItem = ""
Expand Down