From bc6d795f8befbf2ea1f9ab0e4a5d9a22728a2ea2 Mon Sep 17 00:00:00 2001
From: panqihua <1029559041@qq.com>
Date: Sat, 4 Jul 2020 19:47:42 -0700
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E5=BC=8F=E4=BC=A0=E8=BE=93=EF=BC=8C?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=88=97=E8=A1=A8=EF=BC=8C=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=AD=8C=E6=9B=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloudmusic.xcodeproj/project.pbxproj          |  12 +-
 cloudmusic/Alert.swift                        |  29 --
 cloudmusic/Base.lproj/Main.storyboard         |  89 ++++--
 cloudmusic/ExtensionUIView.swift              |  94 +++++++
 cloudmusic/MusicRequest.swift                 |  50 +++-
 cloudmusic/MyTabBar.swift                     |  34 +++
 cloudmusic/PlayController.swift               | 260 ++++++++++++++++++
 cloudmusic/PlayListController.swift           |  88 +++---
 cloudmusic/SearchController.swift             |  58 ++--
 .../cloudmusic.xcdatamodel/contents           |   7 +-
 10 files changed, 599 insertions(+), 122 deletions(-)
 delete mode 100644 cloudmusic/Alert.swift
 create mode 100644 cloudmusic/ExtensionUIView.swift
 create mode 100644 cloudmusic/MyTabBar.swift

diff --git a/cloudmusic.xcodeproj/project.pbxproj b/cloudmusic.xcodeproj/project.pbxproj
index 28109af..6a148e8 100644
--- a/cloudmusic.xcodeproj/project.pbxproj
+++ b/cloudmusic.xcodeproj/project.pbxproj
@@ -21,7 +21,8 @@
 		7151CAEE24B00ED4004C4563 /* PlayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7151CAED24B00ED4004C4563 /* PlayController.swift */; };
 		7151CAF024B01A6B004C4563 /* SearchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7151CAEF24B01A6B004C4563 /* SearchController.swift */; };
 		7151CAF524B02DDA004C4563 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = 7151CAF424B02DDA004C4563 /* SwiftyJSON */; };
-		7151CB0124B042BC004C4563 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7151CB0024B042BC004C4563 /* Alert.swift */; };
+		7151CB0124B042BC004C4563 /* ExtensionUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7151CB0024B042BC004C4563 /* ExtensionUIView.swift */; };
+		7151CB0524B07BD2004C4563 /* MyTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7151CB0424B07BD2004C4563 /* MyTabBar.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -60,7 +61,8 @@
 		7151CAEB24B001EE004C4563 /* MusicRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicRequest.swift; sourceTree = "<group>"; };
 		7151CAED24B00ED4004C4563 /* PlayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayController.swift; sourceTree = "<group>"; };
 		7151CAEF24B01A6B004C4563 /* SearchController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchController.swift; sourceTree = "<group>"; };
-		7151CB0024B042BC004C4563 /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = "<group>"; };
+		7151CB0024B042BC004C4563 /* ExtensionUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionUIView.swift; sourceTree = "<group>"; };
+		7151CB0424B07BD2004C4563 /* MyTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyTabBar.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -124,7 +126,8 @@
 				7151CAEB24B001EE004C4563 /* MusicRequest.swift */,
 				7151CAED24B00ED4004C4563 /* PlayController.swift */,
 				7151CAEF24B01A6B004C4563 /* SearchController.swift */,
-				7151CB0024B042BC004C4563 /* Alert.swift */,
+				7151CB0024B042BC004C4563 /* ExtensionUIView.swift */,
+				7151CB0424B07BD2004C4563 /* MyTabBar.swift */,
 			);
 			path = cloudmusic;
 			sourceTree = "<group>";
@@ -286,11 +289,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7151CB0124B042BC004C4563 /* Alert.swift in Sources */,
+				7151CB0124B042BC004C4563 /* ExtensionUIView.swift in Sources */,
 				7151CAEE24B00ED4004C4563 /* PlayController.swift in Sources */,
 				7151CADF24AFE612004C4563 /* PlayListController.swift in Sources */,
 				7151CAB424AFE14D004C4563 /* cloudmusic.xcdatamodeld in Sources */,
 				7151CAEC24B001EF004C4563 /* MusicRequest.swift in Sources */,
+				7151CB0524B07BD2004C4563 /* MyTabBar.swift in Sources */,
 				7151CAA824AFE14D004C4563 /* AppDelegate.swift in Sources */,
 				7151CAF024B01A6B004C4563 /* SearchController.swift in Sources */,
 				7151CAAA24AFE14D004C4563 /* SceneDelegate.swift in Sources */,
