feat(shortcut): 增加浏览器内全局快捷键的功能

README.md

@@ -1,6 +1,6 @@
-Listen 1 (Chrome Extension) V1.6.0
+Listen 1 (Chrome Extension) V1.6.1
 ==========
-（最后更新于2018年04月23日）
+（最后更新于2018年05月30日）
 
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
 
@@ -45,6 +45,9 @@ Firefox打包安装
 更新日志
 -------
 
+`2018-05-30`
+* 修复QQ音乐无法播放的问题（感谢@noschoollee 提供修复方案）
+
 `2018-04-23`
 * 修复虾米音乐无法播放的问题
 

js/background.js

@@ -1,6 +1,9 @@
+let listen1Tab = undefined;
+
 chrome.browserAction.onClicked.addListener(function(tab) {
   chrome.tabs.create({'url': chrome.extension.getURL('listen1.html')}, function(tab) {
     // Tab opened.
+    listen1Tab = tab
   });
 });
 
@@ -71,4 +74,25 @@ chrome.runtime.onMessage.addListener(
         Github.handleCallback(code);
         sendResponse();
     }
-);
+);
+
+chrome.commands.onCommand.addListener(function (command) {
+    const [viewWindow] = chrome.extension.getViews({
+        type: 'tab',
+        tabId: listen1Tab.id
+    });
+
+    switch (command) {
+        case 'play_next':
+            viewWindow.document.querySelector('.next').click();
+            break;
+        case 'play_prev':
+            viewWindow.document.querySelector('.previous').click();
+            break;
+        case 'play_pause':
+            viewWindow.document.querySelector('.mastfoot a.play').click();
+            break;
+        default:
+            console.log('不支持的快捷键')
+    }
+});

js/provider/qq.js

@@ -237,10 +237,13 @@ var qq = (function() {
     }
 
     var qq_bootstrap_track = function(sound, track, success, failure, hm, se) {
-        var target_url ='http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?' + 
-            'json=3&guid=780782017&g_tk=938407465&loginUin=0&hostUin=0&' + 
-            'format=jsonp&inCharset=GB2312&outCharset=GB2312&notice=0&' + 
-            'platform=yqq&jsonpCallback=jsonCallback&needNewCode=0';
+        var target_url ='https://c.y.qq.com/base/fcgi-bin/fcg_music_express_mobile3.fcg' +
+            '?g_tk=195219765&jsonpCallback=MusicJsonCallback004680169373158849' + 
+            '&loginUin=1297716249&hostUin=0&format=json&inCharset=utf8' + 
+            '&outCharset=utf-8&notice=0&platform=yqq&needNewCode=0' + 
+            '&cid=205361747&callback=MusicJsonCallback004680169373158849' + 
+            '&uin=1297716249&songmid='+ track.id.slice('qqtrack_'.length) +
+            '&filename=C400'+ track.id.slice('qqtrack_'.length) + '.m4a&guid=7332953645';
 
         hm({
             url:target_url,
@@ -249,11 +252,13 @@ var qq = (function() {
         })
         .then(function(response) {
             var data = response.data;
-            data = data.slice('jsonCallback('.length, -');'.length);
+            data = data.slice(data.indexOf('(')+1,data.length-1);
             data = JSON.parse(data);
-            var token = data.key;
-            var url = 'http://dl.stream.qqmusic.qq.com/C200' +  track.id.slice('qqtrack_'.length)  + '.m4a?vkey=' +
-                token + '&fromtag=0&guid=780782017';
+            var token = data.data.items[0].vkey;
+            var url = 'http://dl.stream.qqmusic.qq.com/C400' +
+              track.id.slice('qqtrack_'.length)  +
+              '.m4a?vkey=' + token +
+              '&uin=1297716249&fromtag=0&guid=7332953645';
             sound.url = url;
             success();
         });

listen1.html

@@ -351,7 +351,7 @@ <h3 class="masthead-brand" ng-click="showTag(2)">Listen 1</h3>
           <div class="settings-content">
             <p> Listen 1 主页: <a href="http://listen1.github.io/listen1/" target="_blank"> http://listen1.github.io/listen1/ </a> </p>
             <p> Listen 1 邮箱: githublisten1@gmail.com </p>
-            <p> 当前版本 1.6.0 (本软件基于MIT协议开源免费)</p>
+            <p> 当前版本 1.6.1 (本软件基于MIT协议开源免费)</p>
           </div>
         </div>
       </div>

manifest.json

@@ -15,10 +15,36 @@
     "manifest_version": 2,
     "name": "Listen 1",
     "permissions": [ "notifications", "unlimitedStorage", "downloads", "storage", "contextMenus", "tabs", "*://music.163.com/*", "*://*.xiami.com/*", "*://*.qq.com/*", "*://api.github.com/*", "*://github.com/*", "webRequest", "webRequestBlocking"],
-    "version": "1.6.0",
+    "version": "1.6.1",
     "web_accessible_resources": [ "images/*" ],
     "content_scripts": [{
         "matches": ["https://listen1.github.io/listen1/*"],
         "js": ["js/oauth_callback.js"]
-    }]
+    }],
+    "commands": {
+        "play_next": {
+            "suggested_key": {
+                "default": "Ctrl+Shift+Right",
+                "mac": "Command+Shift+Right"
+            },
+            "description": "Play next song.",
+            "global": true
+        },
+        "play_prev": {
+            "suggested_key": {
+                "default": "Ctrl+Shift+Left",
+                "mac": "Command+Shift+Left"
+            },
+            "description": "Play previous song.",
+            "global": true
+        },
+        "play_pause": {
+            "suggested_key": {
+                "default": "Ctrl+Shift+Up",
+                "mac": "Command+Shift+Up"
+            },
+            "description": "Toggle play pause state.",
+            "global": true
+        }
+    }
 }

manifest_firefox.json

@@ -21,10 +21,36 @@
     "manifest_version": 2,
     "name": "Listen 1",
     "permissions": [ "notifications", "unlimitedStorage", "downloads", "storage", "contextMenus", "tabs", "*://music.163.com/*", "*://*.xiami.com/*", "*://*.qq.com/*", "*://api.github.com/*", "*://github.com/*", "webRequest", "webRequestBlocking"],
-    "version": "1.6.0",
+    "version": "1.6.1",
     "web_accessible_resources": [ "images/*" ],
     "content_scripts": [{
         "matches": ["https://listen1.github.io/listen1/*"],
         "js": ["js/oauth_callback.js"]
-    }]
+    }],
+    "commands": {
+        "play_next": {
+            "suggested_key": {
+                "default": "Ctrl+Shift+Right",
+                "mac": "Command+Shift+Right"
+            },
+            "description": "Play next song.",
+            "global": true
+        },
+        "play_prev": {
+            "suggested_key": {
+                "default": "Ctrl+Shift+Left",
+                "mac": "Command+Shift+Left"
+            },
+            "description": "Play previous song.",
+            "global": true
+        },
+        "play_pause": {
+            "suggested_key": {
+                "default": "Ctrl+Shift+Up",
+                "mac": "Command+Shift+Up"
+            },
+            "description": "Toggle play pause state.",
+            "global": true
+        }
+    }
 }