gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2024-10-04 15:11:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update the Screen Matching feature

Browse Source
This commit is contained in:
Namhyeon Go 2024-07-29 22:28:07 +09:00
parent b687cf7727
commit 3b09a47fb8
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs
View File

@ -114,7 +114,7 @@ namespace WelsonJS.Service
Timer screenTimer = new Timer Timer screenTimer = new Timer
{ {
Interval = 1000 // 1 second Interval = 10000 // 10 seconds
}; };
screenTimer.Elapsed += OnScreenTime; screenTimer.Elapsed += OnScreenTime;
timers.Add(screenTimer); timers.Add(screenTimer);
@ -224,10 +224,9 @@ namespace WelsonJS.Service
Log(result.ScreenNumber.ToString()); Log(result.ScreenNumber.ToString());
Log(result.Location.ToString()); Log(result.Location.ToString());
Log(DispatchServiceEvent("screenTime", new object[] Log(DispatchServiceEvent("screenTime", new string[]
{ {
result.FileName, result.FileName,
result.ScreenNumber.ToString(),
result.Location.X.ToString(), result.Location.X.ToString(),
result.Location.Y.ToString(), result.Location.Y.ToString(),
result.MaxCorrelation.ToString() result.MaxCorrelation.ToString()
@ -240,9 +239,17 @@ namespace WelsonJS.Service
} }
} }
private string DispatchServiceEvent(string eventType, object[] args = null) private string DispatchServiceEvent(string eventType, string[] args = null)
{ {
return InvokeScriptMethod("dispatchServiceEvent", scriptName, eventType, args); if (args == null)
{
return InvokeScriptMethod("dispatchServiceEvent", scriptName, eventType, "");
}
else
{
return InvokeScriptMethod("dispatchServiceEvent", scriptName, eventType, String.Join("; ", args));
}
} }
private string InvokeScriptMethod(string methodName, params object[] parameters) private string InvokeScriptMethod(string methodName, params object[] parameters)

3
app.js
View File

@ -589,8 +589,9 @@ function initializeWindow(name, args, w, h) {
} }
} }
function dispatchServiceEvent(name, eventType, args) { function dispatchServiceEvent(name, eventType, _args) {
var app = require(name); var app = require(name);
var args = _args.split('; ');
// load the service // load the service
if (app) { if (app) {

BIN
bin/x86/WelsonJS.Service.exe
View File

Binary file not shown.

BIN
bin/x86/WelsonJS.Service.pdb
View File

Binary file not shown.

4
defaultService.js
View File

@ -14,8 +14,8 @@ function onServiceElapsedTime() {
return "onServiceElapsedTime recevied"; return "onServiceElapsedTime recevied";
} }
function onServiceScreenTime(filename, handle, title, x, y, maxCorrelation) { function onServiceScreenTime(args) {
return "onServiceScreenTime recevied. " + filename; return "onServiceScreenTime recevied. " + args.join(', ');
} }
exports.main = main; exports.main = main;