Merge pull request cocos2d#1521 from dingpinglv/Iss3825_SimpleAudioEngine

Fixed #3825: update the multiple audio white list

Author: dingpinglv

cocos2d/audio/SimpleAudioEngine.js

@@ -1960,7 +1960,7 @@ cc.AudioEngine.getInstance = function () {
         if (cc.Browser.supportWebAudio) {
             this._instance = new cc.WebAudioEngine();
         } else {
-            if (cc.Browser.multipleAudioWhiteList.indexOf(cc.Browser.type) == -1)
+            if (cc.Browser.multipleAudioWhiteList.indexOf(cc.Browser.type) !== -1)
                 this._instance = new cc.SimpleAudioEngine();
             else
                 this._instance = new cc.SimpleAudioEngineForMobile();

cocos2d/core/platform/miniFramework.js

@@ -63,20 +63,23 @@ cc.Browser.webglWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safa
  * Browsers that multiple audio support well
  * @type {Array}
  */
-cc.Browser.multipleAudioWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safari"];
+cc.Browser.multipleAudioWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safari", "ucbrowser", "qqbrowser", "mqqbrowser"];
 
 (function () {
     var ua = navigator.userAgent;
     cc.Browser.ua = ua.toLowerCase();
     cc.Browser.platform = navigator.platform.toLowerCase();
     cc.Browser.isMobile = (cc.Browser.ua.indexOf('mobile') != -1 || cc.Browser.ua.indexOf('android') != -1);
     cc.Browser.type = (function () {
-        var browserTypes = cc.Browser.ua.match(/micromessenger|qqbrowser|mqqbrowser|ucbrowser|360browser|baidubrowser|maxthon|ie|opera|firefox/) || cc.Browser.ua.match(/chrome|safari/);
+        var browserTypes = cc.Browser.ua.match(/micromessenger|qqbrowser|mqqbrowser|ucbrowser|360browser|baiduboxapp|baidubrowser|maxthon|ie|opera|miuibrowser|firefox/)
+            || cc.Browser.ua.match(/chrome|safari/);
+
         if (browserTypes && browserTypes.length > 0) {
             var el = browserTypes[0];
             if (el == 'micromessenger') {
                 return 'wechat';
-            }
+            }else if( el === "safari" && (cc.Browser.ua.match(/android.*applewebkit/) != null))
+                return "androidbrowser";
             return el;
         }
         return "unknow";