Merge pull request #18 from amylaseF85/feature/play-music

NowPlayingに曲名・アートワークを表示できるようにした
enpitut2019 · Nov 1, 2019 · 359348c · 359348c
2 parents 7aa7e71 + bfc1e0c
commit 359348c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/DJYusaku.xcodeproj/project.pbxproj b/DJYusaku.xcodeproj/project.pbxproj
@@ -481,13 +481,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 29WP3DF4XR;
+				DEVELOPMENT_TEAM = J87XZSWPMZ;
 				INFOPLIST_FILE = DJYusaku/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = jp.yaplus.DJYusaku;
+				PRODUCT_BUNDLE_IDENTIFIER = jp.yaplus.DJYusaku.amylase;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -500,13 +500,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 29WP3DF4XR;
+				DEVELOPMENT_TEAM = J87XZSWPMZ;
 				INFOPLIST_FILE = DJYusaku/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = jp.yaplus.DJYusaku;
+				PRODUCT_BUNDLE_IDENTIFIER = jp.yaplus.DJYusaku.amylase;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;

diff --git a/DJYusaku/RequestsViewController.swift b/DJYusaku/RequestsViewController.swift
@@ -47,6 +47,7 @@ class RequestsViewController: UIViewController {
         }
 
         NotificationCenter.default.addObserver(self, selector: #selector(handleRequestsUpdated), name: .requestQueueToRequestsVCName, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handlePlayingItemChanged), name: NSNotification.Name.MPMusicPlayerControllerNowPlayingItemDidChange, object: nil)
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -64,7 +65,23 @@ class RequestsViewController: UIViewController {
         }
     }
 
+    @objc func handlePlayingItemChanged(notification: NSNotification){
+        guard RequestQueue.shared.countRequests() > 0 else { return }
+        let nowPlayingMusicDataModel = RequestQueue.shared.getRequest(index: 0)
+        RequestQueue.shared.removeRequest(index: 0)
+        DispatchQueue.global().async {
+            let fetchedImage = Artwork.fetch(url: nowPlayingMusicDataModel.artworkUrl)
+            DispatchQueue.main.async {
+                self.tableView.reloadData()
+                self.playingTitle.text    = nowPlayingMusicDataModel.title
+                self.playingArtwork.image = fetchedImage
+
+            }
+        }
+    }
+
     @objc func handleRequestsUpdated(notification: NSNotification){
+        print("handleRequestsUpdated")
         // リクエスト画面を更新
         DispatchQueue.main.async{
             self.tableView.reloadData()
@@ -97,10 +114,7 @@ class RequestsViewController: UIViewController {
             let descripter = MPMusicPlayerStoreQueueDescriptor(storeIDs: [songID])
             musicPlayerApplicationController.setQueue(with: descripter)
             musicPlayerApplicationController.play()
-            RequestQueue.shared.removeRequest(index: 0) // TableViewには表示しない
-            DispatchQueue.main.async{
-                self.tableView.reloadData()
-            }
+
         }
     }
 
@@ -114,11 +128,7 @@ class RequestsViewController: UIViewController {
             mutableQueue.remove(mutableQueue.items[0])
         }, completionHandler: { [unowned self] queue, error in
             guard self.musicPlayerApplicationController.nowPlayingItem != nil && error == nil else { return }
-            // RequestQueueと辻褄を合わせる
-            RequestQueue.shared.removeRequest(index: 0)
-            DispatchQueue.main.async{
-                self.tableView.reloadData()
-            }
+            // 何もしない
         })
     }