From 4fd644d71e2aff6337dc01045068e9d20973759f Mon Sep 17 00:00:00 2001 From: Xuan Sang LE Date: Fri, 5 Jun 2020 20:28:35 +0200 Subject: [PATCH] fix bug in activity monitor --- ActivityMonitor/README.md | 7 ++++++- ActivityMonitor/build/debug/README.md | 7 ++++++- ActivityMonitor/build/debug/main.js | 2 +- ActivityMonitor/build/debug/package.json | 2 +- .../build/release/ActivityMonitor.zip | Bin 3137 -> 3205 bytes ActivityMonitor/main.coffee | 2 +- ActivityMonitor/package.json | 2 +- packages.json | 2 +- 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ActivityMonitor/README.md b/ActivityMonitor/README.md index 4377301..a2ae782 100644 --- a/ActivityMonitor/README.md +++ b/ActivityMonitor/README.md @@ -1,3 +1,8 @@ # Activity monitor -This simple application show the current running AntOS processes \ No newline at end of file +This simple application show the current running AntOS processes + +## Change logs + +### v0.0.5-a +* Fix process type identification bug \ No newline at end of file diff --git a/ActivityMonitor/build/debug/README.md b/ActivityMonitor/build/debug/README.md index 4377301..a2ae782 100644 --- a/ActivityMonitor/build/debug/README.md +++ b/ActivityMonitor/build/debug/README.md @@ -1,3 +1,8 @@ # Activity monitor -This simple application show the current running AntOS processes \ No newline at end of file +This simple application show the current running AntOS processes + +## Change logs + +### v0.0.5-a +* Fix process type identification bug \ No newline at end of file diff --git a/ActivityMonitor/build/debug/main.js b/ActivityMonitor/build/debug/main.js index a33a0d0..2c81228 100644 --- a/ActivityMonitor/build/debug/main.js +++ b/ActivityMonitor/build/debug/main.js @@ -1 +1 @@ -(function(){var t,i,e;e=this.OS.PM,i=this.OS.application,(t=class extends this.OS.application.BaseApplication{constructor(t){super("ActivityMonitor",t)}main(){var t;return this.scheme.apptitle="Activity Monitor",this.grid=this.find("mygrid"),this.on("btclick",t=>{var i,s,a;if("btkill"===t.id&&(a=this.grid.selectedRow))return s=a.data[0],(i=e.appByPid(s.text))?i.quit(!0):void 0}),t=[{width:50,text:"__(Pid)"},{text:"__(Name)"},{text:"__(Type)",width:80},{width:80,text:"__(Alive (ms))"}],this.gdata={processes:{},alive:[]},this.grid.header=t,this.monitor()}monitor(){var t;return this.gdata.alive=[],t=(new Date).getTime(),$.each(e.processes,(e,s)=>$.each(s,(e,s)=>(this.gdata.processes[s.pid]?(this.gdata.processes[s.pid][3].text=t-s.birth,this.gdata.processes[s.pid][3].domel.update()):(this.gdata.processes[s.pid]=[{text:s.pid},{icon:1===i[s.name].type?i[s.name].meta.icon:s.icon,iconclass:1===i[s.name].type?i[s.name].meta.iconclass:s.iconclass,text:s.name},{text:1===i[s.name].type?"__(Application)":"__(Service)"},{text:t-s.birth}],this.grid.push(this.gdata.processes[s.pid])),this.gdata.alive.push(s.pid)))),$.each(this.gdata.processes,(t,i)=>{if($.inArray(Number(t),this.gdata.alive)<0)return this.grid.delete(this.gdata.processes[t].domel),this.gdata.processes[t]=void 0,delete this.gdata.processes[t]}),this.timer=setTimeout(()=>this.monitor(),500)}cleanup(t){if(this.timer)return clearTimeout(this.timer)}}).singleton=!0,this.OS.register("ActivityMonitor",t)}).call(this); \ No newline at end of file +(function(){var t,i,e;e=this.OS.PM,i=this.OS.application,(t=class extends this.OS.application.BaseApplication{constructor(t){super("ActivityMonitor",t)}main(){var t;return this.scheme.apptitle="Activity Monitor",this.grid=this.find("mygrid"),this.on("btclick",t=>{var i,s,a;if("btkill"===t.id&&(a=this.grid.selectedRow))return s=a.data[0],(i=e.appByPid(s.text))?i.quit(!0):void 0}),t=[{width:50,text:"__(Pid)"},{text:"__(Name)"},{text:"__(Type)",width:80},{width:80,text:"__(Alive (ms))"}],this.gdata={processes:{},alive:[]},this.grid.header=t,this.monitor()}monitor(){var t;return this.gdata.alive=[],t=(new Date).getTime(),$.each(e.processes,(e,s)=>$.each(s,(e,s)=>(this.gdata.processes[s.pid]?(this.gdata.processes[s.pid][3].text=t-s.birth,this.gdata.processes[s.pid][3].domel.update()):(this.gdata.processes[s.pid]=[{text:s.pid},{icon:1===i[s.name].type?i[s.name].meta.icon:s.icon,iconclass:1===i[s.name].type?i[s.name].meta.iconclass:s.iconclass,text:s.name},{text:0===i[s.name].type?"__(Application)":"__(Service)"},{text:t-s.birth}],this.grid.push(this.gdata.processes[s.pid])),this.gdata.alive.push(s.pid)))),$.each(this.gdata.processes,(t,i)=>{if($.inArray(Number(t),this.gdata.alive)<0)return this.grid.delete(this.gdata.processes[t].domel),this.gdata.processes[t]=void 0,delete this.gdata.processes[t]}),this.timer=setTimeout(()=>this.monitor(),500)}cleanup(t){if(this.timer)return clearTimeout(this.timer)}}).singleton=!0,this.OS.register("ActivityMonitor",t)}).call(this); \ No newline at end of file diff --git a/ActivityMonitor/build/debug/package.json b/ActivityMonitor/build/debug/package.json index fa56bf9..c3942b6 100644 --- a/ActivityMonitor/build/debug/package.json +++ b/ActivityMonitor/build/debug/package.json @@ -6,7 +6,7 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.0.4-a", + "version":"0.0.5-a", "category":"System", "iconclass":"fa fa-heartbeat", "mimes":["none"] diff --git a/ActivityMonitor/build/release/ActivityMonitor.zip b/ActivityMonitor/build/release/ActivityMonitor.zip index 78075938308ee47e911b86a9815b5c2e0ce3ac0e..548c3a71e4ccf8d76e9e2ea73d6f49628a77a2dd 100644 GIT binary patch delta 308 zcmX>o(JILs;LXg!#Q*}$laFrX{lv%%qyrRZyuLaEC^lm<4^v7Y7nicKf^$Yf0U%2)fM$R&56lQK{bRBWk33rxH;4lOR6AJP delta 255 zcmZpbJSf2%;LXg!#Q*|^T}L+Zeq!VW(gCmDc=Cn-#X=_YFr}cX*?f@6pOFKkNb3#H zoXrv}cbO*_u?uhJ;P?d*o?P>&V=@=l4@Q&8%-qS$K$Vj-xy{gwUBj&fmbu9-om0TX zz>u4mnWvXrTpZxd$Rxr5cM#Z)v#bmZAj}SSCX6`54Aqr|p$X&y3q}S85axlY2h&?7 MC-BI#iE)EC0O40ZG5`Po diff --git a/ActivityMonitor/main.coffee b/ActivityMonitor/main.coffee index 0ee28e1..8d47a1d 100644 --- a/ActivityMonitor/main.coffee +++ b/ActivityMonitor/main.coffee @@ -73,7 +73,7 @@ class ActivityMonitor extends this.OS.application.BaseApplication text: a.name }, { - text: if _APP[a.name].type == 1 then "__(Application)" else "__(Service)" + text: if _APP[a.name].type == 0 then "__(Application)" else "__(Service)" }, { text: now - a.birth diff --git a/ActivityMonitor/package.json b/ActivityMonitor/package.json index fa56bf9..c3942b6 100644 --- a/ActivityMonitor/package.json +++ b/ActivityMonitor/package.json @@ -6,7 +6,7 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.0.4-a", + "version":"0.0.5-a", "category":"System", "iconclass":"fa fa-heartbeat", "mimes":["none"] diff --git a/packages.json b/packages.json index 70e0947..5f7690f 100644 --- a/packages.json +++ b/packages.json @@ -14,7 +14,7 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/ActivityMonitor/README.md", "category": "System", "author": "Xuan Sang LE", - "version": "0.0.4-a", + "version": "0.0.5-a", "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/ActivityMonitor/build/release/ActivityMonitor.zip" }, {