efront 3.33.3 → 3.34.2

package/coms/kugou/player.js

@@ -3,8 +3,55 @@ var playState = kugou$playState;
 var playModes = kugou$playModes;
 var playModeData = data.getInstance("play-mode");
 var playList = kugou$playList();
-var getMusicInfo = function (hash) {
-    return data.from("song-info", { hash });
+var patchMusicInfo = async function (info) {
+    var res = null, krc;
+    switch (info.type) {
+        case "qqjt":
+            info.lrc = (await cross("get", info.lyric)).response;
+            console.log(info)
+            res = await data.from("qqjt-url", qqjc({
+                TSID: info.id
+            }))
+            break;
+        case "yyyy":
+            res = await data.from("yyyy-url", yyyc.encode({
+                ids: JSON.stringify([info.id]),
+                csrf_token: '',
+                level: "standard",
+                encodeType: "aac"
+            }));
+            info.lrc = await data.from('yyyy-lrc', yyyc.encode({
+                id: info.id,
+                lv: 0,
+                // tv: 0,
+            }));
+            info.singerName = info.singername;
+            info.songName = info.songname;
+            break;
+        case "kuwo":
+            res = await data.from("play-url", info);
+            info.lrc = await data.from("kuwo-lrc", info, function (lrc) {
+                return lrc.map(l => `[${l.time}]${l.lineLyric}`).join('\r\n');
+            });
+            info.avatar = info.pic;
+            info.singerName = info.singername;
+            info.songName = info.songname;
+            break;
+        case "kugo":
+        default:
+            res = await data.from("song-info", info);
+            krc = await data.from("search-krc", res);
+            krc = await data.from("download-krc", krc);
+            info.krc = fromBase64(krc);
+            if (res.fail_process === 12) res.priced = true;
+            if (res.imgUrl) {
+                res.avatar = res.imgUrl.replace(/\{size\}/ig, 200);
+            }
+            break;
+    }
+    Object.assign(info, res);
+    if (info.avatar) info.avatarUrl = `url('${info.avatar}')`;
+    return info;
 };
 var getLrc = function () {
     return `https://m.kugou.com/app/i/krc.php?cmd=100&keyword=%E9%99%88%E6%98%9F%E3%80%81%E5%BC%A0%E7%BF%94%E8%BD%A9%20-%20%E5%86%B3%E4%B8%8D%E5%9B%9E%E5%A4%B4&hash=77AFF2715498A86AA28AC2DAA29C3FEB&timelength=280000&d=0.2984004589282503`;
@@ -18,7 +65,7 @@ on("keydown")(window, function (event) {
     var { target } = event;
     if (/^(input|select|textarea)$/i.test(target.tagName)) return;
     var $scope = player.$scope;
-    if (!$scope.audio && !kugou$musicList.active_hash) return;
+    if (!$scope.audio && !kugou$musicList.getActived()) return;
     switch (event.keyCode || event.which) {
         case 32:
             if (event.repeat) break;
@@ -69,7 +116,6 @@ var filterTime = function (a, t) {
     }
     return res.map(fixTime).join(":");
 };
-
 var backer = document.createElement("back");
 onremove(backer, function () {
     $scope.page = false;
@@ -91,6 +137,12 @@ var $scope = {
     canvas: kugou$dance,
     activeList: playList,
     index: 0,
+    get songName() {
+        return this.info.singername || this.info.singerName;
+    },
+    get singerName() {
+        return this.info.songname || this.info.songName;
+    },
     update() {
         if (touching) return;
         let _audio = $scope.audio;
@@ -131,7 +183,8 @@ var $scope = {
             rootElements.unmount(backer);
         }
     },
-    pause() {
+    pause(inc) {
+        if (inc !== false) ++this.playid;
         $scope.playing = false;
         let _audio = $scope.audio;
         ns.disable();
@@ -181,22 +234,22 @@ var $scope = {
         }
     },
     playid: 0,
-    play(hash = musicList.active_hash) {
+    play(music = musicList.getActived()) {
+        var playid = ++this.playid;
         render.refresh();
-        var isPlayback = typeof hash === "number";
+        var isPlayback = typeof music === "number";
         if (isPlayback) {
-            if (hash < 0) {
-                hash = hash + musicList.length;
+            if (music < 0) {
+                music = music + musicList.length;
             }
             if (!musicList.length) return;
-            if (hash >= musicList.length) {
-                hash = hash % musicList.length;
+            if (music >= musicList.length) {
+                music = music % musicList.length;
             }
-            hash = musicList[hash];
-            if (!hash) return;
-            hash = hash.hash;
+            music = musicList[music];
+            if (!music) return;
         }
-        if (hash === musicList.active_hash && $scope.audio) {
+        if (musicList.isActived(music) && $scope.audio) {
             if ($scope.playing) return $scope.pause();
             $scope.playing = true;
             let _audio = $scope.audio;
@@ -206,15 +259,13 @@ var $scope = {
             }
             return;
         }
-        if (!isPlayback) for (var cx = musicList.length - 1; cx >= 0; cx--) {
-            if (musicList[cx].hash === hash) musicList.splice(cx, 1);
-        }
+        if (!isPlayback) musicList.remove(music);
 
-        $scope.pause();
+        $scope.pause(false);
 
         /**
          * ios 只能由用户创建audio，所以请在用户触发的事件中调用play方法
-         */
+        */
         $scope.playing = false;
         /**
          * @type {HTMLAudioElement}
@@ -245,17 +296,14 @@ var $scope = {
             _audio.autostart = true;
             return alert("暂不支持在您的浏览器中播放！");
         }
-        musicList.active_hash = hash;
+        musicList.setActive(music);
         $scope.playing = true;
         playState.width = 0;
-        getMusicInfo(hash).loading_promise.then((response) => {
+        patchMusicInfo(music).then((response) => {
+            if (playid !== this.playid) return;
             if (!this.playing) return;
-            if (hash !== musicList.active_hash) return;
-            if (response.imgUrl) {
-                response.avatar = response.imgUrl.replace(/\{size\}/ig, 200);
-                response.avatarUrl = `url('${response.avatar}')`;
-            }
-            var index = kugou$musicList.map(a => a.hash).indexOf(hash);
+            if (!musicList.isActived(music)) return;
+            var index = kugou$musicList.indexOf(music);
             var distlist = kugou$musicList.slice(0);
             distlist.forEach(function (info) {
                 delete info.activate;
@@ -267,9 +315,7 @@ var $scope = {
                 $scope.index = 0;
                 distlist.unshift(response);
             }
-            response.hash = hash;
             response.activate = true;
-            distlist.active_hash = hash;
             extend($scope.info, response);
             cast($scope.krcpad, response);
             _audio.onerror = e => {

package/coms/kugou/qqjc.js

@@ -0,0 +1,172 @@
+var md5 = function () {
+    var ERROR = "input is invalid type"
+    var HEX_CHARS = "0123456789abcdef".split("");
+    var EXTRA = [128, 32768, 8388608, -2147483648],
+        SHIFT = [0, 8, 16, 24],
+        OUTPUT_TYPES = ["hex", "array", "digest", "buffer", "arrayBuffer", "base64"],
+        BASE64_ENCODE_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),
+        blocks = [], buffer8;
+    var createOutputMethod = function (e) {
+        return function (t) {
+            return new Md5(!0).update(t)[e]()
+        }
+    }
+    function Md5(e) {
+        if (e)
+            blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] = blocks[4] = blocks[5] = blocks[6] = blocks[7] = blocks[8] = blocks[9] = blocks[10] = blocks[11] = blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0,
+                this.blocks = blocks,
+                this.buffer8 = buffer8;
+        else
+            this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = this.hBytes = 0,
+            this.finalized = this.hashed = !1,
+            this.first = !0
+    }
+    Md5.prototype.update = function (e) {
+        if (!this.finalized) {
+            var t, n = typeof e;
+            if ("string" != n) {
+                if ("object" != n)
+                    throw ERROR;
+                if (null === e)
+                    throw ERROR;
+                else if (!Array.isArray(e))
+                    throw ERROR;
+                t = !0
+            }
+            for (var r, i, s = 0, o = e.length, a = this.blocks, l = this.buffer8; s < o;) {
+                if (this.hashed && (this.hashed = !1,
+                    a[0] = a[16],
+                    a[16] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = a[9] = a[10] = a[11] = a[12] = a[13] = a[14] = a[15] = 0),
+                    t)
+                    for (i = this.start; s < o && i < 64; ++s)
+                        a[i >> 2] |= e[s] << SHIFT[3 & i++];
+                else
+                    for (i = this.start; s < o && i < 64; ++s)
+                        (r = e.charCodeAt(s)) < 128 ? a[i >> 2] |= r << SHIFT[3 & i++] : (r < 2048 ? a[i >> 2] |= (192 | r >> 6) << SHIFT[3 & i++] : (r < 55296 || 57344 <= r ? a[i >> 2] |= (224 | r >> 12) << SHIFT[3 & i++] : (r = 65536 + ((1023 & r) << 10 | 1023 & e.charCodeAt(++s)),
+                            a[i >> 2] |= (240 | r >> 18) << SHIFT[3 & i++],
+                            a[i >> 2] |= (128 | r >> 12 & 63) << SHIFT[3 & i++]),
+                            a[i >> 2] |= (128 | r >> 6 & 63) << SHIFT[3 & i++]),
+                            a[i >> 2] |= (128 | 63 & r) << SHIFT[3 & i++]);
+                this.lastByteIndex = i,
+                    this.bytes += i - this.start,
+                    64 <= i ? (this.start = i - 64,
+                        this.hash(),
+                        this.hashed = !0) : this.start = i
+            }
+            return 4294967295 < this.bytes && (this.hBytes += this.bytes / 4294967296 << 0,
+                this.bytes = this.bytes % 4294967296),
+                this
+        }
+    }
+
+    Md5.prototype.finalize = function () {
+        if (!this.finalized) {
+            this.finalized = !0;
+            var e = this.blocks
+                , t = this.lastByteIndex;
+            e[t >> 2] |= EXTRA[3 & t],
+                56 <= t && (this.hashed || this.hash(),
+                    e[0] = e[16],
+                    e[16] = e[1] = e[2] = e[3] = e[4] = e[5] = e[6] = e[7] = e[8] = e[9] = e[10] = e[11] = e[12] = e[13] = e[14] = e[15] = 0),
+                e[14] = this.bytes << 3,
+                e[15] = this.hBytes << 3 | this.bytes >>> 29,
+                this.hash()
+        }
+    }
+
+    Md5.prototype.hash = function () {
+        var e, t, n, r, i, s, o = this.blocks;
+        t = this.first ? ((t = ((e = ((e = o[0] - 680876937) << 7 | e >>> 25) - 271733879 << 0) ^ (n = ((n = (-271733879 ^ (r = ((r = (-1732584194 ^ 2004318071 & e) + o[1] - 117830708) << 12 | r >>> 20) + e << 0) & (-271733879 ^ e)) + o[2] - 1126478375) << 17 | n >>> 15) + r << 0) & (r ^ e)) + o[3] - 1316259209) << 22 | t >>> 10) + n << 0 : (e = this.h0,
+            t = this.h1,
+            n = this.h2,
+            ((t += ((e = ((e += ((r = this.h3) ^ t & (n ^ r)) + o[0] - 680876936) << 7 | e >>> 25) + t << 0) ^ (n = ((n += (t ^ (r = ((r += (n ^ e & (t ^ n)) + o[1] - 389564586) << 12 | r >>> 20) + e << 0) & (e ^ t)) + o[2] + 606105819) << 17 | n >>> 15) + r << 0) & (r ^ e)) + o[3] - 1044525330) << 22 | t >>> 10) + n << 0),
+            t = ((t += ((e = ((e += (r ^ t & (n ^ r)) + o[4] - 176418897) << 7 | e >>> 25) + t << 0) ^ (n = ((n += (t ^ (r = ((r += (n ^ e & (t ^ n)) + o[5] + 1200080426) << 12 | r >>> 20) + e << 0) & (e ^ t)) + o[6] - 1473231341) << 17 | n >>> 15) + r << 0) & (r ^ e)) + o[7] - 45705983) << 22 | t >>> 10) + n << 0,
+            t = ((t += ((e = ((e += (r ^ t & (n ^ r)) + o[8] + 1770035416) << 7 | e >>> 25) + t << 0) ^ (n = ((n += (t ^ (r = ((r += (n ^ e & (t ^ n)) + o[9] - 1958414417) << 12 | r >>> 20) + e << 0) & (e ^ t)) + o[10] - 42063) << 17 | n >>> 15) + r << 0) & (r ^ e)) + o[11] - 1990404162) << 22 | t >>> 10) + n << 0,
+            t = ((t += ((e = ((e += (r ^ t & (n ^ r)) + o[12] + 1804603682) << 7 | e >>> 25) + t << 0) ^ (n = ((n += (t ^ (r = ((r += (n ^ e & (t ^ n)) + o[13] - 40341101) << 12 | r >>> 20) + e << 0) & (e ^ t)) + o[14] - 1502002290) << 17 | n >>> 15) + r << 0) & (r ^ e)) + o[15] + 1236535329) << 22 | t >>> 10) + n << 0,
+            t = ((t += ((r = ((r += (t ^ n & ((e = ((e += (n ^ r & (t ^ n)) + o[1] - 165796510) << 5 | e >>> 27) + t << 0) ^ t)) + o[6] - 1069501632) << 9 | r >>> 23) + e << 0) ^ e & ((n = ((n += (e ^ t & (r ^ e)) + o[11] + 643717713) << 14 | n >>> 18) + r << 0) ^ r)) + o[0] - 373897302) << 20 | t >>> 12) + n << 0,
+            t = ((t += ((r = ((r += (t ^ n & ((e = ((e += (n ^ r & (t ^ n)) + o[5] - 701558691) << 5 | e >>> 27) + t << 0) ^ t)) + o[10] + 38016083) << 9 | r >>> 23) + e << 0) ^ e & ((n = ((n += (e ^ t & (r ^ e)) + o[15] - 660478335) << 14 | n >>> 18) + r << 0) ^ r)) + o[4] - 405537848) << 20 | t >>> 12) + n << 0,
+            t = ((t += ((r = ((r += (t ^ n & ((e = ((e += (n ^ r & (t ^ n)) + o[9] + 568446438) << 5 | e >>> 27) + t << 0) ^ t)) + o[14] - 1019803690) << 9 | r >>> 23) + e << 0) ^ e & ((n = ((n += (e ^ t & (r ^ e)) + o[3] - 187363961) << 14 | n >>> 18) + r << 0) ^ r)) + o[8] + 1163531501) << 20 | t >>> 12) + n << 0,
+            t = ((t += ((r = ((r += (t ^ n & ((e = ((e += (n ^ r & (t ^ n)) + o[13] - 1444681467) << 5 | e >>> 27) + t << 0) ^ t)) + o[2] - 51403784) << 9 | r >>> 23) + e << 0) ^ e & ((n = ((n += (e ^ t & (r ^ e)) + o[7] + 1735328473) << 14 | n >>> 18) + r << 0) ^ r)) + o[12] - 1926607734) << 20 | t >>> 12) + n << 0,
+            t = ((t += ((s = (r = ((r += ((i = t ^ n) ^ (e = ((e += (i ^ r) + o[5] - 378558) << 4 | e >>> 28) + t << 0)) + o[8] - 2022574463) << 11 | r >>> 21) + e << 0) ^ e) ^ (n = ((n += (s ^ t) + o[11] + 1839030562) << 16 | n >>> 16) + r << 0)) + o[14] - 35309556) << 23 | t >>> 9) + n << 0,
+            t = ((t += ((s = (r = ((r += ((i = t ^ n) ^ (e = ((e += (i ^ r) + o[1] - 1530992060) << 4 | e >>> 28) + t << 0)) + o[4] + 1272893353) << 11 | r >>> 21) + e << 0) ^ e) ^ (n = ((n += (s ^ t) + o[7] - 155497632) << 16 | n >>> 16) + r << 0)) + o[10] - 1094730640) << 23 | t >>> 9) + n << 0,
+            t = ((t += ((s = (r = ((r += ((i = t ^ n) ^ (e = ((e += (i ^ r) + o[13] + 681279174) << 4 | e >>> 28) + t << 0)) + o[0] - 358537222) << 11 | r >>> 21) + e << 0) ^ e) ^ (n = ((n += (s ^ t) + o[3] - 722521979) << 16 | n >>> 16) + r << 0)) + o[6] + 76029189) << 23 | t >>> 9) + n << 0,
+            t = ((t += ((s = (r = ((r += ((i = t ^ n) ^ (e = ((e += (i ^ r) + o[9] - 640364487) << 4 | e >>> 28) + t << 0)) + o[12] - 421815835) << 11 | r >>> 21) + e << 0) ^ e) ^ (n = ((n += (s ^ t) + o[15] + 530742520) << 16 | n >>> 16) + r << 0)) + o[2] - 995338651) << 23 | t >>> 9) + n << 0,
+            t = ((t += ((r = ((r += (t ^ ((e = ((e += (n ^ (t | ~r)) + o[0] - 198630844) << 6 | e >>> 26) + t << 0) | ~n)) + o[7] + 1126891415) << 10 | r >>> 22) + e << 0) ^ ((n = ((n += (e ^ (r | ~t)) + o[14] - 1416354905) << 15 | n >>> 17) + r << 0) | ~e)) + o[5] - 57434055) << 21 | t >>> 11) + n << 0,
+            t = ((t += ((r = ((r += (t ^ ((e = ((e += (n ^ (t | ~r)) + o[12] + 1700485571) << 6 | e >>> 26) + t << 0) | ~n)) + o[3] - 1894986606) << 10 | r >>> 22) + e << 0) ^ ((n = ((n += (e ^ (r | ~t)) + o[10] - 1051523) << 15 | n >>> 17) + r << 0) | ~e)) + o[1] - 2054922799) << 21 | t >>> 11) + n << 0,
+            t = ((t += ((r = ((r += (t ^ ((e = ((e += (n ^ (t | ~r)) + o[8] + 1873313359) << 6 | e >>> 26) + t << 0) | ~n)) + o[15] - 30611744) << 10 | r >>> 22) + e << 0) ^ ((n = ((n += (e ^ (r | ~t)) + o[6] - 1560198380) << 15 | n >>> 17) + r << 0) | ~e)) + o[13] + 1309151649) << 21 | t >>> 11) + n << 0,
+            t = ((t += ((r = ((r += (t ^ ((e = ((e += (n ^ (t | ~r)) + o[4] - 145523070) << 6 | e >>> 26) + t << 0) | ~n)) + o[11] - 1120210379) << 10 | r >>> 22) + e << 0) ^ ((n = ((n += (e ^ (r | ~t)) + o[2] + 718787259) << 15 | n >>> 17) + r << 0) | ~e)) + o[9] - 343485551) << 21 | t >>> 11) + n << 0,
+            this.first ? (this.h0 = e + 1732584193 << 0,
+                this.h1 = t - 271733879 << 0,
+                this.h2 = n - 1732584194 << 0,
+                this.h3 = r + 271733878 << 0,
+                this.first = !1) : (this.h0 = this.h0 + e << 0,
+                    this.h1 = this.h1 + t << 0,
+                    this.h2 = this.h2 + n << 0,
+                    this.h3 = this.h3 + r << 0)
+    }
+
+    Md5.prototype.hex = function () {
+        this.finalize();
+        var e = this.h0
+            , t = this.h1
+            , n = this.h2
+            , r = this.h3;
+        return HEX_CHARS[e >> 4 & 15] + HEX_CHARS[15 & e] + HEX_CHARS[e >> 12 & 15] + HEX_CHARS[e >> 8 & 15] + HEX_CHARS[e >> 20 & 15] + HEX_CHARS[e >> 16 & 15] + HEX_CHARS[e >> 28 & 15] + HEX_CHARS[e >> 24 & 15] + HEX_CHARS[t >> 4 & 15] + HEX_CHARS[15 & t] + HEX_CHARS[t >> 12 & 15] + HEX_CHARS[t >> 8 & 15] + HEX_CHARS[t >> 20 & 15] + HEX_CHARS[t >> 16 & 15] + HEX_CHARS[t >> 28 & 15] + HEX_CHARS[t >> 24 & 15] + HEX_CHARS[n >> 4 & 15] + HEX_CHARS[15 & n] + HEX_CHARS[n >> 12 & 15] + HEX_CHARS[n >> 8 & 15] + HEX_CHARS[n >> 20 & 15] + HEX_CHARS[n >> 16 & 15] + HEX_CHARS[n >> 28 & 15] + HEX_CHARS[n >> 24 & 15] + HEX_CHARS[r >> 4 & 15] + HEX_CHARS[15 & r] + HEX_CHARS[r >> 12 & 15] + HEX_CHARS[r >> 8 & 15] + HEX_CHARS[r >> 20 & 15] + HEX_CHARS[r >> 16 & 15] + HEX_CHARS[r >> 28 & 15] + HEX_CHARS[r >> 24 & 15]
+    }
+
+    Md5.prototype.toString = Md5.prototype.hex,
+        Md5.prototype.digest = function () {
+            this.finalize();
+            var e = this.h0
+                , t = this.h1
+                , n = this.h2
+                , r = this.h3;
+            return [255 & e, e >> 8 & 255, e >> 16 & 255, e >> 24 & 255, 255 & t, t >> 8 & 255, t >> 16 & 255, t >> 24 & 255, 255 & n, n >> 8 & 255, n >> 16 & 255, n >> 24 & 255, 255 & r, r >> 8 & 255, r >> 16 & 255, r >> 24 & 255]
+        }
+
+    Md5.prototype.array = Md5.prototype.digest
+    Md5.prototype.arrayBuffer = function () {
+        this.finalize();
+        var e = new ArrayBuffer(16)
+            , t = new Uint32Array(e);
+        return t[0] = this.h0,
+            t[1] = this.h1,
+            t[2] = this.h2,
+            t[3] = this.h3,
+            e
+    }
+
+    Md5.prototype.buffer = Md5.prototype.arrayBuffer
+    Md5.prototype.base64 = function () {
+        for (var e, t, n, r = "", i = this.array(), s = 0; s < 15;)
+            e = i[s++],
+                t = i[s++],
+                n = i[s++],
+                r += BASE64_ENCODE_CHAR[e >>> 2] + BASE64_ENCODE_CHAR[63 & (e << 4 | t >>> 4)] + BASE64_ENCODE_CHAR[63 & (t << 2 | n >>> 6)] + BASE64_ENCODE_CHAR[63 & n];
+        return e = i[s],
+            r + (BASE64_ENCODE_CHAR[e >>> 2] + BASE64_ENCODE_CHAR[e << 4 & 63] + "==")
+    };
+    return createOutputMethod("hex");
+}();
+var secret = "0b50b02fd0d73a9c4c8c3a781c30845f";
+function createSign(e) {
+    if ("[object Object]" !== Object.prototype.toString.call(e))
+        throw new Error("The parameter of query must be a Object.");
+    var t = Math.floor(Date.now() / 1e3);
+    extend(e, {
+        timestamp: t,
+        appid: 16073360
+    });
+    var n = Object.keys(e);
+    n.sort();
+    for (var r = "", i = 0; i < n.length; i++) {
+        var s = n[i];
+        r += (0 == i ? "" : "&") + s + "=" + e[s]
+    }
+    return extend(e, {
+        sign: md5(r += secret),
+        timestamp: t,
+    })
+}
+return createSign;

package/coms/kugou/song.html

@@ -1,8 +1,13 @@
 <bg></bg>
 <png class="logo" ng-if="song.imgurl" ng-src=song.imgurl></png>
-<div class="singer" ng-if="song.singer" ng-model=song.singerMarked></div>
-<div class="song" ng-model=song.songMarked></div>
+<div class="singer" ng-if="song.singer" ng-html=song.singerMarked></div>
+<div class="song" style:="{whiteSpace:song.items?'normal':'nowrap'}">
+    <span ng-html=song.songMarked></span>
+    <span class="types" -if="song.items" refresh>
+        <i type_="s.type" ng-class="{actived:musicList.isActived(s)}" priced_="!!s.priced" @click="event.stopPropagation(),play(s)" -repeat="s in song.items"></i>
+    </span>
+</div>
 <div class="filterTime(song.timeLength)"></div>
-<div refresh class="play-state" ng-if="song.hash===musicList.active_hash" ng-class={error:playState.error}>
+<div refresh class="play-state" -if="isActived()" ng-class={error:playState.error}>
     <div ng-style="{width:playState.width}"></div>
 </div>

package/coms/kugou/song.js

@@ -1,32 +1,54 @@
+function dplay() {
+    this.firstChild.$scope.play();
+}
 function main(elem) {
     elem = elem || document.createElement("song");
-    elem.renderid = 9;
     var $scope = {
         filterTime,
         png: img,
         bg,
+        play(s) {
+            if (!s) s = this.song.items ? this.song.items[0] : this.song;
+            dispatch(elem, 'play', s);
+        },
+        isActived() {
+            if (this.song.items) {
+                for (var s of this.song.items) {
+                    if (this.musicList.isActived(s)) return true;
+                }
+                return false;
+            }
+            return this.musicList.isActived(this.song);
+        },
         playState: kugou$playState,
         song: {},
         musicList: kugou$musicList,
     };
     care(elem, function (item) {
         if (!elem.innerHTML) elem.innerHTML = song;
-        var songName = String(item.name || item.songName || item.songname_original || '');
-        var singerName = String(item.singer || item.singerName || item.singername || '');
+        var songName = String(item.songname || item.song || item.songName || item.songname_original || item.name || '');
+        var singerName = String(item.singername || item.singer || item.singerName || '');
         if (~songName.indexOf(singerName)) {
             if (/\s*\-\s*/.test(songName)) {
                 singerName = songName.replace(/^([\s\S]*?)\s*\-\s*[\s\S]*$/, '$1');
                 songName = songName.replace(/^[\s\S]*?\s*\-\s*/, '');
             }
         }
-        $scope.song = {
-            hash: item.hash || item.hashid,
-            imgurl: item.imgurl,
+        $scope.song = extendIfNeeded(Object.create(item), {
+            imgurl: item.imgurl || item.avatar,
             singer: singerName,
+            items: item instanceof Array ? item : null,
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
-        };
+        });
+        if ($scope.song.items) {
+            attr(elem, 'group', true);
+        }
+        else {
+            attr(elem, 'group', null);
+        }
         render(elem.children, $scope, 0);
     });
+    onclick(elem, dplay);
     return block(elem);
 }

package/coms/kugou/song.less

@@ -1,7 +1,7 @@
 & {
-    height: 52px;
+    height: auto;
     line-height: 40px;
-    padding: 10px;
+    padding: 10px 10px 0 10px;
     font-size: 16px;
     white-space: nowrap;
     overflow: hidden;
@@ -23,7 +23,7 @@
 >.logo {
     height: 40px;
     width: 40px;
-    margin: -6px -4px;
+    margin: -4px -2px;
 
     &+.singer+.song,
     &+.song {
@@ -39,16 +39,19 @@
     }
 
 }
-&.imgonly{
+
+&.imgonly {
     padding: 0;
     line-height: 0;
     font-size: 0;
     padding-bottom: 76%;
     height: auto;
-    >:not(png){
+
+    >:not(png) {
         display: none;
     }
-    >.logo{
+
+    >.logo {
         position: absolute;
         height: 100%;
         width: 100%;
@@ -56,11 +59,68 @@
     }
 }
 
+.types {
+    display: inline-block;
+    padding: 0 6px;
+    margin: 0 -6px;
+
+    >i {
+        display: inline-block;
+        width: 1em;
+        height: 1em;
+        background-size: contain;
+        background-repeat: no-repeat;
+        background-position: center;
+        margin-right: 6px;
+        z-index: 1;
+        cursor: pointer;
+        vertical-align: middle;
+        position: relative;
+        font-style: normal;
+
+        &[priced] {
+            filter: grayscale(.9);
+        }
+
+        &.actived {
+            outline-offset: 2px;
+            outline: 1px solid;
+        }
+
+    }
+
+    [type=kugo] {
+        background-image: url("icons/kugo.ico");
+    }
+
+    [type=kuwo] {
+        background-image: url("icons/kuwo.png");
+    }
+    [type=yyyy] {
+        background-image: url("icons/yyyy.ico");
+    }
+    [type=qqjt] {
+        background-image: url("icons/qqjt.ico");
+    }
+}
+
+&[group]>.song {
+    white-space: normal;
+}
+
 >.song {
-    line-height: 30px;
+    line-height: 28px;
+    padding-top: 2px;
+    padding-bottom: 12px;
     width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
+
+    >span {
+        margin-right: 6px;
+        vertical-align: top;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 }
 
 b {
@@ -72,8 +132,8 @@ b {
 
 >.singer {
     position: absolute;
-    left: 6px;
-    top: 4px;
+    left: 8px;
+    top: 6px;
     // right: 10px;
     text-align: center;
     line-height: 12px;
@@ -81,18 +141,20 @@ b {
     color: #fff9;
 
     &+.song {
-        padding-top: 8px;
+        padding-top: 12px;
+        padding-bottom: 6px;
     }
 }
-png{
+
+png {
     filter: brightness(.7) contrast(.9);
 }
 
 >.play-state {
     position: absolute;
-    bottom: 2px;
-    right: 4px;
-    left: 4px;
+    bottom: 0;
+    right: 2px;
+    left: 2px;
     display: block;
     background: #2c7bb522;
     height: 2px;