Merge pull request #41 from jeedom/beta

Add Geoloc

Author: rocket13011

core/api/mobile.api.php

@@ -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__));
 ?>

core/class/mobile.class.php

@@ -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);