李勇 / McuClient

转到一个项目
Toggle navigation Toggle navigation pinning
AlexWang
2501e753 1 parent 71697709

空指针错误

内嵌 并排对比
正在显示 2 个修改的文件 包含 56 行增加 和 55 行删除
此 diff 太大无法显示。
@@ -9,64 +9,65 @@ let loger = Loger.getLoger('SystemConfig'); @@ -9,64 +9,65 @@ let loger = Loger.getLoger('SystemConfig');
9 class SystemConfig { 9 class SystemConfig {
10 constructor() { 10 constructor() {
11 11
12 - }  
13 - //获取系统信息  
14 - static getSystemInfo(){  
15 - //检查是否是移动端  
16 - GlobalConfig.isMobile = mdetect.isMobileUA();  
17 - if (GlobalConfig.isMobile) {  
18 - loger.warn("当前设备是移动设备");  
19 - } else {  
20 - loger.warn("当前设备是PC");  
21 - }  
22 - if(mdetect.isIOS()){  
23 - GlobalConfig.deviceType=1;//"ios";  
24 - } if(mdetect.isAndroid()){  
25 - GlobalConfig.platform=2;//"android";  
26 - }else {  
27 - GlobalConfig.platform=0;//"pc";  
28 } 12 }
  13 + //获取系统信息
  14 + static getSystemInfo() {
  15 + //检查是否是移动端
  16 + GlobalConfig.isMobile = mdetect.isMobileUA();
  17 + if (GlobalConfig.isMobile) {
  18 + loger.warn("当前设备是移动设备");
  19 + } else {
  20 + loger.warn("当前设备是PC");
  21 + }
  22 + if (mdetect.isIOS()) {
  23 + GlobalConfig.deviceType = 1; //"ios";
  24 + }
  25 + if (mdetect.isAndroid()) {
  26 + GlobalConfig.platform = 2; //"android";
  27 + } else {
  28 + GlobalConfig.platform = 0; //"pc";
  29 + }
29 30
30 - //语言  
31 - GlobalConfig.language ="unknown";  
32 - if(navigator){  
33 - let language=navigator.language || navigator.browserLanguage;  
34 - GlobalConfig.language = language.toLocaleLowerCase();  
35 - }  
36 - let browserInfo=this.getBrowserInfo();  
37 - GlobalConfig.explorer=browserInfo.explorer||"未知";  
38 - GlobalConfig.explorerVersion=browserInfo.explorerVersion||"未知"; 31 + //语言
  32 + GlobalConfig.language = "unknown";
  33 + if (navigator) {
  34 + let language = navigator.language || navigator.browserLanguage;
  35 + GlobalConfig.language = language.toLocaleLowerCase();
  36 + }
  37 + let browserInfo = this.getBrowserInfo();
  38 + GlobalConfig.explorer = browserInfo.explorer || "未知";
  39 + GlobalConfig.explorerVersion = browserInfo.explorerVersion || "未知";
39 40
40 - GlobalConfig.os=this.detectOS();  
41 - loger.log("deviceType:"+GlobalConfig.deviceType);  
42 - loger.log("language:"+GlobalConfig.language);  
43 - loger.log("explorer:"+GlobalConfig.explorer);  
44 - loger.log("explorerVersion:"+GlobalConfig.explorerVersion);  
45 - loger.log("os:"+GlobalConfig.os);  
46 - }  
47 - //获取浏览器和信息  
48 - static getBrowserInfo(){  
49 - var Sys = {};  
50 - var ua = navigator.userAgent.toLowerCase();  
51 - var re =/(trident|msie|firefox|chrome|opera|version).*?([\d.]+)/;  
52 - var m = ua.match(re);  
53 - Sys.explorer = m[1].replace(/version/, "'safari");  
54 -  
55 - //判断是否是IE11  
56 - if(Sys.explorer=="trident"){  
57 - Sys.explorer="IE11"  
58 - Sys.explorerVersion = "11.0";  
59 - }else if(Sys.explorer=="msie"){  
60 - //IE  
61 - Sys.explorer="IE"  
62 - Sys.explorerVersion = m[2];  
63 - }else {  
64 - //非IE  
65 - Sys.explorerVersion = m[2]; 41 + GlobalConfig.os = this.detectOS();
  42 + loger.log("deviceType:" + GlobalConfig.deviceType);
  43 + loger.log("language:" + GlobalConfig.language);
  44 + loger.log("explorer:" + GlobalConfig.explorer);
  45 + loger.log("explorerVersion:" + GlobalConfig.explorerVersion);
  46 + loger.log("os:" + GlobalConfig.os);
66 } 47 }
67 - return Sys;  
68 - }  
69 - //系统信息 48 + //获取浏览器和信息
  49 + static getBrowserInfo() {
  50 + var Sys = {};
  51 + var ua = navigator.userAgent.toLowerCase();
  52 + var re = /(trident|msie|firefox|chrome|opera|version).*?([\d.]+)/;
  53 + var m = ua.match(re);
  54 + if (!m) m = ["version/1.0.0", "version", "1.0.0"];
  55 + Sys.explorer = m[1].replace(/version/, "'safari");
  56 + //判断是否是IE11
  57 + if (Sys.explorer == "trident") {
  58 + Sys.explorer = "IE11"
  59 + Sys.explorerVersion = "11.0";
  60 + } else if (Sys.explorer == "msie") {
  61 + //IE
  62 + Sys.explorer = "IE"
  63 + Sys.explorerVersion = m[2];
  64 + } else {
  65 + //非IE
  66 + Sys.explorerVersion = m[2];
  67 + }
  68 + return Sys;
  69 + }
  70 + //系统信息
70 static detectOS() { 71 static detectOS() {
71 var sUserAgent = navigator.userAgent; 72 var sUserAgent = navigator.userAgent;
72 var isWin = (navigator.platform == "Win32") || (navigator.platform == "Windows"); 73 var isWin = (navigator.platform == "Win32") || (navigator.platform == "Windows");
@@ -83,7 +84,7 @@ class SystemConfig { @@ -83,7 +84,7 @@ class SystemConfig {
83 if (isWinXP) return "WinXP"; 84 if (isWinXP) return "WinXP";
84 var isWin2003 = sUserAgent.indexOf("Windows NT 5.2") > -1 || sUserAgent.indexOf("Windows 2003") > -1; 85 var isWin2003 = sUserAgent.indexOf("Windows NT 5.2") > -1 || sUserAgent.indexOf("Windows 2003") > -1;
85 if (isWin2003) return "Win2003"; 86 if (isWin2003) return "Win2003";
86 - var isWinVista= sUserAgent.indexOf("Windows NT 6.0") > -1 || sUserAgent.indexOf("Windows Vista") > -1; 87 + var isWinVista = sUserAgent.indexOf("Windows NT 6.0") > -1 || sUserAgent.indexOf("Windows Vista") > -1;
87 if (isWinVista) return "WinVista"; 88 if (isWinVista) return "WinVista";
88 var isWin7 = sUserAgent.indexOf("Windows NT 6.1") > -1 || sUserAgent.indexOf("Windows 7") > -1; 89 var isWin7 = sUserAgent.indexOf("Windows NT 6.1") > -1 || sUserAgent.indexOf("Windows 7") > -1;
89 if (isWin7) return "Win7"; 90 if (isWin7) return "Win7";