Skip to content

D
domotikad
Commit 42de2d48 authored by nextime's avatar nextime
Browse files
Options

Added call button on gmi interface

parent 43e0818e
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 78 deletions
Web/htdocs/gmi/index.php
View file @ 42de2d48
...@@ -35,7 +35,7 @@ foreach($panels as $panel) { ...@@ -35,7 +35,7 @@ foreach($panels as $panel) {
$buttonar_left=getPanelButtons($_DOMOTIKA['username'], $panel['panel_content'], $panel['panel_sections'], $panel['panel_websections'], $panel['panel_selector'],true,7); $buttonar_left=getPanelButtons($_DOMOTIKA['username'], $panel['panel_content'], $panel['panel_sections'], $panel['panel_websections'], $panel['panel_selector'],true,7);
break; break;
case 'gxv3175_center': case 'gxv3175_center':
$buttonar_center=DB::query("SELECT button_name,screenshot FROM mediasources $buttonar_center=DB::query("SELECT button_name,screenshot,audiostream FROM mediasources
WHERE websection='citophone' AND active=1 ORDER BY position,id"); // AND DMDOMAIN(button_name, '".$panel['panel_content']."')=1 WHERE websection='citophone' AND active=1 ORDER BY position,id"); // AND DMDOMAIN(button_name, '".$panel['panel_content']."')=1
break; break;
case 'gxv3175_right': case 'gxv3175_right':
...@@ -44,23 +44,9 @@ foreach($panels as $panel) { ...@@ -44,23 +44,9 @@ foreach($panels as $panel) {
} }
} }
//$buttonar_left=getPanelButtons($_DOMOTIKA['username'], "*","*","_grandstream_left", "dmdomain","true",7);
//$buttonar_right=getPanelButtons($_DOMOTIKA['username'], "*","*","_grandstream_right", "dmdomain","true",7);
//print_r($buttonar_left);
//print_r($buttonar_center);
?> ?>
<html> <html>
<head> <head>
<!--
<script type="text/javascript"
src="https://getfirebug.com/firebug-lite.js">
{
overrideConsole: false,
startInNewWindow: false,
startOpened: true,
enableTrace: true
}
</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">
...@@ -69,31 +55,14 @@ src="https://getfirebug.com/firebug-lite.js"> ...@@ -69,31 +55,14 @@ src="https://getfirebug.com/firebug-lite.js">
<meta http-equiv="pragma" content="no-cache"> <meta http-equiv="pragma" content="no-cache">
<meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate, max-age=-1, max-stale=0, post-check=0, pre-check=0"> <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate, max-age=-1, max-stale=0, post-check=0, pre-check=0">
<meta http-equiv="expires" content="-1"> <meta http-equiv="expires" content="-1">
<!--
<script src="/resources/js/sockjs-0.3.min.js" ></script>
<script src="/resources/js/ajaxsocket.js" ></script>
<script src="/resources/js/jquery-1.9.0.min.js"></script>
<script type="text/javascript" src="http://getfirebug.com/firebug-lite.js"></script>
-->
<script src="/resources/js/zepto.min.js"></script> <script src="/resources/js/zepto.min.js"></script>
<script src="/resources/EventSource/eventsource.js"></script> <script src="/resources/EventSource/eventsource.js"></script>
<script language="javascript" src="simpleGMI.js"></script> <script language="javascript" src="simpleGMI.js"></script>
<script type="text/javascript"> <script type="text/javascript">
window.lastAction=new Date().getTime(); window.lastAction=new Date().getTime();
simpleGMI.fullScreen(); simpleGMI.fullScreen();
/**
* jQuery alterClass plugin
*
* Remove element classes with wildcard matching. Optionally add classes:
* $( '#foo' ).alterClass( 'foo-* bar-*', 'foobar' )
*
* Copyright (c) 2011 Pete Boere (the-echoplex.net)
* Free under terms of the MIT license: http://www.opensource.org/licenses/mit-license.php
*
*/
(function ( $ ) { (function ( $ ) {
$.fn.alterClass = function ( removals, additions ) { $.fn.alterClass = function ( removals, additions ) {
var self = this; var self = this;
...@@ -119,53 +88,36 @@ $.fn.alterClass = function ( removals, additions ) { ...@@ -119,53 +88,36 @@ $.fn.alterClass = function ( removals, additions ) {
}; };
})( window.jQuery || window.Zepto ); })( window.jQuery || window.Zepto );
/*
function postreply(arg)
{
console.debug(arg);
} */
/*
var clicksound = new Audio("/domotika/gmi/beep.wav");
clicksound.preload = 'auto';
clicksound.load();
function playClick(volume) {
var click=clicksound.cloneNode();
click.volume=volume;
click.play();
}*/
function butpushed(btype, bid) function butpushed(btype, bid)
{ {
window.lastAction=new Date().getTime(); window.lastAction=new Date().getTime();
//playClick(1);
//simpleGMI.play('/domotika/gmi/beep.wav',0,0,function(data){alert(data)});
$.post("/rest/v1.2/"+btype+"/setbyid/"+bid+"/json"); $.post("/rest/v1.2/"+btype+"/setbyid/"+bid+"/json");
//simpleGMI.post("http://q.unixmedia.net/rest/v1.2/"+btype+"/setbyid/"+bid+"/json", 'gmi=true', postreply);
} }
function selcamopen() function selcamopen()
{ {
window.lastAction=new Date().getTime(); window.lastAction=new Date().getTime();
$('#camopts').show(); $('#camopts').show();
$('#camchoose').hide(); $('#camchoose').hide();
$('#camcall').hide();
} }
function changeCamera(uri, name) function changeCamera(uri, name, sip)
{ {
window.lastAction=new Date().getTime(); window.lastAction=new Date().getTime();
$('#camchoose').attr('data-uri', uri) $('#camchoose').attr('data-uri', uri)
$('#camchoose').text(name); $('#camchoose').text('CAM: '+name);
$('#camcall').attr('data-sip', sip);
$('#camchoose').show(); $('#camchoose').show();
$('#camcall').show();
$('#camopts').hide(); $('#camopts').hide();
} }
//setInterval(function(){
// simpleGMI.refresh(); function callcam()
//}, 3600000); {
// simpleGMI.post('http://q.unixmedia.net/domotika/gmi/style.css', 'aaa=sarca', postreply); window.lastAction=new Date().getTime();
//}, 5000); simpleGMI.dial(0, 1, 0, $('#camcall').attr('data-sip'), '', 0);
}
</script> </script>
</head> </head>
<body> <body>
...@@ -190,13 +142,17 @@ function changeCamera(uri, name) ...@@ -190,13 +142,17 @@ function changeCamera(uri, name)
<? if(count($buttonar_center)<1) { ?> <? if(count($buttonar_center)<1) { ?>
<button class="pure-button pure-button-warning" 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 { ?>
<button class="pure-button pure-button-success" style="width:100%;height:130px;" <button class="pure-button pure-button-success" style="width:100%;height:60px;"
data-uri="<?=$buttonar_center['0']['screenshot'];?>" id="camchoose" data-uri="<?=$buttonar_center['0']['screenshot'];?>" id="camchoose"
onclick="selcamopen()">CAM: <?=$buttonar_center['0']['button_name']?></button> onclick="selcamopen()">CAM: <?=$buttonar_center['0']['button_name']?></button>
<button class="pure-button pure-button-warning" style="width:100%;height:60px;margin-top:10px;"
data-sip="<?=str_replace('SIP:','',$buttonar_center['0']['audiostream']);?>" id="camcall"
onclick="callcam()">Chiama</button>
<div style="width:30%;background-color:#000;position:absolute;top:10px;display:none;z-index:1000;overflow:auto;height:85%" id="camopts"> <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) { ?>
<button class="pure-button pure-button-secondary" <button class="pure-button pure-button-secondary"
onclick="changeCamera('<?=$cit['screenshot'];?>', '<?=$cit['button_name']?>')" onclick="changeCamera('<?=$cit['screenshot'];?>', '<?=$cit['button_name']?>', '<?=str_replace('SIP:','', $cit['audiostream'])?>')"
style="width:100%;height:50px;margin-top:5px;" ><?=$cit['button_name']?></button> style="width:100%;height:50px;margin-top:5px;" ><?=$cit['button_name']?></button>
<? } ?> <? } ?>
</div> </div>
...@@ -231,15 +187,6 @@ function changeCamera(uri, name) ...@@ -231,15 +187,6 @@ function changeCamera(uri, name)
</div> </div>
<div class="footer-bar" style="z-index:10000"> <div class="footer-bar" style="z-index:10000">
<!--
<button onClick="simpleGMI.dial(0, 0, 0, 281, '', 1)" class="pure-button pure-button-secondary">
<i class="fa fa-microphone fa-2x blackiconcolor"></i>
</button>
<span> STATUS: DEFAULT</span>
<button onClick="simpleGMI.refresh()" class="pure-button pure-button-secondary" style="float:right">
<i class="fa fa-refresh fa-2x fa-spin blackiconcolor"></i>
</button>
-->
<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>
</button> </button>
...@@ -259,7 +206,6 @@ var syncReceived = function(event) { ...@@ -259,7 +206,6 @@ var syncReceived = function(event) {
var color=$(this).attr('data-dmcolor-on'); var color=$(this).attr('data-dmcolor-on');
else else
var color=$(this).attr('data-dmcolor-off'); var color=$(this).attr('data-dmcolor-off');
//alert(color);
$(this).alterClass('pure-button-*', color); $(this).alterClass('pure-button-*', color);
} }
) )
...@@ -274,9 +220,7 @@ function updateImage() ...@@ -274,9 +220,7 @@ 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 = $('#camchoose').attr('data-uri') + "?time=" + new Date().getTime(); window.camimage.src = $('#camchoose').attr('data-uri') + "?time=" + new Date().getTime();
//alert($('#camerasel option:selected').text());
} }
if(window.es!=null) if(window.es!=null)
setTimeout(updateImage, 500); setTimeout(updateImage, 500);
...@@ -284,7 +228,6 @@ function updateImage() ...@@ -284,7 +228,6 @@ function updateImage()
window.camimagenum = <?=count($buttonar_center)?>; window.camimagenum = <?=count($buttonar_center)?>;
Zepto(function($){ Zepto(function($){
window.es = new EventSource("/sse"); window.es = new EventSource("/sse");
window.es.addEventListener("sync", syncReceived); window.es.addEventListener("sync", syncReceived);
...@@ -298,7 +241,6 @@ keepAlive = setInterval(function(){ ...@@ -298,7 +241,6 @@ keepAlive = setInterval(function(){
function(r){ function(r){
if(r.data=='SLOGGEDOUT') if(r.data=='SLOGGEDOUT')
{ {
//location.reload();
simpleGMI.refresh(); simpleGMI.refresh();
} }
}); });
...@@ -307,8 +249,12 @@ keepAlive = setInterval(function(){ ...@@ -307,8 +249,12 @@ keepAlive = setInterval(function(){
function endGMI() function endGMI()
{ {
clearInterval(keepAlive); clearInterval(keepAlive);
es.close(); try {
es=null; es.close();
es=null;
} catch(err) {
}
simpleGMI.exit(); simpleGMI.exit();
} }
......
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