http发送去掉ping。

LN
Commit dae56167 由 LN 编写于 2020-03-16 10:43:05 +0800
dll/CodeLibrary.dll
source/AssemblyLineClient/App.config
source/AssemblyLineClient/记录.txt
source/Common/util/MyWebClient.cs
source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
source/DeviceLibrary/assemblymanager/SServerManager.cs
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
--- a/dll/CodeLibrary.dll
查看文件 @dae5616
+++ b/dll/CodeLibrary.dll
查看文件 @dae5616
--- a/source/AssemblyLineClient/App.config
查看文件 @dae5616
+++ b/source/AssemblyLineClient/App.config
查看文件 @dae5616
@@ -50,7 +50,7 @@
    <add key="OpenRFIDWrite" value="1" />
    <add key="DefaultPWD" value="123456" />
    <!--当前调试的设备ID，分号分割-->
-    <add key="DebugDeviceId" value="301" />
+    <add key="DebugDeviceId" value="302" />
    <add key="Server_Log_Open" value="0" />
    <add key="CodeCount" value="3" />
    <add key="DefaultTrayNum" value="0" />

--- a/source/AssemblyLineClient/记录.txt
查看文件 @dae5616
+++ b/source/AssemblyLineClient/记录.txt
查看文件 @dae5616
-在阳光电源流水线的基础上新建佳世达流水线料项目
+20200315:
+皮带线报警后不继续转动皮带线。
+http发送去掉ping。
+20200314:
+出料机构：如果是7寸盘，提前放行托盘
+皮带线123：增加NG气缸逻辑
+急停判断修改。
+在阳光电源流水线的基础上新建佳世达流水线料项目
 流水线SubType:1000
 移栽出入仓模块：1-18
 入料模块：101-104
@@ -302,10 +358,9 @@ IO_Value增加None的定义，防止误操作
 进仓模块：高度大于30的盘，出库时托盘先不顶升，待料盘到达托盘上方后，顶升再上升。
-20200314:
-出料机构：如果是7寸盘，提前放行托盘
-皮带线123：增加NG气缸逻辑
-急停判断修改。

