Social-Cycling/flockompass
Social-Cycling/flockompass
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update session dict whien updating from flock server

Browse Source
This commit is contained in:
rgarcia-herrera 2024-01-05 21:23:49 -06:00
parent 1ed4b45fe1
commit 63a97c364d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildozer.spec
View File

@ -28,7 +28,7 @@ source.include_exts = py,png,jpg,kv,atlas
#source.exclude_patterns = license,images/*/*.jpg #source.exclude_patterns = license,images/*/*.jpg
# (str) Application versioning (method 1) # (str) Application versioning (method 1)
version = 0.2 version = 0.7
# (str) Application versioning (method 2) # (str) Application versioning (method 2)
@ -37,7 +37,7 @@ version = 0.2
# (list) Application requirements # (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy # comma separated e.g. requirements = sqlite3,kivy
requirements = hostpython3, python3, kivy, plyer, android, mapview, requests, urllib3, chardet, idna, geopy, geographiclib, python-dateutil requirements = hostpython3, python3, kivy, https://github.com/HyTurtle/plyer/archive/master.zip, android, mapview, requests, urllib3, chardet, idna, geopy, geographiclib, python-dateutil
# (str) Custom source folders for requirements # (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes # Sets custom source for any requirements with recipes
@ -89,7 +89,7 @@ fullscreen = 0
android.permissions = INTERNET,ACCESS_FINE_LOCATION,ACCESS_COARSE_LOCATION,WAKE_LOCK,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE android.permissions = INTERNET,ACCESS_FINE_LOCATION,ACCESS_COARSE_LOCATION,WAKE_LOCK,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE
# (int) Target Android API, should be as high as possible. # (int) Target Android API, should be as high as possible.
#android.api = 27 android.api = 30
# (int) Minimum API your APK will support. # (int) Minimum API your APK will support.
#android.minapi = 21 #android.minapi = 21

17
main.py
View File

@ -84,7 +84,7 @@ class FlockompassApp(App):
settings = {'settings_smoothing': 0.88, settings = {'settings_smoothing': 0.88,
'settings_compass_update': 0.88, 'settings_compass_update': 0.88,
'settings_theme': "dark", 'settings_theme': "dark",
'settings_flock_server': 'http://flocker.mooo.com' 'settings_flock_server': 'http://flocker.mooo.com'
} }
with open(pickle_path, 'wb') as f: with open(pickle_path, 'wb') as f:
@ -137,7 +137,7 @@ class FlockompassApp(App):
self.compass_enable() self.compass_enable()
self.session_data['dest_lat'] = self.ms.ids.centermark.lat self.session_data['dest_lat'] = self.ms.ids.centermark.lat
self.session_data['dest_lon'] = self.ms.ids.centermark.lon self.session_data['dest_lon'] = self.ms.ids.centermark.lon
Clock.schedule_once(self.center_map_on_session, 0) Clock.schedule_once(self.center_map_on_session, 0)
self.flock_server_register() self.flock_server_register()
Clock.schedule_interval(self.flock, Clock.schedule_interval(self.flock,
self.session_data.get('settings_update_freq', 10.0)) self.session_data.get('settings_update_freq', 10.0))
@ -190,7 +190,7 @@ class FlockompassApp(App):
self.session_data['dest_lon'] = self.gps_data['lon'] self.session_data['dest_lon'] = self.gps_data['lon']
Clock.schedule_once(self.center_map_on_session, 0) Clock.schedule_once(self.center_map_on_session, 0)
# self.ms.ids.mapview.center_on(self.session_data['dest_lat'], # self.ms.ids.mapview.center_on(self.session_data['dest_lat'],
# self.session_data['dest_lon']) # self.session_data['dest_lon'])
else: else:
@ -238,7 +238,7 @@ class FlockompassApp(App):
def center_map_on_session(self, *args): def center_map_on_session(self, *args):
self.ms.ids.mapview.center_on(self.session_data['dest_lat'], self.ms.ids.mapview.center_on(self.session_data['dest_lat'],
self.session_data['dest_lon']) self.session_data['dest_lon'])
def get_field(self, dt): def get_field(self, dt):
""" """
@ -347,7 +347,7 @@ class FlockompassApp(App):
self.session_data['bike_id'] = r.json()['bike_id'] self.session_data['bike_id'] = r.json()['bike_id']
self.session_data['client_id'] = client_id self.session_data['client_id'] = client_id
Logger.info('registered! got bike_id: %s' % self.session_data['bike_id']) Logger.info('registered! got bike_id: %s' % self.session_data['bike_id'])
self.flock_server_update() self.flock_server_update()
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e:
status_code = e.response.status_code status_code = e.response.status_code
Logger.info('http error', status_code) Logger.info('http error', status_code)
@ -375,7 +375,12 @@ class FlockompassApp(App):
if resp: if resp:
self.session_data['last_update'] = isoparse(resp.pop('last_update')) self.session_data['last_update'] = isoparse(resp.pop('last_update'))
if 'flock_size' not in resp: if 'flock_size' in resp:
self.session_data['flock_lat'] = resp.pop('flock_lat')
self.session_data['flock_lon'] = resp.pop('flock_lon')
self.session_data['flock_size'] = resp.pop('flock_size')
self.session_data['flock_avg_speed'] = resp.pop('flock_avg_speed')
else:
self.session_data.pop('flock_avg_speed', None) self.session_data.pop('flock_avg_speed', None)
self.session_data.pop('flock_lat', None) self.session_data.pop('flock_lat', None)
self.session_data.pop('flock_lon', None) self.session_data.pop('flock_lon', None)

2
requirements.txt
View File

@ -32,7 +32,7 @@ pep517==0.6.0
pexpect==4.8.0 pexpect==4.8.0
pickleshare==0.7.5 pickleshare==0.7.5
platformdirs==2.4.0 platformdirs==2.4.0
plyer==2.0.0 plyer
prompt-toolkit==3.0.21 prompt-toolkit==3.0.21
ptyprocess==0.7.0 ptyprocess==0.7.0
Pygments==2.10.0 Pygments==2.10.0