|
@@ -192,66 +192,68 @@ namespace Venus_RT.Devices.VCE
|
|
|
msg = msg.Trim();
|
|
|
if (!string.IsNullOrEmpty(msg))
|
|
|
{
|
|
|
-
|
|
|
- if (_currentVceMessage.Head == VceMessageHead.Action || _currentVceMessage.Head == VceMessageHead.Set || _currentVceMessage.Head == VceMessageHead.Petrify)
|
|
|
+
|
|
|
+ switch (_currentVceMessage.Head)
|
|
|
{
|
|
|
- switch (msg)
|
|
|
- {
|
|
|
-
|
|
|
- case "_RDY":
|
|
|
- LOG.Write(eEvent.EV_VCE_COMMON_INFO, _moduleName, $"vce start {_currentVceMessage.Head}");
|
|
|
- break;
|
|
|
-
|
|
|
- case "_BKGRDY":
|
|
|
- LOG.Write(eEvent.EV_VCE_COMMON_INFO, _moduleName, $"vce {_currentVceMessage.Head} over");
|
|
|
- _status = RState.End;
|
|
|
- break;
|
|
|
-
|
|
|
- default:
|
|
|
- _status = RState.Failed;
|
|
|
- string reason;
|
|
|
- Errorhandle(msg, out reason);
|
|
|
- LOG.Write(eEvent.ERR_VCE_COMMON_Failed, _moduleName, reason);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (_currentVceMessage.Head == VceMessageHead.Read)
|
|
|
- {
|
|
|
-
|
|
|
- if (_match_ReadMsg.IsMatch(msg))
|
|
|
- {
|
|
|
-
|
|
|
- _HasReceiveMsg = true;
|
|
|
- switch (_currentVceMessage.Command)
|
|
|
+ case VceMessageHead.Action:
|
|
|
+ case VceMessageHead.Set:
|
|
|
+ case VceMessageHead.Petrify:
|
|
|
+ switch (msg)
|
|
|
{
|
|
|
-
|
|
|
- case VceCommand.ReadMap:
|
|
|
- ReadMapData(msg);
|
|
|
+
|
|
|
+ case "_RDY":
|
|
|
+ LOG.Write(eEvent.EV_VCE_COMMON_INFO, _moduleName, $"vce start {_currentVceMessage.Head}");
|
|
|
+ break;
|
|
|
+
|
|
|
+ case "_BKGRDY":
|
|
|
+ LOG.Write(eEvent.EV_VCE_COMMON_INFO, _moduleName, $"vce {_currentVceMessage.Head} over");
|
|
|
+ _status = RState.End;
|
|
|
+ break;
|
|
|
+
|
|
|
+ default:
|
|
|
+ _status = RState.Failed;
|
|
|
+ string reason;
|
|
|
+ Errorhandle(msg, out reason);
|
|
|
+ LOG.Write(eEvent.ERR_VCE_COMMON_Failed, _moduleName, reason);
|
|
|
break;
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- else
|
|
|
- {
|
|
|
- if (msg == "_RDY")
|
|
|
+ break;
|
|
|
+ case VceMessageHead.Read:
|
|
|
+
|
|
|
+ if (_match_ReadMsg.IsMatch(msg))
|
|
|
{
|
|
|
- if (_HasReceiveMsg)
|
|
|
+
|
|
|
+ _HasReceiveMsg = true;
|
|
|
+ switch (_currentVceMessage.Command)
|
|
|
{
|
|
|
- _status = RState.End;
|
|
|
+
|
|
|
+ case VceCommand.ReadMap:
|
|
|
+ ReadMapData(msg);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (msg == "_RDY")
|
|
|
+ {
|
|
|
+ if (_HasReceiveMsg)
|
|
|
+ {
|
|
|
+ _status = RState.End;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LOG.Write(eEvent.ERR_VCE_COMMON_Failed, _moduleName, $"Read Message is over but not receive msg! raw message:{_currentMsg}");
|
|
|
+ _status = RState.Failed;
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- LOG.Write(eEvent.ERR_VCE_COMMON_Failed, _moduleName, $"Read Message is over but not receive msg! raw message:{_currentMsg}");
|
|
|
_status = RState.Failed;
|
|
|
+ LOG.Write(eEvent.ERR_VCE_COMMON_Failed, _moduleName, $"Read Message is invalid: receive message {msg} and send message {_currentMsg}");
|
|
|
}
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- _status = RState.Failed;
|
|
|
- LOG.Write(eEvent.ERR_VCE_COMMON_Failed, _moduleName, $"Read Message is invalid: receive message {msg} and send message {_currentMsg}");
|
|
|
- }
|
|
|
- }
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
}
|