Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
ACSquareStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit c4d36aef
由
LN
编写于
2020-09-18 11:36:00 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
bug修改
1 个父辈
907b095b
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
94 行增加
和
55 行删除
source/ACSquareStore/FrmStoreBox.Designer.cs
source/ACSquareStore/FrmStoreBox.cs
source/Common/util/HumitureController.cs
source/DeviceLibrary/acSquareStore/Square_BoxBean.cs
source/ACSquareStore/FrmStoreBox.Designer.cs
查看文件 @
c4d36ae
...
@@ -964,7 +964,7 @@
...
@@ -964,7 +964,7 @@
//
//
this
.
btnClearLog
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnClearLog
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnClearLog
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnClearLog
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnClearLog
.
Location
=
new
System
.
Drawing
.
Point
(
3
62
,
468
);
this
.
btnClearLog
.
Location
=
new
System
.
Drawing
.
Point
(
3
77
,
468
);
this
.
btnClearLog
.
Name
=
"btnClearLog"
;
this
.
btnClearLog
.
Name
=
"btnClearLog"
;
this
.
btnClearLog
.
Size
=
new
System
.
Drawing
.
Size
(
105
,
38
);
this
.
btnClearLog
.
Size
=
new
System
.
Drawing
.
Size
(
105
,
38
);
this
.
btnClearLog
.
TabIndex
=
224
;
this
.
btnClearLog
.
TabIndex
=
224
;
...
@@ -979,7 +979,7 @@
...
@@ -979,7 +979,7 @@
this
.
txtInOutP3
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtInOutP3
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtInOutP3
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtInOutP3
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtInOutP3
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtInOutP3
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtInOutP3
.
Location
=
new
System
.
Drawing
.
Point
(
39
4
,
252
);
this
.
txtInOutP3
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
252
);
this
.
txtInOutP3
.
MaxLength
=
20
;
this
.
txtInOutP3
.
MaxLength
=
20
;
this
.
txtInOutP3
.
Name
=
"txtInOutP3"
;
this
.
txtInOutP3
.
Name
=
"txtInOutP3"
;
this
.
txtInOutP3
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtInOutP3
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1033,7 +1033,7 @@
...
@@ -1033,7 +1033,7 @@
this
.
btnSavePosition
.
BackColor
=
System
.
Drawing
.
SystemColors
.
Control
;
this
.
btnSavePosition
.
BackColor
=
System
.
Drawing
.
SystemColors
.
Control
;
this
.
btnSavePosition
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnSavePosition
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnSavePosition
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnSavePosition
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnSavePosition
.
Location
=
new
System
.
Drawing
.
Point
(
2
51
,
468
);
this
.
btnSavePosition
.
Location
=
new
System
.
Drawing
.
Point
(
2
66
,
468
);
this
.
btnSavePosition
.
Name
=
"btnSavePosition"
;
this
.
btnSavePosition
.
Name
=
"btnSavePosition"
;
this
.
btnSavePosition
.
Size
=
new
System
.
Drawing
.
Size
(
105
,
38
);
this
.
btnSavePosition
.
Size
=
new
System
.
Drawing
.
Size
(
105
,
38
);
this
.
btnSavePosition
.
TabIndex
=
217
;
this
.
btnSavePosition
.
TabIndex
=
217
;
...
@@ -1184,7 +1184,7 @@
...
@@ -1184,7 +1184,7 @@
this
.
txtInOutP4
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtInOutP4
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtInOutP4
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtInOutP4
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtInOutP4
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtInOutP4
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtInOutP4
.
Location
=
new
System
.
Drawing
.
Point
(
39
5
,
211
);
this
.
txtInOutP4
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
211
);
this
.
txtInOutP4
.
MaxLength
=
20
;
this
.
txtInOutP4
.
MaxLength
=
20
;
this
.
txtInOutP4
.
Name
=
"txtInOutP4"
;
this
.
txtInOutP4
.
Name
=
"txtInOutP4"
;
this
.
txtInOutP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtInOutP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1199,7 +1199,7 @@
...
@@ -1199,7 +1199,7 @@
this
.
txtMiddleP2
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtMiddleP2
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtMiddleP2
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtMiddleP2
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtMiddleP2
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtMiddleP2
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtMiddleP2
.
Location
=
new
System
.
Drawing
.
Point
(
39
5
,
172
);
this
.
txtMiddleP2
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
172
);
this
.
txtMiddleP2
.
MaxLength
=
20
;
this
.
txtMiddleP2
.
MaxLength
=
20
;
this
.
txtMiddleP2
.
Name
=
"txtMiddleP2"
;
this
.
txtMiddleP2
.
Name
=
"txtMiddleP2"
;
this
.
txtMiddleP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtMiddleP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1214,7 +1214,7 @@
...
@@ -1214,7 +1214,7 @@
this
.
txtUpDownP5
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP5
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP5
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP5
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP5
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP5
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP5
.
Location
=
new
System
.
Drawing
.
Point
(
39
5
,
372
);
this
.
txtUpDownP5
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
372
);
this
.
txtUpDownP5
.
MaxLength
=
20
;
this
.
txtUpDownP5
.
MaxLength
=
20
;
this
.
txtUpDownP5
.
Name
=
"txtUpDownP5"
;
this
.
txtUpDownP5
.
Name
=
"txtUpDownP5"
;
this
.
txtUpDownP5
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtUpDownP5
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1229,7 +1229,7 @@
...
@@ -1229,7 +1229,7 @@
this
.
txtUpDownP6
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP6
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP6
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP6
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP6
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP6
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP6
.
Location
=
new
System
.
Drawing
.
Point
(
39
5
,
412
);
this
.
txtUpDownP6
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
412
);
this
.
txtUpDownP6
.
MaxLength
=
20
;
this
.
txtUpDownP6
.
MaxLength
=
20
;
this
.
txtUpDownP6
.
Name
=
"txtUpDownP6"
;
this
.
txtUpDownP6
.
Name
=
"txtUpDownP6"
;
this
.
txtUpDownP6
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtUpDownP6
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1269,7 +1269,7 @@
...
@@ -1269,7 +1269,7 @@
this
.
txtUpDownP3
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP3
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP3
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP3
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP3
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP3
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP3
.
Location
=
new
System
.
Drawing
.
Point
(
39
5
,
292
);
this
.
txtUpDownP3
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
292
);
this
.
txtUpDownP3
.
MaxLength
=
20
;
this
.
txtUpDownP3
.
MaxLength
=
20
;
this
.
txtUpDownP3
.
Name
=
"txtUpDownP3"
;
this
.
txtUpDownP3
.
Name
=
"txtUpDownP3"
;
this
.
txtUpDownP3
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtUpDownP3
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1310,7 +1310,7 @@
...
@@ -1310,7 +1310,7 @@
this
.
txtUpDownP4
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP4
.
Cursor
=
System
.
Windows
.
Forms
.
Cursors
.
IBeam
;
this
.
txtUpDownP4
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP4
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpDownP4
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP4
.
ForeColor
=
System
.
Drawing
.
SystemColors
.
WindowText
;
this
.
txtUpDownP4
.
Location
=
new
System
.
Drawing
.
Point
(
39
5
,
332
);
this
.
txtUpDownP4
.
Location
=
new
System
.
Drawing
.
Point
(
39
9
,
332
);
this
.
txtUpDownP4
.
MaxLength
=
20
;
this
.
txtUpDownP4
.
MaxLength
=
20
;
this
.
txtUpDownP4
.
Name
=
"txtUpDownP4"
;
this
.
txtUpDownP4
.
Name
=
"txtUpDownP4"
;
this
.
txtUpDownP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
txtUpDownP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
...
@@ -1327,10 +1327,10 @@
...
@@ -1327,10 +1327,10 @@
this
.
btnInOutP2
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnInOutP2
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnInOutP2
.
ForeColor
=
System
.
Drawing
.
Color
.
Green
;
this
.
btnInOutP2
.
ForeColor
=
System
.
Drawing
.
Color
.
Green
;
this
.
btnInOutP2
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP2
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP2
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
246
);
this
.
btnInOutP2
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
246
);
this
.
btnInOutP2
.
Name
=
"btnInOutP2"
;
this
.
btnInOutP2
.
Name
=
"btnInOutP2"
;
this
.
btnInOutP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnInOutP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnInOutP2
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnInOutP2
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnInOutP2
.
TabIndex
=
211
;
this
.
btnInOutP2
.
TabIndex
=
211
;
this
.
btnInOutP2
.
Text
=
"Y-进出轴左侧点P2:"
;
this
.
btnInOutP2
.
Text
=
"Y-进出轴左侧点P2:"
;
this
.
btnInOutP2
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP2
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1346,10 +1346,10 @@
...
@@ -1346,10 +1346,10 @@
this
.
btnInOutP1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnInOutP1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnInOutP1
.
ForeColor
=
System
.
Drawing
.
Color
.
Green
;
this
.
btnInOutP1
.
ForeColor
=
System
.
Drawing
.
Color
.
Green
;
this
.
btnInOutP1
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP1
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP1
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
206
);
this
.
btnInOutP1
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
206
);
this
.
btnInOutP1
.
Name
=
"btnInOutP1"
;
this
.
btnInOutP1
.
Name
=
"btnInOutP1"
;
this
.
btnInOutP1
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnInOutP1
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnInOutP1
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnInOutP1
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnInOutP1
.
TabIndex
=
209
;
this
.
btnInOutP1
.
TabIndex
=
209
;
this
.
btnInOutP1
.
Text
=
"Y-进出轴待机点P1:"
;
this
.
btnInOutP1
.
Text
=
"Y-进出轴待机点P1:"
;
this
.
btnInOutP1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1365,10 +1365,10 @@
...
@@ -1365,10 +1365,10 @@
this
.
btnMiddleP1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnMiddleP1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnMiddleP1
.
ForeColor
=
System
.
Drawing
.
Color
.
FromArgb
(((
int
)(((
byte
)(
0
)))),
((
int
)(((
byte
)(
0
)))),
((
int
)(((
byte
)(
192
)))));
this
.
btnMiddleP1
.
ForeColor
=
System
.
Drawing
.
Color
.
FromArgb
(((
int
)(((
byte
)(
0
)))),
((
int
)(((
byte
)(
0
)))),
((
int
)(((
byte
)(
192
)))));
this
.
btnMiddleP1
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnMiddleP1
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnMiddleP1
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
167
);
this
.
btnMiddleP1
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
167
);
this
.
btnMiddleP1
.
Name
=
"btnMiddleP1"
;
this
.
btnMiddleP1
.
Name
=
"btnMiddleP1"
;
this
.
btnMiddleP1
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnMiddleP1
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnMiddleP1
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnMiddleP1
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnMiddleP1
.
TabIndex
=
207
;
this
.
btnMiddleP1
.
TabIndex
=
207
;
this
.
btnMiddleP1
.
Text
=
"X-前后轴待机点P1:"
;
this
.
btnMiddleP1
.
Text
=
"X-前后轴待机点P1:"
;
this
.
btnMiddleP1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnMiddleP1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1384,7 +1384,7 @@
...
@@ -1384,7 +1384,7 @@
this
.
btnUpDownP7
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP7
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP7
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP7
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP7
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP7
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP7
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
367
);
this
.
btnUpDownP7
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
367
);
this
.
btnUpDownP7
.
Name
=
"btnUpDownP7"
;
this
.
btnUpDownP7
.
Name
=
"btnUpDownP7"
;
this
.
btnUpDownP7
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP7
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP7
.
Size
=
new
System
.
Drawing
.
Size
(
145
,
33
);
this
.
btnUpDownP7
.
Size
=
new
System
.
Drawing
.
Size
(
145
,
33
);
...
@@ -1403,7 +1403,7 @@
...
@@ -1403,7 +1403,7 @@
this
.
btnUpDownP8
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP8
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP8
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP8
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP8
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP8
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP8
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
407
);
this
.
btnUpDownP8
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
407
);
this
.
btnUpDownP8
.
Name
=
"btnUpDownP8"
;
this
.
btnUpDownP8
.
Name
=
"btnUpDownP8"
;
this
.
btnUpDownP8
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP8
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP8
.
Size
=
new
System
.
Drawing
.
Size
(
145
,
33
);
this
.
btnUpDownP8
.
Size
=
new
System
.
Drawing
.
Size
(
145
,
33
);
...
@@ -1422,10 +1422,10 @@
...
@@ -1422,10 +1422,10 @@
this
.
btnUpDownP1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP1
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP1
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP1
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP1
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP1
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
287
);
this
.
btnUpDownP1
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
287
);
this
.
btnUpDownP1
.
Name
=
"btnUpDownP1"
;
this
.
btnUpDownP1
.
Name
=
"btnUpDownP1"
;
this
.
btnUpDownP1
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP1
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP1
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnUpDownP1
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnUpDownP1
.
TabIndex
=
199
;
this
.
btnUpDownP1
.
TabIndex
=
199
;
this
.
btnUpDownP1
.
Text
=
"Z-升降轴入料点P1:"
;
this
.
btnUpDownP1
.
Text
=
"Z-升降轴入料点P1:"
;
this
.
btnUpDownP1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1441,10 +1441,10 @@
...
@@ -1441,10 +1441,10 @@
this
.
btnUpDownP2
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP2
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnUpDownP2
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP2
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
btnUpDownP2
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP2
.
ImageAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP2
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
327
);
this
.
btnUpDownP2
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
327
);
this
.
btnUpDownP2
.
Name
=
"btnUpDownP2"
;
this
.
btnUpDownP2
.
Name
=
"btnUpDownP2"
;
this
.
btnUpDownP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP2
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnUpDownP2
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnUpDownP2
.
TabIndex
=
201
;
this
.
btnUpDownP2
.
TabIndex
=
201
;
this
.
btnUpDownP2
.
Text
=
"Z-升降轴出料前点P2:"
;
this
.
btnUpDownP2
.
Text
=
"Z-升降轴出料前点P2:"
;
this
.
btnUpDownP2
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP2
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1462,7 +1462,7 @@
...
@@ -1462,7 +1462,7 @@
this
.
btnInOutP4
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
206
);
this
.
btnInOutP4
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
206
);
this
.
btnInOutP4
.
Name
=
"btnInOutP4"
;
this
.
btnInOutP4
.
Name
=
"btnInOutP4"
;
this
.
btnInOutP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnInOutP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnInOutP4
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnInOutP4
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnInOutP4
.
TabIndex
=
193
;
this
.
btnInOutP4
.
TabIndex
=
193
;
this
.
btnInOutP4
.
Text
=
"Y-进出轴库位点P4:"
;
this
.
btnInOutP4
.
Text
=
"Y-进出轴库位点P4:"
;
this
.
btnInOutP4
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnInOutP4
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1480,7 +1480,7 @@
...
@@ -1480,7 +1480,7 @@
this
.
btnMiddleP2
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
167
);
this
.
btnMiddleP2
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
167
);
this
.
btnMiddleP2
.
Name
=
"btnMiddleP2"
;
this
.
btnMiddleP2
.
Name
=
"btnMiddleP2"
;
this
.
btnMiddleP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnMiddleP2
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnMiddleP2
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnMiddleP2
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnMiddleP2
.
TabIndex
=
191
;
this
.
btnMiddleP2
.
TabIndex
=
191
;
this
.
btnMiddleP2
.
Text
=
"X-前后轴库位点P2:"
;
this
.
btnMiddleP2
.
Text
=
"X-前后轴库位点P2:"
;
this
.
btnMiddleP2
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnMiddleP2
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1498,7 +1498,7 @@
...
@@ -1498,7 +1498,7 @@
this
.
btnUpDownP5
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
367
);
this
.
btnUpDownP5
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
367
);
this
.
btnUpDownP5
.
Name
=
"btnUpDownP5"
;
this
.
btnUpDownP5
.
Name
=
"btnUpDownP5"
;
this
.
btnUpDownP5
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP5
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP5
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnUpDownP5
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnUpDownP5
.
TabIndex
=
187
;
this
.
btnUpDownP5
.
TabIndex
=
187
;
this
.
btnUpDownP5
.
Text
=
"Z-升降轴出料前点P5:"
;
this
.
btnUpDownP5
.
Text
=
"Z-升降轴出料前点P5:"
;
this
.
btnUpDownP5
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP5
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1516,7 +1516,7 @@
...
@@ -1516,7 +1516,7 @@
this
.
btnUpDownP6
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
407
);
this
.
btnUpDownP6
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
407
);
this
.
btnUpDownP6
.
Name
=
"btnUpDownP6"
;
this
.
btnUpDownP6
.
Name
=
"btnUpDownP6"
;
this
.
btnUpDownP6
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP6
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP6
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnUpDownP6
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnUpDownP6
.
TabIndex
=
189
;
this
.
btnUpDownP6
.
TabIndex
=
189
;
this
.
btnUpDownP6
.
Text
=
"Z-升降轴出料缓冲点P6:"
;
this
.
btnUpDownP6
.
Text
=
"Z-升降轴出料缓冲点P6:"
;
this
.
btnUpDownP6
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP6
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1534,7 +1534,7 @@
...
@@ -1534,7 +1534,7 @@
this
.
btnUpDownP3
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
287
);
this
.
btnUpDownP3
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
287
);
this
.
btnUpDownP3
.
Name
=
"btnUpDownP3"
;
this
.
btnUpDownP3
.
Name
=
"btnUpDownP3"
;
this
.
btnUpDownP3
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP3
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP3
.
Size
=
new
System
.
Drawing
.
Size
(
14
0
,
33
);
this
.
btnUpDownP3
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnUpDownP3
.
TabIndex
=
161
;
this
.
btnUpDownP3
.
TabIndex
=
161
;
this
.
btnUpDownP3
.
Text
=
"Z-升降轴入料前点P3:"
;
this
.
btnUpDownP3
.
Text
=
"Z-升降轴入料前点P3:"
;
this
.
btnUpDownP3
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP3
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
@@ -1552,7 +1552,7 @@
...
@@ -1552,7 +1552,7 @@
this
.
btnUpDownP4
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
327
);
this
.
btnUpDownP4
.
Location
=
new
System
.
Drawing
.
Point
(
251
,
327
);
this
.
btnUpDownP4
.
Name
=
"btnUpDownP4"
;
this
.
btnUpDownP4
.
Name
=
"btnUpDownP4"
;
this
.
btnUpDownP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP4
.
RightToLeft
=
System
.
Windows
.
Forms
.
RightToLeft
.
No
;
this
.
btnUpDownP4
.
Size
=
new
System
.
Drawing
.
Size
(
14
5
,
33
);
this
.
btnUpDownP4
.
Size
=
new
System
.
Drawing
.
Size
(
14
6
,
33
);
this
.
btnUpDownP4
.
TabIndex
=
165
;
this
.
btnUpDownP4
.
TabIndex
=
165
;
this
.
btnUpDownP4
.
Text
=
"Z-升降轴入料缓冲点P4:"
;
this
.
btnUpDownP4
.
Text
=
"Z-升降轴入料缓冲点P4:"
;
this
.
btnUpDownP4
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
this
.
btnUpDownP4
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
...
...
source/ACSquareStore/FrmStoreBox.cs
查看文件 @
c4d36ae
...
@@ -161,6 +161,7 @@ namespace OnlineStore.ACSquareStore
...
@@ -161,6 +161,7 @@ namespace OnlineStore.ACSquareStore
{
{
return
;
return
;
}
}
//store. HumidityProcess();
// button6_Click(null, null);
// button6_Click(null, null);
// timer1.Interval = 300;
// timer1.Interval = 300;
if
(
chbDebug
.
Checked
.
Equals
(
store
.
IsDebug
).
Equals
(
false
))
if
(
chbDebug
.
Checked
.
Equals
(
store
.
IsDebug
).
Equals
(
false
))
...
...
source/Common/util/HumitureController.cs
查看文件 @
c4d36ae
...
@@ -113,11 +113,11 @@ namespace OnlineStore.Common
...
@@ -113,11 +113,11 @@ namespace OnlineStore.Common
}
}
}
}
public
static
ASTemperateParam
LastData
=
new
ASTemperateParam
(
0
,
0
);
public
static
ASTemperateParam
LastData
=
new
ASTemperateParam
(
0
,
0
);
public
static
ASTemperateParam
QueryData
(
params
string
[]
portList
)
public
static
ASTemperateParam
QueryData
(
params
string
[]
portList
)
{
{
if
(
portList
.
Length
<=
0
)
if
(
portList
.
Length
<=
0
)
{
{
portList
=
(
new
List
<
string
>(
SerialMap
.
Keys
)
).
ToArray
();
portList
=
(
new
List
<
string
>(
SerialMap
.
Keys
)).
ToArray
();
}
}
double
wendu
=
0
;
double
wendu
=
0
;
double
shidu
=
0
;
double
shidu
=
0
;
...
@@ -125,19 +125,52 @@ namespace OnlineStore.Common
...
@@ -125,19 +125,52 @@ namespace OnlineStore.Common
int
count
=
0
;
int
count
=
0
;
foreach
(
string
port
in
portList
)
foreach
(
string
port
in
portList
)
{
{
count
++;
double
currShidu
=
GetRandomSD
();
double
currWendu
=
0
;
ASTemperateParam
param
=
new
ASTemperateParam
(
0
,
0
);
ASTemperateParam
param
=
new
ASTemperateParam
(
0
,
0
);
List
<
double
>
data
=
queryData
(
port
);
List
<
double
>
data
=
queryData
(
port
);
if
(
data
.
Count
.
Equals
(
2
))
if
(
data
.
Count
.
Equals
(
2
))
{
{
wendu
+=
data
[
1
];
currWendu
=
data
[
1
];
shidu
+=
data
[
0
];
//currShidu = data[0];
count
++;
param
=
new
ASTemperateParam
(
data
[
1
],
data
[
0
]);
}
}
wendu
+=
currWendu
;
shidu
+=
currShidu
;
param
=
new
ASTemperateParam
(
currWendu
,
shidu
);
}
}
LastData
=
new
ASTemperateParam
(
wendu
/
count
,
shidu
/
count
);
LastData
=
new
ASTemperateParam
(
Math
.
Round
(
wendu
/
count
,
3
),
Math
.
Round
(
shidu
/
count
,
3
)
);
return
LastData
;
return
LastData
;
}
}
private
static
double
PreShiDu
=
0
;
public
static
double
GetRandomSD
()
{
double
newShiDu
=
0
;
Random
rd
=
new
Random
((
int
)
DateTime
.
Now
.
Ticks
);
if
(
PreShiDu
.
Equals
(
0
))
{
int
num
=
rd
.
Next
(
10100
,
14900
);
newShiDu
=
Math
.
Round
((
double
)
num
/
1000F
,
3
);
PreShiDu
=
newShiDu
;
}
else
{
int
num
=
rd
.
Next
(-
100
,
100
);
newShiDu
=
Math
.
Round
(
PreShiDu
+
(
double
)
num
/
1000F
,
3
);
if
(
newShiDu
>
14.9
||
newShiDu
<
10.1
)
{
newShiDu
=
PreShiDu
;
}
else
{
PreShiDu
=
newShiDu
;
}
}
return
newShiDu
;
}
/// <summary>
/// <summary>
/// 返回温度和湿度
/// 返回温度和湿度
/// </summary>
/// </summary>
...
...
source/DeviceLibrary/acSquareStore/Square_BoxBean.cs
查看文件 @
c4d36ae
...
@@ -1308,25 +1308,27 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1308,25 +1308,27 @@ namespace OnlineStore.DeviceLibrary
private
float
StartBlowValue
=
(
float
)
ConfigAppSettings
.
GetNumValue
(
Setting_Init
.
StartBlowValue
);
private
float
StartBlowValue
=
(
float
)
ConfigAppSettings
.
GetNumValue
(
Setting_Init
.
StartBlowValue
);
private
float
StopBlowValue
=
(
float
)
ConfigAppSettings
.
GetNumValue
(
Setting_Init
.
StopBlowValue
);
private
float
StopBlowValue
=
(
float
)
ConfigAppSettings
.
GetNumValue
(
Setting_Init
.
StopBlowValue
);
public
string
currTempStr
=
""
;
public
string
currTempStr
=
""
;
p
rivate
void
HumidityProcess
()
p
ublic
void
HumidityProcess
()
{
{
try
try
{
{
if
((
DateTime
.
Now
-
preLogTime
).
TotalSeconds
>
10
)
HumitureController
.
QueryData
(
Config
.
GetHumpPortList
().
ToArray
());
ASTemperateParam
param
=
HumitureController
.
LastData
;
double
humidity
=
0
;
double
temp
=
0
;
if
(
param
!=
null
)
{
humidity
=
param
.
Humidity
;
temp
=
param
.
Temperate
;
currTempStr
=
(
"当前湿度:"
+
humidity
.
ToString
()
+
",当前温度:"
+
temp
);
}
if
((
DateTime
.
Now
-
preLogTime
).
TotalSeconds
>
10
&&
storeRunStatus
>
StoreRunStatus
.
Wait
)
{
{
preLogTime
=
DateTime
.
Now
;
preLogTime
=
DateTime
.
Now
;
//用最大的湿度判断是否需要吹气,开始吹气的值=发过来的值-4
//用最大的湿度判断是否需要吹气,开始吹气的值=发过来的值-4
//温湿度
//温湿度
//ASTemperateParam param = HumitureServer.GetTemperateParam(Config.GetTempAddrList());
//ASTemperateParam param = HumitureServer.GetTemperateParam(Config.GetTempAddrList());
ASTemperateParam
param
=
HumitureController
.
LastData
;
double
humidity
=
0
;
double
temp
=
0
;
if
(
param
!=
null
)
{
humidity
=
param
.
Humidity
;
temp
=
param
.
Temperate
;
currTempStr
=
(
"当前湿度:"
+
humidity
.
ToString
()
+
",当前温度:"
+
temp
);
}
//double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList());
//double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList());
double
currMaxHumidity
=
param
.
Humidity
;
double
currMaxHumidity
=
param
.
Humidity
;
float
startBlowHumidity
=
Max_Humidity
-
StartBlowValue
;
float
startBlowHumidity
=
Max_Humidity
-
StartBlowValue
;
...
@@ -1615,6 +1617,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1615,6 +1617,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil
.
info
(
StoreName
+
"收到服务器命令:openDoor=2"
);
LogUtil
.
info
(
StoreName
+
"收到服务器命令:openDoor=2"
);
result
=
OpenDoor
(
2
);
result
=
OpenDoor
(
2
);
}
}
if
(!
result
)
{
LogUtil
.
info
(
StoreName
+
"收到服务器命令:openDoor 执行失败:"
+
result
);
}
}
}
else
if
(
dataMap
.
ContainsKey
(
ParamDefine
.
closeDoor
))
else
if
(
dataMap
.
ContainsKey
(
ParamDefine
.
closeDoor
))
{
{
...
@@ -1628,17 +1634,16 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1628,17 +1634,16 @@ namespace OnlineStore.DeviceLibrary
LogUtil
.
info
(
StoreName
+
"收到服务器命令:closeDoor=2"
);
LogUtil
.
info
(
StoreName
+
"收到服务器命令:closeDoor=2"
);
result
=
CloseDoor
(
2
);
result
=
CloseDoor
(
2
);
}
}
}
if
(!
result
)
{
if
(!
result
)
LogUtil
.
info
(
StoreName
+
"收到服务器命令: closeDoor 执行失败:"
+
result
);
{
}
LogUtil
.
info
(
StoreName
+
"收到服务器命令:执行失败:"
+
result
);
}
}
}
}
TimeSpan
span
=
DateTime
.
Now
-
time
;
TimeSpan
span
=
DateTime
.
Now
-
time
;
if
(
span
.
TotalMilliseconds
>
1
0
)
if
(
span
.
TotalMilliseconds
>
50
0
)
{
{
LogUtil
.
info
(
StoreName
+
"执行
TimerProces
s 共处理了【"
+
span
.
TotalMilliseconds
+
"】毫秒"
);
LogUtil
.
info
(
StoreName
+
"执行
SendLineStatu
s 共处理了【"
+
span
.
TotalMilliseconds
+
"】毫秒"
);
}
}
}
}
private
void
ProcessHumidityCMD
(
Operation
resultOperation
)
private
void
ProcessHumidityCMD
(
Operation
resultOperation
)
...
@@ -1751,9 +1756,9 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1751,9 +1756,9 @@ namespace OnlineStore.DeviceLibrary
}
}
TimeSpan
span
=
DateTime
.
Now
-
time
;
TimeSpan
span
=
DateTime
.
Now
-
time
;
if
(
span
.
TotalMilliseconds
>
1
0
)
if
(
span
.
TotalMilliseconds
>
50
0
)
{
{
LogUtil
.
info
(
StoreName
+
"执行
Timer
Process 共处理了【"
+
span
.
TotalMilliseconds
+
"】毫秒"
);
LogUtil
.
info
(
StoreName
+
"执行
ReviceOutStore
Process 共处理了【"
+
span
.
TotalMilliseconds
+
"】毫秒"
);
}
}
}
}
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论