Skip to content

Commit 94c7b1c

Browse files
author
wenjia
committed
[change]:名称修改
1 parent 1a84ffe commit 94c7b1c

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

doc/时间戳协议.docx

71.1 KB
Binary file not shown.

src/lang/en-us.xaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
<s:String x:Key="Record">&#160;&#160;&#160;&#160;Record</s:String>
5656
<s:String x:Key="GetTime">GetTime</s:String>
5757
<s:String x:Key="SetTime">SetTime</s:String>
58-
<s:String x:Key="ClearTime">ClearTime</s:String>
58+
<s:String x:Key="ClearTime">Clear</s:String>
5959
<s:String x:Key="Search">Search</s:String>
6060
<s:String x:Key="InvertSearch">Invert Search</s:String>
6161
<s:String x:Key="InvertSearchCount">Invert Number</s:String>
6262
<s:String x:Key="SearchResult">Result</s:String>
6363
<s:String x:Key="FuncGetTime">Get Current Time In Radar</s:String>
6464
<s:String x:Key="FuncSetTime">synchronize Radar Time</s:String>
65-
<s:String x:Key="FuncClearTime">Clear Radar Time</s:String>
65+
<s:String x:Key="FuncClearTime">Clear Radar Log</s:String>
6666
<s:String x:Key="FuncRecord">Get Records In Radar</s:String>
6767
<s:String x:Key="FuncInvertRecord">Get Last Number Records In Radar</s:String>
6868
<s:String x:Key="ConfirmAlarm">Show</s:String>
@@ -120,8 +120,8 @@
120120
<s:String x:Key="SetTimeFail">Set Time Fail</s:String>
121121
<s:String x:Key="SetTimeSuccess">Set Time Success</s:String>
122122
<s:String x:Key="ClearTiming">Clearing Time</s:String>
123-
<s:String x:Key="ClearTimeFail">Clear Time Fail</s:String>
124-
<s:String x:Key="ClearTimeSuccess">Clear Time Success</s:String>
123+
<s:String x:Key="ClearTimeFail">Clear Log Fail</s:String>
124+
<s:String x:Key="ClearTimeSuccess">Clear Log Success</s:String>
125125
<s:String x:Key="SearchTimeFail">Search Time Fail</s:String>
126126
<s:String x:Key="SearchTimeSuccess">Search Time Success</s:String>
127127
<s:String x:Key="SearchTimeGetNone">Get Data None</s:String>

src/lang/zh-cn.xaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<s:String x:Key="ConfigModelTitle">设置</s:String>
88
<s:String x:Key="CANModelTitle">CAN口</s:String>
99
<s:String x:Key="DeveloperModelTitle">开发设置</s:String>
10-
<s:String x:Key="RecordModelTitle">雷达数据</s:String>
10+
<s:String x:Key="RecordModelTitle">日志</s:String>
1111
<s:String x:Key="AlarmModelTitile">虚警处理</s:String>
1212
<s:String x:Key="CompareModelTitle">背景对比</s:String>
1313
<s:String x:Key="Serial">串&#160;&#160;&#160;口</s:String>
@@ -55,14 +55,14 @@
5555
<s:String x:Key="Record">雷达日志</s:String>
5656
<s:String x:Key="GetTime">获取时间</s:String>
5757
<s:String x:Key="SetTime">设置时间</s:String>
58-
<s:String x:Key="ClearTime">清除时间</s:String>
58+
<s:String x:Key="ClearTime">清除日志</s:String>
5959
<s:String x:Key="Search">按时间查询记录</s:String>
6060
<s:String x:Key="InvertSearch">倒置查询记录</s:String>
6161
<s:String x:Key="InvertSearchCount">倒置查询数量</s:String>
6262
<s:String x:Key="SearchResult">查询结果</s:String>
6363
<s:String x:Key="FuncGetTime">获取雷达当前时间</s:String>
6464
<s:String x:Key="FuncSetTime">同步雷达当前时间</s:String>
65-
<s:String x:Key="FuncClearTime">清除雷达当前时间</s:String>
65+
<s:String x:Key="FuncClearTime">清除雷达当前日志</s:String>
6666
<s:String x:Key="FuncRecord">查询雷达在起止时间中的数据</s:String>
6767
<s:String x:Key="FuncInvertRecord">查询雷达未尾数据</s:String>
6868
<s:String x:Key="ConfirmAlarm">显示虚警</s:String>
@@ -120,15 +120,15 @@
120120
<s:String x:Key="SetTimeFail">设置雷达时间失败</s:String>
121121
<s:String x:Key="SetTimeSuccess">设置雷达时间成功</s:String>
122122
<s:String x:Key="ClearTiming">正在清除雷达时间</s:String>
123-
<s:String x:Key="ClearTimeFail">清除雷达时间失败</s:String>
124-
<s:String x:Key="ClearTimeSuccess">清除雷达时间成功</s:String>
123+
<s:String x:Key="ClearTimeFail">清除雷达日志失败</s:String>
124+
<s:String x:Key="ClearTimeSuccess">清除雷达日志成功</s:String>
125125
<s:String x:Key="SearchTimeFail">查询数据失败</s:String>
126126
<s:String x:Key="SearchTimeSuccess">查询数据成功</s:String>
127127
<s:String x:Key="SearchTimeGetNone">查询数据为空</s:String>
128128
<s:String x:Key="Searching">正在查询数据</s:String>
129129
<s:String x:Key="SearchTimeEnd">查询数据结束</s:String>
130-
<s:String x:Key="Persistence">记录(雷达时间戳)</s:String>
131-
<s:String x:Key="Ignore">不记录(雷达时间戳</s:String>
130+
<s:String x:Key="Persistence">记录(时间戳)</s:String>
131+
<s:String x:Key="Ignore">不记录(时间戳)</s:String>
132132
<s:String x:Key="Up">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;抬杆</s:String>
133133
<s:String x:Key="Down">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;降杆</s:String>
134134
<s:String x:Key="UpValue">Dalay:1</s:String>

src/model/ViewModelUtil.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ public SerialMainViewModel(MahApps.Metro.Controls.Dialogs.IDialogCoordinator dia
10091009
{
10101010
ExecuteDelegate = param =>
10111011
{
1012-
SerialWork(() => toClarTime());
1012+
SerialWork(() => ToClarTime());
10131013
}
10141014
};
10151015
SearchCmd = new SimpleCommand()
@@ -1801,7 +1801,7 @@ private void ToInvertSearch()
18011801
serial.WriteLine(SerialRadarCommands.SearchInvert + " " + InvertSearchCount);
18021802
}
18031803

1804-
private void toClarTime()
1804+
private void ToClarTime()
18051805
{
18061806
string lastOperation = SerialRadarCommands.SensorStop;
18071807
Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(async ()=> {

0 commit comments

Comments
 (0)