|
@@ -2563,7 +2563,7 @@ namespace UAS_LabelMachine
|
|
|
if (getMsg.Contains("ReadId"))
|
|
if (getMsg.Contains("ReadId"))
|
|
|
{
|
|
{
|
|
|
string msgStr = getMsg.Trim('\0').Replace("ReadId1|,|", "");
|
|
string msgStr = getMsg.Trim('\0').Replace("ReadId1|,|", "");
|
|
|
- msgStr = Regex.Match(msgStr, @"[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[0-9A-Za-z]+\*[0-9A-Za-z]+\*[0-9A-Za-z]+\*[A-Za-z0-9]+").Value;
|
|
|
|
|
|
|
+ msgStr = Regex.Match(msgStr, @"[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+").Value;
|
|
|
//设置索引和内容
|
|
//设置索引和内容
|
|
|
// msgStr = msgStr.Split(ps_split.ToCharArray()[0])[dataindex];
|
|
// msgStr = msgStr.Split(ps_split.ToCharArray()[0])[dataindex];
|
|
|
Input.Text = msgStr;
|
|
Input.Text = msgStr;
|
|
@@ -2605,7 +2605,7 @@ namespace UAS_LabelMachine
|
|
|
if (getMsg.Contains("ReadId3"))
|
|
if (getMsg.Contains("ReadId3"))
|
|
|
{
|
|
{
|
|
|
string msgStr = getMsg.Trim('\0').Replace("ReadId3|,|", "");
|
|
string msgStr = getMsg.Trim('\0').Replace("ReadId3|,|", "");
|
|
|
- string temp = Regex.Match(msgStr, @"[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[0-9A-Za-z]+\*[0-9A-Za-z]+\*[0-9A-Za-z]+\*[A-Za-z0-9]+").Value;
|
|
|
|
|
|
|
+ string temp = Regex.Match(msgStr, @"[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+\*[-{0,5}/{0,5}.{0,5}0-9A-Za-z]+").Value;
|
|
|
string pr_code = "";
|
|
string pr_code = "";
|
|
|
//如果不存在原厂标签的话
|
|
//如果不存在原厂标签的话
|
|
|
if (temp != "")
|
|
if (temp != "")
|