diff --git a/cloudmusic/Alert.swift b/cloudmusic/Alert.swift
deleted file mode 100644
index 824ac6d..0000000
--- a/cloudmusic/Alert.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  Alert.swift
-//  cloudmusic
-//
-//  Created by Qihua Pan on 2020/7/3.
-//  Copyright © 2020 Qihua Pan. All rights reserved.
-//
-
-import UIKit
-import CoreData
-extension UIViewController{
-    func alert(message:String,title:String="警告信息",preferredStyle:UIAlertController.Style=UIAlertController.Style.alert,style:UIAlertAction.Style=UIAlertAction.Style.destructive){
-        let alertController = UIAlertController(title: title, message: message, preferredStyle: preferredStyle)
-
-        alertController.addAction(UIAlertAction(title: "确认", style:style, handler: nil))
-
-        self.present(alertController, animated: true, completion: nil)
-    }
-    
-    //获取上下文对象
-    func getContext()-> NSManagedObjectContext  {
-        //获取总代理
-        let appDelegate = UIApplication.shared.delegate as! AppDelegate
-        //获取托管对象总管
-        //let managedObjectContect = appDelegate.persistentContainer.viewContext
-        //返回托管对象总管
-        return appDelegate.persistentContainer.viewContext
-    }
-}
diff --git a/cloudmusic/Base.lproj/Main.storyboard b/cloudmusic/Base.lproj/Main.storyboard
index ea904d3..b2e145b 100644
--- a/cloudmusic/Base.lproj/Main.storyboard
+++ b/cloudmusic/Base.lproj/Main.storyboard
@@ -7,10 +7,10 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Tab Bar Controller-->
+        <!--My Tab Bar-->
         <scene sceneID="yl2-sM-qoP">
             <objects>
-                <tabBarController id="49e-Tb-3d3" sceneMemberID="viewController">
+                <tabBarController id="49e-Tb-3d3" customClass="MyTabBar" customModule="cloudmusic" customModuleProvider="target" sceneMemberID="viewController">
                     <tabBar key="tabBar" contentMode="scaleToFill" id="W28-zg-YXA">
                         <rect key="frame" x="0.0" y="975" width="768" height="49"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
@@ -39,6 +39,15 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nUq-jo-T3O">
+                                <rect key="frame" x="109" y="143" width="196" height="50"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="30"/>
+                                <state key="normal" title="清空播放列表"/>
+                                <connections>
+                                    <action selector="pressClear:" destination="Nbr-zX-YvN" eventType="touchUpInside" id="ieu-JK-5oD"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="Kug-6K-cM5"/>
@@ -50,7 +59,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="kF2-IP-0Wq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-772" y="327"/>
+            <point key="canvasLocation" x="-772.46376811594212" y="326.78571428571428"/>
         </scene>
         <!--播放-->
         <scene sceneID="NDX-nT-lkJ">
@@ -64,44 +73,63 @@
                                 <rect key="frame" x="87" y="126" width="240" height="128"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IIQ-1o-bMh">
-                                <rect key="frame" x="168" y="281" width="71" height="36"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ryn-W9-Eef">
+                                <rect key="frame" x="20" y="447" width="374" height="36"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="30"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ryn-W9-Eef">
-                                <rect key="frame" x="168" y="325" width="71" height="36"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="nSL-9z-TOF">
-                                <rect key="frame" x="87" y="447" width="256" height="2"/>
+                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nSL-9z-TOF">
+                                <rect key="frame" x="87" y="325" width="240" height="2"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </progressView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="previous" id="cje-ai-bPk">
-                                <rect key="frame" x="87" y="600" width="50" height="50"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="E1J-pc-P7G">
+                                <rect key="frame" x="182" y="600" width="50" height="50"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="next" id="JAt-Tx-hWz">
-                                <rect key="frame" x="293" y="600" width="50" height="50"/>
+                                <state key="normal" title="Button" image="play"/>
+                                <connections>
+                                    <action selector="pressPlay:" destination="IEQ-xx-jyn" eventType="touchUpInside" id="9fL-hG-EIF"/>
+                                </connections>
+                            </button>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="JjE-1k-Wp4">
+                                <rect key="frame" x="277" y="600" width="50" height="50"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="play" id="Koi-FD-jGR">
-                                <rect key="frame" x="189" y="600" width="50" height="50"/>
+                                <state key="normal" title="Button" image="next"/>
+                                <connections>
+                                    <action selector="pressNext:" destination="IEQ-xx-jyn" eventType="touchUpInside" id="Vah-r1-eyg"/>
+                                    <action selector="pressPlay:" destination="IEQ-xx-jyn" eventType="touchUpInside" id="sZG-o2-L7z"/>
+                                </connections>
+                            </button>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="HRB-c3-2n3">
+                                <rect key="frame" x="87" y="600" width="50" height="50"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
+                                <state key="normal" title="Button" image="previous"/>
+                                <connections>
+                                    <action selector="pressPlay:" destination="IEQ-xx-jyn" eventType="touchUpInside" id="VYy-jC-lPg"/>
+                                    <action selector="pressPrev:" destination="IEQ-xx-jyn" eventType="touchUpInside" id="igG-fW-Lx1"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Q6S-pp-bF3">
+                                <rect key="frame" x="20" y="508" width="374" height="36"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="ybG-XY-4xE"/>
                     </view>