--- a/source/Common/util/MyWebClient.cs
查看文件 @dae5616
+++ b/source/Common/util/MyWebClient.cs
查看文件 @dae5616
@@ -11,7 +11,7 @@ using System.Text;
 namespace OnlineStore.Common
 {
-    public class MyWebClient:WebClient
+    public class MyWebClient : WebClient
    {
        private int _timeout;
@@ -73,17 +73,17 @@ namespace OnlineStore.Common
            return true;
        }
        public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public static string Post(string url, string paramData)
+        public static string Post(string url, string paramData, int timeOut = 2000)
        {
-            return Post(url, paramData, Encoding.UTF8);
+            return Post(url, paramData, Encoding.UTF8, timeOut);
        }
        private static int isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
-        public static string Post(string url, string paramData, Encoding encoding)
+        public static string Post(string url, string paramData, Encoding encoding, int timeOut = 2000)
        {
-            if (PingURLIP(url, 100).Equals(false))
+            //if (PingURLIP(url, 100).Equals(false))
-            {
+            //{
-                return "";
+            //    return "";
-            }
+            //}
            if (isLog == 1)
            {
                LOGGER.Info("给服务器发送数据【" + paramData + "】 ");

--- a/source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
查看文件 @dae5616
+++ b/source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
查看文件 @dae5616
@@ -431,7 +431,7 @@ namespace OnlineStore.DeviceLibrary
                {
                    if (result.Equals(""))
                    {
-                        if (span.TotalSeconds >= 4 && span.TotalSeconds <= 5)
+                        if (span.TotalSeconds >= 3 && span.TotalSeconds <= 5)
                        {
                            LogUtil.debug(subType + "停止运动：[" + moveDO + "] [" + checkDI + "] 耗时 [" + FormUtil.GetSpanStr(span) + "][" + canWhileCount + "]");
                        }

--- a/source/DeviceLibrary/assemblymanager/SServerManager.cs
查看文件 @dae5616
+++ b/source/DeviceLibrary/assemblymanager/SServerManager.cs
查看文件 @dae5616
@@ -80,10 +80,12 @@ namespace OnlineStore.DeviceLibrary
                string server = GetAddr(Addr_PosForPutin, paramMap);
                //string server = GetAddr(Addr_PosForPutin) + "?cids=" + LineServer.GetAllCID() + "&code=%3D" + codeStr;
+                DateTime startTime = DateTime.Now;
                LogUtil.info(deviceName + "托盘【" + trayNum + "】 条码【 " + codeStr + "】料串【" + rfid + "】，获取入库库位：");
-                string resultStr = HttpHelper.Post(server, "");
+                string resultStr = HttpHelper.Post(server, "",10000);
-                LogUtil.info(deviceName +  "CodeReceived  【" + server + "】【" + resultStr + "】");
+                LogUtil.info(deviceName +  "CodeReceived "+FormUtil.GetSpanStr(DateTime.Now-startTime)+" 【" + server + "】【" + resultStr + "】");
                //{"result":"0","msg":"","pos":"11#AC1_18_4_28","barcode":"R506072019102200414","cid":"line-ac-11"}
                LineOperation serverResult = JsonHelper.DeserializeJsonToObject<LineOperation>(resultStr);
                if (serverResult == null)
@@ -184,9 +186,10 @@ namespace OnlineStore.DeviceLibrary
                paramMap.Add("barcode", codeStr);//  barcode = 扫到的条码
                string server = GetAddr(Addr_getSize, paramMap);
+                DateTime startTime = DateTime.Now;
                string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info("GetTraySize 【" + server + "】【" + resultStr + "】");
+                LogUtil.info("GetTraySize   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
                //返回: { "code": 0, "msg":"ok", data: 7} 
                ServerData serverResult = JsonHelper.DeserializeJsonToObject<ServerData>(resultStr);
                if (serverResult == null)
@@ -230,8 +233,9 @@ namespace OnlineStore.DeviceLibrary
                paramMap.Add("status", status);   // status = 状态信息, 移栽 = MOVING, 流水线 = INLINE, 皮带线 = INBELT
                paramMap.Add("locInfo", locInfo);  // locInfo = 位置信息,移栽时为移栽编号,流水线时为托盘号,皮带线时为皮带线编号,机器人时为机器人编号
                string server = GetAddr(Addr_updateLocInfo, paramMap);
+                DateTime startTime = DateTime.Now;
                string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info("UpdateTrayLoc  【" + server + "】【" + resultStr + "】");
+                LogUtil.info("UpdateTrayLoc   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
                // 返回: { "code": 0, "msg":"ok", "data":""}
                ServerData serverResult = JsonHelper.DeserializeJsonToObject<ServerData>(resultStr);
                if (serverResult == null)
@@ -269,8 +273,9 @@ namespace OnlineStore.DeviceLibrary
                paramMap.Add("rfidLoc", rfidPosId);     // rfidLoc=料架的架位信息 
                // paramMap.Add("robotIndex", "0");          // robotIndex = r机器人编号(非机器人放置时不传此参数), IP为51的机器人为1, 52的机器人为2, 53的机器人为3
                string server = GetAddr(Addr_putShelfFinished, paramMap);
+                DateTime startTime = DateTime.Now;
                string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info("PutShelfFinished  【" + server + "】【" + resultStr + "】");
+                LogUtil.info("PutShelfFinished    " + FormUtil.GetSpanStr(DateTime.Now - startTime) + "  【" + server + "】【" + resultStr + "】");
                // 返回: {"code": 0, "msg":"ok", "data":{"rfid":"xxx","smallEmpty":0,"bigEmpty":0, "packageEmpty":0,"cutPackageTask":0,"packageTask":10,"cutTask":10, "smallTask":5, "bigTask":5}
                PutFinishedData serverResult = JsonHelper.DeserializeJsonToObject<PutFinishedData>(resultStr);
                // string str = "{"code":0,"msg":"ok","data":{"smallTask":"1","cutPackageTask":"0","packageTask":"0","bigTask":"0","smallEmpty":"0","bigEmpty":"0","packageEmpty":"0","rfid":" - 1 - 1","cutTask":"0"}}";
@@ -311,8 +316,9 @@ namespace OnlineStore.DeviceLibrary
                Dictionary<string, string> paramMap = new Dictionary<string, string>();
                paramMap.Add("rfid", rfid);//rfid   
                string server = GetAddr(Addr_clearPutInRfid, paramMap);
+                DateTime startTime = DateTime.Now;
                string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info(deviceName + "clearPutInRfid  【" + server + "】【" + resultStr + "】");
+                LogUtil.info(deviceName + "clearPutInRfid    " + FormUtil.GetSpanStr(DateTime.Now - startTime) + "  【" + server + "】【" + resultStr + "】");
            }
            catch (Exception ex)
@@ -344,12 +350,13 @@ namespace OnlineStore.DeviceLibrary
                    return msg;
                }
+                DateTime startTime = DateTime.Now;
                Dictionary<string, string> paramMap = new Dictionary<string, string>();
                paramMap.Add("robotIndex", robotIndex.ToString());//rfid   
                paramMap.Add("barcode", barcode);
                string server = GetAddr(Addr_arriveRobotLocation, paramMap);
                string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info(deviceName + "arriveRobotLocation  【" + server + "】【" + resultStr + "】");
+                LogUtil.info(deviceName + "arriveRobotLocation      " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
            }
            catch (Exception ex)

--- a/source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
查看文件 @dae5616
+++ b/source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
查看文件 @dae5616
@@ -117,10 +117,10 @@ namespace OnlineStore.DeviceLibrary
        [HandleProcessCorruptedStateExceptions]
        public static List<string> CameraScan(List<string> cameraList, string deviceName, bool isSaveImg = false)
        {
-            if (codeCount < 1)
+            //if (codeCount < 1)
-            {
+            //{
-                codeCount = 1;
+            //    codeCount = 1;
-            }
+            //}
            List<string> codeList = new List<string>();
            if (cameraList == null || cameraList.Count <= 0)
            {