Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
刘韬
/
MIMO
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b46f4e5d
由
张东亮
编写于
2023-03-20 09:23:51 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
添加监控相机保存功能
1 个父辈
ba47a86f
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
22 行增加
和
28 行删除
DeviceLibrary/theMachine/BoxTransport.cs
TheMachine/SettingControl.Designer.cs
TheMachine/SettingControl.cs
DeviceLibrary/theMachine/BoxTransport.cs
查看文件 @
b46f4e5
...
@@ -81,7 +81,6 @@ namespace DeviceLibrary
...
@@ -81,7 +81,6 @@ namespace DeviceLibrary
}
}
else
else
{
{
IPCameraHelper
.
StartRecord
(
$
"{WareCode}-{to.posid}"
);
WareCode
=
from
.
Reel
.
WareCode
;
WareCode
=
from
.
Reel
.
WareCode
;
plateH
=
from
.
Reel
.
PlateH
;
plateH
=
from
.
Reel
.
PlateH
;
From
=
from
.
clone
();
From
=
from
.
clone
();
...
...
TheMachine/SettingControl.Designer.cs
查看文件 @
b46f4e5
...
@@ -41,12 +41,12 @@ namespace TheMachine
...
@@ -41,12 +41,12 @@ namespace TheMachine
this
.
uC_LedConfig1
=
new
TheMachine
.
UC
.
UC_LedConfig
();
this
.
uC_LedConfig1
=
new
TheMachine
.
UC
.
UC_LedConfig
();
this
.
tabControl1
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabControl1
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabPage_set
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
tabPage_set
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
button2
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
button1
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
uC_SetUserPassword1
=
new
TheMachine
.
UC_SetUserPassword
();
this
.
uC_SetUserPassword1
=
new
TheMachine
.
UC_SetUserPassword
();
this
.
tabPage_ledtower
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
tabPage_ledtower
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
tabPage1
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
tabPage1
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
fixtureSizeConfigControl1
=
new
DeviceLibrary
.
FixtureSizeConfigControl
();
this
.
fixtureSizeConfigControl1
=
new
DeviceLibrary
.
FixtureSizeConfigControl
();
this
.
button1
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
button2
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
tp
.
SuspendLayout
();
this
.
tp
.
SuspendLayout
();
this
.
tabControl1
.
SuspendLayout
();
this
.
tabControl1
.
SuspendLayout
();
this
.
tabPage_set
.
SuspendLayout
();
this
.
tabPage_set
.
SuspendLayout
();
...
@@ -194,6 +194,26 @@ namespace TheMachine
...
@@ -194,6 +194,26 @@ namespace TheMachine
this
.
tabPage_set
.
Text
=
"常规设置"
;
this
.
tabPage_set
.
Text
=
"常规设置"
;
this
.
tabPage_set
.
UseVisualStyleBackColor
=
true
;
this
.
tabPage_set
.
UseVisualStyleBackColor
=
true
;
//
//
// button2
//
this
.
button2
.
Location
=
new
System
.
Drawing
.
Point
(
53
,
365
);
this
.
button2
.
Name
=
"button2"
;
this
.
button2
.
Size
=
new
System
.
Drawing
.
Size
(
156
,
59
);
this
.
button2
.
TabIndex
=
9
;
this
.
button2
.
Text
=
"Stop Recording"
;
this
.
button2
.
UseVisualStyleBackColor
=
true
;
this
.
button2
.
Click
+=
new
System
.
EventHandler
(
this
.
button2_Click
);
//
// button1
//
this
.
button1
.
Location
=
new
System
.
Drawing
.
Point
(
53
,
270
);
this
.
button1
.
Name
=
"button1"
;
this
.
button1
.
Size
=
new
System
.
Drawing
.
Size
(
156
,
59
);
this
.
button1
.
TabIndex
=
8
;
this
.
button1
.
Text
=
"Start Recording"
;
this
.
button1
.
UseVisualStyleBackColor
=
true
;
this
.
button1
.
Click
+=
new
System
.
EventHandler
(
this
.
button1_Click_2
);
//
// uC_SetUserPassword1
// uC_SetUserPassword1
//
//
this
.
uC_SetUserPassword1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
uC_SetUserPassword1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
...
@@ -233,26 +253,6 @@ namespace TheMachine
...
@@ -233,26 +253,6 @@ namespace TheMachine
this
.
fixtureSizeConfigControl1
.
Size
=
new
System
.
Drawing
.
Size
(
1010
,
708
);
this
.
fixtureSizeConfigControl1
.
Size
=
new
System
.
Drawing
.
Size
(
1010
,
708
);
this
.
fixtureSizeConfigControl1
.
TabIndex
=
0
;
this
.
fixtureSizeConfigControl1
.
TabIndex
=
0
;
//
//
// button1
//
this
.
button1
.
Location
=
new
System
.
Drawing
.
Point
(
53
,
270
);
this
.
button1
.
Name
=
"button1"
;
this
.
button1
.
Size
=
new
System
.
Drawing
.
Size
(
156
,
59
);
this
.
button1
.
TabIndex
=
8
;
this
.
button1
.
Text
=
"开始记录监控"
;
this
.
button1
.
UseVisualStyleBackColor
=
true
;
this
.
button1
.
Click
+=
new
System
.
EventHandler
(
this
.
button1_Click_2
);
//
// button2
//
this
.
button2
.
Location
=
new
System
.
Drawing
.
Point
(
53
,
365
);
this
.
button2
.
Name
=
"button2"
;
this
.
button2
.
Size
=
new
System
.
Drawing
.
Size
(
156
,
59
);
this
.
button2
.
TabIndex
=
9
;
this
.
button2
.
Text
=
"停止记录监控"
;
this
.
button2
.
UseVisualStyleBackColor
=
true
;
this
.
button2
.
Click
+=
new
System
.
EventHandler
(
this
.
button2_Click
);
//
// SettingControl
// SettingControl
//
//
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
None
;
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
None
;
...
...
TheMachine/SettingControl.cs
查看文件 @
b46f4e5
...
@@ -120,11 +120,6 @@ namespace TheMachine
...
@@ -120,11 +120,6 @@ namespace TheMachine
lbl_hmdstate
.
Text
+=
$
"{crc.GetString(L.temperature, "
温度
")}:{t.Temperate}℃, {crc.GetString(L.humidity, "
湿度
")}:{t.Humidity}%"
;
lbl_hmdstate
.
Text
+=
$
"{crc.GetString(L.temperature, "
温度
")}:{t.Temperate}℃, {crc.GetString(L.humidity, "
湿度
")}:{t.Humidity}%"
;
}
}
private
void
button1_Click_1
(
object
sender
,
EventArgs
e
)
{
}
private
void
button1_Click_2
(
object
sender
,
EventArgs
e
)
private
void
button1_Click_2
(
object
sender
,
EventArgs
e
)
{
{
DeviceLibrary
.
IPCameraHelper
.
StartRecord
(
"manual"
);
DeviceLibrary
.
IPCameraHelper
.
StartRecord
(
"manual"
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论