浏览器类型判断 userAgent 更新wade-mobile.js

display-server/web/res/js/mobile/wade-mobile.js

@@ -4,15 +4,26 @@
define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobile.js"],function(Wade,Base64) {
	//终端类型,a为android,i为ios
	var deviceType = (function(){
		var sUserAgent = navigator.userAgent.toLowerCase();
		var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
		var bIsIphone = sUserAgent.match(/iphone os/i) == "iphone os";
		var bIsAndroid = sUserAgent.match(/android/i) == "android";
		var bIsWinphone = sUserAgent.match(/windows phone /i) == "windows phone " || sUserAgent.match(/windows phone os /i) == "windows phone os ";
		if(bIsAndroid){
			return "a";
		}else if(bIsIpad||bIsIphone){
			return "i";
		/*
		IpuMobile/i1/android/00/2.0/Hybrid
        userAgent格式
        i1版本规范:
        标识符/规范版本号/终端类型(ios,android,wp)/终端型号(平板，或尺寸,00表示默认)/框架版本号/结尾标识符
        */
		var sUserAgent = window.navigator.userAgent;
		//          标识符     规范1  类型2 型号3  框架4 结尾标识符
		var re = /IpuMobile\/(.*)\/(.*)\/(.*)\/(.*)\/Hybrid/ig
		var arrMessages = re.exec(sUserAgent);
		if(arrMessages && arrMessages[1] =="i1" ){
			if(arrMessages[2] == "android"){
				return "a";
			}else if(arrMessages[2] == "ios"){
				return "i"
			}else if(arrMessages[2] == "wp"){
				return "w";
			}else{
				return null;
			}
		}else{
			return null;
		}
@@ -21,7 +32,6 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
		window["TerminalType"] = deviceType;
	}
	var terminalType = window["TerminalType"];
	
	WadeMobile = (function(){
        return{
        	isAndroid:function(){
@@ -31,7 +41,7 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
        	},isWP:function(){
        		return terminalType=='w';
        	},isApp:function(){//判断是否是APP应用
				return terminalType!=null;
				return !!terminalType;
        	},getSysInfo:function(callback,key,err){//TELNUMBER|IMEI|IMSI|SDKVERSION|OSVERSION|PLATFORM|SIMNUMBER
				WadeMobile.callback.storageCallback("getSysInfo",callback);
				execute("getSysInfo", [key],err);
@@ -363,18 +373,33 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
//注意：在iframe中，_WadeMobileSet_Key_+时间戳表示一个key，此key作为了在top对象上索引iframe中的WadeMobile的依据。
//将保持引用的key值存入到当前ifame的window对象上。
(function(){
	//屏蔽所有浏览器
	if( window.navigator.userAgent.indexOf("IpuMobile\/") == -1 ) {
		console.log("<WadeMobileSet> \"IpuMobile\/\" string does not exist in the userAgent. return.");
		return;
	}
	
	if(top != window){
		if(top.WadeMobileSet == undefined){
			top.WadeMobileSet = {};
		}
		for(var key in top.WadeMobileSet){
			if( key.indexOf("_WadeMobileSet_Key_") != -1 && ( top.WadeMobileSet[key] == undefined || top.WadeMobileSet[key].canRemoved() ) ){
			try{
				if( key.indexOf("_WadeMobileSet_Key_") != -1 && ( !top.WadeMobileSet[key] || ( top.WadeMobileSet[key].canRemoved && top.WadeMobileSet[key].canRemoved() ) ) ){
					console.log("(top set)delete:" + key);
					delete top.WadeMobileSet[key];
					console.log("(top set)delete success :" + key);
				}
			}catch(e){
				console.log("a error(WadeMobile) : " + e);
				console.log("(top set)delete:" + key);
				delete top.WadeMobileSet[key];
				console.log("(top set)delete success :" + key);
			}
		}
		var key = "_WadeMobileSet_Key_" + new Date().getTime();
		window._WadeMobileSet_Key_ = key;
		console.log("In an iframe, window.WadeMobile object is referenced top.WadeMobileSet." + key);
		console.log("in an iframe, window.WadeMobile object is referenced top.WadeMobileSet." + key);
		top.WadeMobileSet[key] = window.WadeMobile;
		window.WadeMobile.canRemoved = function(){
			return !window;

general-web-server/web/res/js/wade-mobile.js

@@ -375,9 +375,9 @@ window.Mobile = window.WadeMobile = (function() {
//注意：在iframe中，_WadeMobileSet_Key_+时间戳表示一个key，此key作为了在top对象上索引iframe中的WadeMobile的依据。
//将保持引用的key值存入到当前ifame的window对象上。
(function(){
	//屏蔽IE浏览器
	if('ActiveXObject' in window) {
		console.log("<WadeMobileSet> it exists window.ActiveXObject.return ...");
	//屏蔽所有浏览器
	if( window.navigator.userAgent.indexOf("IpuMobile\/") == -1 ) {
		console.log("<WadeMobileSet> \"IpuMobile\/\" string does not exist in the userAgent. return.");
		return;
	}