Skip to content

D
domotikad
Commit 43e0818e authored by nextime's avatar nextime
Browse files
Options

GMI Interface is now working!

parent 62338b62
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 15 deletions
Web/htdocs/gmi/index.php
View file @ 43e0818e
...@@ -51,6 +51,7 @@ foreach($panels as $panel) { ...@@ -51,6 +51,7 @@ foreach($panels as $panel) {
?> ?>
<html> <html>
<head> <head>
<!--
<script type="text/javascript" <script type="text/javascript"
src="https://getfirebug.com/firebug-lite.js"> src="https://getfirebug.com/firebug-lite.js">
{ {
...@@ -59,7 +60,7 @@ src="https://getfirebug.com/firebug-lite.js"> ...@@ -59,7 +60,7 @@ src="https://getfirebug.com/firebug-lite.js">
startOpened: true, startOpened: true,
enableTrace: true enableTrace: true
} }
</script> </script> -->
<title>Domotika GMI Interface</title> <title>Domotika GMI Interface</title>
<link rel="stylesheet" href="/resources/pure/pure-nr-min.css"> <link rel="stylesheet" href="/resources/pure/pure-nr-min.css">
<link rel="stylesheet" href="/resources/fontawesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/resources/fontawesome/css/font-awesome.min.css">
...@@ -118,6 +119,7 @@ $.fn.alterClass = function ( removals, additions ) { ...@@ -118,6 +119,7 @@ $.fn.alterClass = function ( removals, additions ) {
}; };
})( window.jQuery || window.Zepto ); })( window.jQuery || window.Zepto );
/* /*
function postreply(arg) function postreply(arg)
{ {
...@@ -143,6 +145,22 @@ function butpushed(btype, bid) ...@@ -143,6 +145,22 @@ function butpushed(btype, bid)
//simpleGMI.post("http://q.unixmedia.net/rest/v1.2/"+btype+"/setbyid/"+bid+"/json", 'gmi=true', postreply); //simpleGMI.post("http://q.unixmedia.net/rest/v1.2/"+btype+"/setbyid/"+bid+"/json", 'gmi=true', postreply);
} }
function selcamopen()
{
window.lastAction=new Date().getTime();
$('#camopts').show();
$('#camchoose').hide();
}
function changeCamera(uri, name)
{
window.lastAction=new Date().getTime();
$('#camchoose').attr('data-uri', uri)
$('#camchoose').text(name);
$('#camchoose').show();
$('#camopts').hide();
}
//setInterval(function(){ //setInterval(function(){
// simpleGMI.refresh(); // simpleGMI.refresh();
//}, 3600000); //}, 3600000);
...@@ -170,20 +188,25 @@ function butpushed(btype, bid) ...@@ -170,20 +188,25 @@ function butpushed(btype, bid)
<div class="pure-u-1-3" style="width:31%"> <div class="pure-u-1-3" style="width:31%">
<div style="padding:5px;"> <div style="padding:5px;">
<? if(count($buttonar_center)<1) { ?> <? if(count($buttonar_center)<1) { ?>
<button class="pure-button pure-button-primary" style="width:100%;height:130px;" onclick="simpleGMI.refresh()">No Citophones</button> <button class="pure-button pure-button-warning" style="width:100%;height:130px;" onclick="simpleGMI.refresh()">No Citophones</button>
<? } else { ?> <? } else { ?>
<select class="styled-select" id=camerasel name=camerasel style="width:100%;height:130px;"> <button class="pure-button pure-button-success" style="width:100%;height:130px;"
data-uri="<?=$buttonar_center['0']['screenshot'];?>" id="camchoose"
onclick="selcamopen()">CAM: <?=$buttonar_center['0']['button_name']?></button>
<div style="width:30%;background-color:#000;position:absolute;top:10px;display:none;z-index:1000;overflow:auto;height:85%" id="camopts">
<? foreach($buttonar_center as $cit) { ?> <? foreach($buttonar_center as $cit) { ?>
<option value="<?=$cit['screenshot'];?>"><?=$cit['button_name']?></option> <button class="pure-button pure-button-secondary"
onclick="changeCamera('<?=$cit['screenshot'];?>', '<?=$cit['button_name']?>')"
style="width:100%;height:50px;margin-top:5px;" ><?=$cit['button_name']?></button>
<? } ?> <? } ?>
</select> </div>
<? } ?> <? } ?>
</div> </div>
<div style="height:80px" onclick="simpleGMI.refresh()"> <div style="height:80px" onclick="simpleGMI.refresh()">
</div> </div>
<div style="padding:5px;display:block"> <div style="padding:5px;display:block;position:absolute;top:220px;">
<img id="camera" src="/domotika/gmi/img/camera.jpg" style="width:100%;height:190px" onclick="simpleGMI.refresh()"></img> <img id="camera" src="/domotika/gmi/img/camera.jpg" style="width:80%;height:190px" onclick="simpleGMI.refresh()"></img>
</div> </div>
...@@ -207,7 +230,7 @@ function butpushed(btype, bid) ...@@ -207,7 +230,7 @@ function butpushed(btype, bid)
</div> </div>
<div class="footer-bar"> <div class="footer-bar" style="z-index:10000">
<!-- <!--
<button onClick="simpleGMI.dial(0, 0, 0, 281, '', 1)" class="pure-button pure-button-secondary"> <button onClick="simpleGMI.dial(0, 0, 0, 281, '', 1)" class="pure-button pure-button-secondary">
<i class="fa fa-microphone fa-2x blackiconcolor"></i> <i class="fa fa-microphone fa-2x blackiconcolor"></i>
...@@ -225,7 +248,6 @@ function butpushed(btype, bid) ...@@ -225,7 +248,6 @@ function butpushed(btype, bid)
</button> </button>
</div> </div>
<script> <script>
var es = new EventSource("/sse");
var syncReceived = function(event) { var syncReceived = function(event) {
var res=$.parseJSON(event.data); var res=$.parseJSON(event.data);
...@@ -243,7 +265,6 @@ var syncReceived = function(event) { ...@@ -243,7 +265,6 @@ var syncReceived = function(event) {
) )
}); });
} }
es.addEventListener("sync", syncReceived);
window.camimage = new Image(); window.camimage = new Image();
window.camimage.src = "/domotika/gmi/img/camera.jpg"; window.camimage.src = "/domotika/gmi/img/camera.jpg";
...@@ -253,18 +274,23 @@ function updateImage() ...@@ -253,18 +274,23 @@ function updateImage()
if(window.camimage.complete) { if(window.camimage.complete) {
$('#camera').attr('src', window.camimage.src); $('#camera').attr('src', window.camimage.src);
window.camimage = new Image(); window.camimage = new Image();
window.camimage.src = $('#camerasel').val() + "?time=" + new Date().getTime(); //window.camimage.src = $('#camerasel').val() + "?time=" + new Date().getTime();
window.camimage.src = $('#camchoose').attr('data-uri') + "?time=" + new Date().getTime();
//alert($('#camerasel option:selected').text()); //alert($('#camerasel option:selected').text());
} }
if(es!=null) if(window.es!=null)
setTimeout(updateImage, 500); setTimeout(updateImage, 500);
} }
window.camimagenum = <?=count($buttonar_center)?>; window.camimagenum = <?=count($buttonar_center)?>;
if(window.camimagenum>0) Zepto(function($){
window.es = new EventSource("/sse");
window.es.addEventListener("sync", syncReceived);
if(window.camimagenum>0)
updateImage(); updateImage();
});
keepAlive = setInterval(function(){ keepAlive = setInterval(function(){
...@@ -289,7 +315,7 @@ function endGMI() ...@@ -289,7 +315,7 @@ function endGMI()
function checkEnd() function checkEnd()
{ {
window.checkAction=new Date().getTime(); window.checkAction=new Date().getTime();
if((window.checkAction-window.lastAction)>30000) if((window.checkAction-window.lastAction)>60000)
{ {
endGMI(); endGMI();
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment