第 1 阶段:虚拟实训台,项目 2、3 的示例跑通
- 实训台状态由服务器统一保存:滑块和开关设定传感器读数,推给学生程序; 学生程序控制的灯、继电器、LED 屏回写到实训台 - 网页按教材实训台布局图绘制实训台,传感器卡片上直接调节环境 - 新控件:CheckBox、RadioButton(事件顺序与 WinForms 一致),Lamp、Alarm - 设备类库:串口未打开时控制无效,与实物一致 - 修正:列表属性序列化时数字被转成字符串 - 示例:项目 2 任务 2–3、项目 3 任务 1–2;网址参数 ?sample= 打开指定示例 - 测试:实训台单元测试,项目 2、3 的端到端测试 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
98be8331bc
commit
26104ae81e
38 files changed
+2346
-77
No files matched your search
@@ -91,8 +91,7 @@ public class ADAM4017Helper
|
||||
return model;
|
||||
}
|
||||
|
||||
private string Read(int quantity) =>
|
||||
TrainingBoard.AnalogInputs.TryGetValue(_channels[quantity], out var value) ? value.ToString() : "0";
|
||||
private string Read(int quantity) => TrainingBoard.ReadAnalog(_channels[quantity]).ToString();
|
||||
|
||||
public void Close() => _portName = null;
|
||||
}
|
||||
@@ -120,12 +119,15 @@ public class ADAM4150Helper
|
||||
return model;
|
||||
}
|
||||
|
||||
private bool Read(int sensor) => TrainingBoard.DigitalInputs.TryGetValue(_channels[sensor], out var value) && value;
|
||||
private bool Read(int sensor) => TrainingBoard.ReadDigital(_channels[sensor]);
|
||||
|
||||
/// <summary>控制继电器 DO0–DO4(DO0 报警灯、DO1 照明灯、DO2 路灯),通道号有效时返回 true</summary>
|
||||
/// <summary>
|
||||
/// 控制继电器 DO0–DO4(DO0 报警灯、DO1 照明灯、DO2 路灯、DO3/DO4 插座)。
|
||||
/// 和真实设备一样,串口没有打开时控制无效、返回 false(教材仿真版不检查,这里更贴近实物)。
|
||||
/// </summary>
|
||||
public bool OnOff(int DO, bool IsOpen)
|
||||
{
|
||||
if (DO < 0 || DO > 4) return false;
|
||||
if (DO < 0 || DO > 4 || string.IsNullOrWhiteSpace(_portName)) return false;
|
||||
SimHost.SendDevice("adam4150", "do", new[] { DO, IsOpen ? 1 : 0 });
|
||||
return true;
|
||||
}
|
||||
@@ -139,10 +141,10 @@ public class ZigBeeHelper
|
||||
|
||||
public void Open(string PortName) => _portName = PortName;
|
||||
|
||||
/// <summary>控制 ZigBee 继电器节点 0、1,通道号有效时返回 true</summary>
|
||||
/// <summary>控制 ZigBee 继电器节点 0、1(教材用节点 1 控制路灯);串口没有打开时控制无效、返回 false</summary>
|
||||
public bool OnOff(int RelayNum, bool IsOpen)
|
||||
{
|
||||
if (RelayNum < 0 || RelayNum > 1) return false;
|
||||
if (RelayNum < 0 || RelayNum > 1 || string.IsNullOrWhiteSpace(_portName)) return false;
|
||||
SimHost.SendDevice("zigbee", "relay", new[] { RelayNum, IsOpen ? 1 : 0 });
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1,25 +1,46 @@
|
||||
using System.Collections.Concurrent;
|
||||
using System;
|
||||
using System.Text.Json.Nodes;
|
||||
|
||||
namespace DeviceCtrlLibrary;
|
||||
|
||||
/// <summary>
|
||||
/// 虚拟实训台的设备状态。第 0 阶段先放在运行器进程里、用固定的默认值;
|
||||
/// 第 1 阶段改为向 Bun 服务器上的实训台查询,数值由网页上的滑块和开关控制。
|
||||
/// 学生程序进程里的实训台传感器读数副本。权威状态在 Bun 服务器上(网页滑块和开关控制):
|
||||
/// 启动时从环境变量 SIM_BOARD 读入,之后服务器每次变化都通过标准输入推送过来。
|
||||
/// SetData() 直接读这里,不需要等待网络往返。
|
||||
/// </summary>
|
||||
internal static class TrainingBoard
|
||||
public static class TrainingBoard
|
||||
{
|
||||
/// <summary>ADAM-4017 各通道的读数(Vin0 温度、Vin1 湿度、Vin2 光照……),按教材格式保存为整数</summary>
|
||||
public static readonly ConcurrentDictionary<int, int> AnalogInputs = new()
|
||||
{
|
||||
[0] = 25, // 温度 ℃
|
||||
[1] = 60, // 湿度 %
|
||||
[2] = 500, // 光照 lx
|
||||
[3] = 101, // 气压 kPa
|
||||
[4] = 60, // 空气质量
|
||||
[5] = 600, // CO2 ppm
|
||||
[6] = 20, // 风速
|
||||
};
|
||||
private static readonly object Lock = new();
|
||||
// ADAM-4017 Vin0–Vin7(温度、湿度、光照、气压、空气质量、CO2、风速、预留)
|
||||
private static int[] _analog = { 25, 60, 500, 101, 60, 600, 3, 0 };
|
||||
// ADAM-4150 DI0–DI6(人体红外、火焰、烟雾、红外对射、预留)
|
||||
private static bool[] _digital = new bool[7];
|
||||
|
||||
/// <summary>ADAM-4150 数字量输入(DI0 人体红外、DI1 火焰、DI2 烟雾、DI3 红外对射)</summary>
|
||||
public static readonly ConcurrentDictionary<int, bool> DigitalInputs = new();
|
||||
static TrainingBoard()
|
||||
{
|
||||
var initial = Environment.GetEnvironmentVariable("SIM_BOARD");
|
||||
if (!string.IsNullOrEmpty(initial) && JsonNode.Parse(initial) is JsonObject json) Update(json);
|
||||
}
|
||||
|
||||
/// <summary>平台内部使用:应用服务器推送的 {"analog":[…],"digital":[…]}</summary>
|
||||
public static void Update(JsonObject json)
|
||||
{
|
||||
lock (Lock)
|
||||
{
|
||||
if (json["analog"] is JsonArray analog)
|
||||
for (var i = 0; i < analog.Count && i < _analog.Length; i++) _analog[i] = (int?)analog[i] ?? 0;
|
||||
if (json["digital"] is JsonArray digital)
|
||||
for (var i = 0; i < digital.Count && i < _digital.Length; i++) _digital[i] = (bool?)digital[i] ?? false;
|
||||
}
|
||||
}
|
||||
|
||||
internal static int ReadAnalog(int channel)
|
||||
{
|
||||
lock (Lock) return channel >= 0 && channel < _analog.Length ? _analog[channel] : 0;
|
||||
}
|
||||
|
||||
internal static bool ReadDigital(int channel)
|
||||
{
|
||||
lock (Lock) return channel >= 0 && channel < _digital.Length && _digital[channel];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
using System.Drawing;
|
||||
using System.Text.Json.Nodes;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace WinFormsDeviceControlLibrary;
|
||||
|
||||
/// <summary>教材控件库的灯泡:OnOff(true) 显示亮灯图片,OnOff(false) 显示灭灯图片。只改变界面,不控制实训台</summary>
|
||||
[ClientType("WinFormsDeviceControlLibrary.Lamp")]
|
||||
public class Lamp : UserControl
|
||||
{
|
||||
private bool _isOn;
|
||||
|
||||
public Lamp() => BackColor = Color.White;
|
||||
|
||||
protected override Size DefaultSize => new(104, 185);
|
||||
|
||||
public void OnOff(bool IsOpen)
|
||||
{
|
||||
EnsureThreadAccess();
|
||||
_isOn = IsOpen;
|
||||
NotifyChanged("IsOn", _isOn);
|
||||
}
|
||||
|
||||
protected override void WriteProps(JsonObject props)
|
||||
{
|
||||
base.WriteProps(props);
|
||||
props["IsOn"] = _isOn;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>教材控件库的报警灯:OnOff(true) 显示报警图片。只改变界面,不控制实训台</summary>
|
||||
[ClientType("WinFormsDeviceControlLibrary.Alarm")]
|
||||
public class Alarm : UserControl
|
||||
{
|
||||
private bool _isOn;
|
||||
|
||||
public Alarm() => BackColor = Color.White;
|
||||
|
||||
protected override Size DefaultSize => new(150, 150);
|
||||
|
||||
public void OnOff(bool IsOpen)
|
||||
{
|
||||
EnsureThreadAccess();
|
||||
_isOn = IsOpen;
|
||||
NotifyChanged("IsOn", _isOn);
|
||||
}
|
||||
|
||||
protected override void WriteProps(JsonObject props)
|
||||
{
|
||||
base.WriteProps(props);
|
||||
props["IsOn"] = _isOn;
|
||||
}
|
||||
}
|
||||
@@ -105,6 +105,9 @@ internal static class StudentProgramHost
|
||||
SimHost.Ui.Post(() => control.PerformUserAction(action));
|
||||
}
|
||||
break;
|
||||
case "board":
|
||||
DeviceCtrlLibrary.TrainingBoard.Update(message!);
|
||||
break;
|
||||
case "reply":
|
||||
SimHost.CompleteRequest((int?)message!["requestId"] ?? 0, message["result"]?.DeepClone());
|
||||
break;
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
using System.Drawing;
|
||||
using System.Text.Json.Nodes;
|
||||
using Sim.Host;
|
||||
|
||||
namespace System.Windows.Forms;
|
||||
|
||||
public enum CheckState { Unchecked, Checked, Indeterminate }
|
||||
|
||||
public enum Appearance { Normal, Button }
|
||||
|
||||
/// <summary>
|
||||
/// 复选框。用户点击时先切换 Checked(触发 CheckedChanged),再触发 Click——
|
||||
/// 教材项目 3 在 Click 里读取 Checked,依赖这个顺序。
|
||||
/// </summary>
|
||||
public class CheckBox : ButtonBase
|
||||
{
|
||||
private CheckState _checkState;
|
||||
|
||||
protected override Size DefaultSize => new(104, 24);
|
||||
|
||||
public bool AutoCheck { get; set; } = true;
|
||||
public bool ThreeState { get; set; }
|
||||
public Appearance Appearance { get; set; }
|
||||
public ContentAlignment CheckAlign { get; set; } = ContentAlignment.MiddleLeft;
|
||||
|
||||
public bool Checked
|
||||
{
|
||||
get => _checkState != CheckState.Unchecked;
|
||||
set => CheckState = value ? CheckState.Checked : CheckState.Unchecked;
|
||||
}
|
||||
|
||||
public CheckState CheckState
|
||||
{
|
||||
get => _checkState;
|
||||
set
|
||||
{
|
||||
if (_checkState == value) return;
|
||||
var wasChecked = Checked;
|
||||
SetProp(ref _checkState, value, nameof(CheckState));
|
||||
NotifyChanged(nameof(Checked), Checked);
|
||||
if (wasChecked != Checked) OnCheckedChanged(EventArgs.Empty);
|
||||
OnCheckStateChanged(EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
public event EventHandler? CheckedChanged;
|
||||
public event EventHandler? CheckStateChanged;
|
||||
|
||||
protected virtual void OnCheckedChanged(EventArgs e) => CheckedChanged?.Invoke(this, e);
|
||||
protected virtual void OnCheckStateChanged(EventArgs e) => CheckStateChanged?.Invoke(this, e);
|
||||
|
||||
protected override void OnClick(EventArgs e)
|
||||
{
|
||||
if (AutoCheck)
|
||||
{
|
||||
CheckState = _checkState switch
|
||||
{
|
||||
CheckState.Unchecked => CheckState.Checked,
|
||||
CheckState.Checked when ThreeState => CheckState.Indeterminate,
|
||||
_ => CheckState.Unchecked,
|
||||
};
|
||||
}
|
||||
base.OnClick(e);
|
||||
}
|
||||
|
||||
protected override void WriteProps(JsonObject props)
|
||||
{
|
||||
base.WriteProps(props);
|
||||
props["Checked"] = Checked;
|
||||
props["CheckState"] = _checkState.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 单选按钮。同一个容器里的单选按钮互斥。选中一个时,事件顺序与 WinForms 一致:
|
||||
/// 先是原来选中的那个触发 CheckedChanged(变为未选中),再是新选中的触发 CheckedChanged,最后触发 Click。
|
||||
/// 教材项目 3 任务 1 在两个按钮的 CheckedChanged 里分别开灯、关灯,最终状态依赖这个顺序。
|
||||
/// </summary>
|
||||
public class RadioButton : ButtonBase
|
||||
{
|
||||
private bool _checked;
|
||||
|
||||
protected override Size DefaultSize => new(104, 24);
|
||||
|
||||
public bool AutoCheck { get; set; } = true;
|
||||
public Appearance Appearance { get; set; }
|
||||
public ContentAlignment CheckAlign { get; set; } = ContentAlignment.MiddleLeft;
|
||||
|
||||
public bool Checked
|
||||
{
|
||||
get => _checked;
|
||||
set
|
||||
{
|
||||
if (_checked == value) return;
|
||||
SetProp(ref _checked, value, nameof(Checked));
|
||||
if (value && AutoCheck) UncheckSiblings();
|
||||
OnCheckedChanged(EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
private void UncheckSiblings()
|
||||
{
|
||||
if (Parent == null) return;
|
||||
foreach (var sibling in Parent.Controls)
|
||||
{
|
||||
if (sibling != this && sibling is RadioButton { AutoCheck: true, Checked: true } radio) radio.Checked = false;
|
||||
}
|
||||
}
|
||||
|
||||
public event EventHandler? CheckedChanged;
|
||||
|
||||
protected virtual void OnCheckedChanged(EventArgs e) => CheckedChanged?.Invoke(this, e);
|
||||
|
||||
public void PerformClick()
|
||||
{
|
||||
if (Enabled && Visible) OnClick(EventArgs.Empty);
|
||||
}
|
||||
|
||||
protected override void OnClick(EventArgs e)
|
||||
{
|
||||
if (AutoCheck) Checked = true;
|
||||
base.OnClick(e);
|
||||
}
|
||||
|
||||
protected override void WriteProps(JsonObject props)
|
||||
{
|
||||
base.WriteProps(props);
|
||||
props["Checked"] = _checked;
|
||||
}
|
||||
}
|
||||
@@ -49,7 +49,7 @@ public static class PropValue
|
||||
private static JsonArray ListOf(IEnumerable items)
|
||||
{
|
||||
var array = new JsonArray();
|
||||
foreach (var item in items) array.Add(From(item is string or null ? item : item.ToString()));
|
||||
foreach (var item in items) array.Add(From(item));
|
||||
return array;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user