diff --git a/ActivityMonitor/README.md b/ActivityMonitor/README.md index a2ae782..b010a76 100644 --- a/ActivityMonitor/README.md +++ b/ActivityMonitor/README.md @@ -4,5 +4,8 @@ This simple application show the current running AntOS processes ## Change logs +### v0.0.6-a +* Fix process type identification bug + ### 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 a2ae782..b010a76 100644 --- a/ActivityMonitor/build/debug/README.md +++ b/ActivityMonitor/build/debug/README.md @@ -4,5 +4,8 @@ This simple application show the current running AntOS processes ## Change logs +### v0.0.6-a +* Fix process type identification bug + ### 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 2c81228..4d83712 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: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 +(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:0===i[s.name].type?i[s.name].meta.icon:s.icon,iconclass:0===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 c3942b6..8a359fc 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.5-a", + "version":"0.0.6-a", "category":"System", "iconclass":"fa fa-heartbeat", "mimes":["none"] diff --git a/ActivityMonitor/build/release/ActivityMonitor.zip b/ActivityMonitor/build/release/ActivityMonitor.zip index 548c3a7..7a37b74 100644 Binary files a/ActivityMonitor/build/release/ActivityMonitor.zip and b/ActivityMonitor/build/release/ActivityMonitor.zip differ diff --git a/ActivityMonitor/main.coffee b/ActivityMonitor/main.coffee index 8d47a1d..dc68de2 100644 --- a/ActivityMonitor/main.coffee +++ b/ActivityMonitor/main.coffee @@ -68,8 +68,8 @@ class ActivityMonitor extends this.OS.application.BaseApplication @gdata.processes[a.pid] = [ { text: a.pid }, { - icon: if _APP[a.name].type == 1 then _APP[a.name].meta.icon else a.icon, - iconclass: if _APP[a.name].type == 1 then _APP[a.name].meta.iconclass else a.iconclass, + icon: if _APP[a.name].type == 0 then _APP[a.name].meta.icon else a.icon, + iconclass: if _APP[a.name].type == 0 then _APP[a.name].meta.iconclass else a.iconclass, text: a.name }, { diff --git a/ActivityMonitor/package.json b/ActivityMonitor/package.json index c3942b6..8a359fc 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.5-a", + "version":"0.0.6-a", "category":"System", "iconclass":"fa fa-heartbeat", "mimes":["none"] diff --git a/packages.json b/packages.json index 5f7690f..7da4445 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.5-a", + "version": "0.0.6-a", "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/ActivityMonitor/build/release/ActivityMonitor.zip" }, {