Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 737a14b7 由 刘韬
选项

修正旧版本兼容性

1 个父辈 39d691c8
内嵌 并排
正在显示 12 个修改的文件 包含 165 行增加 和 12 行删除
Common/util/SMF.cs
...@@ -3,6 +3,7 @@ using System; ...@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq; using System.Linq;
using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using static System.Net.WebRequestMethods; using static System.Net.WebRequestMethods;
...@@ -81,6 +82,7 @@ namespace OnlineStore.Common ...@@ -81,6 +82,7 @@ namespace OnlineStore.Common
{ {
try try
{ {
ServicePointManager.Expect100Continue = false;
Dictionary<string, string> paramMap = new Dictionary<string, string> Dictionary<string, string> paramMap = new Dictionary<string, string>
{ {
{ "cid", cid }, { "cid", cid },
......
DLL/ConfigHelper.dll
此文件类型无法预览
DLL/ConfigHelper.xml
...@@ -261,5 +261,57 @@ ...@@ -261,5 +261,57 @@
</summary> </summary>
<param name="comment"></param> <param name="comment"></param>
</member> </member>
<member name="P:CommonLib.AppPathExe">
<summary>
程序exe全路经 如d:\app\app.exe
</summary>
</member>
<member name="P:CommonLib.AppPathDir">
<summary>
程序所在路径 如d:\app\
</summary>
</member>
<member name="P:CommonLib.AppPathRoot">
<summary>
程序所在盘符 如d:\
</summary>
</member>
<member name="P:CommonLib.AppName">
<summary>
程序exe名称
</summary>
</member>
<member name="P:CommonLib.AppAssemblyTitle">
<summary>
程序AssemblyTitle
</summary>
</member>
<member name="M:CommonLib.GetPath(System.String)">
<summary>
获取相对当前程序的目录
</summary>
<param name="dirname"></param>
<returns></returns>
</member>
<member name="M:CommonLib.RegisterInstall">
<summary>
将程序路径写到注册表, 方便以后做软件更新
</summary>
</member>
<member name="M:CommonLib.AddOrUpdateStartupTask(System.Boolean,System.Int32)">
<summary>
将程序设置为计划任务电脑开机,用户登陆后自动启动
</summary>
<param name="enable">是否启用</param>
<param name="delaysec">延迟启动时间秒</param>
</member>
<member name="M:CommonLib.DeleteOverDayFile(System.String,System.String,System.Int32)">
<summary>
删除超过指定天数的文件
</summary>
<param name="path">文件路经</param>
<param name="ext">扩展名检索格式:*.jpg</param>
<param name="day">天数</param>
</member>
</members> </members>
</doc> </doc>
DLL/ConfigHelper.zip
此文件类型无法预览
DeviceLibrary/theMachine/MainMachine.cs
...@@ -48,7 +48,7 @@ namespace DeviceLibrary ...@@ -48,7 +48,7 @@ namespace DeviceLibrary
public delegate void ProcessMsg(List<Msg> msg); public delegate void ProcessMsg(List<Msg> msg);
public event ProcessMsg ProcessMsgEvent; public event ProcessMsg ProcessMsgEvent;
internal AxisBean Middle_Axis; public AxisBean Middle_Axis;
public AxisBean UpDown_Axis; public AxisBean UpDown_Axis;
internal AxisBean InOut_Axis; internal AxisBean InOut_Axis;
internal AxisBean Comp_Axis; internal AxisBean Comp_Axis;
......
DeviceLibrary/theMachine/MainMachine_String.cs
...@@ -747,6 +747,7 @@ namespace DeviceLibrary ...@@ -747,6 +747,7 @@ namespace DeviceLibrary
LogUtil.info($"料串门已屏蔽，不暂停"); LogUtil.info($"料串门已屏蔽，不暂停");
return; return;
} }
if (StringDoor != null)
StringDoor.Pause(); StringDoor.Pause();
} }
} }
......
DeviceLibrary/userControl/AxisMoveControl.cs
...@@ -28,9 +28,12 @@ namespace DeviceLibrary ...@@ -28,9 +28,12 @@ namespace DeviceLibrary
InitializeComponent(); InitializeComponent();
CheckForIllegalCrossThreadCalls = false; CheckForIllegalCrossThreadCalls = false;
crc.OpenResourceLog = true; crc.OpenResourceLog = true;
if (!string.IsNullOrEmpty(Setting_Init.App_Default_Language))
{
crc.LanguageChangeEvent += Crc_LanguageChangeEvent; crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
crc.CurrLanguage = Setting_Init.App_Default_Language; crc.CurrLanguage = Setting_Init.App_Default_Language;
} }
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e) private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{ {
......
TheMachine/AxisControl.Designer.cs
...@@ -30,6 +30,8 @@ namespace TheMachine ...@@ -30,6 +30,8 @@ namespace TheMachine
private void InitializeComponent() private void InitializeComponent()
{ {
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl(); this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.configControl1 = new TheMachine.ConfigControl(); this.configControl1 = new TheMachine.ConfigControl();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
...@@ -38,6 +40,8 @@ namespace TheMachine ...@@ -38,6 +40,8 @@ namespace TheMachine
// panel1 // panel1
// //
this.panel1.AutoScroll = true; this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.axisMoveControl1); this.panel1.Controls.Add(this.axisMoveControl1);
this.panel1.Controls.Add(this.configControl1); this.panel1.Controls.Add(this.configControl1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
...@@ -46,6 +50,26 @@ namespace TheMachine ...@@ -46,6 +50,26 @@ namespace TheMachine
this.panel1.Size = new System.Drawing.Size(1234, 924); this.panel1.Size = new System.Drawing.Size(1234, 924);
this.panel1.TabIndex = 2; this.panel1.TabIndex = 2;
// //
// button3
//
this.button3.Location = new System.Drawing.Point(38, 481);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(155, 31);
this.button3.TabIndex = 13;
this.button3.Text = "旋转轴停止";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(38, 432);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(155, 31);
this.button2.TabIndex = 12;
this.button2.Text = "旋转轴循环";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(3, 3); this.axisMoveControl1.Location = new System.Drawing.Point(3, 3);
...@@ -82,5 +106,7 @@ namespace TheMachine ...@@ -82,5 +106,7 @@ namespace TheMachine
private DeviceLibrary.AxisMoveControl axisMoveControl1; private DeviceLibrary.AxisMoveControl axisMoveControl1;
private ConfigControl configControl1; private ConfigControl configControl1;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button2;
} }
} }
TheMachine/AxisControl.cs
...@@ -21,6 +21,8 @@ namespace TheMachine ...@@ -21,6 +21,8 @@ namespace TheMachine
{ {
InitializeComponent(); InitializeComponent();
RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent; RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent;
if (DesignMode)
return;
crc.LanguageChangeEvent += Crc_LanguageChangeEvent; crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
} }
...@@ -56,5 +58,67 @@ namespace TheMachine ...@@ -56,5 +58,67 @@ namespace TheMachine
{ {
} }
volatile bool roateloop = false;
private void button2_Click(object sender, EventArgs e)
{
Task.Run(() => {
var p1 = RobotManage.mainMachine.Config.UpDown_P1;
var p1_speed = RobotManage.mainMachine.Config.UpDown_P1_speed;
var axis = RobotManage.mainMachine.UpDown_Axis;
roateloop = true;
while (roateloop)
{
axis.AbsMove(null, p1, p1_speed);
Task.Delay(200).Wait();
while (axis.IsBusy)
{
Task.Delay(100).Wait();
}
if (!roateloop)
break;
Task.Delay(500).Wait();
axis.AbsMove(null, 1, p1_speed);
Task.Delay(200).Wait();
while (axis.IsBusy)
{
Task.Delay(100).Wait();
}
Task.Delay(500).Wait();
}
});
Task.Run(() => {
var p1 = RobotManage.mainMachine.Config.Middle_P1;
var p1_speed = RobotManage.mainMachine.Config.Middle_P1_speed;
var axis = RobotManage.mainMachine.Middle_Axis;
roateloop = true;
while (roateloop)
{
axis.AbsMove(null, p1, p1_speed);
Task.Delay(200).Wait();
while (axis.IsBusy)
{
Task.Delay(100).Wait();
}
if (!roateloop)
break;
Task.Delay(500).Wait();
axis.AbsMove(null, 1, p1_speed);
Task.Delay(200).Wait();
while (axis.IsBusy)
{
Task.Delay(100).Wait();
}
Task.Delay(500).Wait();
}
});
}
private void button3_Click(object sender, EventArgs e)
{
roateloop = false;
}
} }
} }
TheMachine/SettingControl.Designer.cs
...@@ -48,10 +48,10 @@ namespace TheMachine ...@@ -48,10 +48,10 @@ namespace TheMachine
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.tp.SetColumnSpan(this.chbAutoRun, 2); this.tp.SetColumnSpan(this.chbAutoRun, 2);
this.chbAutoRun.Location = new System.Drawing.Point(10, 175); this.chbAutoRun.Location = new System.Drawing.Point(10, 166);
this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10); this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(104, 19); this.chbAutoRun.Size = new System.Drawing.Size(84, 16);
this.chbAutoRun.TabIndex = 1; this.chbAutoRun.TabIndex = 1;
this.chbAutoRun.Text = "开机自启动"; this.chbAutoRun.Text = "开机自启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
...@@ -60,10 +60,10 @@ namespace TheMachine ...@@ -60,10 +60,10 @@ namespace TheMachine
// //
this.cb_tempsensorport.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_tempsensorport.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_tempsensorport.FormattingEnabled = true; this.cb_tempsensorport.FormattingEnabled = true;
this.cb_tempsensorport.Location = new System.Drawing.Point(161, 6); this.cb_tempsensorport.Location = new System.Drawing.Point(139, 6);
this.cb_tempsensorport.Margin = new System.Windows.Forms.Padding(6); this.cb_tempsensorport.Margin = new System.Windows.Forms.Padding(6);
this.cb_tempsensorport.Name = "cb_tempsensorport"; this.cb_tempsensorport.Name = "cb_tempsensorport";
this.cb_tempsensorport.Size = new System.Drawing.Size(121, 23); this.cb_tempsensorport.Size = new System.Drawing.Size(121, 20);
this.cb_tempsensorport.TabIndex = 2; this.cb_tempsensorport.TabIndex = 2;
this.cb_tempsensorport.Tag = "not"; this.cb_tempsensorport.Tag = "not";
// //
...@@ -74,7 +74,7 @@ namespace TheMachine ...@@ -74,7 +74,7 @@ namespace TheMachine
this.label_tempsensor.Location = new System.Drawing.Point(10, 10); this.label_tempsensor.Location = new System.Drawing.Point(10, 10);
this.label_tempsensor.Margin = new System.Windows.Forms.Padding(10); this.label_tempsensor.Margin = new System.Windows.Forms.Padding(10);
this.label_tempsensor.Name = "label_tempsensor"; this.label_tempsensor.Name = "label_tempsensor";
this.label_tempsensor.Size = new System.Drawing.Size(135, 15); this.label_tempsensor.Size = new System.Drawing.Size(107, 12);
this.label_tempsensor.TabIndex = 3; this.label_tempsensor.TabIndex = 3;
this.label_tempsensor.Text = "温湿度控制器端口:"; this.label_tempsensor.Text = "温湿度控制器端口:";
this.label_tempsensor.TextAlign = System.Drawing.ContentAlignment.TopRight; this.label_tempsensor.TextAlign = System.Drawing.ContentAlignment.TopRight;
...@@ -82,7 +82,7 @@ namespace TheMachine ...@@ -82,7 +82,7 @@ namespace TheMachine
// button_positiontool // button_positiontool
// //
this.tp.SetColumnSpan(this.button_positiontool, 2); this.tp.SetColumnSpan(this.button_positiontool, 2);
this.button_positiontool.Location = new System.Drawing.Point(10, 80); this.button_positiontool.Location = new System.Drawing.Point(10, 74);
this.button_positiontool.Margin = new System.Windows.Forms.Padding(10); this.button_positiontool.Margin = new System.Windows.Forms.Padding(10);
this.button_positiontool.Name = "button_positiontool"; this.button_positiontool.Name = "button_positiontool";
this.button_positiontool.Size = new System.Drawing.Size(181, 36); this.button_positiontool.Size = new System.Drawing.Size(181, 36);
...@@ -95,10 +95,10 @@ namespace TheMachine ...@@ -95,10 +95,10 @@ namespace TheMachine
// //
this.lbl_hmdstate.AutoSize = true; this.lbl_hmdstate.AutoSize = true;
this.tp.SetColumnSpan(this.lbl_hmdstate, 2); this.tp.SetColumnSpan(this.lbl_hmdstate, 2);
this.lbl_hmdstate.Location = new System.Drawing.Point(10, 45); this.lbl_hmdstate.Location = new System.Drawing.Point(10, 42);
this.lbl_hmdstate.Margin = new System.Windows.Forms.Padding(10); this.lbl_hmdstate.Margin = new System.Windows.Forms.Padding(10);
this.lbl_hmdstate.Name = "lbl_hmdstate"; this.lbl_hmdstate.Name = "lbl_hmdstate";
this.lbl_hmdstate.Size = new System.Drawing.Size(67, 15); this.lbl_hmdstate.Size = new System.Drawing.Size(53, 12);
this.lbl_hmdstate.TabIndex = 5; this.lbl_hmdstate.TabIndex = 5;
this.lbl_hmdstate.Tag = "not"; this.lbl_hmdstate.Tag = "not";
this.lbl_hmdstate.Text = "当前状态"; this.lbl_hmdstate.Text = "当前状态";
...@@ -133,17 +133,17 @@ namespace TheMachine ...@@ -133,17 +133,17 @@ namespace TheMachine
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.Size = new System.Drawing.Size(310, 204); this.tp.Size = new System.Drawing.Size(266, 192);
this.tp.TabIndex = 6; this.tp.TabIndex = 6;
// //
// cb_usefixpos // cb_usefixpos
// //
this.cb_usefixpos.AutoSize = true; this.cb_usefixpos.AutoSize = true;
this.tp.SetColumnSpan(this.cb_usefixpos, 2); this.tp.SetColumnSpan(this.cb_usefixpos, 2);
this.cb_usefixpos.Location = new System.Drawing.Point(10, 136); this.cb_usefixpos.Location = new System.Drawing.Point(10, 130);
this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10); this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10);
this.cb_usefixpos.Name = "cb_usefixpos"; this.cb_usefixpos.Name = "cb_usefixpos";
this.cb_usefixpos.Size = new System.Drawing.Size(119, 19); this.cb_usefixpos.Size = new System.Drawing.Size(96, 16);
this.cb_usefixpos.TabIndex = 6; this.cb_usefixpos.TabIndex = 6;
this.cb_usefixpos.Text = "启用校准库位"; this.cb_usefixpos.Text = "启用校准库位";
this.cb_usefixpos.UseVisualStyleBackColor = true; this.cb_usefixpos.UseVisualStyleBackColor = true;
......
TheMachine/SettingControl.cs
...@@ -12,6 +12,7 @@ using System.Data; ...@@ -12,6 +12,7 @@ using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
...@@ -133,6 +134,7 @@ namespace TheMachine ...@@ -133,6 +134,7 @@ namespace TheMachine
Task.Run(() => CodeManager.TestHasReel(CodeManager.hikNameList[0], out _, out _)); Task.Run(() => CodeManager.TestHasReel(CodeManager.hikNameList[0], out _, out _));
} }
//private void button2_Click(object sender, EventArgs e) //private void button2_Click(object sender, EventArgs e)
//{ //{
// DeviceLibrary.IPCameraHelper.StartRecord("manual"); // DeviceLibrary.IPCameraHelper.StartRecord("manual");
......
TheMachine/UC/ConfigControl.cs
...@@ -253,12 +253,15 @@ namespace TheMachine ...@@ -253,12 +253,15 @@ namespace TheMachine
private void ConfigControl_Load(object sender, EventArgs e) private void ConfigControl_Load(object sender, EventArgs e)
{ {
if (DesignMode)
return;
OnlineStore.CodeResourceControl.LanguageChangeEvent += CodeResourceControl_LanguageChange; OnlineStore.CodeResourceControl.LanguageChangeEvent += CodeResourceControl_LanguageChange;
CodeResourceControl_LanguageChange(null,null); CodeResourceControl_LanguageChange(null,null);
} }
private void CodeResourceControl_LanguageChange(object sender, EventArgs e) private void CodeResourceControl_LanguageChange(object sender, EventArgs e)
{ {
OnlineStore.CodeResourceControl.LanguageProcess(this); OnlineStore.CodeResourceControl.LanguageProcess(this);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!