Skip to content

Commit b8de11b

Browse files
DigitalPlatformDigitalPlatform
committed
整理代码
1 parent 9e16c54 commit b8de11b

12 files changed

+590
-92
lines changed

‎DigitalPlatform.RFID/NewTagList.cs

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@ public List<TagAndData> Tags
3030
}
3131
}
3232

33+
bool _enableTagCache = true;
34+
35+
// 是否启用标签内容缓存？
36+
public bool EnableTagCache
37+
{
38+
get
39+
{
40+
return _enableTagCache;
41+
}
42+
set
43+
{
44+
_enableTagCache = value;
45+
if (value == false)
46+
ClearTagTable(null, false);
47+
}
48+
}
49+
3350
public void AssertTagInfo()
3451
{
3552
int i = 0;
@@ -495,6 +512,7 @@ public bool SetEasData(string uid, bool enable)
495512
return false;
496513
}
497514

515+
// 缓存中的事项个数
498516
public int TagTableCount
499517
{
500518
get
@@ -513,16 +531,22 @@ GetTagInfoResult GetTagInfo(delegate_getTagInfo getTagInfo,
513531
//if (channel.Started == false)
514532
// return new GetTagInfoResult { Value = -1, ErrorInfo = "RFID 通道尚未启动" };
515533

516-
TagInfo info = (TagInfo)_tagTable[uid];
534+
TagInfo info = null;
517535

518-
// 2020/10/17
519-
// 检查 reader_name 和 antenna
520-
if (info != null)
536+
// 先从 cache 里面找
537+
if (_enableTagCache)
521538
{
522-
if (info.ReaderName != reader_name || info.AntennaID != antenna)
539+
info = (TagInfo)_tagTable[uid];
540+
541+
// 2020/10/17
542+
// 检查 reader_name 和 antenna
543+
if (info != null)
523544
{
524-
info = null;
525-
_tagTable.Remove(uid);
545+
if (info.ReaderName != reader_name || info.AntennaID != antenna)
546+
{
547+
info = null;
548+
_tagTable.Remove(uid);
549+
}
526550
}
527551
}
528552

@@ -532,7 +556,8 @@ GetTagInfoResult GetTagInfo(delegate_getTagInfo getTagInfo,
532556
if (result.Value == -1)
533557
return result;
534558
info = result.TagInfo;
535-
if (info != null)
559+
// 加入 cache
560+
if (_enableTagCache && info != null)
536561
{
537562
if (_tagTable.Count > 1000)
538563
_tagTable.Clear();

‎RfidDrivers.First/RfidDriver1.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3628,6 +3628,20 @@ public NormalResult WriteTagInfo(// byte[] uid, UInt32 tag_type
36283628
// string style
36293629
)
36303630
{
3631+
// 2021/1/7
3632+
if (old_tag_info == null)
3633+
return new NormalResult
3634+
{
3635+
Value = -1,
3636+
ErrorInfo = "参数 old_tag_info 不应为 null"
3637+
};
3638+
if (new_tag_info == null)
3639+
return new NormalResult
3640+
{
3641+
Value = -1,
3642+
ErrorInfo = "参数 new_tag_info 不应为 null"
3643+
};
3644+
36313645
StringBuilder debugInfo = new StringBuilder();
36323646
debugInfo.AppendLine($"WriteTagInfo() one_reader_name={one_reader_name}");
36333647
debugInfo.AppendLine($"old_tag_info={old_tag_info.ToString()}");

‎RfidTool/DataModel.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public static InitializeDriverResult InitialDriver(
5858
if (reset_hint_table || existing_hint_table == null)
5959
SetHintTable(initial_result.HintTable);
6060

61+
// 首次设置是否启用缓存
62+
TagList.EnableTagCache = EnableTagCache;
63+
6164
_task = Task.Factory.StartNew(
6265
() =>
6366
{
@@ -244,6 +247,19 @@ public static bool WriteUhfUserBank
244247
}
245248
}
246249

250+
// 启用标签缓存
251+
public static bool EnableTagCache
252+
{
253+
get
254+
{
255+
return ClientInfo.Config.GetBoolean("general", "enableTagCache", true);
256+
}
257+
set
258+
{
259+
ClientInfo.Config.SetBoolean("general", "enableTagCache", value);
260+
}
261+
}
262+
247263
// 写入标签
248264
public static NormalResult WriteTagInfo(string one_reader_name,
249265
TagInfo old_tag_info,

‎RfidTool/FloatingErrorDialog.Designer.cs

Lines changed: 83 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RfidTool/FloatingErrorDialog.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace RfidTool
12+
{
13+
public partial class FloatingErrorDialog : Form
14+
{
15+
public FloatingErrorDialog()
16+
{
17+
InitializeComponent();
18+
}
19+
20+
public string Message
21+
{
22+
get
23+
{
24+
return this.label_text.Text;
25+
}
26+
set
27+
{
28+
this.label_text.Text = value;
29+
}
30+
}
31+
32+
private void button_close_Click(object sender, EventArgs e)
33+
{
34+
this.Close();
35+
}
36+
}
37+
}

‎RfidTool/FloatingErrorDialog.resx

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎RfidTool/MainForm.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@ private void MenuItem_settings_Click(object sender, EventArgs e)
466466
ClientInfo.MemoryState(dlg, "settingDialog", "state");
467467

468468
dlg.ShowDialog(this);
469+
if (dlg.DialogResult == DialogResult.OK)
470+
DataModel.TagList.EnableTagCache = DataModel.EnableTagCache;
469471
}
470472
}
471473

0 commit comments

Comments
 (0)