efront 4.0.20 → 4.0.22

package/coms/kugou/player.js

@@ -187,7 +187,6 @@ var $scope = {
         if (inc !== false) ++this.playid;
         $scope.playing = false;
         let _audio = $scope.audio;
-        ns.disable();
         if (_audio && _audio.pause instanceof Function) _audio.pause();
         render.refresh();
     },
@@ -196,7 +195,7 @@ var $scope = {
         select(elem, $scope.activeList, null);
     },
     draw(buf) {
-        if (!player || !player.offsetHeight || !$scope.dance) return;
+        if (!player || !player.offsetHeight || !$scope.dance) return cast($scope.dance, { theta: $scope.quickTheta || 0 });
         buf = Array.prototype.map.call(buf, a => (a / 128.0 - 1) * 2 / 9 + 0.6);
         var width = freePixel(player.offsetWidth);
         var height = 72;
@@ -258,7 +257,6 @@ var $scope = {
             $scope.playing = true;
             let _audio = $scope.audio;
             if (_audio.play instanceof Function) {
-                if (ns.wake) ns.enable();
                 _audio.play();
             }
             return;
@@ -275,23 +273,18 @@ var $scope = {
          * @type {HTMLAudioElement}
          */
         var _audio = document.createElement("audio");
-        _audio.onended = function () {
-            ns.disable();
-        };
-        if (hasContext) {
-            // ios设备目前未找到可视化方案
+        if (hasContext && !/iPhone/.test(navigator.userAgent)) {
+            // ios设备添加可视化后，无法背景播放
             var context = new AudioContext;
             var source = context.createMediaElementSource(_audio);
             analyser = context.createAnalyser();
             analyser.fftSize = dancingArray.length;
             source.connect(analyser);
-            _audio.crossOrigin = "anonymous";
-            source.crossOrigin = 'anonymous';
             source.connect(context.destination);
+            _audio.crossOrigin = "anonymous";
         }
         if (_audio.play) {
             _audio.ontimeupdate = $scope.update;
-            if (ns.wake) ns.enable();
             _audio.play();//安卓4以上的播放功能要在用户事件中调用;
         } else {
             // <embed id="a_player_ie8" type="audio/mpeg" src="a.mp3" autostart="false"></embed>
@@ -327,10 +320,8 @@ var $scope = {
                 if ($scope.audio === _audio) {
                     playState.error = true;
                 }
-                if (ns) ns.disable();
             };
             delete playState.error;
-            if (ns.wake) ns.enable();
             _audio.src = hasContext && music.type !== "qqjt" ? cross.getCrossUrl(response.url) : response.url;
             _audio.play();
             data.setInstance('musicList', distlist, true);
@@ -435,20 +426,6 @@ var createControls = function () {
     return player;
 };
 var ns = document.addEventListener && new thirdParty$NoSleep;
-data.bindInstance("play-mode", function (e) {
-    if (!ns) return;
-    if (e.wake) {
-        ns.wake = true;
-        if ($scope.playing) {
-            $scope.pause();
-            $scope.play();
-        }
-    }
-    else if (ns) {
-        ns.wake = false;
-        ns.disable();
-    }
-});
 
 var player = function (player) {
     render(player, $scope);

package/coms/reptile/colored_console.js

@@ -97,10 +97,10 @@ var write = function (hasNewLine, str) {
         bgColor = colors[bg] || "",
         reset = colors.Reset;
     var hasNewLine = /^(warn|error|pass|fail)$/.test(log);
-    var logger = function (...args) {
+    var logger = function () {
         var label = fgColor + bgColor + info + reset;
         var time_stamp = '';
-        var str = [time_stamp, label, ...args.map(a => renderColor(a))].join(" ");
+        var str = [time_stamp, label].concat(Array.prototype.map.call(arguments, a => renderColor(a))).join(" ");
         write1(hasNewLine, str);
     };
     colored[log] = logger;
@@ -120,7 +120,7 @@ var formatRows = function (arg, rows, deep, entry, leave) {
     var space = new Array(deep).join("    ");
     var deepspace = new Array(deep + 1).join("    ");
     var lens = rows.slice(0, 100).map(r => r.replace(colorReg, '').replace(/[\u00ff-\uffff]/g, '00').length);
-    var maxLength = Math.max(...lens) + 2;
+    var maxLength = Math.max.apply(Math, lens) + 2;
     var itemcount = (process.stdout.columns - deepspace.length - 10) / maxLength | 0;
     if (rows.length > itemcount) {
         if (itemcount * itemcount > rows.length + process.stdout.columns) itemcount = Math.ceil(Math.sqrt(rows.length + process.stdout.columns));
@@ -162,9 +162,9 @@ var formatRows = function (arg, rows, deep, entry, leave) {
         }
         else {
             for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
-                res.push([rows[cx], ...rows.slice(cx + 1, cx + itemcount).map((r, i) => {
+                res.push([rows[cx]].concat(rows.slice(cx + 1, cx + itemcount).map((r, i) => {
                     return Array(Math.max(maxLength[i] - lens[cx + i], 0)).join(" ") + r;
-                })].join(', '));
+                })).join(', '));
             }
         }
     }
@@ -265,11 +265,11 @@ colored.time = function (date = new Date, str) {
     write1(true, colors.BgGray + colors.FgWhite2 + formatDate.call(date) + str + colors.Reset);
 };
 
-colored.type = function (...args) {
-    write1(false, args.map(a => format(a)).join(' '));
+colored.type = function () {
+    write1(false, Array.prototype.map.call(arguments, a => format(a)).join(' '));
 };
-colored.line = function (...args) {
-    write1(true, args.map(a => format(a)).join(' '));
+colored.line = function () {
+    write1(true, Array.prototype.map.call(arguments, a => format(a)).join(' '));
 };
 var _log = console.log;
 colored.log = function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.20",
+    "version": "4.0.22",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {