From fab7bf3130e92c5843e47ed8fe7813328fafe9c3 Mon Sep 17 00:00:00 2001
From: Dominic Lan <doomiris@163.com>
Date: Mon, 14 Feb 2022 23:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=8A=A8=E7=94=BB=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 default.aproj |  2 +-
 main.aardio   | 52 +++++++++++++++++++++++++--------------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/default.aproj b/default.aproj
index ded4566..18200df 100644
--- a/default.aproj
+++ b/default.aproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="RunCat_with_aardio" libEmbed="true" icon="res\appIcon.ico" ui="win" output="RunCat_with_aardio.exe" CompanyName="单位名称" FileDescription="RunCat_with_aardio" LegalCopyright="Copyright (C) 作者 2022" ProductName="RunCat_with_aardio" InternalName="RunCat_with_aardio" FileVersion="0.0.0.03" ProductVersion="0.0.0.03" publishDir="/dist/" dstrip="false" local="false" ignored="false">
+<project ver="10" name="RunCat_with_aardio" libEmbed="true" icon="res\appIcon.ico" ui="win" output="RunCat_with_aardio.exe" CompanyName="单位名称" FileDescription="RunCat_with_aardio" LegalCopyright="Copyright (C) 作者 2022" ProductName="RunCat_with_aardio" InternalName="RunCat_with_aardio" FileVersion="0.0.0.04" ProductVersion="0.0.0.04" publishDir="/dist/" dstrip="false" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
 	<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
 		<file name="appIcon.ico" path="res\appIcon.ico" comment="res\appIcon.ico"/>
diff --git a/main.aardio b/main.aardio
index 793a2f5..15f807a 100644
--- a/main.aardio
+++ b/main.aardio
@@ -64,14 +64,16 @@ mainForm.onMinimize = function(lParam){
 mainForm.onClose = mainForm.onMinimize;
 /*}}*/
 
-//import console
-//console.open();
+/*
+import console
+console.open();
+*/
+
 
-//_runInterval = {100;150;200;250;300;350;400;450;500;550};
-_runInterval = {200;190;180;170;160;150;140;130;120;100};
-//ANIMATE_TIMER_DEFAULT_INTERVAL / (float)Math.Max(1.0f, Math.Min(20.0f, s / 5.0f));
+_ANIMATE_DEFAULT_INTERVAL = 200;
 
-var iconBlink_timer = win.timer( mainForm, _runInterval[1]);
+
+var iconBlink_timer = win.timer( mainForm, _ANIMATE_DEFAULT_INTERVAL);
 var icon_index = 1;
 iconBlink_timer.onTimer = function(hwnd,msg,id,tick){
 	if icon_index > #iconTab icon_index = 1;
@@ -82,34 +84,30 @@ iconBlink_timer.onTimer = function(hwnd,msg,id,tick){
 var cpuCheck_timer = win.timer( mainForm, config.system.cpuCheckFrequency * 1000 /* 检测频率秒 */);
 
 _coreNum := sys.info().dwNumberOfProcessors; //CPU 核心数
-_Frequency := sys.cpu.getFrequence(); //CPU 最大频率
+_Frequency := math.round(sys.cpu.getFrequence()); //CPU 最大频率
 
 var GetSystemTimes = ::Kernel32.api("GetSystemTimes","bool(LONG& lpIdleTime, LONG& lpKernelTime, LONG& lpUserTime)" );
-var cpuTms = {0};
+var cpuTms = {};
 cpuCheck_timer.onTimer = function(hwnd,msg,id,tick){
 	var ret, idleTime, kernelTime, userTime = GetSystemTimes(0, 0, 0);
-	var interval_index = 1;
 	var usage = 0;
 	if ret {
-		var t =  (idleTime + userTime - idleTime)/10000/_coreNum;
+		var t =  (idleTime + userTime - idleTime)/1000/_coreNum;
 		table.push(cpuTms, t);
-		if #cpuTms > 2 table.shift(cpuTms);
-		var per = math.abs(cpuTms[2] - cpuTms[1]) /owner.getInterval() * 100;
-		usage = per*1000/_Frequency /* cpu 使用率 是这么计算的吗? */;
-		interval_index = math.round( usage * 10); 
-		
-		if !interval_index interval_index = 1;
-		if interval_index < 1 interval_index = 1;
-		if interval_index >10 interval_index = 10;
+		if #cpuTms > 2 table.shift(cpuTms);	
+		if #cpuTms == 2 {
+			var per = math.abs(cpuTms[2] - cpuTms[1]) / owner.getInterval() * 1000;
+			usage = per * 100 /* _% */ / _Frequency /* cpu 使用率 是这么计算的吗? */;
+		}
+	}
+	if usage > 0 {
+		tray.tip = "CPU: " ++ math.round(usage, 1) ++ "%";
+		var ANIMATE_INTERVAL = math.round(_ANIMATE_DEFAULT_INTERVAL / math.max(1, math.min(20, usage / 5)));
+		iconBlink_timer.setInterval(ANIMATE_INTERVAL);
 	}
-	
-	iconBlink_timer.setInterval(_runInterval[interval_index]);
-	tray.tip = math.round(usage * 10, 1) ++ "%";
 }
 
 
-
-
 /*托盘菜单{{*/
 mainForm.popmenu = win.ui.popmenu(mainForm);//创建弹出菜单
 mainForm.popmenu.add('&open',function(id){
@@ -152,19 +150,19 @@ mainForm.wndproc =  function(hwnd,message,wParam,lParam){
 /*}}*/
 mainForm.whitecat.oncommand = function(id,event){
 	if event !== 0/*_BN_CLICKED*/ return ; 
-//	config.system.save();
+	config.system.save();
 	iconTab = _iconLib[1];
 }
 
 mainForm.blackcat.oncommand = function(id,event){
 	if event !== 0/*_BN_CLICKED*/ return ; 
-//	config.system.save();
+	config.system.save();
 	iconTab = _iconLib[2];	
 }
 
 mainForm.cpuCheckFrequency.onModified = function(modified){ 
-//	config.system.save();
-	cpuCheck_timer.setInterval(owner.text*1000);
+	config.system.save();
+	cpuCheck_timer.setInterval(owner.text * 1000);
 }
 
 mainForm.show();