Skip to content

Commit 8a7476d

Browse files
committed
更正开关串口后,波特率等信息错误的问题
1 parent 23725cb commit 8a7476d

4 files changed

Lines changed: 31 additions & 37 deletions

File tree

changlog/autoUpdate.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<item>
3-
<version>1.0.3.0</version>
4-
<url>https://llcom.papapoi.com/update/1.0.3.0.zip</url>
5-
<changelog>https://llcom.papapoi.com/changelog/1.0.3.0.html</changelog>
3+
<version>1.0.3.1</version>
4+
<url>https://llcom.papapoi.com/update/1.0.3.1.zip</url>
5+
<changelog>https://llcom.papapoi.com/changelog/1.0.3.1.html</changelog>
66
<mandatory mode="1">true</mandatory>
77
</item>

changlog/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
> 欢迎加入交流群:`906307487`
1010

11+
## LLCOM 1.0.3.1
12+
13+
- 更正开关串口后,波特率等信息错误的问题
14+
15+
---
16+
1117
## LLCOM 1.0.3.0
1218

1319
- 更正当打开某些设备(如某些4G模块)的串口,断开后不会被释放,导致无法再次开启该COM口,只能重启软件的BUG

llcom/Model/Uart.cs

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,30 @@ public Uart()
3333
/// </summary>
3434
private void refreshSerialDevice()
3535
{
36+
try
37+
{
38+
lastPortBaseStream?.Dispose();
39+
}
40+
catch (Exception e)
41+
{
42+
Console.WriteLine($"portBaseStream?.Dispose error:{e.Message}");
43+
}
44+
try
45+
{
46+
serial.BaseStream.Dispose();
47+
}
48+
catch (Exception e)
49+
{
50+
Console.WriteLine($"serial.BaseStream.Dispose error:{e.Message}");
51+
}
3652
serial.Dispose();
3753
serial = new SerialPort();
3854
//声明接收到事件
3955
serial.DataReceived += Serial_DataReceived;
56+
serial.BaudRate = Tools.Global.setting.baudRate;
57+
serial.Parity = (Parity)Tools.Global.setting.parity;
58+
serial.DataBits = Tools.Global.setting.dataBits;
59+
serial.StopBits = (StopBits)Tools.Global.setting.stopBit;
4060
}
4161

4262
/// <summary>
@@ -72,22 +92,6 @@ public bool IsOpen()
7292
public void Open()
7393
{
7494
string temp = serial.PortName;
75-
try
76-
{
77-
lastPortBaseStream?.Dispose();
78-
}
79-
catch (Exception e)
80-
{
81-
Console.WriteLine($"portBaseStream?.Dispose error:{e.Message}");
82-
}
83-
try
84-
{
85-
serial.BaseStream.Dispose();
86-
}
87-
catch (Exception e)
88-
{
89-
Console.WriteLine($"serial.BaseStream.Dispose error:{e.Message}");
90-
}
9195
refreshSerialDevice();
9296
serial.PortName = temp;
9397
serial.Open();
@@ -99,22 +103,6 @@ public void Open()
99103
/// </summary>
100104
public void Close()
101105
{
102-
try
103-
{
104-
lastPortBaseStream?.Dispose();
105-
}
106-
catch (Exception e)
107-
{
108-
Console.WriteLine($"portBaseStream?.Dispose error:{e.Message}");
109-
}
110-
try
111-
{
112-
serial.BaseStream.Dispose();
113-
}
114-
catch (Exception e)
115-
{
116-
Console.WriteLine($"serial.BaseStream.Dispose error:{e.Message}");
117-
}
118106
refreshSerialDevice();
119107
serial.Close();
120108
}

llcom/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
5252
//通过使用 "*",如下所示:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.3.0")]
55-
[assembly: AssemblyFileVersion("1.0.3.0")]
54+
[assembly: AssemblyVersion("1.0.3.1")]
55+
[assembly: AssemblyFileVersion("1.0.3.1")]
5656
[assembly: NeutralResourcesLanguage("zh-CN")]
5757

0 commit comments

Comments
 (0)