rabin 7 years ago
parent
commit
151c34dc64
2 changed files with 8 additions and 8 deletions
  1. 7 7
      cron.py
  2. 1 1
      service/device.py

+ 7 - 7
cron.py

@@ -9,7 +9,7 @@ import time
 from demeter.core import *
 from gevent import monkey; monkey.patch_socket()
 import gevent
-from pic import pic
+#from pic import pic
 from demeter.mqtt import *
 # 处理定时命令、周期命令、条件控制、消息、设备状态等
 timeSleep = 10
@@ -23,7 +23,7 @@ def switch(value):
 def device():
 	while 1:
 		model = Demeter.model('device_info')
-		cur = Demeter.time() - 1200
+		cur = Demeter.time() - 1800
 		model.cdate.assgin(cur, '<=')
 		model.status = True
 		data = model.select()
@@ -177,12 +177,12 @@ def timeSync():
 
 def handle():
 	gevent.joinall([
-		gevent.spawn(timing),
-		gevent.spawn(loop),
-		gevent.spawn(device),
-		gevent.spawn(savePic),
+		#gevent.spawn(timing),
+		#gevent.spawn(loop),
+		#gevent.spawn(device),
+		#gevent.spawn(savePic),
 		gevent.spawn(control),
-		gevent.spawn(timeSync),
+		#gevent.spawn(timeSync),
 		gevent.spawn(mulQueue),
 		gevent.spawn(mulQueueDrop),
 	])

+ 1 - 1
service/device.py

@@ -178,7 +178,7 @@ class Device(object):
 				oper = self.msg(info['type_id'], v['value']) + msg
 			#判断是不是卷帘类的按钮,如果是,要等15秒。。
 			if self.type_info['unit'] == 'button':
-				sleep(15)
+				time.sleep(15)
 			if state:
 				model.update(status=2, oper=oper, operdate=Demeter.time())
 			else: