Skip to content

张东亮 / AGV_3D_SMD

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4b7b6377 由 张东亮
选项

1222

1 个父辈 e98428f4
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 32 行增加 和 23 行删除
AGV_3D_SMD/App.config
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<file value="logs/AgvServer.log"/> <file value="logs/AgvServer.log"/>
<param name="Encoding" value="UTF-8"/> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true"/> <appendToFile value="true"/>
<param name="MaxSizeRollBackups" value="60"/>
<rollingStyle value="Date"/> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
<file value="logs/MiR_API.log"/> <file value="logs/MiR_API.log"/>
<param name="Encoding" value="UTF-8"/> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true"/> <appendToFile value="true"/>
<param name="MaxSizeRollBackups" value="30"/>
<rollingStyle value="Date"/> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
...@@ -42,12 +44,12 @@ ...@@ -42,12 +44,12 @@
<appender-ref ref="MiR_API"/> <appender-ref ref="MiR_API"/>
</logger> </logger>
<logger name="AgvServer"> <logger name="AgvServer">
<level value="Debug"/> <level value="Info"/>
<appender-ref ref="AgvServer"/> <appender-ref ref="AgvServer"/>
</logger> </logger>
<root> <root>
<level value="Info"/> <level value="Info"/>
<appender-ref ref="AGVControl_SMD_BOX"/> <appender-ref ref="AGV_3D_SMD"/>
</root> </root>
</log4net> </log4net>
<appSettings> <appSettings>
......
AGV_3D_SMD/FrmMain.cs
...@@ -72,7 +72,6 @@ namespace AGVControl ...@@ -72,7 +72,6 @@ namespace AGVControl
{ {
Invoke(new Action(() => Invoke(new Action(() =>
{ {
DgvNode.Rows[nodeIndex].DefaultCellStyle.ForeColor = CommonVar.nodeInfo[nodeIndex].Online && CommonVar.nodeInfo[nodeIndex].IsUse ? Color.Black : Color.Red;
DgvNode.Rows[nodeIndex].SetValues(CommonVar.nodeInfo[nodeIndex].ToRow()); DgvNode.Rows[nodeIndex].SetValues(CommonVar.nodeInfo[nodeIndex].ToRow());
})); }));
System.GC.Collect(); System.GC.Collect();
...@@ -83,7 +82,6 @@ namespace AGVControl ...@@ -83,7 +82,6 @@ namespace AGVControl
Invoke(new Action(() => Invoke(new Action(() =>
{ {
DgvNode.Rows[nodeIndex].DefaultCellStyle.ForeColor = CommonVar.nodeInfo[nodeIndex].Online ? Color.Black : Color.Red; DgvNode.Rows[nodeIndex].DefaultCellStyle.ForeColor = CommonVar.nodeInfo[nodeIndex].Online ? Color.Black : Color.Red;
DgvNode.Rows[nodeIndex].SetValues(CommonVar.nodeInfo[nodeIndex].ToRow());
})); }));
System.GC.Collect(); System.GC.Collect();
} }
...@@ -129,12 +127,10 @@ namespace AGVControl ...@@ -129,12 +127,10 @@ namespace AGVControl
ShowConfig(); ShowConfig();
change = true; change = true;
//ChkAutoCharge.Checked = CommonVar.chargeStatus.AutoCharge;
change = false; change = false;
// CommonVar.control.AgvChanged += Control_AgvChanged;
CommonVar.server.NodeChanged += Server_NodeChanged; CommonVar.server.NodeChanged += Server_NodeChanged;
CommonVar.server.NodeOnline += Server_NodeOnline; CommonVar.server.NodeOnline += Server_NodeOnline;
richTextBox1 = LogUtil.logBox; LogUtil.logBox= richTextBox1;
} }
private void FrmMain_FormClosing(object sender, FormClosingEventArgs e) private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
......
AGV_UI/Status.cs
...@@ -69,6 +69,10 @@ namespace AGV_UI ...@@ -69,6 +69,10 @@ namespace AGV_UI
{ {
this.Invoke(new Action(() => this.Invoke(new Action(() =>
{ {
if (curBattery < MinBattery)
lblBattery.ForeColor = Color.White;
else
lblBattery.ForeColor = Color.Black;
lblBattery.Text = objs[0] as string; lblBattery.Text = objs[0] as string;
lblBattery.Image = objs[1] as Image; lblBattery.Image = objs[1] as Image;
} }
......
DeviceLibrary/AgvServer.cs
...@@ -298,10 +298,10 @@ namespace DeviceLibrary ...@@ -298,10 +298,10 @@ namespace DeviceLibrary
else else
{ {
time += sleep; time += sleep;
if (time > 10000) if (time > 60000)
{ {
Offline(client); Offline(client);
log.Info("[" + client.IP + "] 超过10s没有收到数据，关闭连接"); log.Debug("[" + client.IP + "] 超过60s没有收到数据，关闭连接");
} }
} }
} }
...@@ -396,9 +396,8 @@ namespace DeviceLibrary ...@@ -396,9 +396,8 @@ namespace DeviceLibrary
{ {
CommonVar.nodeInfo[idx].Online = true; CommonVar.nodeInfo[idx].Online = true;
NodeOnline?.Invoke(idx); NodeOnline?.Invoke(idx);
NodeChanged?.Invoke(idx);
} }
NodeChanged?.Invoke(idx);
if (CommonVar.nodeInfo[idx].CheckNodeStateChanged(node)) if (CommonVar.nodeInfo[idx].CheckNodeStateChanged(node))
{ {
log.Info( "节点状态更新 " + node.StatetText()); log.Info( "节点状态更新 " + node.StatetText());
...@@ -417,8 +416,7 @@ namespace DeviceLibrary ...@@ -417,8 +416,7 @@ namespace DeviceLibrary
int idx = CommonVar.nodeInfo.FindIndex(s => s.Name == client.nodeName[i]); int idx = CommonVar.nodeInfo.FindIndex(s => s.Name == client.nodeName[i]);
if (idx == -1) continue; if (idx == -1) continue;
CommonVar.nodeInfo[idx].Offline(); CommonVar.nodeInfo[idx].Offline();
NodeChanged(idx); NodeOnline?.Invoke(idx);
NodeOnline(idx);
} }
client.nodeName.Clear(); client.nodeName.Clear();
} }
......
DeviceLibrary/Control.cs
...@@ -25,10 +25,6 @@ namespace DeviceLibrary ...@@ -25,10 +25,6 @@ namespace DeviceLibrary
/// </summary> /// </summary>
public ScopeLimit limitArea; public ScopeLimit limitArea;
/// <summary>
/// 获取任务打开
/// </summary>
public static bool OpenGetJob = true;
public Control() public Control()
{ {
AgvCallTimer = new System.Timers.Timer AgvCallTimer = new System.Timers.Timer
...@@ -87,7 +83,6 @@ namespace DeviceLibrary ...@@ -87,7 +83,6 @@ namespace DeviceLibrary
{ {
try try
{ {
// if (!CheckOnline(i)) continue;
CheckOnline(i); CheckOnline(i);
bool change = false; bool change = false;
MiR_API.Get_Task_State(CommonVar.agvInfo[i].CurTaskID, out string stateStr); MiR_API.Get_Task_State(CommonVar.agvInfo[i].CurTaskID, out string stateStr);
...@@ -131,7 +126,7 @@ namespace DeviceLibrary ...@@ -131,7 +126,7 @@ namespace DeviceLibrary
{ {
Job job = null; Job job = null;
if (OpenGetJob) if (agv_Info.IsUse)
{ {
job = find.GetNewJob(agv_Info); job = find.GetNewJob(agv_Info);
...@@ -141,6 +136,10 @@ namespace DeviceLibrary ...@@ -141,6 +136,10 @@ namespace DeviceLibrary
return job; return job;
} }
} }
else
{
return null;
}
} }
} }
...@@ -207,7 +206,6 @@ namespace DeviceLibrary ...@@ -207,7 +206,6 @@ namespace DeviceLibrary
CommonVar.agvInfo[idx].IsCon = true; CommonVar.agvInfo[idx].IsCon = true;
LogUtil.info(CommonVar.agvInfo[idx].Name + " Online"); LogUtil.info(CommonVar.agvInfo[idx].Name + " Online");
AgvOnline?.Invoke(idx); AgvOnline?.Invoke(idx);
AgvChanged?.Invoke(idx);
} }
} }
else else
...@@ -217,11 +215,10 @@ namespace DeviceLibrary ...@@ -217,11 +215,10 @@ namespace DeviceLibrary
CommonVar.agvInfo[idx].IsCon = false; CommonVar.agvInfo[idx].IsCon = false;
LogUtil.info(CommonVar.agvInfo[idx].Name + " Offline"); LogUtil.info(CommonVar.agvInfo[idx].Name + " Offline");
AgvOnline?.Invoke(idx); AgvOnline?.Invoke(idx);
AgvChanged?.Invoke(idx);
} }
else else
{ {
LogUtil.info(CommonVar.agvInfo[idx].Name + " Offline"); LogUtil.debug(CommonVar.agvInfo[idx].Name + " Offline");
} }
} }
return rtn; return rtn;
......
DeviceLibrary/bean/Agv_Info.cs
...@@ -36,7 +36,19 @@ namespace DeviceLibrary ...@@ -36,7 +36,19 @@ namespace DeviceLibrary
/// <summary> /// <summary>
/// 是否在线 /// 是否在线
/// </summary> /// </summary>
public bool IsCon { set; get; } public bool IsCon
{
set
{
if (!value.Equals(isCon))
{
isCon = value;
StateKanban.SetConnectState(isCon);
}
}
get { return isCon; }
}
private bool isCon = false;
/// <summary> /// <summary>
/// 是否可用 /// 是否可用
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!