Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
AlexWang
2017-07-19 17:36:39 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2501e7531f54ff63c527cb749e4454252ec4639d
2501e753
1 parent
71697709
空指针错误
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
56 行增加
和
55 行删除
dist/McuClient.js
src/SystemConfig.js
dist/McuClient.js
查看文件 @
2501e75
此 diff 太大无法显示。
src/SystemConfig.js
查看文件 @
2501e75
...
...
@@ -9,64 +9,65 @@ let loger = Loger.getLoger('SystemConfig');
class
SystemConfig
{
constructor
()
{
}
//获取系统信息
static
getSystemInfo
(){
//检查是否是移动端
GlobalConfig
.
isMobile
=
mdetect
.
isMobileUA
();
if
(
GlobalConfig
.
isMobile
)
{
loger
.
warn
(
"当前设备是移动设备"
);
}
else
{
loger
.
warn
(
"当前设备是PC"
);
}
if
(
mdetect
.
isIOS
()){
GlobalConfig
.
deviceType
=
1
;
//"ios";
}
if
(
mdetect
.
isAndroid
()){
GlobalConfig
.
platform
=
2
;
//"android";
}
else
{
GlobalConfig
.
platform
=
0
;
//"pc";
}
//获取系统信息
static
getSystemInfo
()
{
//检查是否是移动端
GlobalConfig
.
isMobile
=
mdetect
.
isMobileUA
();
if
(
GlobalConfig
.
isMobile
)
{
loger
.
warn
(
"当前设备是移动设备"
);
}
else
{
loger
.
warn
(
"当前设备是PC"
);
}
if
(
mdetect
.
isIOS
())
{
GlobalConfig
.
deviceType
=
1
;
//"ios";
}
if
(
mdetect
.
isAndroid
())
{
GlobalConfig
.
platform
=
2
;
//"android";
}
else
{
GlobalConfig
.
platform
=
0
;
//"pc";
}
//语言
GlobalConfig
.
language
=
"unknown"
;
if
(
navigator
){
let
language
=
navigator
.
language
||
navigator
.
browserLanguage
;
GlobalConfig
.
language
=
language
.
toLocaleLowerCase
();
}
let
browserInfo
=
this
.
getBrowserInfo
();
GlobalConfig
.
explorer
=
browserInfo
.
explorer
||
"未知"
;
GlobalConfig
.
explorerVersion
=
browserInfo
.
explorerVersion
||
"未知"
;
//语言
GlobalConfig
.
language
=
"unknown"
;
if
(
navigator
)
{
let
language
=
navigator
.
language
||
navigator
.
browserLanguage
;
GlobalConfig
.
language
=
language
.
toLocaleLowerCase
();
}
let
browserInfo
=
this
.
getBrowserInfo
();
GlobalConfig
.
explorer
=
browserInfo
.
explorer
||
"未知"
;
GlobalConfig
.
explorerVersion
=
browserInfo
.
explorerVersion
||
"未知"
;
GlobalConfig
.
os
=
this
.
detectOS
();
loger
.
log
(
"deviceType:"
+
GlobalConfig
.
deviceType
);
loger
.
log
(
"language:"
+
GlobalConfig
.
language
);
loger
.
log
(
"explorer:"
+
GlobalConfig
.
explorer
);
loger
.
log
(
"explorerVersion:"
+
GlobalConfig
.
explorerVersion
);
loger
.
log
(
"os:"
+
GlobalConfig
.
os
);
}
//获取浏览器和信息
static
getBrowserInfo
(){
var
Sys
=
{};
var
ua
=
navigator
.
userAgent
.
toLowerCase
();
var
re
=
/
(
trident|msie|firefox|chrome|opera|version
)
.*
?([\d
.
]
+
)
/
;
var
m
=
ua
.
match
(
re
);
Sys
.
explorer
=
m
[
1
].
replace
(
/version/
,
"'safari"
);
//判断是否是IE11
if
(
Sys
.
explorer
==
"trident"
){
Sys
.
explorer
=
"IE11"
Sys
.
explorerVersion
=
"11.0"
;
}
else
if
(
Sys
.
explorer
==
"msie"
){
//IE
Sys
.
explorer
=
"IE"
Sys
.
explorerVersion
=
m
[
2
];
}
else
{
//非IE
Sys
.
explorerVersion
=
m
[
2
];
GlobalConfig
.
os
=
this
.
detectOS
();
loger
.
log
(
"deviceType:"
+
GlobalConfig
.
deviceType
);
loger
.
log
(
"language:"
+
GlobalConfig
.
language
);
loger
.
log
(
"explorer:"
+
GlobalConfig
.
explorer
);
loger
.
log
(
"explorerVersion:"
+
GlobalConfig
.
explorerVersion
);
loger
.
log
(
"os:"
+
GlobalConfig
.
os
);
}
return
Sys
;
}
//系统信息
//获取浏览器和信息
static
getBrowserInfo
()
{
var
Sys
=
{};
var
ua
=
navigator
.
userAgent
.
toLowerCase
();
var
re
=
/
(
trident|msie|firefox|chrome|opera|version
)
.*
?([\d
.
]
+
)
/
;
var
m
=
ua
.
match
(
re
);
if
(
!
m
)
m
=
[
"version/1.0.0"
,
"version"
,
"1.0.0"
];
Sys
.
explorer
=
m
[
1
].
replace
(
/version/
,
"'safari"
);
//判断是否是IE11
if
(
Sys
.
explorer
==
"trident"
)
{
Sys
.
explorer
=
"IE11"
Sys
.
explorerVersion
=
"11.0"
;
}
else
if
(
Sys
.
explorer
==
"msie"
)
{
//IE
Sys
.
explorer
=
"IE"
Sys
.
explorerVersion
=
m
[
2
];
}
else
{
//非IE
Sys
.
explorerVersion
=
m
[
2
];
}
return
Sys
;
}
//系统信息
static
detectOS
()
{
var
sUserAgent
=
navigator
.
userAgent
;
var
isWin
=
(
navigator
.
platform
==
"Win32"
)
||
(
navigator
.
platform
==
"Windows"
);
...
...
@@ -83,7 +84,7 @@ class SystemConfig {
if
(
isWinXP
)
return
"WinXP"
;
var
isWin2003
=
sUserAgent
.
indexOf
(
"Windows NT 5.2"
)
>
-
1
||
sUserAgent
.
indexOf
(
"Windows 2003"
)
>
-
1
;
if
(
isWin2003
)
return
"Win2003"
;
var
isWinVista
=
sUserAgent
.
indexOf
(
"Windows NT 6.0"
)
>
-
1
||
sUserAgent
.
indexOf
(
"Windows Vista"
)
>
-
1
;
var
isWinVista
=
sUserAgent
.
indexOf
(
"Windows NT 6.0"
)
>
-
1
||
sUserAgent
.
indexOf
(
"Windows Vista"
)
>
-
1
;
if
(
isWinVista
)
return
"WinVista"
;
var
isWin7
=
sUserAgent
.
indexOf
(
"Windows NT 6.1"
)
>
-
1
||
sUserAgent
.
indexOf
(
"Windows 7"
)
>
-
1
;
if
(
isWin7
)
return
"Win7"
;
...
...
请
注册
或
登录
后发表评论