-                    <tabBarItem key="tabBarItem" title="播放" id="LTq-mh-JP7"/>
+                    <tabBarItem key="tabBarItem" title="播放" image="first" id="LTq-mh-JP7"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
-                        <outlet property="progress" destination="nSL-9z-TOF" id="J9o-AG-9GH"/>
+                        <outlet property="musicName" destination="Ryn-W9-Eef" id="XOe-9Q-NV9"/>
+                        <outlet property="nextButton" destination="JjE-1k-Wp4" id="JQC-m5-yxd"/>
+                        <outlet property="playButton" destination="E1J-pc-P7G" id="4dC-CP-c9Y"/>
+                        <outlet property="prevButton" destination="HRB-c3-2n3" id="MgH-hx-Vyb"/>
+                        <outlet property="progress" destination="nSL-9z-TOF" id="UvS-8r-B8l"/>
+                        <outlet property="timeLabel" destination="Q6S-pp-bF3" id="dTA-W5-w6b"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="1bd-h6-NBe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -116,13 +144,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="请输入关键词" textAlignment="natural" minimumFontSize="17" id="sEc-Yc-Wes">
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="请输入关键词" textAlignment="natural" minimumFontSize="17" id="sEc-Yc-Wes">
                                 <rect key="frame" x="57" y="227" width="201" height="39.5"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="tUw-aS-iW0">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="tUw-aS-iW0">
                                 <rect key="frame" x="293" y="224" width="51" height="42"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
@@ -140,9 +168,10 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="X1b-Gk-lAx"/>
                     </view>
-                    <tabBarItem key="tabBarItem" title="搜索" id="6FF-jA-ogW"/>
+                    <tabBarItem key="tabBarItem" title="搜索" image="second" id="6FF-jA-ogW"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
+                        <outlet property="item" destination="6FF-jA-ogW" id="URK-Kf-G68"/>
                         <outlet property="keyword" destination="sEc-Yc-Wes" id="TTL-EO-sxq"/>
                         <outlet property="musicTable" destination="6rp-N1-MZ4" id="4g5-vA-jpy"/>
                     </connections>
@@ -153,9 +182,11 @@
         </scene>
     </scenes>
     <resources>
+        <image name="first" width="30" height="30"/>
         <image name="list.dash" catalog="system" width="128" height="85"/>
         <image name="next" width="200" height="200"/>
         <image name="play" width="200" height="200"/>
         <image name="previous" width="200" height="200"/>
+        <image name="second" width="30" height="30"/>
     </resources>
 </document>
