修改标志位

GcDevicePc/DataState.cs

@@ -920,7 +920,7 @@ namespace GcDevicePc
                     if (CProfileDevice.m_DevParam.valve.u16ValveSetTime2[2] > 0)
                         ModbusLib.Globaldata.tcpGlobaldata.ppmstate = 0x03;  //标定
                     else if (CProfileDevice.m_DevParam.valve.u16ValveSetTime2[3] > 0)
-                        ModbusLib.Globaldata.tcpGlobaldata.ppmstate = 0x02;  //零气
+                        ModbusLib.Globaldata.tcpGlobaldata.ppmstate = 0x01;  //零气
                     else ModbusLib.Globaldata.tcpGlobaldata.ppmstate = 0x01;
                     
                 }

GcDevicePc/MDIBase.cs

@@ -241,10 +241,10 @@ namespace GcDevicePc
             timespan = System.DateTime.Now - startTime;
             toolStripStatusLabelusertime.Text = String.Format("运行时间：{0}", 
                 timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
-
+           // Trace.WriteLine(string.Format("时间{0}，状态{1}", getIdleTick(),LandIn.Island),"sys");
 
             //监视界面活动
-            if (getIdleTick()/1000>1000*60*30 && LandIn.Island)
+            if (getIdleTick()>60*30 && LandIn.Island)
             {
                 
                 if (_userForm != null)
@@ -255,6 +255,7 @@ namespace GcDevicePc
                 }
                 LandIn.Island = false;
                 SetMenu(LandIn.Island);
+                Trace.WriteLine("进入自动销户","sys");
             }
         }
         [StructLayout(LayoutKind.Sequential)]
@@ -269,7 +270,7 @@ namespace GcDevicePc
         public static extern bool GetLastInputInfo(ref LASTINPUTINFO plii);
 
         /// <summary>
-        /// 返回持续时间  ms
+        /// 返回持续时间  s
         /// </summary>
         /// <returns></returns>
         public long getIdleTick()
@@ -277,7 +278,7 @@ namespace GcDevicePc
             LASTINPUTINFO vLastInputInfo = new LASTINPUTINFO();
             vLastInputInfo.cbSize = Marshal.SizeOf(vLastInputInfo);
             if (!GetLastInputInfo(ref vLastInputInfo)) return 0;
-            return Environment.TickCount - (long)vLastInputInfo.dwTime;
+            return (Environment.TickCount - (long)vLastInputInfo.dwTime)/1000;
         }