From b0caa42ca2b3048beff294254cc9665fc4c8f23e Mon Sep 17 00:00:00 2001 From: Matthieu Date: Wed, 30 Oct 2019 20:32:28 +0100 Subject: [PATCH] Fix data on callback function --- examples/example.py | 23 +++++++++++++++++------ georideapilib/socket.py | 10 ++++++---- setup.py | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/examples/example.py b/examples/example.py index d024823..791e7e3 100644 --- a/examples/example.py +++ b/examples/example.py @@ -9,6 +9,8 @@ from georideapilib.objects import GeorideAccount import georideapilib.api as GeorideApi from georideapilib.socket import GeorideSocket +from threading import Thread + _LOGGER = logging.getLogger('example') @@ -22,12 +24,21 @@ def example(): print("token 1: ", account.auth_token) _LOGGER.info("token 1: %s", account.auth_token) # pylint: disable=W0105 - - # socket = GeorideSocket() - # socket.init() - # socket.connect(account.auth_token) - # time.sleep(10) - # socket.disconnect() + + def locked_locked(data): + _LOGGER.info("Locke received") + + + def connect_socket(account): + socket = GeorideSocket() + socket.subscribe_locked(locked_locked) + socket.init() + socket.connect(account.auth_token) + time.sleep(10) + socket.disconnect() + + thread = Thread(target=connect_socket, args=(account)) + thread.start() """ account.auth_token = GeorideApi.renewToken(account.auth_token) diff --git a/georideapilib/socket.py b/georideapilib/socket.py index 9746d52..b08e289 100644 --- a/georideapilib/socket.py +++ b/georideapilib/socket.py @@ -63,21 +63,21 @@ class GeorideSocket(): """ on_message """ _LOGGER.debug('Message received: %s', data) if self._on_message_callback is not None: - self._on_message_callback() + self._on_message_callback(data) @sio.on('device') def on_device(data): """ on_device """ _LOGGER.debug('Device received: %s', data) if self._on_device_callback is not None: - self._on_device_callback() + self._on_device_callback(data) @sio.on('position') def on_position(data): """ on_position """ _LOGGER.debug('Position received:%s', data) if self._on_position_callback is not None: - self._on_position_callback() + self._on_position_callback(data) @sio.on('alarm') def on_alarm(data): @@ -98,7 +98,9 @@ class GeorideSocket(): """ on_locked """ _LOGGER.debug('Locked received: %s', data) if self._on_locked_callback is not None: - self._on_locked_callback() + self._on_locked_callback(data) + else: + _LOGGER.debug('Lallback is none') self._initialised = True diff --git a/setup.py b/setup.py index 168fc17..fd9b492 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ CURRENT_DIR = os.path.dirname(__file__) setup( name='georideapilib', packages=['georideapilib'], # this must be the same as the name above - version='0.4.0', + version='0.4.1', description='Lib to control georide tracker devices with their rest api', author='Matthieu DUVAL', author_email='georideapilib@duval-dev.fr',