fix(node): label adapter software versions correctly

This commit is contained in:
caoqianming 2026-08-18 15:20:42 +08:00
parent 365b049f1b
commit cccc43a7b3
2 changed files with 9 additions and 3 deletions

View File

@ -85,6 +85,11 @@ class WindowsNodeSourceTests(unittest.TestCase):
self.assertIn("ContentWidth = 760", form)
self.assertIn("NodeAdapterRegistry.InstalledContracts", form)
self.assertIn("CreateCapabilityRow(contract.DisplayName, contract.Capability)", form)
self.assertIn(
'runtime.Software == "OriginPro" ? "Origin" : runtime.Software', form
)
self.assertIn('$"{softwareName} {runtime.SoftwareVersion}"', form)
self.assertNotIn('$"Origin {runtime.SoftwareVersion}"', form)
self.assertIn('CreateButton("立即重连", 112, primary: true)', form)
self.assertIn("ReconnectRequested?.Invoke()", form)
self.assertIn("registrationCard.Visible = !registered", form)
@ -205,7 +210,7 @@ class WindowsNodeSourceTests(unittest.TestCase):
self.assertIn('startInfo.Environment["PYTHONIOENCODING"] = "utf-8"', runner)
form = (PROJECT / "ConfigurationForm.cs").read_text(encoding="utf-8")
self.assertIn('Adapter {adapter.AdapterVersion}', form)
self.assertIn('Origin 版本未知', form)
self.assertIn('$"{softwareName} 版本未知"', form)
self.assertIn(
"&& !jobInbox.HasPendingJobs",
connection,

View File

@ -206,9 +206,10 @@ internal sealed class ConfigurationForm : Form
private static string FormatAdapterStatus(INodeAdapter adapter)
{
var runtime = adapter.DetectRuntime();
var softwareName = runtime.Software == "OriginPro" ? "Origin" : runtime.Software;
var softwareVersion = string.IsNullOrWhiteSpace(runtime.SoftwareVersion)
? "Origin 版本未知"
: $"Origin {runtime.SoftwareVersion}";
? $"{softwareName} 版本未知"
: $"{softwareName} {runtime.SoftwareVersion}";
var state = runtime.Health == "ready" ? "可用" : "不可用";
return $"{adapter.DisplayName}{state} · Adapter {adapter.AdapterVersion} · {softwareVersion}\n"
+ runtime.Detail;