Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MES_PAD
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
MES_PAD
Commits
c3f0af3d
Commit
c3f0af3d
authored
Nov 28, 2018
by
上官
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新同步
parent
269631f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
6 deletions
+45
-6
update.min.js
dest/js/update.min.js
+2
-0
index.html
index.html
+41
-4
manifest.json
manifest.json
+2
-2
No files found.
dest/js/update.min.js
View file @
c3f0af3d
...
@@ -148,6 +148,7 @@ function getUpdateData(){
...
@@ -148,6 +148,7 @@ function getUpdateData(){
* @return {Boolean}
* @return {Boolean}
*/
*/
function
compareVersion
(
ov
,
nv
){
function
compareVersion
(
ov
,
nv
){
if
(
!
ov
||
!
nv
||
ov
==
""
||
nv
==
""
){
if
(
!
ov
||
!
nv
||
ov
==
""
||
nv
==
""
){
return
false
;
return
false
;
}
}
...
@@ -179,6 +180,7 @@ function compareVersion(ov,nv){
...
@@ -179,6 +180,7 @@ function compareVersion(ov,nv){
* @return {Boolean}
* @return {Boolean}
*/
*/
function
compareVersion_big
(
ov
,
nv
){
function
compareVersion_big
(
ov
,
nv
){
console
.
log
(
"new "
+
nv
+
"old "
+
ov
)
if
(
!
ov
||
!
nv
||
ov
==
""
||
nv
==
""
){
if
(
!
ov
||
!
nv
||
ov
==
""
||
nv
==
""
){
return
"9.9.9.9"
;
return
"9.9.9.9"
;
}
}
...
...
index.html
View file @
c3f0af3d
...
@@ -90,11 +90,15 @@
...
@@ -90,11 +90,15 @@
};
};
//--------------------------------------
//--------------------------------------
var
wgtVer
=
null
;
var
wgtVer
=
null
;
var
checkUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/version.txt"
;
var
myDate
=
new
Date
()
myDate
.
toLocaleString
(
)
console
.
log
(
myDate
)
var
checkUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/version.txt?t="
+
myDate
;
// 下载wgt文件
// 下载wgt文件
var
wgtUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/ftt_mes_hot.wgt"
;
var
wgtUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/ftt_mes_hot.wgt"
;
function
downWgtHot
(){
function
downWgtHot
(){
plus
.
nativeUI
.
showWaiting
(
"下载wgt文件..."
);
plus
.
nativeUI
.
showWaiting
(
"下载wgt文件..."
);
plus
.
downloader
.
createDownload
(
wgtUrl
,
{
filename
:
"_doc/update/"
},
function
(
d
,
status
){
plus
.
downloader
.
createDownload
(
wgtUrl
,
{
filename
:
"_doc/update/"
},
function
(
d
,
status
){
if
(
status
==
200
)
{
if
(
status
==
200
)
{
console
.
log
(
"下载wgt成功:"
+
d
.
filename
);
console
.
log
(
"下载wgt成功:"
+
d
.
filename
);
...
@@ -106,8 +110,34 @@
...
@@ -106,8 +110,34 @@
plus
.
nativeUI
.
closeWaiting
();
plus
.
nativeUI
.
closeWaiting
();
}).
start
();
}).
start
();
}
}
function
compareVersion
(
ov
,
nv
){
if
(
!
ov
||
!
nv
||
ov
==
""
||
nv
==
""
){
return
false
;
}
var
b
=
false
,
ova
=
ov
.
split
(
"."
,
4
),
nva
=
nv
.
split
(
"."
,
4
),
j
=
ova
.
length
,
k
=
nva
.
length
;
// console.log("ova:"+ova+"nva:"+nva);
for
(
var
i
=
0
;
i
<
j
&&
i
<
k
;
i
+=
1
){
var
so
=
ova
[
i
],
no
=
parseInt
(
so
),
sn
=
nva
[
i
],
nn
=
parseInt
(
sn
);
if
(
nn
>
no
||
sn
.
length
>
so
.
length
){
return
true
;
}
else
if
(
nn
<
no
){
return
false
;
}
}
if
(
k
>
j
&&
0
==
nv
.
indexOf
(
ov
)){
return
true
;
}
}
function
checkUpdateHot
(){
function
checkUpdateHot
(){
plus
.
nativeUI
.
showWaiting
(
"检测更新..."
);
//
plus.nativeUI.showWaiting("检测更新...");
var
xhr
=
new
XMLHttpRequest
();
var
xhr
=
new
XMLHttpRequest
();
xhr
.
onreadystatechange
=
function
(){
xhr
.
onreadystatechange
=
function
(){
switch
(
xhr
.
readyState
){
switch
(
xhr
.
readyState
){
...
@@ -116,7 +146,14 @@
...
@@ -116,7 +146,14 @@
if
(
xhr
.
status
==
200
){
if
(
xhr
.
status
==
200
){
console
.
log
(
"检测更新成功:"
+
xhr
.
responseText
);
console
.
log
(
"检测更新成功:"
+
xhr
.
responseText
);
var
newVer
=
xhr
.
responseText
;
var
newVer
=
xhr
.
responseText
;
if
(
wgtVer
&&
newVer
&&
(
wgtVer
!=
newVer
)){
// if(wgtVer&&newVer&&(wgtVer!=newVer)){
//
// downWgtHot(); // 下载升级包
// }
if
(
compareVersion
(
wgtVer
,
newVer
)){
downWgtHot
();
// 下载升级包
downWgtHot
();
// 下载升级包
}
else
{
}
else
{
//plus.nativeUI.alert("无新版本可更新!");
//plus.nativeUI.alert("无新版本可更新!");
...
...
manifest.json
View file @
c3f0af3d
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
"id"
:
"H544710A8"
,
/*应用的标识,创建应用时自动生成,勿手动修改*/
"id"
:
"H544710A8"
,
/*应用的标识,创建应用时自动生成,勿手动修改*/
"name"
:
"飞天兔MES"
,
/*应用名称,程序桌面图标名称*/
"name"
:
"飞天兔MES"
,
/*应用名称,程序桌面图标名称*/
"version"
:
{
"version"
:
{
"name"
:
"1.0.0.
39
"
,
/*应用版本名称*/
"name"
:
"1.0.0.
52
"
,
/*应用版本名称*/
"code"
:
"338"
"code"
:
338
},
},
"description"
:
"飞天兔MES平板版"
,
/*应用描述信息*/
"description"
:
"飞天兔MES平板版"
,
/*应用描述信息*/
"icons"
:
{
"icons"
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment