Skip to content

Add Geoloc #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rocket13011 merged 10 commits into from
Nov 20, 2018
Merged

Add Geoloc #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8e704b9
add api Geoloc
rocket13011 Nov 13, 2018
d4c4d60
add saveGeloc add delGeoloc
rocket13011 Nov 14, 2018
ba3be1e
add class SaveGeoloc
rocket13011 Nov 14, 2018
4f89af5
add Class SaveGeoloc in api
rocket13011 Nov 14, 2018
afbc65b
bugfix
rocket13011 Nov 14, 2018
4ee07e7
add EventGeoloc, add DelGeoloc
rocket13011 Nov 14, 2018
367c8d9
Api for Geolocation
rocket13011 Nov 14, 2018
52c9d3d
bugfix php5
rocket13011 Nov 14, 2018
de4be4f
bugfix
rocket13011 Nov 14, 2018
7b7cc6b
rename Method
rocket13011 Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions core/api/mobile.api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,24 @@
$jsonrpc->makeSuccess(mobile::getSaveJson($params['Iq'], $params['type']));
}

if ($jsonrpc->getMethod() == 'geoloc'){
log::add('mobile', 'debug', 'Geoloc '. $params['id'] .' > ' . $params['name'] .' > ' .$params['value']);
mobile::EventGeoloc($params);
$jsonrpc->makeSuccess();
}

if ($jsonrpc->getMethod() == 'geolocSave'){
log::add('mobile', 'debug', 'Geoloc ADD '. $params['id'] .' > ' . $params['name']);
mobile::SaveGeoloc($params);
$jsonrpc->makeSuccess();
}

if ($jsonrpc->getMethod() == 'geolocDel'){
log::add('mobile', 'debug', 'Geoloc DEL '. $params['id'] .' > ' . $params['name']);
mobile::DelGeoloc($params);
$jsonrpc->makeSuccess();
}


throw new Exception(__('Aucune demande', __FILE__));
?>
44 changes: 44 additions & 0 deletions core/class/mobile.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,50 @@ public static function notification($arn, $os, $titre, $message, $badge = 'null'
curl_close($ch);
log::add('mobile', 'debug', 'notification resultat > ' . $server_output);
}

public function SaveGeoloc($geoloc){
log::add('mobile', 'debug', '|-----------------------------------');
log::add('mobile', 'debug', '|--debut de la fonction SaveGeoLoc--');
log::add('mobile', 'debug', '|-----------------------------------');
log::add('mobile', 'debug', '|');
$eqLogicMobile = eqLogic::byLogicalId($geoloc['iQ'], 'mobile');
log::add('mobile', 'debug', '| iQ = '.$geoloc['iQ']);
if(isset($eqLogicMobile)){
log::add('mobile', 'debug', '| Mobile bien trouvé dans cette Jeedom');
log::add('mobile', 'debug', '| Objet > '.$eqLogicMobile->getId());
}
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(),'geoId_'.$geoloc['id']);
if(!is_object($cmdgeoloc)){
$cmdgeoloc = new mobileCmd();
$cmdgeoloc->setLogicalId('geoId_'.$geoloc['id']);
$cmdgeoloc->setEqLogic_id($eqLogicMobile->getId());
$cmdgeoloc->setType('info');
$cmdgeoloc->setSubType('binary');
$cmdgeoloc->setIsVisible(1);
}
$cmdgeoloc->setName(__($geoloc['name'], __FILE__));
$cmdgeoloc->setConfiguration('latitude', $geoloc['latitude']);
$cmdgeoloc->setConfiguration('longitude', $geoloc['longitude']);
$cmdgeoloc->setConfiguration('subtitle', $geoloc['subtitle']);
$cmdgeoloc->setConfiguration('radius', $geoloc['radius']);
$cmdgeoloc->save();
}

public function DelGeoloc($geoloc){
$eqLogicMobile = eqLogic::byLogicalId($geoloc['iQ'], 'mobile');
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(),'geoId_'.$geoloc['id']);
if(isset($cmdgeoloc)){
$cmdgeoloc->remove();
}
}

public function EventGeoloc($geoloc){
$eqLogicMobile = eqLogic::byLogicalId($geoloc['iQ'], 'mobile');
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(),'geoId_'.$geoloc['id']);
if(isset($cmdgeoloc)){
$cmdgeoloc->event($geoloc['value']);
}
}

public function postInsert() {
$key = config::genKey(32);
Expand Down