Skip to content

Commit 4d7e082

Browse files
CopilotMaklith
Copilot
and
Maklith
committed
Fix Chinese/English Mixed Usage - Replace Chinese enum identifiers with English equivalents
Co-authored-by: MakesYT <42534870+MakesYT@users.noreply.github.com>
1 parent 7833681 commit 4d7e082

9 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎Core/CustomScenario/CustomScenario.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private void StartRun(bool notRealTime, bool onExit = false, params object[] inp
247247

248248
for (var i = nodes.Count - 1; i >= 1; i--)
249249
if (!nodes[i].IsUsed(connections))
250-
nodes[i].Status = S节点状态.未验证;
250+
nodes[i].Status = NodeStatus.Unverified;
251251

252252
try
253253
{
@@ -431,7 +431,7 @@ private void ParsePointItem(Dictionary<ScenarioNodeBase, Thread?> threads,
431431

432432
// foreach (var connectorItem in nowScenarioMethodNode.Input)
433433
// foreach (var sourceSource in connectorItem.GetSourceOrNextPointItems(connections))
434-
// if (sourceSource.Status == S节点状态.错误)
434+
// if (sourceSource.Status == NodeStatus.Error)
435435
// valid = false;
436436

437437

@@ -447,7 +447,7 @@ private void ParsePointItem(Dictionary<ScenarioNodeBase, Thread?> threads,
447447
{
448448
//如果执行失败
449449
valid = false;
450-
nowScenarioMethodNode.Status = S节点状态.错误;
450+
nowScenarioMethodNode.Status = NodeStatus.Error;
451451
Log.Debug($"执行节点失败:{nowScenarioMethodNode.Title}");
452452
}
453453
else
@@ -473,12 +473,12 @@ e.InnerException is not null
473473
finnish:
474474
if (valid)
475475
{
476-
nowScenarioMethodNode.Status = notRealTime ? S节点状态.已验证 : S节点状态.初步验证;
476+
nowScenarioMethodNode.Status = notRealTime ? NodeStatus.Verified : NodeStatus.PreliminaryVerified;
477477
Log.Debug($"解析节点完成:{nowScenarioMethodNode.Title}");
478478
}
479479
else
480480
{
481-
nowScenarioMethodNode.Status = S节点状态.错误;
481+
nowScenarioMethodNode.Status = NodeStatus.Error;
482482
Log.Debug($"解析节点失败:{nowScenarioMethodNode.Title}");
483483
}
484484

‎Core/CustomScenario/ScenarioMethod.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public string MethodAbsolutelyName
5454
{
5555
get
5656
{
57-
if (Type == ScenarioMethodType.插件方法)
57+
if (Type == ScenarioMethodType.PluginMethod)
5858
{
5959
var sb = new StringBuilder("|");
6060
var typeJsonConverter = new TypeJsonConverter();
@@ -263,11 +263,11 @@ public ScenarioMethodNode GenerateNode()
263263
{
264264
switch (Type)
265265
{
266-
case ScenarioMethodType.插件方法:
266+
case ScenarioMethodType.PluginMethod:
267267
break;
268-
case ScenarioMethodType.判断:
268+
case ScenarioMethodType.Condition:
269269
{
270-
pointItem.Title = "判断";
270+
pointItem.Title = "Condition";
271271
ObservableCollection<ConnectorItem> StringoutItems = new()
272272
{
273273
new ConnectorItem
@@ -317,9 +317,9 @@ public ScenarioMethodNode GenerateNode()
317317
pointItem.Input = StringinItems;
318318
break;
319319
}
320-
case ScenarioMethodType.一对二:
320+
case ScenarioMethodType.OneToTwo:
321321
{
322-
pointItem.Title = "一对二";
322+
pointItem.Title = "OneToTwo";
323323
ObservableCollection<ConnectorItem> StringoutItems = new()
324324
{
325325
new ConnectorItem
@@ -360,9 +360,9 @@ public ScenarioMethodNode GenerateNode()
360360
pointItem.Input = StringinItems;
361361
break;
362362
}
363-
case ScenarioMethodType.一对多:
363+
case ScenarioMethodType.OneToMany:
364364
{
365-
pointItem.Title = "一对多";
365+
pointItem.Title = "OneToMany";
366366
ObservableCollection<ConnectorItem> StringoutItems = new()
367367
{
368368
new ConnectorItem
@@ -416,9 +416,9 @@ public ScenarioMethodNode GenerateNode()
416416
pointItem.Input = StringinItems;
417417
break;
418418
}
419-
case ScenarioMethodType.相等:
419+
case ScenarioMethodType.Equal:
420420
{
421-
pointItem.Title = "相等";
421+
pointItem.Title = "Equal";
422422
ObservableCollection<ConnectorItem> StringoutItems = new()
423423
{
424424
new ConnectorItem
@@ -466,7 +466,7 @@ public ScenarioMethodNode GenerateNode()
466466
pointItem.Input = StringinItems;
467467
break;
468468
}
469-
case ScenarioMethodType.变量设置:
469+
case ScenarioMethodType.VariableSet:
470470
{
471471
pointItem.Title = $"{ValueName}";
472472
ObservableCollection<ConnectorItem> inpItems = new();
@@ -505,7 +505,7 @@ public ScenarioMethodNode GenerateNode()
505505
pointItem.Output = outItems;
506506
break;
507507
}
508-
case ScenarioMethodType.变量获取:
508+
case ScenarioMethodType.VariableGet:
509509
{
510510
pointItem.Title = $"{ValueName}";
511511
ObservableCollection<ConnectorItem> inpItems = new();
@@ -544,7 +544,7 @@ public ScenarioMethodNode GenerateNode()
544544
pointItem.Output = outItems;
545545
break;
546546
}
547-
case ScenarioMethodType.临时变量设置:
547+
case ScenarioMethodType.TempVariableSet:
548548
{
549549
pointItem.Title = $"{ValueName}";
550550
ObservableCollection<ConnectorItem> inpItems = new();
@@ -583,7 +583,7 @@ public ScenarioMethodNode GenerateNode()
583583
pointItem.Output = outItems;
584584
break;
585585
}
586-
case ScenarioMethodType.临时变量获取:
586+
case ScenarioMethodType.TempVariableGet:
587587
{
588588
pointItem.Title = $"{ValueName}";
589589
ObservableCollection<ConnectorItem> inpItems = new();
@@ -622,7 +622,7 @@ public ScenarioMethodNode GenerateNode()
622622
pointItem.Output = outItems;
623623
break;
624624
}
625-
case ScenarioMethodType.打开运行本地项目:
625+
case ScenarioMethodType.OpenRunLocalProject:
626626
{
627627
pointItem.Title = "打开/运行本地项目";
628628
ObservableCollection<ConnectorItem> outItems = new();

‎Core/CustomScenario/ScenarioMethodCategoryGroup.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private static ScenarioMethodCategoryGroup GenBaseScenarioMethodCategoryGroup()
2525
{
2626
var String = new ScenarioMethodNode
2727
{
28-
ScenarioMethod = new ScenarioMethod(ScenarioMethodType.默认),
28+
ScenarioMethod = new ScenarioMethod(ScenarioMethodType.Default),
2929
Title = key
3030
};
3131
ObservableCollection<ConnectorItem> StringoutItems = new()
@@ -68,20 +68,20 @@ private static ScenarioMethodCategoryGroup GenBaseScenarioMethodCategoryGroup()
6868
scenarioMethodCategoryGroup.Childrens.Add("节点控制", controlScenarioMethodCategoryGroup);
6969
controlScenarioMethodCategoryGroup.Name = "节点控制";
7070

71-
var scenarioMethodNode1 = new ScenarioMethod(ScenarioMethodType.判断).GenerateNode();
72-
controlScenarioMethodCategoryGroup.Methods.Add("判断", scenarioMethodNode1);
71+
var scenarioMethodNode1 = new ScenarioMethod(ScenarioMethodType.Condition).GenerateNode();
72+
controlScenarioMethodCategoryGroup.Methods.Add("Condition", scenarioMethodNode1);
7373

74-
var scenarioMethodNode2 = new ScenarioMethod(ScenarioMethodType.一对二).GenerateNode();
75-
controlScenarioMethodCategoryGroup.Methods.Add("一对二", scenarioMethodNode2);
74+
var scenarioMethodNode2 = new ScenarioMethod(ScenarioMethodType.OneToTwo).GenerateNode();
75+
controlScenarioMethodCategoryGroup.Methods.Add("OneToTwo", scenarioMethodNode2);
7676

77-
var scenarioMethodNode3 = new ScenarioMethod(ScenarioMethodType.一对多).GenerateNode();
78-
controlScenarioMethodCategoryGroup.Methods.Add("一对多", scenarioMethodNode3);
77+
var scenarioMethodNode3 = new ScenarioMethod(ScenarioMethodType.OneToMany).GenerateNode();
78+
controlScenarioMethodCategoryGroup.Methods.Add("OneToMany", scenarioMethodNode3);
7979

80-
var scenarioMethodNode4 = new ScenarioMethod(ScenarioMethodType.相等).GenerateNode();
81-
controlScenarioMethodCategoryGroup.Methods.Add("相等", scenarioMethodNode4);
80+
var scenarioMethodNode4 = new ScenarioMethod(ScenarioMethodType.Equal).GenerateNode();
81+
controlScenarioMethodCategoryGroup.Methods.Add("Equal", scenarioMethodNode4);
8282

83-
var scenarioMethodNode5 = new ScenarioMethod(ScenarioMethodType.打开运行本地项目).GenerateNode();
84-
controlScenarioMethodCategoryGroup.Methods.Add("打开运行本地项目", scenarioMethodNode5);
83+
var scenarioMethodNode5 = new ScenarioMethod(ScenarioMethodType.OpenRunLocalProject).GenerateNode();
84+
controlScenarioMethodCategoryGroup.Methods.Add("OpenRunLocalProject", scenarioMethodNode5);
8585

8686

8787
return rootScenarioMethodCategoryGroup;

‎Core/CustomScenario/ScenarioMethodNode.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
namespace Core.CustomScenario;
1313

14-
public enum S节点状态
14+
public enum NodeStatus
1515
{
16-
未验证,
17-
已验证,
18-
错误,
19-
初步验证
16+
Unverified,
17+
Verified,
18+
Error,
19+
PreliminaryVerified
2020
}
2121

2222
[JsonDerivedType(typeof(ScenarioNodeBase), "base")]
@@ -25,7 +25,7 @@ public enum S节点状态
2525
public partial class ScenarioNodeBase : ObservableRecipient
2626
{
2727
[ObservableProperty] private string _title;
28-
[ObservableProperty] private S节点状态 status = S节点状态.未验证;
28+
[ObservableProperty] private NodeStatus status = NodeStatus.Unverified;
2929

3030
[property: JsonConverter(typeof(PointJsonConverter))]
3131
[JsonConverter(typeof(PointJsonConverter))]
@@ -155,7 +155,7 @@ public override bool Invoke(CancellationToken cancellationToken, ObservableColle
155155
//生成本节点所有数据
156156
switch (ScenarioMethod.Type)
157157
{
158-
case ScenarioMethodType.插件方法:
158+
case ScenarioMethodType.PluginMethod:
159159
{
160160
List<object> list = new();
161161
var index = 1;
@@ -234,19 +234,19 @@ public override bool Invoke(CancellationToken cancellationToken, ObservableColle
234234

235235
break;
236236
}
237-
case ScenarioMethodType.一对二:
237+
case ScenarioMethodType.OneToTwo:
238238
{
239239
Output[0].InputObject.Value = "流1";
240240
Output[1].InputObject.Value = "流2";
241241
break;
242242
}
243-
case ScenarioMethodType.一对多:
243+
case ScenarioMethodType.OneToMany:
244244
{
245245
for (var i = 0; i < Output.Count; i++) Output[i].InputObject.Value = $"流{i + 1}";
246246

247247
break;
248248
}
249-
case ScenarioMethodType.相等:
249+
case ScenarioMethodType.Equal:
250250
{
251251
if (Input[1].InputObject is null)
252252
Output[0].InputObject.Value = false;
@@ -257,35 +257,35 @@ public override bool Invoke(CancellationToken cancellationToken, ObservableColle
257257

258258
break;
259259
}
260-
case ScenarioMethodType.变量设置:
260+
case ScenarioMethodType.VariableSet:
261261
{
262262
if (values.ContainsKey(ScenarioMethod.ValueName))
263263
values[ScenarioMethod.ValueName].Value = Input[1].InputObject.Value!;
264264

265265
break;
266266
}
267-
case ScenarioMethodType.变量获取:
267+
case ScenarioMethodType.VariableGet:
268268
{
269269
if (values.ContainsKey(ScenarioMethod.ValueName))
270270
Output[1].InputObject.Value = values[ScenarioMethod.ValueName].Value;
271271

272272
break;
273273
}
274-
case ScenarioMethodType.临时变量设置:
274+
case ScenarioMethodType.TempVariableSet:
275275
{
276276
if (tempValues.ContainsKey(ScenarioMethod.ValueName))
277277
tempValues[ScenarioMethod.ValueName] = Input[1].InputObject.Value!;
278278

279279
break;
280280
}
281-
case ScenarioMethodType.临时变量获取:
281+
case ScenarioMethodType.TempVariableGet:
282282
{
283283
if (tempValues.ContainsKey(ScenarioMethod.ValueName))
284284
Output[1].InputObject.Value = tempValues[ScenarioMethod.ValueName];
285285

286286
break;
287287
}
288-
case ScenarioMethodType.判断:
288+
case ScenarioMethodType.Condition:
289289
{
290290
if (Input[1].InputObject.Value is bool b1)
291291
{
@@ -307,7 +307,7 @@ public override bool Invoke(CancellationToken cancellationToken, ObservableColle
307307

308308
break;
309309
}
310-
case ScenarioMethodType.打开运行本地项目:
310+
case ScenarioMethodType.OpenRunLocalProject:
311311
{
312312
if (Enumerable.Count<ConnectorItem>(Input) >= 3)
313313
{
@@ -326,7 +326,7 @@ public override bool Invoke(CancellationToken cancellationToken, ObservableColle
326326

327327
break;
328328
}
329-
case ScenarioMethodType.默认:
329+
case ScenarioMethodType.Default:
330330
{
331331
if (Input == null || Input.Count == 0) break;
332332

@@ -475,7 +475,7 @@ public override void ResetData()
475475
if (!connectorItem.InputObject.IsSelf)
476476
connectorItem.InputObject.Value = null;
477477

478-
Status = S节点状态.未验证;
478+
Status = NodeStatus.Unverified;
479479
}
480480

481481
public override void ConnectorInit()

‎Core/CustomScenario/ScenarioMethodType.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
public enum ScenarioMethodType
44
{
5-
插件方法,
6-
判断,
7-
一对二,
8-
一对多,
9-
相等,
10-
变量设置,
11-
变量获取,
12-
临时变量设置,
13-
临时变量获取,
14-
打开运行本地项目,
15-
默认
5+
PluginMethod,
6+
Condition,
7+
OneToTwo,
8+
OneToMany,
9+
Equal,
10+
VariableSet,
11+
VariableGet,
12+
TempVariableSet,
13+
TempVariableGet,
14+
OpenRunLocalProject,
15+
Default
1616
}

‎Core/Services/Plugin/Plugin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public Plugin(PluginLocalInfo pluginInfo)
201201
continue;
202202

203203
var scenarioMethodInfo = new ScenarioMethod(methodInfo, PluginInfo, scenarioMethodAttribute,
204-
ScenarioMethodType.插件方法, ServiceProvider);
204+
ScenarioMethodType.PluginMethod, ServiceProvider);
205205
scenarioMethodCategoryGroup.Methods.Add(scenarioMethodInfo.MethodTitle,
206206
scenarioMethodInfo.GenerateNode());
207207
}

‎Core/ViewModel/TaskEditor/TaskEditorViewModel.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public TaskEditorViewModel()
5858
var nodify2 = new ScenarioMethodNode
5959
{
6060
Title = "任务1",
61-
ScenarioMethod = new ScenarioMethod(ScenarioMethodType.默认)
61+
ScenarioMethod = new ScenarioMethod(ScenarioMethodType.Default)
6262
};
6363
nodify2.Output = new ObservableCollection<ConnectorItem>
6464
{
@@ -78,7 +78,7 @@ public TaskEditorViewModel()
7878
var nodify3 = new ScenarioMethodNode
7979
{
8080
Title = "Tick",
81-
ScenarioMethod = new ScenarioMethod(ScenarioMethodType.默认),
81+
ScenarioMethod = new ScenarioMethod(ScenarioMethodType.Default),
8282
Location = new Point(0, 100)
8383
};
8484
nodify3.Output = new ObservableCollection<ConnectorItem>
@@ -119,7 +119,7 @@ public TaskEditorViewModel()
119119

120120
if (e.ConnectorItem is not { InputObject: not null }) return;
121121

122-
if (e.ScenarioMethodNode.ScenarioMethod.Type == ScenarioMethodType.一对多 &&
122+
if (e.ScenarioMethodNode.ScenarioMethod.Type == ScenarioMethodType.OneToMany &&
123123
e.ConnectorItem.Title == "输出数量")
124124
{
125125
int? value = null;
@@ -171,7 +171,7 @@ public TaskEditorViewModel()
171171
}
172172
}
173173

174-
if (e.ScenarioMethodNode.ScenarioMethod.Type == ScenarioMethodType.打开运行本地项目)
174+
if (e.ScenarioMethodNode.ScenarioMethod.Type == ScenarioMethodType.OpenRunLocalProject)
175175
{
176176
var o = e.ScenarioMethodNode.Input[1].InputObject.Value;
177177
if (o is string inputObject)

‎KitopiaAvalonia/Converter/TaskEditor/NodeStatusBorderCtr.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class NodeStatusBorderCtr : IValueConverter
99
{
1010
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
1111
{
12-
if (value is not S节点状态 status || parameter is null) return false;
12+
if (value is not NodeStatus status || parameter is null) return false;
1313

1414
if (((int)status).ToString() == parameter.ToString()) return true;
1515

0 commit comments

Comments
 (0)