diff --git a/cloudmusic/ExtensionUIView.swift b/cloudmusic/ExtensionUIView.swift
new file mode 100644
index 0000000..c41b126
--- /dev/null
+++ b/cloudmusic/ExtensionUIView.swift
@@ -0,0 +1,94 @@
+//
+//  Alert.swift
+//  cloudmusic
+//
+//  Created by Qihua Pan on 2020/7/3.
+//  Copyright © 2020 Qihua Pan. All rights reserved.
+//
+
+import UIKit
+import CoreData
+extension UIViewController{
+    func   alertModal(message:String,title:String="警告信息",preferredStyle:UIAlertController.Style=UIAlertController.Style.alert,style:UIAlertAction.Style=UIAlertAction.Style.destructive){
+        let alertController = UIAlertController(title: title, message: message, preferredStyle: preferredStyle)
+
+        alertController.addAction(UIAlertAction(title: "确认", style:style, handler: nil))
+
+        self.present(alertController, animated: true, completion: nil)
+    }
+    
+    //获取上下文对象
+    func getContext()-> NSManagedObjectContext  {
+        //获取总代理
+        let appDelegate = UIApplication.shared.delegate as! AppDelegate
+        //获取托管对象总管
+        //let managedObjectContect = appDelegate.persistentContainer.viewContext
+        //返回托管对象总管
+        return appDelegate.persistentContainer.viewContext
+    }
+    
+    func getMusic(id: Int32,name: String) -> Music {
+            let fetchRequest: NSFetchRequest = Music.fetchRequest()
+           fetchRequest.predicate = NSPredicate(format: "id == %@", NSNumber(value: id))
+            do {
+                let result: [Music] = try self.getContext().fetch(fetchRequest)
+                debugPrint("count=\(result.count)")
+                if result.count > 0{
+                    return result[0]
+                }else{
+                    let music = NSEntityDescription.insertNewObject(forEntityName: "Music", into: self.getContext()) as! Music
+                      music.id=id
+                      music.name=name
+                      music.status=false
+                    return music
+                }
+            } catch {
+                fatalError();
+            }
+        
+        }
+
+    
+    func clearAll(){
+        let fetchRequest: NSFetchRequest = Music.fetchRequest()
+        let context=self.getContext()
+           do {
+            let result = try context.fetch(fetchRequest)
+            for item in result{
+                context.delete(item)
+            }
+            do {
+                try self.getContext().save()
+            } catch {
+                let nserror = error as NSError
+                fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
+            }
+        } catch {
+            fatalError();
+        }
+    }
+    
+    func getPlayList()->[Music]{
+        let fetchRequest: NSFetchRequest = Music.fetchRequest()
+        fetchRequest.predicate = NSPredicate(format: "status == true")
+        do {
+            let result: [Music] = try self.getContext().fetch(fetchRequest)
+            return result
+        } catch {
+            fatalError();
+           }
+               
+    }
+    
+    // 更新数据
+  func saveContext() {
+        do {
+            try self.getContext().save()
+        } catch {
+            let nserror = error as NSError
+            fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
+        }
+    }
+
+}
+
diff --git a/cloudmusic/MusicRequest.swift b/cloudmusic/MusicRequest.swift
index a68f1a4..48ee835 100644
--- a/cloudmusic/MusicRequest.swift
+++ b/cloudmusic/MusicRequest.swift
@@ -15,19 +15,47 @@ class MusicRequest: NSObject {
     //接口服务端地址
     private static let request_host = "192.168.50.73:5000"
     
-    //关键词搜索歌曲
-    static func search(keyword:String,callback:@escaping (JSON?) -> Void ){
-        let url="http://\(String(describing: request_host))/search?keywords=\(keyword)"
+    private static func request(url:String,callback:@escaping (JSON?) -> Void){
         debugPrint("搜索请求接口地址:\(url)")
-        AF.request(url).responseJSON { response in
-               debugPrint(response)
+         AF.request(url).responseJSON { response in
+                debugPrint(response)
+           
+            if let data=response.data,let json = try? JSON(data: data){
+                 callback(json)
+             }else{
+                 callback(nil)
+             }
           
-            if let json = try? JSON(data: response.data!){
-                callback(json)
-            }else{
-                callback(nil)
             }
-         
-           }
+        }
+    
+    //关键词搜索歌曲
+    static func search(keyword:String,callback:@escaping (JSON?) -> Void ){
+        let url="http://\(String(describing: request_host))/search?keywords=\(keyword)"
+         request(url: url, callback: callback)
        }
+    
+    //获取音乐url
+    static func searchUrl(id:Int32,callback:@escaping (JSON?) -> Void ){
+        let url="http://\(String(describing: request_host))/song/url?id=\(id)"
+        request(url: url, callback: callback)
+    }
+    
+    //
+    static func saveMusic(url:String,music:Music,callback:@escaping (Progress,URL) -> Void){
+       let documentsURL = FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask)[0]
+       let fileURL = documentsURL.appendingPathComponent("\(music.id).mp3")
+       let destination: DownloadRequest.Destination = { _, _ in
+           return (fileURL, [])
+       }
+        AF.download(url, to: destination)
+        .downloadProgress { progress in
+            callback(progress,fileURL)
+        }
+        .responseData { response in
+            if let data=response.value{
+                debugPrint("文件体积:\(data.count/(1024*1024))MB")
+            }
+        }
+    }
 }
diff --git a/cloudmusic/MyTabBar.swift b/cloudmusic/MyTabBar.swift
new file mode 100644
index 0000000..2b2ae9d
--- /dev/null
+++ b/cloudmusic/MyTabBar.swift
@@ -0,0 +1,34 @@
+//
+//  MyTabBar.swift
+//  cloudmusic
+//
+//  Created by Qihua Pan on 2020/7/4.
+//  Copyright © 2020 Qihua Pan. All rights reserved.
+//
+
+import UIKit
+
+
+class MyTabBar: UITabBarController {
+
+    static var myTabBar:MyTabBar?
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view.
+    }
+
+    
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
+
+
diff --git a/cloudmusic/PlayController.swift b/cloudmusic/PlayController.swift
index 2d68ef9..bc880c7 100644
--- a/cloudmusic/PlayController.swift
+++ b/cloudmusic/PlayController.swift
@@ -7,12 +7,66 @@
 //
 
 import UIKit
+import AVFoundation
+import MediaPlayer
+
 
 class PlayController: UIViewController {
 
     
+    @IBOutlet weak var musicName: UILabel!
+    
     @IBOutlet weak var progress: UIProgressView!
     
+    @IBOutlet weak var timeLabel: UILabel!
+    
+    @IBOutlet weak var playButton: UIButton!
+    
+    @IBOutlet weak var prevButton: UIButton!
+
+    @IBOutlet weak var nextButton: UIButton!
+    
+    var activeIndex:Int = -1
+    
+    var playList:[Music] = []
+    
+    private var avplayer: AVPlayer!//播放器对象
+     private var playerItem: AVPlayerItem!//播放资源对象
+    var timeObserver: Any! //时间观察者
+    
+    @IBAction func pressPlay(_ sender: UIButton) {
+        if self.avplayer.rate>0{
+            self.avplayer.pause()
+            self.playButton.setImage(UIImage(named: "play"), for: .normal)
+        }else{
+            self.avplayer.play()
+            self.playButton.setImage(UIImage(named: "pause"), for: .normal)
+        }
+    }
+    
+    
+    @IBAction func pressNext(_ sender: UIButton) {
+        if self.activeIndex + 1 == self.playList.count{
+            self.activeIndex = 0
+        }else{
+            self.activeIndex += 1
+        }
+        
+        self.play()
+    }
+    
+    
+    
+    @IBAction func pressPrev(_ sender: UIButton) {
+        if self.activeIndex - 1 == -1{
+            self.activeIndex = self.playList.count-1
+        }else{
+            self.activeIndex -= 1
+        }
+        
+        self.play()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -20,9 +74,215 @@ class PlayController: UIViewController {
       
         progress.transform = CGAffineTransform(scaleX: 1, y: 3.0)
         
+        self.playList=self.getPlayList()
+        
+    
+        if(self.playList.count>0){
+            self.activeIndex=0
+          
+            self.play()
+        }
+
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        self.playList=self.getPlayList()
+    
+       
+      if self.playList.count==0{
+         self.musicName.text=""
+          self.alertModal(message: "当前播放列表为空！")
+        
+      }
+        if self.playList.count<2{
+        self.prevButton.isHidden=true
+        self.nextButton.isHidden=true
+      }else{
+          self.prevButton.isHidden=false
+          self.nextButton.isHidden=false
+      }
     }
     
+    
+    func addPlayerItemObserver(){
+        // 为AVPlayerItem添加status属性观察，得到资源准备好，开始播放视频
+        playerItem?.addObserver(self, forKeyPath: "status", options: .new, context: nil)
+        // 监听AVPlayerItem的loadedTimeRanges属性来监听缓冲进度更新
+        playerItem?.addObserver(self, forKeyPath: "loadedTimeRanges", options: .new, context: nil)
+//        NotificationCenter.default.addObserver(self,
+//                                               selector: #selector(playerItemDidReachEnd(notification:)),
+//                                               name: .AVPlayerItemDidPlayToEndTime, object: playerItem)
+    }
+    
+     ///  通过KVO监控播放器状态
+    ///
+    /// - parameter keyPath: 监控属性
+    /// - parameter object:  监视器
+    /// - parameter change:  状态改变
+    /// - parameter context: 上下文
+    override func observeValue(forKeyPath keyPath: String?,
+                                of object: Any?,
+                                change: [NSKeyValueChangeKey : Any]?,
+                                context: UnsafeMutableRawPointer?) {
+         guard let object = object as? AVPlayerItem  else { return }
+         guard let keyPath = keyPath else { return }
+         if keyPath == "status" {
+             if object.status == .readyToPlay { //当资源准备好播放，那么开始播放视频
+                self.avplayer.play()
+                self.playButton.setImage(UIImage(named: "pause"), for: .normal)
+             } else if object.status == .failed || object.status == .unknown {
+                 self.alertModal(message: "解析音频失败")
+             }
+         } else if keyPath == "loadedTimeRanges" {
+             let loadedTime = availableDurationWithplayerItem()
+            let f = CMTimeGetSeconds(object.duration)/loadedTime
+            self.progress.progress=Float(f)
+            if f==1.0{
+                self.progress.isHidden=true
+            }
+            print("当前加载进度\(CMTimeGetSeconds(object.duration)/loadedTime)")
+         }
+    }
+    
+    func addProgressObserver(){
+     // 这里设置每秒执行一次.
+        timeObserver =  self.avplayer.addPeriodicTimeObserver(forInterval: CMTimeMake(value: Int64(1.0),
+                                                     timescale: Int32(1.0)),
+                                                     queue: DispatchQueue.main) { [weak self] (time: CMTime) in
+                                                        self?.updateProgress(time)
+        }
+    }
+    
+    func updateProgress(_ time: CMTime) {
+        // CMTimeGetSeconds函数是将CMTime转换为秒，如果CMTime无效，将返回NaN
+        guard let playerItem = playerItem else {
+            return
+        }
+        let currentTime = CMTimeGetSeconds(time)
+        let totalTime = CMTimeGetSeconds(playerItem.duration)
+        // 更新显示的时间和进度条
+        self.timeLabel.text = "\(self.formatPlayTime(seconds: CMTimeGetSeconds(time)))/\(self.formatPlayTime(seconds: totalTime))"
+        self.progress.setProgress(Float(currentTime/totalTime), animated: true)
+        print("当前已经播放\(self.formatPlayTime(seconds: CMTimeGetSeconds(time)))")
+    }
+    
+    func availableDurationWithplayerItem() -> TimeInterval {
+        guard let loadedTimeRanges = self.avplayer.currentItem?.loadedTimeRanges,
+               let first = loadedTimeRanges.first else {
+                   fatalError()
+         }
+         // 本次缓冲时间范围
+         let timeRange = first.timeRangeValue
+         let startSeconds = CMTimeGetSeconds(timeRange.start) // 本次缓冲起始时间
+         let durationSecound = CMTimeGetSeconds(timeRange.duration)// 缓冲时间
+         let result = startSeconds + durationSecound// 缓冲总长度
+         return result
+    }
+    
+    // 将秒转成时间字符串的方法，因为我们将得到秒。
+    func formatPlayTime(seconds: Double) -> String {
+        if !seconds.isNaN && !seconds.isInfinite{
+            let min = Int(seconds / 60)
+            let sec = Int(seconds.truncatingRemainder(dividingBy: 60))
+            return String(format: "%02d:%02d", min, sec)
+        }else{
+            return ""
+        }
+    }
+    
+    
+    func saveLocal(url: String,music: Music){
+        MusicRequest.saveMusic(url: url,music: music, callback: {(progress,url) in
+                                          debugPrint("Download Progress: \(progress.fractionCompleted)")
+            if progress.isFinished,let name=music.name {
+                                              debugPrint("歌曲\(name)下载完毕, 文件绝对路径=\(url.absoluteString)")
+//                                              if FileManager.default.fileExists(atPath: url.absoluteString){
+//                                                  let filepath=url.absoluteString
+//                                                  music.filepath = filepath
+//                                                  self.saveContext()
+//                                              }
+                                            let filepath=url.absoluteString
+                                            music.filepath = filepath
+                                            self.saveContext()
+                                          }
+                                          
+                                      })
+    }
+    
+    func play(){
+        self.play(music: self.playList[self.activeIndex])
+    }
+    
+    func play1(){
+//        if let url=URL(string:url){
+//               let asset = AVURLAsset(url: url)
+//               self.playerItem = AVPlayerItem(asset: asset)
+//               self.avplayer = AVPlayer(playerItem: self.playerItem)
+//                // 监听它状态的改变,实现kvo的方法
+//            self.addPlayerItemObserver()
+//            self.addProgressObserver()
+//        }else if let name=self.playList[self.activeIndex].name{
+//            self.alertModal(message:"无法解析🎵\(name)的播放地址")
+//        }
+    }
+    
+    func play(url:String,name:String){
+        if let url=URL(string:url){
+               let asset = AVURLAsset(url: url)
+               self.playerItem = AVPlayerItem(asset: asset)
+               self.avplayer = AVPlayer(playerItem: self.playerItem)
+                // 监听它状态的改变,实现kvo的方法
+            self.addPlayerItemObserver()
+            self.addProgressObserver()
+        }else {
+            self.alertModal(message:"无法解析🎵\(name)的播放地址")
+        }
+    }
+    
+    func play(index:Int){
+        self.activeIndex=index
+        self.play()
+    }
+    
+    func play(music:Music){
+        self.progress.isHidden=false
+        if let name=music.name{
+            self.musicName.text=name
+            if let filepath=music.filepath{
+                debugPrint("\(name)本地播放地址\(filepath)")
+                self.play(url: filepath,name:name)
+            }else if let url=music.url{
+                debugPrint("\(name)流式播放地址\(url)")
+                self.play(url: url,name:name)
+                self.saveLocal(url: url, music: music)
+            }else{
+                debugPrint("查找\(name)流式播放地址")
+                MusicRequest.searchUrl(id: music.id, callback: {(json) in
+                    debugPrint("json:\(String(describing: json))")
+                    if let res=json{
+                        if res["code"]==200{
+                            if res["data"].array != nil && res["data"].array!.count>0 &&  res["data"][0]["url"].stringValue.count>0{
+                                let url = res["data"][0]["url"].stringValue
+                                debugPrint("音乐🎵播放地址:\(url)")
+                                music.url=url
+                                self.saveContext()
+                                self.saveLocal(url: url, music: music)
+                                self.play(url: url,name:name)
 
+                            }else{
+                                self.alertModal(message:"无法解析🎵\(String(describing: name))的播放地址")
+                            }
+                        }else{
+                            self.alertModal(message:"无法查找🎵\(String(describing: name))的播放地址")
+                        }
+                    }
+                })
+            }
+        }
+        
+        
+    }
+   
     /*
     // MARK: - Navigation
 
diff --git a/cloudmusic/PlayListController.swift b/cloudmusic/PlayListController.swift
index c32f0d6..a221a09 100644
--- a/cloudmusic/PlayListController.swift
+++ b/cloudmusic/PlayListController.swift
@@ -7,10 +7,19 @@
 //
 
 import UIKit
-
+import CoreData
 class PlayListController: UIViewController {
     @IBOutlet weak var table: UITableView!
     
+    
+    @IBAction func pressClear(_ sender: UIButton) {
+        self.clearAll()
+        self.reload()
+    }
+    
+    
+    var musicList:[Music] = []
+    
     // 注意: Swift中mark注释的格式: MARK:-
        // MARK:- 属性
        let cellID = "cell"
@@ -20,12 +29,38 @@ class PlayListController: UIViewController {
 
               // 设置数据源代理
               table.dataSource = self
-              table.delegate = self
+              table.delegate = self		
 
               // 注册cell
         table.register(UITableViewCell.self, forCellReuseIdentifier: cellID)
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        self.reload()
+        
+        if let tabbar = self.tabBarController,let controllers=tabbar.viewControllers,controllers[0] is PlayController{
+            let play=controllers[0] as! PlayController
+            let i=IndexPath(row: play.activeIndex, section: 0)
+            self.table.selectRow(at: i, animated: true, scrollPosition: .none)
+       }
+        
+    }
+    
+    
+    func reload(){
+        self.musicList = self.getPlayList()
+        self.table.reloadData()
+    }
+    
+    func addMusic(music:Music){
+        self.saveContext()
+        self.musicList.append(music)
+    }
+    
+    func clearList(){
+        self.musicList=[]
+    }
+    
    
     /*
     // MARK: - Navigation
@@ -46,38 +81,29 @@ extension PlayListController: UITableViewDataSource,UITableViewDelegate{
     // MARK:- UITableViewDataSource数据源
     // 必须实现UITableViewDataSource的option修饰的必须实现的方法,否则会报错
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 20
+        return self.musicList.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        /*
-               // ----------------------------------------------------------------
-               // 使用普通方式创建cell
-               let cellID = "cell"
-               
-               // 1.创建cell,此时cell是可选类型
-               var cell = tableView.dequeueReusableCellWithIdentifier(cellID)
-               
-               // 2.判断cell是否为nil
-               if cell == nil {
-               cell = UITableViewCell(style: .Default, reuseIdentifier: cellID)
-               }
-               
-               // 3.设置cell数据
-               cell?.textLabel?.text = "测试数据\(indexPath.row)"
-               
-               return cell!
-               */
-               
-               let cell = tableView.dequeueReusableCell(withIdentifier: cellID)
-               
-               cell?.textLabel?.text = "测试数据\(indexPath.row)"
-               
-               return cell!    }
+        if let cell = tableView.dequeueReusableCell(withIdentifier: cellID){
+            cell.textLabel?.text = "歌曲名:\(String(describing: musicList[indexPath.row].name!))"
+                   return cell
+        }else{
+            return UITableViewCell(style:UITableViewCell.CellStyle.default, reuseIdentifier: cellID)
+        }
+    }
     
-
-    // MARK:- UITableViewDelegate代理
-    private func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
-        print("点击了\(indexPath.row)")
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath){
+        debugPrint("点击了\(self.musicList[indexPath.row].name!)")
+        if let tabbar = self.tabBarController{
+            if let controllers=tabbar.viewControllers{
+                if controllers[0] is PlayController{
+                   let controller=controllers[0] as! PlayController
+                    controller.play(index: indexPath.row)
+                }
+            }
+        }
     }
+    
+
 }
diff --git a/cloudmusic/SearchController.swift b/cloudmusic/SearchController.swift
index 1da5f32..255f06f 100644
--- a/cloudmusic/SearchController.swift
+++ b/cloudmusic/SearchController.swift
@@ -13,7 +13,7 @@ class SearchController: UIViewController {
 
     // 注意: Swift中mark注释的格式: MARK:-
     // MARK:- 属性
-    let cellID = "cell"
+    let cellID = "CellIdentifier"
     //关键词
     @IBOutlet weak var keyword: UITextField!
     
@@ -24,10 +24,11 @@ class SearchController: UIViewController {
     
     var musicList:[cloudmusic.Music]=[]
     
+    @IBOutlet weak var item: UITabBarItem!
     
     //关键词检索歌曲
     @IBAction func search(_ sender: UIButton) {
-        self.textFieldShouldReturn(keyword)
+        self.keyword.resignFirstResponder()
         if let k=keyword{
             if k.text!.count>0{
                 MusicRequest.search(keyword: k.text!,callback: {(json) in
@@ -36,25 +37,24 @@ class SearchController: UIViewController {
                         if res["code"]==200{
                             self.musicList=[]
                             for (_,subJson):(String, JSON) in res["result"]["songs"] {
-//                                debugPrint("index=\(index),subJson=\(subJson)")
-                                let context=self.getContext()
-                                let music = NSEntityDescription.insertNewObject(forEntityName: "Music", into: context) as! Music
-                                music.id=subJson["id"].int64Value
-                                music.name=subJson["name"].stringValue
+                                
+                                let music=self.getMusic(id: subJson["id"].int32Value, name: subJson["name"].stringValue)
+                                
                                 debugPrint("id=\(music.id),name=\(String(describing: music.name))")
                                 self.musicList.append(music)
                             }
                             self.musicTable.reloadData()
                             self.musicTable.isHidden=false
+                            
                         }else{
-                            self.alert(message: "请求失败，请稍后再试")
+                            self.alertModal(message: "请求失败，请稍后再试")
                         }
                     }else{
-                        self.alert(message: "请求失败，请稍后再试")
+                        self.alertModal(message: "请求失败，请稍后再试")
                     }
                 })
             }else{
-                self.alert(message: "关键词不能为空")
+                self.alertModal(message: "关键词不能为空")
             }
         }
     }
@@ -66,6 +66,7 @@ class SearchController: UIViewController {
           // 设置数据源代理
          self.musicTable.dataSource = self
          self.musicTable.delegate = self
+        
          self.musicTable.isHidden=true
 
           // 注册cell
@@ -74,7 +75,7 @@ class SearchController: UIViewController {
         self.keyword.delegate=self
         self.keyword.returnKeyType=UIReturnKeyType.done
         
-        
+        print(self)
     }
     
 
@@ -96,15 +97,40 @@ extension SearchController: UITableViewDataSource,UITableViewDelegate{
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: cellID)
-    
-        cell?.textLabel?.text = "歌曲名:\(String(describing: musicList[indexPath.row].name!))"
-        return cell!
+        if let cell = tableView.dequeueReusableCell(withIdentifier: cellID){
+            cell.textLabel?.text = "歌曲名:\(String(describing: musicList[indexPath.row].name!))"
+                   return cell
+        }else{
+            return UITableViewCell(style:UITableViewCell.CellStyle.default, reuseIdentifier: cellID)
+        }
     }
+
     
-    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath){
+        if let tabbar = self.tabBarController{
+            tabbar.selectedIndex=0
+            if let controllers=tabbar.viewControllers{
+                let music=self.musicList[indexPath.row]
+                if controllers[0] is PlayController{
+                   let controller=controllers[0] as! PlayController
+                    controller.play(music: music)
+                }
+                if controllers[2] is PlayListController{
+                    let controller=controllers[2] as! PlayListController
+                    if !music.status{
+                        music.status=true
+                        controller.addMusic(music: music)
+                    }
+                }
+
+            }
+        }
+    }
+   
 }
 
+
+
 extension SearchController:UITextFieldDelegate{
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         self.keyword.resignFirstResponder()
diff --git a/cloudmusic/cloudmusic.xcdatamodeld/cloudmusic.xcdatamodel/contents b/cloudmusic/cloudmusic.xcdatamodeld/cloudmusic.xcdatamodel/contents
index 90c75b4..ccb8979 100644
--- a/cloudmusic/cloudmusic.xcdatamodeld/cloudmusic.xcdatamodel/contents
+++ b/cloudmusic/cloudmusic.xcdatamodeld/cloudmusic.xcdatamodel/contents
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19F101" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Music" representedClassName="Music" syncable="YES" codeGenerationType="class">
-        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="filepath" optional="YES" attributeType="String"/>
+        <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="name" optional="YES" attributeType="String"/>
+        <attribute name="status" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="url" optional="YES" attributeType="String"/>
     </entity>
     <elements>
-        <element name="Music" positionX="-45" positionY="0" width="128" height="73"/>
+        <element name="Music" positionX="-45" positionY="0" width="128" height="118"/>
     </elements>
 </model>
\ No newline at end of file