diff --git a/.gitignore b/.gitignore index e43b0f9..b18defe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +# Folder view configuration files .DS_Store diff --git a/css/player.css b/css/player.css index b14dde7..c3753a6 100644 --- a/css/player.css +++ b/css/player.css @@ -26,7 +26,6 @@ a { border-radius: 4px 4px 4px 4px; padding: 20px; background-color: #333; - } .dialog-header { @@ -159,6 +158,17 @@ a { color: #ccc; } +.playlist-covers .loading_bottom button{ + width:95%; + color: #333; +} + +.playlist-covers .loading_bottom .loading{ + width:95%; + text-align:center; + color: #fff; +} + .u-cover .mask { position: absolute; top: 0; diff --git a/js/app.js b/js/app.js index bceff38..1e8d561 100644 --- a/js/app.js +++ b/js/app.js @@ -917,7 +917,7 @@ }]); app.controller('MyPlayListController', ['$http','$scope', '$timeout', - 'angularPlayer', 'loWeb', + 'angularPlayer', 'loWeb', function($http, $scope, $timeout, angularPlayer, loWeb){ $scope.myplaylists = []; @@ -941,21 +941,33 @@ }]); - app.controller('PlayListController', ['$http','$scope', '$timeout', - 'angularPlayer','loWeb', function($http, $scope, $timeout, angularPlayer, loWeb){ + app.controller('PlayListController', ['$http','$scope', '$timeout', + 'angularPlayer','loWeb', + function($http, $scope, $timeout, angularPlayer, loWeb){ $scope.result = []; - $scope.tab = 0; + $scope.loading = true $scope.changeTab = function(newTab){ $scope.tab = newTab; $scope.result = []; - loWeb.get('/show_playlist?source=' + getSourceName($scope.tab)).success(function(data) { $scope.result = data.result; }); }; + $scope.scrolling = function(){ + if ($scope.loading == true) { + return + } + $scope.loading = true; + var offset = $scope.result.length + loWeb.get('/show_playlist?source=' + getSourceName($scope.tab) + '&offset=' + offset).success(function(data) { + $scope.result = $scope.result.concat(data.result); + $scope.loading = false; + }); + } + $scope.isActiveTab = function(tab){ return $scope.tab === tab; }; @@ -964,6 +976,7 @@ $scope.loadPlaylist = function(){ loWeb.get('/show_playlist?source=' + getSourceName($scope.tab)).success(function(data) { $scope.result = data.result; + $scope.loading = false; }); }; }]); diff --git a/js/netease.js b/js/netease.js index b5e5481..458f8f8 100644 --- a/js/netease.js +++ b/js/netease.js @@ -2,7 +2,15 @@ var netease = (function() { 'use strict'; var ne_show_playlist = function(url, hm) { - var target_url = 'http://music.163.com/discover/playlist/'; + + var order = "hot" + var offset = getParameterByName('offset',url) + + if (offset != null) { + var target_url = 'http://music.163.com/discover/playlist/?order=' + order + '&limit=35&offset=' + offset; + } else { + var target_url = 'http://music.163.com/discover/playlist/?order=' + order; + } return { success: function(fn) { diff --git a/js/qq.js b/js/qq.js index d446ab9..7444f85 100644 --- a/js/qq.js +++ b/js/qq.js @@ -6,8 +6,12 @@ var qq = (function() { } var qq_show_playlist = function(url, hm) { + + var offset = getParameterByName("offset", url); + var page = offset/50 + 1; var target_url = 'http://i.y.qq.com/s.plcloud/fcgi-bin/fcg_get_diss_by_tag' + - '.fcg?categoryId=10000000&sortId=1&sin=0&ein=49&' + + '.fcg?categoryId=10000000&sortId=' + page + + '&sin=0&ein=49&' + 'format=jsonp&g_tk=5381&loginUin=0&hostUin=0&' + 'format=jsonp&inCharset=GB2312&outCharset=utf-8' + '¬ice=0&platform=yqq&jsonpCallback=' + diff --git a/js/xiami.js b/js/xiami.js index 1ca8522..0d13460 100644 --- a/js/xiami.js +++ b/js/xiami.js @@ -35,7 +35,10 @@ var xiami = (function() { } var xm_show_playlist = function(url, hm) { - var target_url = 'http://www.xiami.com/collect/recommend'; + var offset = getParameterByName("offset",url) + var page = offset/30 + 1 + + var target_url = 'http://www.xiami.com/collect/recommend/page/' + page; return { success: function(fn) { diff --git a/listen1.html b/listen1.html index 4e91bbe..a7b09a9 100644 --- a/listen1.html +++ b/listen1.html @@ -153,20 +153,27 @@
+ {{i.title}} +
+- {{i.title}} -
- -