1

source/ACSingleStore/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SO951-HC-ACSingleStore f6098eca023647b0fd493696a0451b04773a3ac3")]
+[assembly: AssemblyProduct("SO951-HC-ACSingleStore 6e594a0dbd42e88dccc564a7fe8036513fd327ba")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCulture("")]

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -899,9 +899,11 @@ namespace OnlineStore.DeviceLibrary
                 if (TempOrHumidityIsAlarm)
                 if (TempOrHumidityIsAlarm)
                 {
                 {
                     TimeSpan span = DateTime.Now - TempAlarmTime;
                     TimeSpan span = DateTime.Now - TempAlarmTime;
-                    if (span.Minutes > 30)
+                    if (span.Minutes > 40)
                     {
                     {
                         isTemp30M = true;
                         isTemp30M = true;
+                        SetWarnMsg(ResourceControl.CustAlarm, "湿度超限30分钟");//1084
+                        //LogUtil.info("湿度超限30分钟:"+ TempAlarmTime.ToString());
                     }
                     }
                 }
                 }
                 bool isNeedAlarmLed = false;
                 bool isNeedAlarmLed = false;
@@ -1912,6 +1914,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
+                IsInBlowing = IOManager.IOValue(IO_Type.StartOrStopBlow).Equals(IO_VALUE.HIGH);
                 if (DoorOpenAirBlow == 1)
                 if (DoorOpenAirBlow == 1)
                 {
                 {
                     if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) || IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
                     if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) || IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
@@ -1989,8 +1992,12 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
                     }
                     }
                     bool needAlarm = false;
                     bool needAlarm = false;
-                    //如果开始吹气并且当前达到报警值
-                    if (IsInBlowing && humidity > Max_Humidity)
+                    if (humidity <= Max_Humidity) {
+                        TempOrHumidityIsAlarm = false;
+                        TempAlarmTime = DateTime.Now;
+                    }
+                    else                    
+                    if (IsInBlowing && humidity > Max_Humidity)//如果开始吹气并且当前达到报警值
                     {
                     {
                         needAlarm = true;
                         needAlarm = true;
                     }
                     }
@@ -2007,6 +2014,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             LOGGER.Info("不在吹气中，且当前温度【" + param.Temperate + "】低于【" + Max_Temperature + "】，关闭报警！");
                             LOGGER.Info("不在吹气中，且当前温度【" + param.Temperate + "】低于【" + Max_Temperature + "】，关闭报警！");
                             TempOrHumidityIsAlarm = false;
                             TempOrHumidityIsAlarm = false;
+                            TempAlarmTime = DateTime.Now;
                             //Thread.Sleep(100);
                             //Thread.Sleep(100);
                             IOManager.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.LOW);
                             IOManager.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.LOW);
                         }
                         }
@@ -2014,6 +2022,7 @@ namespace OnlineStore.DeviceLibrary
                     else
                     else
                     {
                     {
                         TempOrHumidityIsAlarm = false;
                         TempOrHumidityIsAlarm = false;
+                        TempAlarmTime = DateTime.Now;
                     }
                     }
                     if (needAlarm)
                     if (needAlarm)
                     {
                     {