Merge branch 'release/0.0.2'

README.md

@@ -1,21 +1,26 @@
 # NeteaseCloudMusic Electron
 
-网易云音乐Electron版
-`` 开发中 ``
+[![devDependency Status](https://david-dm.org/disoul/electron-cloud-music/dev-status.svg)](https://david-dm.org/disoul/electron-cloud-music#info=devDependencies)
+网易云音乐Electron版`` 开发中 ``
 
 ## 进度
-目前只有基本功能
+
 * 搜索歌曲+播放（版权歌曲无法播放
 * 播放列表
 * 手机登陆
 * 个人歌单（创建，收藏
-* [TODO] 歌曲界面
-* [TODO] 主页推荐
-* [TODO] 私人FM
-![预览截图](http://7xn38i.com1.z0.glb.clouddn.com/snapshot5.png)   
+* 歌曲界面（滚动歌词
+* 主页推荐
+* 喜欢歌曲 && 自动向网易提交听歌记录
+* [TODO] 私人FM  
+
+![预览截图](http://7xn38i.com1.z0.glb.clouddn.com/2016-05-07 14-32-14屏幕截图.png)
+![预览截图](http://7xn38i.com1.z0.glb.clouddn.com/2016-05-07 14-32-41屏幕截图.png)
+
+## 试用
+目前打包了一个测试版本，[release](https://github.com/disoul/electron-cloud-music/releases/tag/0.0.1)
 
 ## Build
-目前还没有打包，如果想预览开发效果可以按以下步骤自行构建
 
 ```bash
 git clone https://github.com/disoul/electron-cloud-music && cd electron-cloud-music
@@ -25,7 +30,7 @@ npm install webpack-dev-server@2.0.0-beta -g
 npm install electron-prebuilt -g 
 webpack-dev-server --inline --compress --content-base=./
 
-// run cloudmusic in proj root path
-// electron will load from 127.0.0.1:8080(webpack-dev-server
+# run cloudmusic in proj root path
+# electron will load from 127.0.0.1:8080(webpack-dev-server
 electron ./
 ```

app/actions/actions.js

@@ -1,5 +1,6 @@
 'use strict'
-import { Search, Login, getPlayList, SonglistDetail } from '../server';
+import { Search, Login, getPlayList, SonglistDetail, getLyric,playlistTracks } from '../server';
+import lryicParser from '../libs/lrcparse';
 export function play() {
   return { type: 'PLAYER', state: 'PLAYER_PLAY' };
 }
@@ -68,6 +69,14 @@ export function changeRule() {
   return { type: 'SONG', state: 'CHANGERULE' }
 }
 
+export function removesongfromlist(index) {
+  return {type: 'SONG', state: 'REMOVEFROMLIST', payload: index}
+}
+
+export function removesonglist() {
+  return {type: 'SONG', state: 'REMOVELIST' }
+}
+
 export function showPlayList() {
   return { type: 'SONG', state: 'SHOWPLAYLIST' }
 }
@@ -142,7 +151,7 @@ export  function push(content) {
 }
 
 export  function pop() {
-  return { type: 'ROUTER', state: 'PUSH' }
+  return { type: 'ROUTER', state: 'POP' }
 }
 
 // 获取歌单内容
@@ -178,3 +187,54 @@ export function showplaycontentmini() {
 export function hiddenplaycontentmini() {
   return { type: 'PLAYCONTENT', state: 'HIDDENMINI' }
 }
+
+export function showplaycontentmax() {
+  return { type: 'PLAYCONTENT', state: 'SHOWMAX' }
+}
+
+export function hiddenplaycontentmax() {
+  return { type: 'PLAYCONTENT', state: 'HIDDENMAX' }
+}
+
+function fetchinglyric() {
+  return { type: 'PLAYCONTENT', state: 'LRCFETCH' }
+}
+
+function getlyric(res) {
+  return { type: 'PLAYCONTENT', state: 'LRCGET', payload: res }
+}
+
+function errorlyric(err) {
+  return { type: 'PLAYCONTENT', state: 'LRCERROR', payload: err }
+}
+
+export function lyric(id) {
+  return dispatch => {
+    dispatch(fetchinglyric());
+    getLyric(id).then( res => {
+      dispatch(getlyric(lryicParser(res)));
+    })
+    .catch( err => {
+      dispatch(errorlyric(err));
+    });
+  };
+}
+
+export function setlyric(index) {
+  return { type: 'PLAYCONTENT', state: 'LRCSET', payload: index }
+}
+
+function addToast(content) {
+  return { type: 'TOAST', state: 'ADD', payload: content }
+}
+
+function removeToast() {
+  return { type: 'TOAST', state: 'FINISH' }
+}
+
+export function toast(content) {
+  return dispatch => {
+    dispatch(addToast(content));
+    window.setTimeout(dispatch, 5000, removeToast());
+  }
+}