|
|
@@ -65,9 +65,7 @@ camera_image = 'http://169.254.185.181/cgi-bin/images_cgi?channel=0&user=admin&p
|
|
|
camera_zoomin = "http://169.254.185.181/cgi-bin/ptz_cgi?action=ZoomAdd&user=admin&pwd=abcd1234"
|
|
|
camera_zoomout = "http://169.254.185.181/cgi-bin/ptz_cgi?action=ZoomSub&user=admin&pwd=abcd1234"
|
|
|
#php path
|
|
|
-ndvi_path = 'http://60.250.156.234/cust/c1.php'
|
|
|
-ppv_path = 'http://60.250.156.234/cust/p1.php'
|
|
|
-impv_path = 'http://60.250.156.234/cust/im1.php'
|
|
|
+picture_path= 'http://60.250.156.234/cust/c1.php'
|
|
|
|
|
|
reboot_path ="http://www.aisky.com.tw/field/BBtoCaveat.php"
|
|
|
#log
|
|
|
@@ -273,10 +271,10 @@ def system_reboot():
|
|
|
|
|
|
def system_update_code():
|
|
|
os.system('sudo su')
|
|
|
- os.system('rm -rf Edamame')
|
|
|
- os.system('git clone http://60.250.156.230:3000/fatwolf/Edamame.git')
|
|
|
+ os.system('rm -rf KDAIS')
|
|
|
+ os.system('git clone -b KDAIS5 --single-branch http://60.250.156.230:3000/fatwolf/KDAIS.git')
|
|
|
time.sleep(5)
|
|
|
- os.system('cp /home/pi/Edamame/server.py /usr/sbin/')
|
|
|
+ os.system('cp /home/pi/KDAIS/aisky-mqttd /usr/sbin/')
|
|
|
time.sleep(10)
|
|
|
server_log('a033', '1')
|
|
|
time.sleep(5)
|
|
|
@@ -335,9 +333,9 @@ def take_preview_photo(msg):
|
|
|
for f in files:
|
|
|
with open(os.path.join(root, f), "rb") as imageFile:
|
|
|
str = base64.b64encode(imageFile.read())
|
|
|
- url = impv_path
|
|
|
-
|
|
|
- values = {'data': str, 'name': f}
|
|
|
+ url = picture_path
|
|
|
+ nr='5'
|
|
|
+ values = {'data': str, 'name': f,'nr':nr}
|
|
|
data = urllib.parse.urlencode(values)
|
|
|
data = data.encode('utf-8')
|
|
|
req = urllib.request.Request(url, data)
|
|
|
@@ -372,8 +370,9 @@ def preview_photo(msg):
|
|
|
for f in files:
|
|
|
with open(os.path.join(root, f), "rb") as imageFile:
|
|
|
str = base64.b64encode(imageFile.read())
|
|
|
- url = ppv_path
|
|
|
- values = {'p22_'+msg['position']: str, 'p22_name_'+msg['position']: f}
|
|
|
+ url = picture_path
|
|
|
+ nr='5'
|
|
|
+ values = {'p': str, 'p_name':msg['position'],'nr':nr}
|
|
|
p22_1 = urllib.parse.urlencode(values)
|
|
|
p22_1 = p22_1.encode('utf-8')
|
|
|
req = urllib.request.Request(url, p22_1)
|
|
|
@@ -599,9 +598,9 @@ def manual_ndvi(msg):
|
|
|
for f in files:
|
|
|
with open(os.path.join(root, f), "rb") as imageFile:
|
|
|
str = base64.b64encode(imageFile.read())
|
|
|
- url = ndvi_path
|
|
|
- nr = '21'
|
|
|
- values = {'data_ira21': str, 'name_ira21': f, 'nr21': nr}
|
|
|
+ url = picture_path
|
|
|
+ nr = '5'
|
|
|
+ values = {'data_ira': str, 'name_ira': f, 'nr': nr}
|
|
|
data = urllib.parse.urlencode(values)
|
|
|
data = data.encode('utf-8')
|
|
|
req = urllib.request.Request(url, data)
|
|
|
@@ -622,9 +621,9 @@ def manual_ndvi(msg):
|
|
|
for f in files:
|
|
|
with open(os.path.join(root, f), "rb") as imageFile:
|
|
|
str = base64.b64encode(imageFile.read())
|
|
|
- url = ndvi_path
|
|
|
- nr = '21'
|
|
|
- values = {'c_na21': str, 'name_na21': f, 'nr21': nr}
|
|
|
+ url = picture_path
|
|
|
+ nr = '5'
|
|
|
+ values = {'c_na': str, 'name_na': f, 'nr': nr}
|
|
|
c = urllib.parse.urlencode(values)
|
|
|
c = c.encode('utf-8')
|
|
|
req = urllib.request.Request(url, c)
|
|
|
@@ -681,9 +680,9 @@ def ndvi(msg):
|
|
|
for f in files:
|
|
|
with open(os.path.join(root, f), "rb") as imageFile:
|
|
|
str = base64.b64encode(imageFile.read())
|
|
|
- url = ndvi_path
|
|
|
- nr = '21'
|
|
|
- values = {'data_ira21': str, 'name_ira21': f, 'nr21': nr}
|
|
|
+ url = picture_path
|
|
|
+ nr = '5'
|
|
|
+ values = {'data_ira': str, 'name_ira': f, 'nr': nr}
|
|
|
data = urllib.parse.urlencode(values)
|
|
|
data = data.encode('utf-8')
|
|
|
req = urllib.request.Request(url, data)
|
|
|
@@ -704,9 +703,9 @@ def ndvi(msg):
|
|
|
for f in files:
|
|
|
with open(os.path.join(root, f), "rb") as imageFile:
|
|
|
str = base64.b64encode(imageFile.read())
|
|
|
- url = ndvi_path
|
|
|
- nr = '21'
|
|
|
- values = {'c_na21': str, 'name_na21': f, 'nr21': nr}
|
|
|
+ url = picture_path
|
|
|
+ nr = '5'
|
|
|
+ values = {'c_na': str, 'name_na': f, 'nr': nr}
|
|
|
c = urllib.parse.urlencode(values)
|
|
|
c = c.encode('utf-8')
|
|
|
req = urllib.request.Request(url, c)
|
