From 89c83f2b7b0508e4d18b9742c6ce1988fa13cad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=84=95=E5=8D=8E?= <616436641@qq.com>
Date: Fri, 24 May 2019 22:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html      |   2 +-
 src/pages/play.jsx     | 132 ++++++++++++++++++++++++++++++-----------
 src/pages/play.scss    |  32 ++++++++--
 src/styles/common.scss |   1 +
 src/utils/http.js      |  11 +++-
 5 files changed, 134 insertions(+), 44 deletions(-)

diff --git a/public/index.html b/public/index.html
index 6f172e4..7c6efe2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -21,7 +21,7 @@
     -->
     <title>React App</title>
     <script src="https://as.alipayobjects.com/g/component/fastclick/1.0.6/fastclick.js"></script>
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_1183883_8sp7kwstwnb.css"/>
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_1183883_k998zh6mui.css"/>
     <script>
       if ('addEventListener' in document) {
         document.addEventListener('DOMContentLoaded', function () {
diff --git a/src/pages/play.jsx b/src/pages/play.jsx
index 47cf3a0..4ec148b 100644
--- a/src/pages/play.jsx
+++ b/src/pages/play.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { NavBar, Icon, Slider } from 'antd-mobile';
+import { NavBar, Icon, Slider, Button } from 'antd-mobile';
 import './play.scss';
 import { home } from '@/api'
 import BScroll from 'better-scroll'
@@ -9,9 +9,15 @@ export default class Play extends React.Component {
         super()
         this.state = {
             songUrl: '',
-            lrcArray: [],
-            curTimeStamp: '00:00',
-            length: 0
+            picUrl: '',
+            lrcArr: [],
+            curTimeStamp: 0,
+            duration: 0,
+            // 是否拖动状态
+            draging: false,
+            // 是否播放状态
+            playing: true
+
         }
     }
     componentWillMount () {
@@ -19,7 +25,8 @@ export default class Play extends React.Component {
         if (!id) return
         home.getSongDetail({ ids: id }).then(res => {
             this.setState({
-                length: res.songs[0].dt
+                duration: res.songs[0].dt,
+                picUrl: res.songs[0].al.picUrl
             })
         })
         home.getSongUrl({ id }).then(res => {
@@ -28,25 +35,24 @@ export default class Play extends React.Component {
             })
         })
         home.getLyric({ id }).then(res => {
-            let lrcArray = this.parseLrc(res.lrc.lyric)
-            this.setState({
-                lrcArray
-            })
+            if (res.lrc && res.lrc.lyric) {
+                let lrcArr = this.parseLrc(res.lrc.lyric)
+                this.setState({
+                    lrcArr
+                })
+            }
         })
 
     }
     componentDidMount () {
         let wrapper = document.querySelector('.lrc-wrap')
         lrcScroll = new BScroll(wrapper, {})
-        setTimeout(() => {
-            document.querySelector('.player').currentTime = 10
-        }, 1000)
     }
     formatToTime (timeStamp) {
-        let time = parseInt(timeStamp) / 1000
-        let m = Math.floor(time / 60)
+        // let time = parseInt(timeStamp) / 1000
+        let m = Math.floor(timeStamp / 60)
         m < 10 && (m = '0' + m)
-        let s = Math.floor(time % 60)
+        let s = Math.floor(timeStamp % 60)
         s < 10 && (s = '0' + s)
         return `${m}:${s}`
     }
@@ -57,7 +63,7 @@ export default class Play extends React.Component {
     }
     parseLrc (text) {
         let res = text.split('\n')
-        let timeReg = /^\[(\d{2}):(\d{2})\.(\d{2})\]/
+        let timeReg = /^\[(\d{2}):(\d{2})\.(\d*)\]/
         res = res.map(line => {
             let obj = {}
             let result = line.match(timeReg)
@@ -67,28 +73,79 @@ export default class Play extends React.Component {
             }
             return obj
         })
-        return res.filter(line => line.content !== '')
+        return res
     }
-    onTimeUpdate (e) {
-        let curTimeStamp = this.formatToTime(e.timeStamp)
-        let idx = this.state.lrcArray.findIndex(line => line.timeStamp === curTimeStamp)
+    onTimeUpdate () {
+        let curTimeStamp = document.querySelector('.player').currentTime
+        let idx = this.state.lrcArr.findIndex(line => line.timeStamp === this.formatToTime(curTimeStamp))
         if (idx >= 0) {
+            // 滚动歌词
             let el = document.querySelector('.lrc-list')
             let lrcEl = el.querySelectorAll('.lrc-item')[idx]
             lrcScroll.scrollToElement(lrcEl, 300, 0, -150)
+
+            // 歌词高亮
+            let lrcArr = this.state.lrcArr.map(line => ({
+                ...line,
+                active: line.timeStamp === this.formatToTime(curTimeStamp)
+            }))
+            this.setState({
+                lrcArr
+            })
+        }
+        if (!this.state.draging) {
+            this.setState({
+                curTimeStamp
+            })
         }
+    }
+    onTimeChange (val) {
+        let state = this.state
+        // 设置播放时间
         this.setState({
-            curTimeStamp
+            draging: true,
+            curTimeStamp: val
         })
     }
+    onAfterTimeChange (val) {
+        let state = this.state
+        document.querySelector('.player').currentTime = val
+        this.setState({
+            curTimeStamp: val
+        })
+        this.setState({
+            draging: false
+        })
+        // 滚动歌词
+        let idx = state.lrcArr.findIndex(line => line.timeStamp === this.formatToTime(val))
+        if (idx) {
+            let el = document.querySelector('.lrc-list')
+            let lrcEl = el.querySelectorAll('.lrc-item')[idx]
+            lrcScroll.scrollToElement(lrcEl, 300, 0, -150)
+        }
+    }
+    togglePlay () {
+        let player = document.querySelector('.player')
+        if (player.paused) {
+            player.play()
+            this.setState({
+                playing: true
+            })
+        } else {
+            player.pause()
+            this.setState({
+                playing: false
+            })
+        }
+    }
     render () {
         let state = this.state
         // let detail = this.state.detail
         let lrcList
-        if (this.state.lrcArray.length) {
+        if (this.state.lrcArr.length) {
             lrcList = (
-                this.state.lrcArray.map((item, index) => (
-                    <div className={`lrc-item ${item.timeStamp === this.state.curTimeStamp ? 'active' : ''}`} key={index}>
+                this.state.lrcArr.map((item, index) => (
+                    <div className={`lrc-item ${item.active ? 'active' : ''}`} key={index}>
                         {item.content}
                     </div>
                 )))
@@ -106,28 +163,35 @@ export default class Play extends React.Component {
                     ]}
                 >
                 </NavBar>
+                <audio src={state.songUrl} onTimeUpdate={this.onTimeUpdate.bind(this)} controls autoPlay={true} className="player"> </audio>
                 <div className="content">
-                    <audio src={this.state.songUrl} onTimeUpdate={this.onTimeUpdate.bind(this)} controls autoPlay={true} className="player"> </audio>
-                    <div className="lrc-wrap" style={{ transform: `translateY(${this.state.lrcTop}px)` }}>
+                    <div className="lrc-wrap">
                         <div className="lrc-list">
                             {lrcList}
                         </div>
                     </div>
                     <div className="control">
                         <div className="slider">
-                            <span className="cur-time">{state.curTimeStamp}</span>
+                            <span className="cur-time">{this.formatToTime(state.curTimeStamp)}</span>
                             <Slider
-                                style={{ marginLeft: 10, marginRight: 10 }}
                                 defaultValue={0}
-                                value={this.formatToNum(state.curTimeStamp)}
+                                value={state.curTimeStamp}
                                 min={0}
-                                max={30}
-                                onChange={() => { }}
-                                onAfterChange={() => { }}
+                                max={Math.floor(state.duration / 1000)}
+                                onChange={this.onTimeChange.bind(this)}
+                                onAfterChange={this.onAfterTimeChange.bind(this)}
+                                onClick={() => { console.log(555) }}
+                                aa={123}
                             />
-                            <span className="total-time">{this.formatToTime(state.length)}</span>
+                            <span className="total-time">{this.formatToTime(state.duration / 1000)}</span>
+                        </div>
+                        <div className="play-btns">
+                            <span className="iconfont icon-danqu"></span>
+                            <span className="iconfont icon-prev"></span>
+                            <span className={`iconfont ${state.playing ? 'icon-pause' : 'icon-play1'}`} onClick={this.togglePlay.bind(this)}></span>
+                            <span className="iconfont icon-next"></span>
+                            <span className="iconfont icon-play-list"></span>
                         </div>
-
                     </div>
                 </div>
             </div>
diff --git a/src/pages/play.scss b/src/pages/play.scss
index 22f5464..7d7c509 100644
--- a/src/pages/play.scss
+++ b/src/pages/play.scss
@@ -3,8 +3,8 @@
 .play-p{
     .player{
         // z-index: -9999;
-        position: absolute;
-        // visibility: hidden;
+        // position: absolute;
+        visibility: hidden;
     }
     .content{
         padding: 0.35rem;
@@ -12,9 +12,10 @@
         flex-direction: column;
         .lrc-wrap{
             overflow: auto;
+            flex: 1 1 auto;
         }
         .control{
-            height: 2rem;
+            height: 3rem;
             flex: 0 0 auto;
         }
     }
@@ -27,18 +28,19 @@
     }
     .lrc-item{
         line-height: 1.3;
-        margin: 0.5rem;
+        margin: 0.7rem 0.2rem;
         padding-left: 10px;
-        color: fff;
+        color: #ccc;
         transition: color .5s;
         text-align: center;
-        @include fs(0.45rem);
+        @include fs(0.4rem);
     }
     .lrc-item.active{
         color: greenyellow;
         transition: color .5s;
     }
     .lrc-list{
+        padding: 4rem 0;
         transition-duration: .3s !important;
     }
     .lrc-list  .slider-frame{
@@ -48,6 +50,12 @@
         .slider{
             display: flex;
             align-items: center;
+            margin: 0.3rem 0 0.5rem;
+        }
+        .am-slider{
+            margin-left: 10px;
+            margin-right: 10px;
+            touch-action: none;
         }
         .am-slider-wrapper{
             flex: 1 0 auto;
@@ -57,5 +65,17 @@
             width: 1rem;
             flex: 0 1 auto;
         }
+        .play-btns{
+            display: flex;
+            align-items: center;
+            .iconfont{
+                text-align: center;
+                @include fs(0.6rem);
+                flex: 1;
+                &.icon-play1,&.icon-pause{
+                    @include fs(1.3rem);
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 30a98c6..1b51180 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -51,6 +51,7 @@ code {
   .content{
     background-color: rgba(0,0,0,.4);
     overflow: auto;
+    flex: 1 1 auto;
   }
 }
 @mixin ellipsis{
diff --git a/src/utils/http.js b/src/utils/http.js
index 9e11a5b..80f8831 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -1,5 +1,7 @@
 import axios from 'axios'
 import qs from 'qs'
+import { Toast } from 'antd-mobile';
+
 // let baseURL = 'http://localhost:3000'
 let baseURL = 'http://192.168.10.115:3000'
 // let baseURL = 'http://192.168.1.104:3000'
@@ -11,11 +13,14 @@ axios.interceptors.request.use(config => {
 })
 
 axios.interceptors.response.use(response => {
-    // console.log(response)
     return response.data
 }, error => {
-    // console.log(response)
-    return Promise.resolve(error.response)
+    if (error.code === 'ECONNABORTED' && error.message.indexOf('timeout') !== -1) {
+        Toast.offline('请求超时', 1);
+        return
+    }
+    Toast.fail(error.message, 1);
+    return Promise.reject(error)
 })
 
 // function checkStatus (response) {